pythoncn · 0ssifrage · Jan 29, 2014
diff --git a/june/templates/admin/dashboard.html b/june/templates/admin/dashboard.html
@@ -1,9 +1,8 @@
 {% extends "layout.html" %}
+{% from "snippet/macro.html" import nav, pagination %}
 
 {% block subtitle %}{{ _('Dashboard') }}{% endblock %}
 
-{% from "snippet/macro.html" import nav, pagination %}
-
 {% block content %}
   <div class="panel panel-default">
     <div class="panel-heading">

diff --git a/june/templates/email/find.html b/june/templates/email/find.html
@@ -1,21 +1,21 @@
 {% extends "email/layout.html" %}
 
 {% block content %}
-<h3>{{ _('Welcome,') }} {{user}}</h3>
+<h3>{{ _('Welcome,') }} {{ user }}</h3>
 
 <p>
 {% trans -%}
 You have submitted a find password request, follow the link below to find your password. If you didn't make the request, ignore this email.
 {%- endtrans %}
 </p>
-<p><a class="btn" href="{{link}}">{{_('Find Password')}}</a></p>
+<p><a class="btn" href="{{ link }}">{{ _('Find Password') }}</a></p>
 <br />
 <br />
 {% trans -%}
 You can copy and paste the link to your browser address bar:
 {%- endtrans %}
 <br />
-<p>{{link}}</p>
+<p>{{ link }}</p>
 <br />
 <br />
 <em>{% trans %}This link will expire in 24 hours.{% endtrans %}</em>

diff --git a/june/templates/email/layout.html b/june/templates/email/layout.html
@@ -4,9 +4,9 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
     <!-- Facebook sharing information tags -->
-    <meta property="og:title" content="{{config.SITE_TITLE}}" />
+    <meta property="og:title" content="{{ config.SITE_TITLE }}" />
 
-    <title>{{config.SITE_TITLE}}</title>
+    <title>{{ config.SITE_TITLE }}</title>
     <style type="text/css">
       /* Client-specific Styles */
       #outlook a{padding:0;} /* Force Outlook to provide a "view in browser" button. */
@@ -164,10 +164,10 @@
                           <tr mc:repeatable>
                             <td valign="top">
                               <div mc:edit="postcard_heading00">
-                                <h1 id="brand" class="h1">{{config.SITE_TITLE}}</h1>
+                                <h1 id="brand" class="h1">{{ config.SITE_TITLE }}</h1>
                               </div>
                               <div mc:edit="std_content00">
-                                <blockquote class="blockquote">{{config.SITE_DESCRIPTION}}</blockquote>
+                                <blockquote class="blockquote">{{ config.SITE_DESCRIPTION }}</blockquote>
                                 {% block content %}
                                 <strong>Getting started:</strong> Customize your template by clicking on the style editor tabs up above. Set your fonts, colors, and styles. After setting your styling is all done you can click here in this area, delete the text, and start adding your own awesome content!
                                 <br />
@@ -200,7 +200,7 @@ <h1 id="brand" class="h1">{{config.SITE_TITLE}}</h1>
                           <tr>
                             <td valign="top" width="350">
                               <div mc:edit="std_footer">
-                                  <em>Copyright &copy; {{config.SITE_TIME.year}} {{config.SITE_TITLE}}, All rights reserved.</em>
+                                  <em>Copyright &copy; {{ config.SITE_TIME.year }} {{ config.SITE_TITLE }}, All rights reserved.</em>
                               </div>
                             </td>
                           </tr>

diff --git a/june/templates/email/signup.html b/june/templates/email/signup.html
@@ -1,20 +1,20 @@
 {% extends "email/layout.html" %}
 
 {% block content %}
-<p>Hello <strong>{{user.name}}</strong>:</p>
+<p>Hello <strong>{{ user.name }}</strong>:</p>
 <p>
 {% trans -%}
 Thanks for the registration. Follow the link below to activate your account.
 {%- endtrans %}
 </p>
