Rafał Pitoń 10 лет назад
Родитель
Сommit
7799c09f6e
2 измененных файлов с 67 добавлено и 63 удалено
  1. 35 33
      misago/emberapp/app/templates/footer.hbs
  2. 32 30
      misago/templates/misago/footer.html

+ 35 - 33
misago/emberapp/app/templates/footer.hbs

@@ -1,42 +1,44 @@
 <footer class="site-footer">
   <div class="container">
+    <div class="footer-content">
 
-  {{#if showNav}}
-    <div class="first-row">
-      <ul class="list-inline footer-nav">
-      {{#if showTermsLink}}
-        <li>
-        {{#if settings.terms_of_service_link }}
-          <a href="{{unbound settings.terms_of_service_link}}">{{gettext "Terms of service" }}</a>
-        {{else}}
-          {{#link-to 'terms-of-service'}}{{gettext "Terms of service" }}{{/link-to}}
+    {{#if showNav}}
+      <div class="first-row">
+        <ul class="list-inline footer-nav">
+        {{#if showTermsLink}}
+          <li>
+          {{#if settings.terms_of_service_link }}
+            <a href="{{unbound settings.terms_of_service_link}}">{{gettext "Terms of service" }}</a>
+          {{else}}
+            {{#link-to 'terms-of-service'}}{{gettext "Terms of service" }}{{/link-to}}
+          {{/if}}
+          </li>
         {{/if}}
-        </li>
-      {{/if}}
-      {{#if showPrivacyLink}}
-        <li>
-        {{#if settings.privacy_policy_link }}
-          <a href="{{unbound settings.privacy_policy_link}}">{{gettext "Privacy policy" }}</a>
-        {{else}}
-          {{#link-to 'privacy-policy'}}{{gettext "Privacy policy" }}{{/link-to}}
+        {{#if showPrivacyLink}}
+          <li>
+          {{#if settings.privacy_policy_link }}
+            <a href="{{unbound settings.privacy_policy_link}}">{{gettext "Privacy policy" }}</a>
+          {{else}}
+            {{#link-to 'privacy-policy'}}{{gettext "Privacy policy" }}{{/link-to}}
+          {{/if}}
+          </li>
         {{/if}}
-        </li>
-      {{/if}}
-      {{#if settings.forum_footnote}}
-        <li class="site-footnote">
-          {{settings.forum_footnote}}
-        </li>
-      {{/if}}
-      </ul>
-    </div>
-  {{/if}}
+        {{#if settings.forum_footnote}}
+          <li class="site-footnote">
+            {{settings.forum_footnote}}
+          </li>
+        {{/if}}
+        </ul>
+      </div>
+    {{/if}}
 
-    <div class="misago-branding">
-      <a href="http://misago-project.org">
-        <span class="subscript">powered by</span>
-        <span class="brand-border"><span>m</span></span><span class="subscript">isago</span>
-      </a>
-    </div>
+      <div class="misago-branding">
+        <a href="http://misago-project.org">
+          <span class="subscript">powered by</span>
+          <span class="brand-border"><span>m</span></span><span class="subscript">isago</span>
+        </a>
+      </div>
 
+    </div>
   </div>
 </footer>

+ 32 - 30
misago/templates/misago/footer.html

@@ -1,42 +1,44 @@
 {% load i18n %}
 <footer class="site-footer">
   <div class="container">
+    <div class="footer-content">
 
-    <div class="first-row">
+      <div class="first-row">
 
-      {% if misago_settings.terms_of_service or misago_settings.terms_of_service_link or misago_settings.privacy_policy or misago_settings.privacy_policy_link %}
-        <ul class="list-inline footer-nav">
-        {% if misago_settings.terms_of_service or misago_settings.terms_of_service_link %}
-          <li>
-            <a href="{% url 'misago:terms_of_service' %}">{% trans "Terms of service" %}</a>
-          </li>
+        {% if misago_settings.terms_of_service or misago_settings.terms_of_service_link or misago_settings.privacy_policy or misago_settings.privacy_policy_link or misago_settings.forum_footnote %}
+          <ul class="list-inline footer-nav">
+          {% if misago_settings.terms_of_service or misago_settings.terms_of_service_link %}
+            <li>
+              <a href="{% url 'misago:terms_of_service' %}">{% trans "Terms of service" %}</a>
+            </li>
+          {% endif %}
+          {% if misago_settings.privacy_policy or misago_settings.privacy_policy_link %}
+            <li>
+              <a href="{% url 'misago:privacy_policy' %}">{% trans "Privacy policy" %}</a>
+            </li>
+          {% endif %}
+          {% if misago_settings.forum_footnote %}
+            <li class="site-footnote">
+              {{ misago_settings.forum_footnote }}
+            </li>
+          {% endif %}
+          </ul>
         {% endif %}
-        {% if misago_settings.privacy_policy or misago_settings.privacy_policy_link %}
-          <li>
-            <a href="{% url 'misago:privacy_policy' %}">{% trans "Privacy policy" %}</a>
-          </li>
-        {% endif %}
-        {% if misago_settings.forum_footnote %}
-          <li class="site-footnote">
-            {{ misago_settings.forum_footnote }}
-          </li>
-        {% endif %}
-        </ul>
-      {% endif %}
 
-      <p class="noscript-message text-warning">
-        <span class="fa fa-exclamation-triangle fa-lg"></span>
-        {% trans "For complete experience please enable JavaScript." %}
-      </p>
+        <p class="noscript-message text-warning">
+          <span class="fa fa-exclamation-triangle fa-lg"></span>
+          {% trans "For complete experience please enable JavaScript." %}
+        </p>
 
-    </div>
+      </div>
 
-    <div class="misago-branding">
-      <a href="http://misago-project.org">
-        <span class="subscript">powered by</span>
-        <span class="brand-border"><span>m</span></span><span class="subscript">isago</span>
-      </a>
-    </div>
+      <div class="misago-branding">
+        <a href="http://misago-project.org">
+          <span class="subscript">powered by</span>
+          <span class="brand-border"><span>m</span></span><span class="subscript">isago</span>
+        </a>
+      </div>
 
+    </div>
   </div>
 </footer>