0.7.96

fix articles page

ArticlesApp/funcs.py

@@ -1,7 +1,7 @@
 from .models import *
 
 
-elements_on_page = 1
+elements_on_page = 5
 
 def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None):
 
@@ -38,7 +38,8 @@ def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None):
         'articles': arts,
         'last_block': last_block,
         'last_el': to_el,
-        'next_page_els_count': next_page_els_count
+        'next_page_els_count': next_page_els_count,
+        'elements_on_page': elements_on_page
     }
 
     return Dict

ArticlesApp/templatetags/__init__.py

@@ -0,0 +1 @@
+__author__ = 'SDE'

ArticlesApp/templatetags/arts_tags_extra.py

@@ -0,0 +1,48 @@
+__author__ = 'SDE'
+
+from django import template
+from django.template.defaultfilters import stringfilter
+
+register = template.Library()
+
+
+# @register.filter('get_side_art')
+@register.simple_tag
+def get_side_art(last_el, counter, els_on_page):
+    cur_el = last_el - els_on_page + counter
+    if els_on_page < 4:
+        first_left_el = els_on_page + 1
+    else:
+        first_left_el = 4
+    if (cur_el - first_left_el) % 2:
+        return 'even'
+    else:
+        return 'odd'
+
+# @register.filter()
+# def get_numbers_list(from_el, to_el):
+#     res = range(from_el, to_el+1)
+#     return res
+#
+#
+# def val_type(value):
+#     res = type(value)
+#     return res.__name__
+# register.filter('val_type', val_type)
+#
+# @register.filter()
+# def get_cols_table_data_for_row_when_cols3(value, row):
+#     el_count = 3
+#     from_el = (row-1) * el_count
+#     to_el = row * el_count
+#     part = list(value)[from_el:to_el]
+#     return part
+# # register.filter('val_type', val_type)
+#
+#
+# @register.filter
+# @stringfilter
+# def correct_for_tables(value):
+#     if value in ['None', '0.0']:
+#         return '-'
+#     return value

BaseModels/SMS_sender.py

@@ -26,9 +26,9 @@ def send_SMS(phone, text, urgent=False, staff=False):
     phone.encode('utf-8')
 
     http_request = 'http://cp.websms.by/?r=api/msg_send' \
-              '&user=administrator@baldenini.by' \
-              '&apikey=zTwevODOYl' \
-              '&sender=Baldenini'
+              '&user=administrator@site.by' \
+              '&apikey=key' \
+              '&sender=company'
               # '&test=1'
 
     if urgent:

BaseModels/mailSender.py

@@ -20,11 +20,7 @@ import random
 from django.conf import settings
 
 
-# tech@truenergy.by
-# k7n2d3ZFZo4@CU5$4YDk
 
-# administrator@truenergy.by
-# 6&#WfW8$qR2w8uv69e5$
 
 
 # def fix_mailing_links_in_mail(html):
@@ -90,11 +86,7 @@ def admin_send_mail_by_SMTPlib(subject, from_email, to, html_content, attachment
     res = None
 
     try:
-        # smtp_server = 'mail.cln.by'  # 'mail.truenergy.by'
-        # smtp_port = 2525  # 587
-        # smtp_password = 'clNdt6a8a'  # u'98q3$IjxH%RUIxySw8R2'
-        # smtp_login = 'support@cln.by'  # 'support@truenergy.by'
-        # from_email = smtp_login
+
 
         try:
             smtp_server = 'mail.truenergy.by'
@@ -112,8 +104,6 @@ def admin_send_mail_by_SMTPlib(subject, from_email, to, html_content, attachment
                                        smtp_password, attachments)
 
     except Exception as e:
-        # from Baldenini_site.SMS_sender import send_SMS
-        # send_SMS(u'375296177827', u'send_mail_by_SMTPlib error = {0}'.format(str(e)), urgent=True)
         msg = 'admin_send_mail_by_SMTPlib error = {0}'.format(str(e))
         print(msg)
         # techSendMail(msg)
@@ -216,8 +206,6 @@ def send_mail_by_SMTPlib(subject, from_email, to_init, html_content, smtp_server
         # print('mail_lib.quit = {0}'.format(str(msg)))
 
     except Exception as e:
-        # from Baldenini_site.SMS_sender import send_SMS
-        # send_SMS(u'375296177827', u'send_mail_by_SMTPlib error = {0}'.format(str(e)), urgent=True)
         msg = 'send_mail_by_SMTPlib error = {0}'.format(str(e))
         print(msg)
         try:

BaseModels/messages.py

@@ -1,6 +1,5 @@
 ## -*- coding: utf-8 -*-
 __author__ = 'SDE'
-# from Baldenini_site.inter import jsonify
 
 def get_error_message_Dict(show_icon=None):
     print('get_error_message_Dict')

GeneralApp/init_options.py

@@ -0,0 +1,7 @@
+from .models import *
+
+def init():
+    options = Option.objects.all()
+    option_names = options.values_list('name', flat=True)
+    #
+    # if not 'mail_server_url':

GeneralApp/templatetags/base_tags_extra.py

@@ -154,3 +154,7 @@ def get_color_by_number(value, arg=None):
 #
 #     return s
 
+
+
+
+

GeneralApp/views.py

@@ -32,6 +32,10 @@ def test_code(request):
     return HttpResponse('finished')
 
 
+
+
+
+
 def MainPage(request):
     from RoutesApp.forms import RouteForm
 

templates/widgets/w_news_element_item.html

@@ -1,7 +1,9 @@
 {% load static %}
+{% load arts_tags_extra %}
 
 {% if not from_el or forloop.counter > from_el %}
-    <div class="news_item_pagination {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}">
+{#    <div class="news_item_pagination {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}">#}
+    <div class="news_item_pagination {% get_side_art last_el forloop.counter elements_on_page %}">
         <a href="{% url "article_one" art.url %}">
             <div class="pag_news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
             <div class="pag_news_item_text">