-<a href="{{link}}">{{_('Activate your account')}}.</a>
+<a href="{{ link }}">{{ _('Activate your account') }}.</a>
 <br />
 <br />
 {% trans -%}
 You can copy and paste the link to your browser address bar:
 {%- endtrans %}
 <br />
-<p>{{link}}</p>
+<p>{{ link }}</p>
 <br />
 <br />
 <em>{% trans %}This link will expire in 24 hours.{% endtrans %}</em>

diff --git a/june/templates/index.html b/june/templates/index.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
+{% from "snippet/macro.html" import topic_columns %}
 
 {% block title %}{{ config.SITE_TITLE }}{% endblock %}
-{% from "snippet/macro.html" import topic_columns %}
 
 {% block content %}
   {% if blogs %}

diff --git a/june/templates/node/nodes.html b/june/templates/node/nodes.html
@@ -1,9 +1,8 @@
 {% extends "layout.html" %}
+{% from "snippet/macro.html" import navigation %}
 
 {% block subtitle %}{{ _('Nodes') }}{% endblock %}
 
-{% from "snippet/macro.html" import navigation %}
-
 {% block nav %}
   {{ navigation('node') }}
 {% endblock %}

diff --git a/june/templates/node/view.html b/june/templates/node/view.html
@@ -1,9 +1,8 @@
 {% extends "layout.html" %}
+{% from "snippet/macro.html" import navigation, topic_columns, pagination %}
 
 {% block subtitle %}{{ node }}{% endblock %}
 
-{% from "snippet/macro.html" import navigation, topic_columns, pagination %}
-
 {% block nav %}
   {{ navigation('node') }}
 {% endblock %}

diff --git a/june/templates/snippet/footer.html b/june/templates/snippet/footer.html
@@ -2,15 +2,15 @@
   <div class="container clearfix">
     <div class="text-muted pull-left">
       {% if config.SITE_ABOUT %}
-      <a href="{{config.SITE_ABOUT}}">{{ _('About') }}</a>
+      <a href="{{ config.SITE_ABOUT }}">{{ _('About') }}</a>
       {% endif %}
       <span class="sep">•</span>
       <a href="https://github.com/pythoncn/june">{{ _('Open Source') }}</a>
       <span class="sep">•</span>
       <a href="/humans.txt">{{ _('Authors') }}</a>
     </div>
     <p class="muted credit pull-right">
-    &copy;<time datetime="{{config.SITE_TIME}}">{{config.SITE_TIME.year}}</time> {{config.SITE_TITLE}}. All rights reserved.
+    &copy;<time datetime="{{ config.SITE_TIME }}">{{ config.SITE_TIME.year }}</time> {{ config.SITE_TITLE }}. All rights reserved.
     </p>
   </div>
 </footer>
diff --git a/june/templates/snippet/google-analytics.html b/june/templates/snippet/google-analytics.html
@@ -1,7 +1,7 @@
 {% if config.SITE_ANALYTICS %}
 <script type="text/javascript">
 var _gaq = _gaq || [];
-_gaq.push(['_setAccount', '{{config.SITE_ANALYTICS}}']);
+_gaq.push(['_setAccount', '{{ config.SITE_ANALYTICS }}']);
 _gaq.push(['_trackPageview']);
 _gaq.push(['_trackPageLoadTime']);
 {% if g.user %}

diff --git a/june/templates/topic/view.html b/june/templates/topic/view.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
+{% from "snippet/macro.html" import navigation, pagination, form_field %}
 
 {% block subtitle %}{{ topic }}{% endblock %}
-{% from "snippet/macro.html" import navigation, pagination, form_field %}
 
 {% block nav %}
   {{ navigation('topic') }}
@@ -112,7 +112,6 @@ <h1 class="panel-title entry-title">{{ topic.title }}</h1>
   </div>
 {% endblock %}
 
-
 {% block sidebar %}
   <div class="panel panel-default">
     <div class="panel-heading">

diff --git a/june/templates/user/city.html b/june/templates/user/city.html
@@ -1,27 +1,26 @@
 {% extends "layout.html" %}
