From 630c294d4ca58e828be404b649da5b7497a755a6 Mon Sep 17 00:00:00 2001 From: alonisser Date: Sun, 10 Apr 2016 21:05:05 +0300 Subject: [PATCH 1/3] Adding facebook metatags --- templates/site_base.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/site_base.html b/templates/site_base.html index e31e98cc..7639dacb 100644 --- a/templates/site_base.html +++ b/templates/site_base.html @@ -14,6 +14,12 @@ + + + + + + From e0c76f5ecedbd016710cc0f29cdb523d84517699 Mon Sep 17 00:00:00 2001 From: alonisser Date: Tue, 26 Apr 2016 12:34:30 +0300 Subject: [PATCH 2/3] seperating to block, adding twitter and fb app id --- templates/site_base.html | 492 +++++++++++++++++++++------------------ 1 file changed, 267 insertions(+), 225 deletions(-) diff --git a/templates/site_base.html b/templates/site_base.html index 7639dacb..0a0e1165 100644 --- a/templates/site_base.html +++ b/templates/site_base.html @@ -1,314 +1,356 @@ {% load i18n search avatar_tags feedback %}{% load static from staticfiles %} - + {% block extratitle %}{% endblock %} | {% trans 'Open Knesset' %} - - + + - - - - - - - - - + + + + {% block social_share %} + + + + + + + - + + + + - + + + + + {% endblock %} + + + + - - + {% block extracss %} {% endblock %} - + {% block extrahead %}{% endblock %} -
-{% if debug %} -
{% trans 'This is a development server, all data in it should be considered fictional. users are kindly requested to go to '%}http://oknesset.org/
-{% endif %} -
+
+ {% if debug %} +
+
+
{% trans 'This is a development server, all data in it should be considered fictional. users are kindly requested to go to ' %}http://oknesset.org/
+
+
+ {% endif %} +
-
+
-
-
-
-{% if not hide_crumbs %} + + + + +
+
+ {% if not hide_crumbs %} -{% endif %} - -
-
- {% block messages %}{% endblock %} -
- - {% block header %} {% endblock %} -
- {% block flatpage_block %}{% if flatpage %} - {% if flatpage.template_name %} - {% include flatpage.template_name %} - {% else %} - {% include "flatpages/default_block.html" %} - {% endif %} - {% endif %}{% endblock %} - {% block divcontent %} {% block content %}ahm.. my child should replace this block{% endblock %}{% endblock %} -
-
- {% block social %} + {% endif %} + +
+
+ {% block messages %}{% endblock %} +
+ + {% block header %} {% endblock %} +
+ {% block flatpage_block %}{% if flatpage %} + {% if flatpage.template_name %} + {% include flatpage.template_name %} + {% else %} + {% include "flatpages/default_block.html" %} + {% endif %} + {% endif %}{% endblock %} + {% block divcontent %} {% block content %}ahm.. my child should replace this block + {% endblock %}{% endblock %} +
+
+ {% block social %}
{% if not debug and not is_index %}
- שיתוף - - - - - - - + שיתוף + + + + + + +
{% endif %}
- {% endblock %} -
- -
- -
+ + - - {% add_feedback_suggestion_form %} - {% trans "Feedback" as feedback_button_text %} - {% trans "IncText" as inc_text %} - {% trans "DecText" as dec_text %} - -
- {% include "auxiliary/_suggestion_button.html" with suggest_for="feedback" button_text=feedback_button_text %} - {% include "auxiliary/_floating_button.html" with button_text=dec_text btn_class="btn-dec" %} - {% include "auxiliary/_floating_button.html" with button_text=inc_text btn_class="btn-inc" %}
- + + +{% add_feedback_suggestion_form %} +{% trans "Feedback" as feedback_button_text %} +{% trans "IncText" as inc_text %} +{% trans "DecText" as dec_text %} + +
+ {% include "auxiliary/_suggestion_button.html" with suggest_for="feedback" button_text=feedback_button_text %} + {% include "auxiliary/_floating_button.html" with button_text=dec_text btn_class="btn-dec" %} + {% include "auxiliary/_floating_button.html" with button_text=inc_text btn_class="btn-inc" %} +
+ {% comment %} Suggestion forms {% endcomment %} {% if suggestion_forms %}{% include "auxiliary/_suggestion_forms.html" %}{% endif %} - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - {# Load kikar-hamedina scripts #} +{# Load kikar-hamedina scripts #} - - - + + + - + - {% block extrajs %}{% endblock %} - {% block footer %} - {% endblock %} +{% block extrajs %}{% endblock %} +{% block footer %} +{% endblock %} - + From 6331d3a61f3ff1fa0f7e99b78717ddd577bf2f90 Mon Sep 17 00:00:00 2001 From: alonisser Date: Tue, 26 Apr 2016 23:38:42 +0300 Subject: [PATCH 3/3] move to use static --- templates/site_base.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/site_base.html b/templates/site_base.html index 0a0e1165..599a5d67 100644 --- a/templates/site_base.html +++ b/templates/site_base.html @@ -15,21 +15,21 @@ content="{% block description %}{% trans 'Open Knesset - Opening the Knesset to the public' %}{% endblock %}"> {% block social_share %} - + - + - + - + {% endblock %}