-
-{% block subtitle %}{{city}}{% endblock %}
-
 {% from "snippet/macro.html" import navigation, pagination %}
 
+{% block subtitle %}{{ city }}{% endblock %}
+
 {% block nav %}
-{{ navigation('user') }}
+  {{ navigation('user') }}
 {% endblock %}
 
 {% block content %}
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title">{{ city }}</h3>
-  </div>
-  <div class="panel-body">
-    {% for item in paginator.items %}
-      <a class="avatar" href="{{ url_for('user.view', username=item.username) }}" title="{{ item }}">
-        <img src="{{ item.avatar(36) }}" alt="{{ item }}"/>
-      </a>
-    {% endfor %}
-  </div>
-  <div class="panel-footer">
-    {{ paginator.total }} {{ _('members in') }} {{ city }}
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h3 class="panel-title">{{ city }}</h3>
+    </div>
+    <div class="panel-body">
+      {% for item in paginator.items %}
+        <a class="avatar" href="{{ url_for('user.view', username=item.username) }}" title="{{ item }}">
+          <img src="{{ item.avatar(36) }}" alt="{{ item }}"/>
+        </a>
+      {% endfor %}
+    </div>
+    <div class="panel-footer">
+      {{ paginator.total }} {{ _('members in') }} {{ city }}
+    </div>
   </div>
-</div>
 {% endblock %}
diff --git a/june/templates/user/topics.html b/june/templates/user/topics.html
@@ -1,14 +1,12 @@
 {% extends "layout.html" %}
+{% from "snippet/macro.html" import navigation, topic_columns, pagination %}
 
 {% block subtitle %}{{ user }}{% endblock %}
 
-{% from "snippet/macro.html" import navigation, topic_columns, pagination %}
-
 {% block nav %}
   {{ navigation('user') }}
 {% endblock %}
 
-
 {% block content %}
   <div class="panel panel-default">
     <div class="panel-heading">

diff --git a/june/templates/user/users.html b/june/templates/user/users.html
@@ -1,27 +1,26 @@
 {% extends "layout.html" %}
-
-{% block subtitle %}{{_('Users')}}{% endblock %}
-
 {% from "snippet/macro.html" import navigation %}
 
+{% block subtitle %}{{ _('Users') }}{% endblock %}
+
 {% block nav %}
-{{ navigation('user') }}
+  {{ navigation('user') }}
 {% endblock %}
 
 {% block content %}
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title">{{_('Active Members')}}</h3>
-  </div>
-  <div class="panel-body">
-    {% for item in paginator.items %}
-      <a class="avatar" href="{{ url_for('user.view', username=item.username) }}" title="{{ item }}">
-        <img src="{{ item.avatar(36) }}" alt="{{ item }}"/>
-      </a>
-    {% endfor %}
-  </div>
-  <div class="panel-footer">
-    {{ paginator.total }} {{ _('members joined') }} {{ config.SITE_TITLE }}
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h3 class="panel-title">{{ _('Active Members') }}</h3>
+    </div>
+    <div class="panel-body">
+      {% for item in paginator.items %}
+        <a class="avatar" href="{{ url_for('user.view', username=item.username) }}" title="{{ item }}">
+          <img src="{{ item.avatar(36) }}" alt="{{ item }}"/>
+        </a>
+      {% endfor %}
+    </div>
+    <div class="panel-footer">
+      {{ paginator.total }} {{ _('members joined') }} {{ config.SITE_TITLE }}
+    </div>
   </div>
-</div>
 {% endblock %}
diff --git a/june/templates/user/view.html b/june/templates/user/view.html
@@ -1,9 +1,8 @@
 {% extends "layout.html" %}
+{% from "snippet/macro.html" import navigation, topic_columns %}
 
 {% block subtitle %}{{ user }}{% endblock %}
 
-{% from "snippet/macro.html" import navigation, topic_columns %}
-
 {% block nav %}
   {{ navigation('user') }}
 {% endblock %}