You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by pe...@apache.org on 2013/04/18 19:32:49 UTC

[1/3] Override newline after license header in jinja2 templates

Updated Branches:
  refs/heads/master ee4602190 -> 6f8012136


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_header.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_header.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_header.html
index 44ebd9b..77507d6 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_header.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_header.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
 {{g.markdown.convert(value.description)|safe}}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_summary.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_summary.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_summary.html
index 0fb4394..a795858 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_summary.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/forum_summary.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <a href="{{value.url()}}">{{value.name}}</a>({{value.shortname}})<br/>
 {% if value.subforums %}
   <b>Subforums:</b>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
index 8e05c6c..c500794 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
 <div class="grid-5"><label>Forum:</label> <a href="{{value.discussion.url()}}">{{value.discussion.name}}</a></div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
index 3004923..44d8905 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{app.config.options.mount_label}} / Admin Forums{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_options.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_options.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_options.html
index 8c333bd..78bcec9 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_options.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_options.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% block content %}
 {{c.options_admin.display(value=form_value, action=c.project.url()+'admin/'+app.config.options.mount_point+"/configure")}}
 {% endblock %}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussionforums/create_topic.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/create_topic.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/create_topic.html
index 3c90d98..79afdbe 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/create_topic.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/create_topic.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Create Topic{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussionforums/deleted.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/deleted.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/deleted.html
index b4d7bd0..3ec3b39 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/deleted.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/deleted.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}This forum has been deleted{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index fa47490..ca65594 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Forums{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussionforums/search.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/search.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/search.html
index b69603b..4c549cd 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/search.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/search.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Search{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
index 2252273..6bd6fec 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeGit/forgegit/templates/git/index.html
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/templates/git/index.html b/ForgeGit/forgegit/templates/git/index.html
index 55e770d..99881ae 100644
--- a/ForgeGit/forgegit/templates/git/index.html
+++ b/ForgeGit/forgegit/templates/git/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeLink/forgelink/templates/link/index.html
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/templates/link/index.html b/ForgeLink/forgelink/templates/link/index.html
index 2a58342..ddc2f11 100644
--- a/ForgeLink/forgelink/templates/link/index.html
+++ b/ForgeLink/forgelink/templates/link/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Link is not configured{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeSVN/forgesvn/templates/svn/checkout_url.html
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/templates/svn/checkout_url.html b/ForgeSVN/forgesvn/templates/svn/checkout_url.html
index b6cccad..3960798 100644
--- a/ForgeSVN/forgesvn/templates/svn/checkout_url.html
+++ b/ForgeSVN/forgesvn/templates/svn/checkout_url.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% block content %}
 <form>
   <label class="grid-13" for="checkout_url">Checkout url:</label>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeSVN/forgesvn/templates/svn/import.html
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/templates/svn/import.html b/ForgeSVN/forgesvn/templates/svn/import.html
index 1bbbbf5..4cee3ab 100644
--- a/ForgeSVN/forgesvn/templates/svn/import.html
+++ b/ForgeSVN/forgesvn/templates/svn/import.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeSVN/forgesvn/templates/svn/index.html
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/templates/svn/index.html b/ForgeSVN/forgesvn/templates/svn/index.html
index bf8a2d7..ed80fb9 100644
--- a/ForgeSVN/forgesvn/templates/svn/index.html
+++ b/ForgeSVN/forgesvn/templates/svn/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeShortUrl/forgeshorturl/templates/add.html
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/templates/add.html b/ForgeShortUrl/forgeshorturl/templates/add.html
index 6c3dbb6..fc2f0c2 100644
--- a/ForgeShortUrl/forgeshorturl/templates/add.html
+++ b/ForgeShortUrl/forgeshorturl/templates/add.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
     <form method="post" action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/add">
         <label class="grid-13">Short name</label>
         <div class="grid-13"><input type = "text" name = "short_url" style="width: 250px"></div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeShortUrl/forgeshorturl/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/templates/index.html b/ForgeShortUrl/forgeshorturl/templates/index.html
index cd7c9d4..85b94af 100644
--- a/ForgeShortUrl/forgeshorturl/templates/index.html
+++ b/ForgeShortUrl/forgeshorturl/templates/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'forgeshorturl:templates/master.html' %}
 
 {% set can_update = c.user and h.has_access(c.app, 'update') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeShortUrl/forgeshorturl/templates/master.html
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/templates/master.html b/ForgeShortUrl/forgeshorturl/templates/master.html
index 7a7e9c6..fcad187 100644
--- a/ForgeShortUrl/forgeshorturl/templates/master.html
+++ b/ForgeShortUrl/forgeshorturl/templates/master.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Link is not configured{% endblock %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeShortUrl/forgeshorturl/templates/search.html
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/templates/search.html b/ForgeShortUrl/forgeshorturl/templates/search.html
index 023f838..1093121 100644
--- a/ForgeShortUrl/forgeshorturl/templates/search.html
+++ b/ForgeShortUrl/forgeshorturl/templates/search.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'forgeshorturl:templates/master.html' %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Search{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/admin_fields.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/admin_fields.html b/ForgeTracker/forgetracker/templates/tracker/admin_fields.html
index 7e600eb..b16c8b5 100644
--- a/ForgeTracker/forgetracker/templates/tracker/admin_fields.html
+++ b/ForgeTracker/forgetracker/templates/tracker/admin_fields.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% if allow_config %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/admin_options.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/admin_options.html b/ForgeTracker/forgetracker/templates/tracker/admin_options.html
index 63b1d36..cde87fc 100644
--- a/ForgeTracker/forgetracker/templates/tracker/admin_options.html
+++ b/ForgeTracker/forgetracker/templates/tracker/admin_options.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{app.config.options.mount_label}} /  Options{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/bin.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/bin.html b/ForgeTracker/forgetracker/templates/tracker/bin.html
index 3565878..acbb03d 100644
--- a/ForgeTracker/forgetracker/templates/tracker/bin.html
+++ b/ForgeTracker/forgetracker/templates/tracker/bin.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% do g.register_forge_css('css/hilite.css') %}
 {% do g.register_app_css('css/tracker.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/index.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/index.html b/ForgeTracker/forgetracker/templates/tracker/index.html
index 2e6dc18..1d1145c 100644
--- a/ForgeTracker/forgetracker/templates/tracker/index.html
+++ b/ForgeTracker/forgetracker/templates/tracker/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% do g.register_app_css('css/tracker.css') %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/mass_edit.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/mass_edit.html b/ForgeTracker/forgetracker/templates/tracker/mass_edit.html
index 9c6252a..e3a3ee2 100644
--- a/ForgeTracker/forgetracker/templates/tracker/mass_edit.html
+++ b/ForgeTracker/forgetracker/templates/tracker/mass_edit.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% do g.register_forge_css('css/forge/hilite.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/milestone.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/milestone.html b/ForgeTracker/forgetracker/templates/tracker/milestone.html
index 086ffa0..4c1e61c 100644
--- a/ForgeTracker/forgetracker/templates/tracker/milestone.html
+++ b/ForgeTracker/forgetracker/templates/tracker/milestone.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% do g.register_app_css('css/tracker.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/milestones.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/milestones.html b/ForgeTracker/forgetracker/templates/tracker/milestones.html
index 0043f38..e04eb91 100644
--- a/ForgeTracker/forgetracker/templates/tracker/milestones.html
+++ b/ForgeTracker/forgetracker/templates/tracker/milestones.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% do g.register_app_css('css/tracker.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/move_ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/move_ticket.html b/ForgeTracker/forgetracker/templates/tracker/move_ticket.html
index 670f081..908191c 100644
--- a/ForgeTracker/forgetracker/templates/tracker/move_ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/move_ticket.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Move ticket #{{ticket.ticket_num}} {{ticket.summary}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/new_bin.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/new_bin.html b/ForgeTracker/forgetracker/templates/tracker/new_bin.html
index 0bbac7b..691a5d0 100644
--- a/ForgeTracker/forgetracker/templates/tracker/new_bin.html
+++ b/ForgeTracker/forgetracker/templates/tracker/new_bin.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / New bin for {{q}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
index 563ada0..fd75006 100644
--- a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / New Ticket{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/search.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/search.html b/ForgeTracker/forgetracker/templates/tracker/search.html
index 08fda86..48516f8 100644
--- a/ForgeTracker/forgetracker/templates/tracker/search.html
+++ b/ForgeTracker/forgetracker/templates/tracker/search.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% do g.register_app_css('css/tracker.css') %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/stats.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/stats.html b/ForgeTracker/forgetracker/templates/tracker/stats.html
index 52051a0..f4ac5b9 100644
--- a/ForgeTracker/forgetracker/templates/tracker/stats.html
+++ b/ForgeTracker/forgetracker/templates/tracker/stats.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% do g.register_forge_css('css/forge/hilite.css', compress=False) %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker/ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 98bae67..8c98002 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% from 'allura:templates/jinja_master/lib.html' import abbr_date with context %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/bin_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/bin_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/bin_form.html
index 2c3402e..c6f6069 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/bin_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/bin_form.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="post" action="{{action}}">
   {% for field in hidden_fields -%}
     {% set ctx=widget.context_for(field) -%}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin.html b/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin.html
index b66c59b..cdcfb7d 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div class="{{css_class}}"
      style="border:1px solid #ccc">
   {% for f in widget.fields %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin_detail.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin_detail.html b/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin_detail.html
index 9fabebd..4dab13d 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin_detail.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_admin_detail.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div class="{{container_cls}}">
   {% set ctx=widget.context_for(selector) %}
   {{selector.display(css_class=selector_cls, **ctx)}}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_display.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_display.html b/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_display.html
index 5e20d18..176951a 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_display.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/custom_field_display.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div class="custom-field {{'ui-helper-hidden' if hidden else None}}">
   {% for f in widget.fields %}
     <div class="grid-4">{{f.label}}</div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/custom_fields_display.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/custom_fields_display.html b/ForgeTracker/forgetracker/templates/tracker_widgets/custom_fields_display.html
index aebca3e..2a7127f 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/custom_fields_display.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/custom_fields_display.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   <div>
     <label>Custom Fields:</label><p>&nbsp;</p>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
index e3eac2b..e565625 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   {% if tickets|length %}
   {{widget.fields['page_size'].display(page=page, count=count, limit=limit)}}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
index bfc4b7d..7eb4019 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form id="update-values" method="post" action="../update_tickets">
     {% for field in globals.custom_fields %}
       {% if field.name == '_milestone' %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/options_admin.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/options_admin.html b/ForgeTracker/forgetracker/templates/tracker_widgets/options_admin.html
index fb4ed16..c298e02 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/options_admin.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/options_admin.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="{{method}}"
        {% if enctype %}enctype="{{enctype}}"{% endif %}
       action="{{action}}">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_custom_fields.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_custom_fields.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_custom_fields.html
index 7408a6d..fdf687d 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_custom_fields.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_custom_fields.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set cf_count=0 %}
 {% for field in widget.fields %}
   {% set ctx=widget.context_for(field) %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index bde4b2a..bd36514 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 <form method="POST" action="{{action}}" enctype="multipart/form-data">
   {{widget.display_field_by_name('ticket_num')|safe}}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
index ca0f46b..af93d72 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% from 'allura:templates/jinja_master/lib.html' import abbr_date with context %}
 <div id="ticket_search_results_holder" style="clear:both">
   {% if solr_error %}<p>{{solr_error}}</p>{% endif %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeUserStats/forgeuserstats/templates/artifacts.html
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/templates/artifacts.html b/ForgeUserStats/forgeuserstats/templates/artifacts.html
index 76ac1dd..f7a5520 100644
--- a/ForgeUserStats/forgeuserstats/templates/artifacts.html
+++ b/ForgeUserStats/forgeuserstats/templates/artifacts.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeUserStats/forgeuserstats/templates/commits.html
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/templates/commits.html b/ForgeUserStats/forgeuserstats/templates/commits.html
index b63ae74..6f8c2b1 100644
--- a/ForgeUserStats/forgeuserstats/templates/commits.html
+++ b/ForgeUserStats/forgeuserstats/templates/commits.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeUserStats/forgeuserstats/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/templates/index.html b/ForgeUserStats/forgeuserstats/templates/index.html
index b0338ae..ceb3f81 100644
--- a/ForgeUserStats/forgeuserstats/templates/index.html
+++ b/ForgeUserStats/forgeuserstats/templates/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeUserStats/forgeuserstats/templates/settings.html
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/templates/settings.html b/ForgeUserStats/forgeuserstats/templates/settings.html
index e44fd23..e8f2be9 100644
--- a/ForgeUserStats/forgeuserstats/templates/settings.html
+++ b/ForgeUserStats/forgeuserstats/templates/settings.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeUserStats/forgeuserstats/templates/tickets.html
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/templates/tickets.html b/ForgeUserStats/forgeuserstats/templates/tickets.html
index b5465e5..500f92b 100644
--- a/ForgeUserStats/forgeuserstats/templates/tickets.html
+++ b/ForgeUserStats/forgeuserstats/templates/tickets.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/admin_add_page.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/admin_add_page.html b/ForgeWiki/forgewiki/templates/wiki/admin_add_page.html
index 344e3d8..6055747 100644
--- a/ForgeWiki/forgewiki/templates/wiki/admin_add_page.html
+++ b/ForgeWiki/forgewiki/templates/wiki/admin_add_page.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <script type="text/javascript">
     $(function () {
         $("form").submit(function () {

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/admin_home.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/admin_home.html b/ForgeWiki/forgewiki/templates/wiki/admin_home.html
index cbd1c5e..f48b3dd 100644
--- a/ForgeWiki/forgewiki/templates/wiki/admin_home.html
+++ b/ForgeWiki/forgewiki/templates/wiki/admin_home.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="POST" action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/set_home">
   <label class="grid-13">Wiki Home Page:</label>
   <div class="grid-13">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/admin_options.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/admin_options.html b/ForgeWiki/forgewiki/templates/wiki/admin_options.html
index e4417f0..4972422 100644
--- a/ForgeWiki/forgewiki/templates/wiki/admin_options.html
+++ b/ForgeWiki/forgewiki/templates/wiki/admin_options.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <!DOCTYPE html>
 <form action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/set_options" method="post">
     <label class="grid-4">Show discussion:</label>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/browse.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/browse.html b/ForgeWiki/forgewiki/templates/wiki/browse.html
index 8f743c2..f6726cb 100644
--- a/ForgeWiki/forgewiki/templates/wiki/browse.html
+++ b/ForgeWiki/forgewiki/templates/wiki/browse.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'forgewiki:templates/wiki/master.html' %}
 {% from 'allura:templates/jinja_master/lib.html' import abbr_date with context %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/browse_tags.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/browse_tags.html b/ForgeWiki/forgewiki/templates/wiki/browse_tags.html
index f8f51aa..e464a39 100644
--- a/ForgeWiki/forgewiki/templates/wiki/browse_tags.html
+++ b/ForgeWiki/forgewiki/templates/wiki/browse_tags.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'forgewiki:templates/wiki/master.html' %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Browse Labels{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/master.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/master.html b/ForgeWiki/forgewiki/templates/wiki/master.html
index c4382a7..a920736 100644
--- a/ForgeWiki/forgewiki/templates/wiki/master.html
+++ b/ForgeWiki/forgewiki/templates/wiki/master.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% do g.register_app_css('css/wiki.css', compress=False) %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/page_diff.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_diff.html b/ForgeWiki/forgewiki/templates/wiki/page_diff.html
index 0fcca49..f521911 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_diff.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_diff.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'forgewiki:templates/wiki/master.html' %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / {{p1.title}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/page_edit.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_edit.html b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
index 67177c2..1944f54 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'forgewiki:templates/wiki/master.html' %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / {{page.title}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/page_history.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_history.html b/ForgeWiki/forgewiki/templates/wiki/page_history.html
index 8469bba..d0e3338 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_history.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_history.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'forgewiki:templates/wiki/master.html' %}
 {% from 'allura:templates/jinja_master/lib.html' import abbr_date with context %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 8ea4d31..0153b04 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'forgewiki:templates/wiki/master.html' %}
 {% do g.register_forge_css('css/forge/hilite.css', compress=False) %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeWiki/forgewiki/templates/wiki/search.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/search.html b/ForgeWiki/forgewiki/templates/wiki/search.html
index 263b364..6c91664 100644
--- a/ForgeWiki/forgewiki/templates/wiki/search.html
+++ b/ForgeWiki/forgewiki/templates/wiki/search.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'forgewiki:templates/wiki/master.html' %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Search{% endblock %}


[3/3] git commit: Override newline after license header in jinja2 templates

Posted by pe...@apache.org.
Override newline after license header in jinja2 templates

Signed-off-by: Peter Hartmann <pe...@apache.org>

Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6f801213
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6f801213
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6f801213

Branch: refs/heads/master
Commit: 6f8012136c2f2b78614e4bc86a564212519f2d5e
Parents: ee46021
Author: Peter Hartmann <pe...@apache.org>
Authored: Thu Apr 18 19:31:20 2013 +0200
Committer: Peter Hartmann <pe...@apache.org>
Committed: Thu Apr 18 19:31:20 2013 +0200

----------------------------------------------------------------------
 .../admin/templates/admin_widgets/card_field.html  |    4 ++--
 .../templates/admin_widgets/metadata_admin.html    |    4 ++--
 Allura/allura/ext/admin/templates/audit.html       |    4 ++--
 .../allura/ext/admin/templates/project_admin.html  |    4 ++--
 .../allura/ext/admin/templates/project_group.html  |    4 ++--
 .../allura/ext/admin/templates/project_groups.html |    4 ++--
 .../ext/admin/templates/project_invitations.html   |    4 ++--
 .../ext/admin/templates/project_overview.html      |    4 ++--
 .../ext/admin/templates/project_permissions.html   |    4 ++--
 .../ext/admin/templates/project_screenshots.html   |    4 ++--
 .../allura/ext/admin/templates/project_tools.html  |    4 ++--
 .../allura/ext/admin/templates/project_trove.html  |    4 ++--
 .../allura/ext/admin/templates/widgets/audit.html  |    4 ++--
 .../templates/user_dashboard_configuration.html    |    4 ++--
 .../ext/user_profile/templates/user_index.html     |    4 ++--
 Allura/allura/templates/app_admin_edit_label.html  |    4 ++--
 Allura/allura/templates/app_admin_options.html     |    4 ++--
 Allura/allura/templates/app_admin_permissions.html |    4 ++--
 Allura/allura/templates/award.html                 |    4 ++--
 Allura/allura/templates/award_not_found.html       |    4 ++--
 Allura/allura/templates/awards.html                |    4 ++--
 Allura/allura/templates/bare_openid.html           |    4 ++--
 Allura/allura/templates/claim_openid.html          |    4 ++--
 Allura/allura/templates/create_account.html        |    4 ++--
 Allura/allura/templates/custom_login.html          |    4 ++--
 Allura/allura/templates/discussion/index.html      |    4 ++--
 Allura/allura/templates/discussion/moderate.html   |    4 ++--
 Allura/allura/templates/discussion/post.html       |    4 ++--
 Allura/allura/templates/discussion/thread.html     |    4 ++--
 Allura/allura/templates/error.html                 |    4 ++--
 Allura/allura/templates/grant.html                 |    4 ++--
 Allura/allura/templates/grants.html                |    4 ++--
 Allura/allura/templates/jinja_master/lib.html      |    4 ++--
 Allura/allura/templates/jinja_master/master.html   |    4 ++--
 Allura/allura/templates/jinja_master/nav_menu.html |    4 ++--
 .../templates/jinja_master/neigh_nav_menu.html     |    4 ++--
 .../templates/jinja_master/neigh_top_nav.html      |    4 ++--
 .../templates/jinja_master/sidebar_menu.html       |    4 ++--
 .../templates/jinja_master/theme_macros.html       |    4 ++--
 Allura/allura/templates/jinja_master/top_nav.html  |    4 ++--
 Allura/allura/templates/login.html                 |    4 ++--
 Allura/allura/templates/markdown_syntax.html       |    4 ++--
 .../allura/templates/markdown_syntax_dialog.html   |    4 ++--
 .../allura/templates/neighborhood_add_project.html |    4 ++--
 .../templates/neighborhood_admin_accolades.html    |    4 ++--
 .../templates/neighborhood_admin_overview.html     |    4 ++--
 Allura/allura/templates/neighborhood_help.html     |    4 ++--
 Allura/allura/templates/neighborhood_list.html     |    4 ++--
 Allura/allura/templates/neighborhood_moderate.html |    4 ++--
 .../templates/neighborhood_project_list.html       |    4 ++--
 Allura/allura/templates/neighborhood_stats.html    |    4 ++--
 .../templates/neighborhood_stats_adminlist.html    |    4 ++--
 Allura/allura/templates/oauth_applications.html    |    4 ++--
 Allura/allura/templates/oauth_authorize.html       |    4 ++--
 Allura/allura/templates/oauth_authorize_ok.html    |    4 ++--
 Allura/allura/templates/oembed/generic.html        |    4 ++--
 Allura/allura/templates/oembed/html_tpl.html       |    4 ++--
 Allura/allura/templates/oembed/link.html           |    4 ++--
 Allura/allura/templates/oembed/link_opera.html     |    4 ++--
 Allura/allura/templates/oembed/link_twitter.html   |    4 ++--
 Allura/allura/templates/oembed/photo.html          |    4 ++--
 Allura/allura/templates/project_list.html          |    4 ++--
 Allura/allura/templates/repo/admin_extensions.html |    4 ++--
 Allura/allura/templates/repo/barediff.html         |    4 ++--
 Allura/allura/templates/repo/commit.html           |    4 ++--
 Allura/allura/templates/repo/commit_basic.html     |    4 ++--
 Allura/allura/templates/repo/commit_browser.html   |    4 ++--
 Allura/allura/templates/repo/diff.html             |    4 ++--
 Allura/allura/templates/repo/file.html             |    4 ++--
 Allura/allura/templates/repo/fork.html             |    4 ++--
 Allura/allura/templates/repo/forks.html            |    4 ++--
 Allura/allura/templates/repo/log.html              |    4 ++--
 Allura/allura/templates/repo/merge_request.html    |    4 ++--
 Allura/allura/templates/repo/merge_requests.html   |    4 ++--
 Allura/allura/templates/repo/repo_master.html      |    4 ++--
 Allura/allura/templates/repo/request_merge.html    |    4 ++--
 Allura/allura/templates/repo/tags.html             |    4 ++--
 Allura/allura/templates/repo/tarball.html          |    4 ++--
 Allura/allura/templates/repo/tree.html             |    4 ++--
 Allura/allura/templates/search_index.html          |    4 ++--
 Allura/allura/templates/setup_openid_user.html     |    4 ++--
 Allura/allura/templates/site_admin.html            |    4 ++--
 .../templates/site_admin_add_subscribers.html      |    4 ++--
 .../allura/templates/site_admin_api_tickets.html   |    4 ++--
 Allura/allura/templates/site_admin_index.html      |    4 ++--
 .../allura/templates/site_admin_new_projects.html  |    4 ++--
 .../allura/templates/site_admin_reclone_repo.html  |    4 ++--
 Allura/allura/templates/site_admin_stats.html      |    4 ++--
 Allura/allura/templates/site_admin_task_list.html  |    4 ++--
 Allura/allura/templates/site_admin_task_new.html   |    4 ++--
 Allura/allura/templates/site_admin_task_view.html  |    4 ++--
 Allura/allura/templates/tool_list.html             |    4 ++--
 Allura/allura/templates/trovecategories.html       |    4 ++--
 Allura/allura/templates/user_availability.html     |    4 ++--
 Allura/allura/templates/user_contacts.html         |    4 ++--
 Allura/allura/templates/user_info.html             |    4 ++--
 Allura/allura/templates/user_prefs.html            |    4 ++--
 Allura/allura/templates/user_skills.html           |    4 ++--
 Allura/allura/templates/user_subs.html             |    4 ++--
 Allura/allura/templates/widgets/admin_field.html   |    4 ++--
 Allura/allura/templates/widgets/admin_form.html    |    4 ++--
 Allura/allura/templates/widgets/analytics.html     |    4 ++--
 Allura/allura/templates/widgets/attachment.html    |    4 ++--
 .../allura/templates/widgets/attachment_add.html   |    4 ++--
 .../allura/templates/widgets/attachment_list.html  |    4 ++--
 Allura/allura/templates/widgets/discussion.html    |    4 ++--
 .../templates/widgets/discussion_header.html       |    4 ++--
 .../allura/templates/widgets/download_button.html  |    4 ++--
 Allura/allura/templates/widgets/edit_post.html     |    4 ++--
 Allura/allura/templates/widgets/field_cluster.html |    4 ++--
 Allura/allura/templates/widgets/file_chooser.html  |    4 ++--
 Allura/allura/templates/widgets/flag_post.html     |    4 ++--
 Allura/allura/templates/widgets/forge_form.html    |    4 ++--
 Allura/allura/templates/widgets/include.html       |    4 ++--
 Allura/allura/templates/widgets/label_edit.html    |    4 ++--
 Allura/allura/templates/widgets/lightbox.html      |    4 ++--
 Allura/allura/templates/widgets/markdown_edit.html |    4 ++--
 Allura/allura/templates/widgets/moderate_post.html |    4 ++--
 .../allura/templates/widgets/moderate_posts.html   |    4 ++--
 .../widgets/neighborhood_add_project.html          |    4 ++--
 .../widgets/neighborhood_overview_form.html        |    4 ++--
 .../widgets/neighborhood_project_select.html       |    4 ++--
 .../allura/templates/widgets/new_topic_post.html   |    4 ++--
 Allura/allura/templates/widgets/page_list.html     |    4 ++--
 Allura/allura/templates/widgets/page_size.html     |    4 ++--
 Allura/allura/templates/widgets/post_thread.html   |    4 ++--
 Allura/allura/templates/widgets/post_widget.html   |    4 ++--
 .../templates/widgets/project_list_widget.html     |    4 ++--
 .../templates/widgets/project_screenshots.html     |    4 ++--
 .../allura/templates/widgets/project_summary.html  |    4 ++--
 .../templates/widgets/project_user_combo.html      |    4 ++--
 .../templates/widgets/project_user_select.html     |    4 ++--
 Allura/allura/templates/widgets/repo/commit.html   |    4 ++--
 .../templates/widgets/repo/commit_browser.html     |    4 ++--
 Allura/allura/templates/widgets/repo/log.html      |    4 ++--
 Allura/allura/templates/widgets/repo/revision.html |    4 ++--
 .../allura/templates/widgets/repo/tree_widget.html |    4 ++--
 .../allura/templates/widgets/search_results.html   |    4 ++--
 .../templates/widgets/sortable_repeated_field.html |    4 ++--
 .../allura/templates/widgets/sortable_table.html   |    4 ++--
 Allura/allura/templates/widgets/state_field.html   |    4 ++--
 Allura/allura/templates/widgets/subscribe.html     |    4 ++--
 .../templates/widgets/subscription_form.html       |    4 ++--
 Allura/allura/templates/widgets/thread_header.html |    4 ++--
 Allura/allura/templates/widgets/thread_widget.html |    4 ++--
 Allura/allura/templates/widgets/threads_table.html |    4 ++--
 Allura/allura/templates/widgets/vote.html          |    4 ++--
 ForgeActivity/forgeactivity/templates/index.html   |    4 ++--
 .../forgeactivity/templates/widgets/follow.html    |    4 ++--
 .../forgeblog/templates/blog/admin_exfeed.html     |    4 ++--
 .../forgeblog/templates/blog/admin_options.html    |    4 ++--
 ForgeBlog/forgeblog/templates/blog/edit_post.html  |    4 ++--
 ForgeBlog/forgeblog/templates/blog/edit_posts.html |    4 ++--
 ForgeBlog/forgeblog/templates/blog/index.html      |    4 ++--
 ForgeBlog/forgeblog/templates/blog/post.html       |    4 ++--
 ForgeBlog/forgeblog/templates/blog/post_diff.html  |    4 ++--
 .../forgeblog/templates/blog/post_history.html     |    4 ++--
 ForgeBlog/forgeblog/templates/blog/search.html     |    4 ++--
 .../templates/blog_widgets/page_list.html          |    4 ++--
 .../templates/blog_widgets/post_form.html          |    4 ++--
 .../templates/blog_widgets/preview_post.html       |    4 ++--
 .../templates/blog_widgets/view_post.html          |    4 ++--
 ForgeChat/forgechat/templates/chat/chat_lib.html   |    4 ++--
 ForgeChat/forgechat/templates/chat/day.html        |    4 ++--
 ForgeChat/forgechat/templates/chat/index.html      |    4 ++--
 ForgeChat/forgechat/templates/chat/search.html     |    4 ++--
 .../templates/discussion_widgets/add_forum.html    |    4 ++--
 .../discussion_widgets/add_forum_short.html        |    4 ++--
 .../templates/discussion_widgets/discussion.html   |    4 ++--
 .../templates/discussion_widgets/forum_header.html |    4 ++--
 .../discussion_widgets/forum_summary.html          |    4 ++--
 .../discussion_widgets/thread_header.html          |    4 ++--
 .../templates/discussionforums/admin_forums.html   |    4 ++--
 .../templates/discussionforums/admin_options.html  |    4 ++--
 .../templates/discussionforums/create_topic.html   |    4 ++--
 .../templates/discussionforums/deleted.html        |    4 ++--
 .../templates/discussionforums/index.html          |    4 ++--
 .../templates/discussionforums/search.html         |    4 ++--
 .../templates/discussionforums/thread.html         |    4 ++--
 ForgeGit/forgegit/templates/git/index.html         |    4 ++--
 ForgeLink/forgelink/templates/link/index.html      |    4 ++--
 ForgeSVN/forgesvn/templates/svn/checkout_url.html  |    4 ++--
 ForgeSVN/forgesvn/templates/svn/import.html        |    4 ++--
 ForgeSVN/forgesvn/templates/svn/index.html         |    4 ++--
 ForgeShortUrl/forgeshorturl/templates/add.html     |    4 ++--
 ForgeShortUrl/forgeshorturl/templates/index.html   |    4 ++--
 ForgeShortUrl/forgeshorturl/templates/master.html  |    4 ++--
 ForgeShortUrl/forgeshorturl/templates/search.html  |    4 ++--
 .../templates/tracker/admin_fields.html            |    4 ++--
 .../templates/tracker/admin_options.html           |    4 ++--
 .../forgetracker/templates/tracker/bin.html        |    4 ++--
 .../forgetracker/templates/tracker/index.html      |    4 ++--
 .../forgetracker/templates/tracker/mass_edit.html  |    4 ++--
 .../forgetracker/templates/tracker/milestone.html  |    4 ++--
 .../forgetracker/templates/tracker/milestones.html |    4 ++--
 .../templates/tracker/move_ticket.html             |    4 ++--
 .../forgetracker/templates/tracker/new_bin.html    |    4 ++--
 .../forgetracker/templates/tracker/new_ticket.html |    4 ++--
 .../forgetracker/templates/tracker/search.html     |    4 ++--
 .../forgetracker/templates/tracker/stats.html      |    4 ++--
 .../forgetracker/templates/tracker/ticket.html     |    4 ++--
 .../templates/tracker_widgets/bin_form.html        |    4 ++--
 .../tracker_widgets/custom_field_admin.html        |    4 ++--
 .../tracker_widgets/custom_field_admin_detail.html |    4 ++--
 .../tracker_widgets/custom_field_display.html      |    4 ++--
 .../tracker_widgets/custom_fields_display.html     |    4 ++--
 .../templates/tracker_widgets/mass_edit.html       |    4 ++--
 .../templates/tracker_widgets/mass_edit_form.html  |    4 ++--
 .../templates/tracker_widgets/options_admin.html   |    4 ++--
 .../tracker_widgets/ticket_custom_fields.html      |    4 ++--
 .../templates/tracker_widgets/ticket_form.html     |    4 ++--
 .../tracker_widgets/ticket_search_results.html     |    4 ++--
 .../forgeuserstats/templates/artifacts.html        |    4 ++--
 .../forgeuserstats/templates/commits.html          |    4 ++--
 ForgeUserStats/forgeuserstats/templates/index.html |    4 ++--
 .../forgeuserstats/templates/settings.html         |    4 ++--
 .../forgeuserstats/templates/tickets.html          |    4 ++--
 .../forgewiki/templates/wiki/admin_add_page.html   |    4 ++--
 ForgeWiki/forgewiki/templates/wiki/admin_home.html |    4 ++--
 .../forgewiki/templates/wiki/admin_options.html    |    4 ++--
 ForgeWiki/forgewiki/templates/wiki/browse.html     |    4 ++--
 .../forgewiki/templates/wiki/browse_tags.html      |    4 ++--
 ForgeWiki/forgewiki/templates/wiki/master.html     |    4 ++--
 ForgeWiki/forgewiki/templates/wiki/page_diff.html  |    4 ++--
 ForgeWiki/forgewiki/templates/wiki/page_edit.html  |    4 ++--
 .../forgewiki/templates/wiki/page_history.html     |    4 ++--
 ForgeWiki/forgewiki/templates/wiki/page_view.html  |    4 ++--
 ForgeWiki/forgewiki/templates/wiki/search.html     |    4 ++--
 228 files changed, 456 insertions(+), 456 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/card_field.html b/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
index 49c3e47..fe03142 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div class="fleft active-card">
   <input type="hidden" name="card-{{index}}.id" value="{{id}}"/>
   <ul class="deck">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
index f75e1e9..738428f 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="POST" action="update" enctype="multipart/form-data" id="metadata_form">
   <div class="grid-9">
     {{ widget.display_label(widget.fields.name) }}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/audit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/audit.html b/Allura/allura/ext/admin/templates/audit.html
index dae06f3..4de58b8 100644
--- a/Allura/allura/ext/admin/templates/audit.html
+++ b/Allura/allura/ext/admin/templates/audit.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / Admin / Audit{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/project_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_admin.html b/Allura/allura/ext/admin/templates/project_admin.html
index 21b2196..3da1c0c 100644
--- a/Allura/allura/ext/admin/templates/project_admin.html
+++ b/Allura/allura/ext/admin/templates/project_admin.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% set wiki_found = False %}
 {% set tracker_found = False %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/project_group.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_group.html b/Allura/allura/ext/admin/templates/project_group.html
index c32d61b..927b776 100644
--- a/Allura/allura/ext/admin/templates/project_group.html
+++ b/Allura/allura/ext/admin/templates/project_group.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% if show_settings %}
 {{c.form.display(value=group, action=action)}}
 {% else %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/project_groups.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_groups.html b/Allura/allura/ext/admin/templates/project_groups.html
index 79e93fc..54f7c26 100644
--- a/Allura/allura/ext/admin/templates/project_groups.html
+++ b/Allura/allura/ext/admin/templates/project_groups.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% do g.register_forge_css('css/forge/deck.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/project_invitations.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_invitations.html b/Allura/allura/ext/admin/templates/project_invitations.html
index 157ab99..7f4e63e 100644
--- a/Allura/allura/ext/admin/templates/project_invitations.html
+++ b/Allura/allura/ext/admin/templates/project_invitations.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / Neighborhood Invitation(s){% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/project_overview.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_overview.html b/Allura/allura/ext/admin/templates/project_overview.html
index 8df4dac..3c77be2 100644
--- a/Allura/allura/ext/admin/templates/project_overview.html
+++ b/Allura/allura/ext/admin/templates/project_overview.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / Metadata{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/project_permissions.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_permissions.html b/Allura/allura/ext/admin/templates/project_permissions.html
index fbec05c..186bd06 100644
--- a/Allura/allura/ext/admin/templates/project_permissions.html
+++ b/Allura/allura/ext/admin/templates/project_permissions.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% do g.register_forge_css('css/forge/deck.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/project_screenshots.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_screenshots.html b/Allura/allura/ext/admin/templates/project_screenshots.html
index 33af8ef..3f92475 100644
--- a/Allura/allura/ext/admin/templates/project_screenshots.html
+++ b/Allura/allura/ext/admin/templates/project_screenshots.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / Screenshots{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/project_tools.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_tools.html b/Allura/allura/ext/admin/templates/project_tools.html
index b9a9a2d..c4344cb 100644
--- a/Allura/allura/ext/admin/templates/project_tools.html
+++ b/Allura/allura/ext/admin/templates/project_tools.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% do g.register_forge_css('css/forge/deck.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/project_trove.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_trove.html b/Allura/allura/ext/admin/templates/project_trove.html
index e0b7723..bcd557d 100644
--- a/Allura/allura/ext/admin/templates/project_trove.html
+++ b/Allura/allura/ext/admin/templates/project_trove.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / Categorization{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/admin/templates/widgets/audit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/widgets/audit.html b/Allura/allura/ext/admin/templates/widgets/audit.html
index ca27014..e26f075 100644
--- a/Allura/allura/ext/admin/templates/widgets/audit.html
+++ b/Allura/allura/ext/admin/templates/widgets/audit.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div class="grid-19">
   <div style="overflow:auto">
     <table>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/user_profile/templates/user_dashboard_configuration.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/templates/user_dashboard_configuration.html b/Allura/allura/ext/user_profile/templates/user_dashboard_configuration.html
index 77df776..0ff962a 100644
--- a/Allura/allura/ext/user_profile/templates/user_dashboard_configuration.html
+++ b/Allura/allura/ext/user_profile/templates/user_dashboard_configuration.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{user.display_name}} / Configure Dashboard{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/ext/user_profile/templates/user_index.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/templates/user_index.html b/Allura/allura/ext/user_profile/templates/user_index.html
index b084ce02..014406d 100644
--- a/Allura/allura/ext/user_profile/templates/user_index.html
+++ b/Allura/allura/ext/user_profile/templates/user_index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/app_admin_edit_label.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_edit_label.html b/Allura/allura/templates/app_admin_edit_label.html
index 3944716..e76eab2 100644
--- a/Allura/allura/templates/app_admin_edit_label.html
+++ b/Allura/allura/templates/app_admin_edit_label.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <!DOCTYPE html>
 <form method="post" action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/update_label">
   {% for o in app.config_options if o.name in ['mount_label'] %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/app_admin_options.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_options.html b/Allura/allura/templates/app_admin_options.html
index 938d571..83a3aa6 100644
--- a/Allura/allura/templates/app_admin_options.html
+++ b/Allura/allura/templates/app_admin_options.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <!DOCTYPE html>
 <form method="post" action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/configure">
   {% for o in app.config_options if o.name not in ['mount_point', 'mount_label', 'ordinal'] %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/app_admin_permissions.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_permissions.html b/Allura/allura/templates/app_admin_permissions.html
index 260ef0b..039a898 100644
--- a/Allura/allura/templates/app_admin_permissions.html
+++ b/Allura/allura/templates/app_admin_permissions.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% do g.register_forge_css('css/forge/deck.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/award.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/award.html b/Allura/allura/templates/award.html
index 8c062c7..3cb2b72 100644
--- a/Allura/allura/templates/award.html
+++ b/Allura/allura/templates/award.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}Award{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/award_not_found.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/award_not_found.html b/Allura/allura/templates/award_not_found.html
index 2dd95e4..e2d21dc 100644
--- a/Allura/allura/templates/award_not_found.html
+++ b/Allura/allura/templates/award_not_found.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}Award Not Found{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/awards.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/awards.html b/Allura/allura/templates/awards.html
index c4beb60..950f74a 100644
--- a/Allura/allura/templates/awards.html
+++ b/Allura/allura/templates/awards.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}Award List{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/bare_openid.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/bare_openid.html b/Allura/allura/templates/bare_openid.html
index 2de4d23..d30e796 100644
--- a/Allura/allura/templates/bare_openid.html
+++ b/Allura/allura/templates/bare_openid.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}Setup a Full Account{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/claim_openid.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/claim_openid.html b/Allura/allura/templates/claim_openid.html
index 54fe715..7421dfa 100644
--- a/Allura/allura/templates/claim_openid.html
+++ b/Allura/allura/templates/claim_openid.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/create_account.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/create_account.html b/Allura/allura/templates/create_account.html
index 94aeee9..48171c7 100644
--- a/Allura/allura/templates/create_account.html
+++ b/Allura/allura/templates/create_account.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/custom_login.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/custom_login.html b/Allura/allura/templates/custom_login.html
index 23023ab..94f130b 100644
--- a/Allura/allura/templates/custom_login.html
+++ b/Allura/allura/templates/custom_login.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{title}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/discussion/index.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/discussion/index.html b/Allura/allura/templates/discussion/index.html
index fab97d3..7443462 100644
--- a/Allura/allura/templates/discussion/index.html
+++ b/Allura/allura/templates/discussion/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,5 +15,5 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {{c.discussion.display(value=discussion, threads=threads, limit=limit, page=page, count=count)}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/discussion/moderate.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/discussion/moderate.html b/Allura/allura/templates/discussion/moderate.html
index 78dcf3c..b5f2e22 100644
--- a/Allura/allura/templates/discussion/moderate.html
+++ b/Allura/allura/templates/discussion/moderate.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/discussion/post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/discussion/post.html b/Allura/allura/templates/discussion/post.html
index 49284ce..5b015f2 100644
--- a/Allura/allura/templates/discussion/post.html
+++ b/Allura/allura/templates/discussion/post.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/discussion/thread.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/discussion/thread.html b/Allura/allura/templates/discussion/thread.html
index c17f2e6..87e718b 100644
--- a/Allura/allura/templates/discussion/thread.html
+++ b/Allura/allura/templates/discussion/thread.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/error.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/error.html b/Allura/allura/templates/error.html
index f3cc6ff..3bfacc9 100644
--- a/Allura/allura/templates/error.html
+++ b/Allura/allura/templates/error.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/grant.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/grant.html b/Allura/allura/templates/grant.html
index cbb075a..ce490d9 100644
--- a/Allura/allura/templates/grant.html
+++ b/Allura/allura/templates/grant.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}Grant{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/grants.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/grants.html b/Allura/allura/templates/grants.html
index cd39a3a..1d56047 100644
--- a/Allura/allura/templates/grants.html
+++ b/Allura/allura/templates/grants.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}Grants List{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 99ff405..0e4938a 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% macro related_artifacts(artifact) -%}
   {% set related_artifacts = artifact.related_artifacts() %}
   {% if related_artifacts %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index 7268f07..11482a7 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <!DOCTYPE html>
 <!-- Server: {{g.server_name}} -->
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/jinja_master/nav_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/nav_menu.html b/Allura/allura/templates/jinja_master/nav_menu.html
index e6d2623..76648a1 100644
--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 {% set n = c.project.neighborhood %}
 {% if not c.project or (n.neighborhood_project == c.project and not n.show_title) %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/jinja_master/neigh_nav_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/neigh_nav_menu.html b/Allura/allura/templates/jinja_master/neigh_nav_menu.html
index 2826ea2..687dd2b 100644
--- a/Allura/allura/templates/jinja_master/neigh_nav_menu.html
+++ b/Allura/allura/templates/jinja_master/neigh_nav_menu.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% if not neighborhood or not neighborhood.show_title %}
   <div id="nav_menu_missing"></div>
 {% else %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/jinja_master/neigh_top_nav.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/neigh_top_nav.html b/Allura/allura/templates/jinja_master/neigh_top_nav.html
index 93f0ec7..39b37b9 100644
--- a/Allura/allura/templates/jinja_master/neigh_top_nav.html
+++ b/Allura/allura/templates/jinja_master/neigh_top_nav.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% if neighborhood and neighborhood.neighborhood_project %}
   {% for s in neighborhood.neighborhood_project.sitemap() %}
     <a href="{{s.url}}" class="ui-icon-{{s.ui_icon or 'admin'}}">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/jinja_master/sidebar_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/sidebar_menu.html b/Allura/allura/templates/jinja_master/sidebar_menu.html
index 4fd947d..f8b9c8e 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set ul_active = [] %}
 {% macro sidebar_item(s) -%}
   {% if s.url %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index 17bc9a5..e1c9903 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {%- macro header(login_url, logout_url) %}
 <header id="site-header">
     <div class="wrapper">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/jinja_master/top_nav.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/top_nav.html b/Allura/allura/templates/jinja_master/top_nav.html
index ad99bfa..1e4f54a 100644
--- a/Allura/allura/templates/jinja_master/top_nav.html
+++ b/Allura/allura/templates/jinja_master/top_nav.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% if c.project %}
   {% for s in c.project.grouped_navbar_entries() %}
     <a href="{{s.url}}" class="ui-icon-{{s.ui_icon or 'admin'}}">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/login.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/login.html b/Allura/allura/templates/login.html
index b76f944..fef3f7f 100644
--- a/Allura/allura/templates/login.html
+++ b/Allura/allura/templates/login.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/markdown_syntax.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/markdown_syntax.html b/Allura/allura/templates/markdown_syntax.html
index 8138e57..ffba5aa 100644
--- a/Allura/allura/templates/markdown_syntax.html
+++ b/Allura/allura/templates/markdown_syntax.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Markdown Syntax{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/markdown_syntax_dialog.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/markdown_syntax_dialog.html b/Allura/allura/templates/markdown_syntax_dialog.html
index 4679540..9675a53 100644
--- a/Allura/allura/templates/markdown_syntax_dialog.html
+++ b/Allura/allura/templates/markdown_syntax_dialog.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <!DOCTYPE html>
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 {{lib.markdown_syntax()}}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/neighborhood_add_project.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_add_project.html b/Allura/allura/templates/neighborhood_add_project.html
index cf419f1..cd1f79c 100644
--- a/Allura/allura/templates/neighborhood_add_project.html
+++ b/Allura/allura/templates/neighborhood_add_project.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/neighborhood_admin_accolades.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_admin_accolades.html b/Allura/allura/templates/neighborhood_admin_accolades.html
index eb7d90a..63264bc 100644
--- a/Allura/allura/templates/neighborhood_admin_accolades.html
+++ b/Allura/allura/templates/neighborhood_admin_accolades.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{neighborhood.name}} / Award Administration{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/neighborhood_admin_overview.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_admin_overview.html b/Allura/allura/templates/neighborhood_admin_overview.html
index a4ca467..07489e9 100644
--- a/Allura/allura/templates/neighborhood_admin_overview.html
+++ b/Allura/allura/templates/neighborhood_admin_overview.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{neighborhood.name}} / Overview{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/neighborhood_help.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_help.html b/Allura/allura/templates/neighborhood_help.html
index d6795df..6ad8163 100644
--- a/Allura/allura/templates/neighborhood_help.html
+++ b/Allura/allura/templates/neighborhood_help.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}Neighborhood Help{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/neighborhood_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_list.html b/Allura/allura/templates/neighborhood_list.html
index 1a29b29..1b85931 100644
--- a/Allura/allura/templates/neighborhood_list.html
+++ b/Allura/allura/templates/neighborhood_list.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{title}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/neighborhood_moderate.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_moderate.html b/Allura/allura/templates/neighborhood_moderate.html
index 4682d9e..7beea44 100644
--- a/Allura/allura/templates/neighborhood_moderate.html
+++ b/Allura/allura/templates/neighborhood_moderate.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/neighborhood_project_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_project_list.html b/Allura/allura/templates/neighborhood_project_list.html
index deecc70..1f2939e 100644
--- a/Allura/allura/templates/neighborhood_project_list.html
+++ b/Allura/allura/templates/neighborhood_project_list.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = not neighborhood.allow_browse %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/neighborhood_stats.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_stats.html b/Allura/allura/templates/neighborhood_stats.html
index 1c2eeb6..fa0e68f 100644
--- a/Allura/allura/templates/neighborhood_stats.html
+++ b/Allura/allura/templates/neighborhood_stats.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block top_nav %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/neighborhood_stats_adminlist.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_stats_adminlist.html b/Allura/allura/templates/neighborhood_stats_adminlist.html
index 83e7393..4e3afe0 100644
--- a/Allura/allura/templates/neighborhood_stats_adminlist.html
+++ b/Allura/allura/templates/neighborhood_stats_adminlist.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / Statistics / Admins list{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/oauth_applications.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oauth_applications.html b/Allura/allura/templates/oauth_applications.html
index 7703900..f31c27e 100644
--- a/Allura/allura/templates/oauth_applications.html
+++ b/Allura/allura/templates/oauth_applications.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/oauth_authorize.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oauth_authorize.html b/Allura/allura/templates/oauth_authorize.html
index b6635b9..eecb5fc 100644
--- a/Allura/allura/templates/oauth_authorize.html
+++ b/Allura/allura/templates/oauth_authorize.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/oauth_authorize_ok.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oauth_authorize_ok.html b/Allura/allura/templates/oauth_authorize_ok.html
index 08fe07d..02f1de0 100644
--- a/Allura/allura/templates/oauth_authorize_ok.html
+++ b/Allura/allura/templates/oauth_authorize_ok.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/oembed/generic.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oembed/generic.html b/Allura/allura/templates/oembed/generic.html
index 2a80391..40a9f0f 100644
--- a/Allura/allura/templates/oembed/generic.html
+++ b/Allura/allura/templates/oembed/generic.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <html>
   <body>
     <a href="{{href}}">{{href}}</a> (cannot be embedded)

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/oembed/html_tpl.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oembed/html_tpl.html b/Allura/allura/templates/oembed/html_tpl.html
index 3313428..0b063a2 100644
--- a/Allura/allura/templates/oembed/html_tpl.html
+++ b/Allura/allura/templates/oembed/html_tpl.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
                       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/oembed/link.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oembed/link.html b/Allura/allura/templates/oembed/link.html
index e580081..f3517a8 100644
--- a/Allura/allura/templates/oembed/link.html
+++ b/Allura/allura/templates/oembed/link.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <html>
   <body>
     <pre>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/oembed/link_opera.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oembed/link_opera.html b/Allura/allura/templates/oembed/link_opera.html
index 4aff2c6..ec98f72 100644
--- a/Allura/allura/templates/oembed/link_opera.html
+++ b/Allura/allura/templates/oembed/link_opera.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
                       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/oembed/link_twitter.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oembed/link_twitter.html b/Allura/allura/templates/oembed/link_twitter.html
index 267675f..76489c1 100644
--- a/Allura/allura/templates/oembed/link_twitter.html
+++ b/Allura/allura/templates/oembed/link_twitter.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <html>
   <body>
     <a href="{{href}}" target="_blank">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/oembed/photo.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oembed/photo.html b/Allura/allura/templates/oembed/photo.html
index eca1a1e..2511923 100644
--- a/Allura/allura/templates/oembed/photo.html
+++ b/Allura/allura/templates/oembed/photo.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <html>
   <body>
     <a href="{{href}}" target="_blank">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/project_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/project_list.html b/Allura/allura/templates/project_list.html
index bf57eac..6232a24 100644
--- a/Allura/allura/templates/project_list.html
+++ b/Allura/allura/templates/project_list.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{title}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/admin_extensions.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/admin_extensions.html b/Allura/allura/templates/repo/admin_extensions.html
index a73d9a5..e09a77a 100644
--- a/Allura/allura/templates/repo/admin_extensions.html
+++ b/Allura/allura/templates/repo/admin_extensions.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form>
   <label class="grid-13">Extensions:</label>
   <div class="grid-13">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/barediff.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/barediff.html b/Allura/allura/templates/repo/barediff.html
index 8b31017..babccfa 100644
--- a/Allura/allura/templates/repo/barediff.html
+++ b/Allura/allura/templates/repo/barediff.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% if a.has_image_view and b.has_image_view %}
   <img src="{{a.url()}}?format=raw"
        alt="{{h.text.truncate(a.commit._id, 10)}}"

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/commit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/commit.html b/Allura/allura/templates/repo/commit.html
index 3fd411c..a6f5179 100644
--- a/Allura/allura/templates/repo/commit.html
+++ b/Allura/allura/templates/repo/commit.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% do g.register_forge_css('css/forge/diff.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/commit_basic.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/commit_basic.html b/Allura/allura/templates/repo/commit_basic.html
index 8284047..f1625ca 100644
--- a/Allura/allura/templates/repo/commit_basic.html
+++ b/Allura/allura/templates/repo/commit_basic.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {{c.revision_widget.display(value=commit, prev=prev, next=next)}}
 <table>
   <tbody>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/commit_browser.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/commit_browser.html b/Allura/allura/templates/repo/commit_browser.html
index f27cbb7..512e157 100644
--- a/Allura/allura/templates/repo/commit_browser.html
+++ b/Allura/allura/templates/repo/commit_browser.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 {% set graph_x_space = 10 %}
 {% set graph_y_space = 20 %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/diff.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/diff.html b/Allura/allura/templates/repo/diff.html
index 0759bd7..a724896 100644
--- a/Allura/allura/templates/repo/diff.html
+++ b/Allura/allura/templates/repo/diff.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 {% do g.register_forge_css('css/forge/hilite.css') %}
 {% do g.register_forge_css('css/forge/diff.css') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/file.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/file.html b/Allura/allura/templates/repo/file.html
index a6dc7ab..3dcb447 100644
--- a/Allura/allura/templates/repo/file.html
+++ b/Allura/allura/templates/repo/file.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 {% do g.register_forge_css('css/forge/hilite.css') %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/fork.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/fork.html b/Allura/allura/templates/repo/fork.html
index fd00f9c..b552273 100644
--- a/Allura/allura/templates/repo/fork.html
+++ b/Allura/allura/templates/repo/fork.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Fork {{from_repo.name}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/forks.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/forks.html b/Allura/allura/templates/repo/forks.html
index a178777..089abb9 100644
--- a/Allura/allura/templates/repo/forks.html
+++ b/Allura/allura/templates/repo/forks.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Forks{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/log.html b/Allura/allura/templates/repo/log.html
index 7660d3c..7d41198 100644
--- a/Allura/allura/templates/repo/log.html
+++ b/Allura/allura/templates/repo/log.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/merge_request.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_request.html b/Allura/allura/templates/repo/merge_request.html
index 6cbf23e..2ed40a9 100644
--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/merge_requests.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_requests.html b/Allura/allura/templates/repo/merge_requests.html
index e18046f..772957c 100644
--- a/Allura/allura/templates/repo/merge_requests.html
+++ b/Allura/allura/templates/repo/merge_requests.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/repo_master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/repo_master.html b/Allura/allura/templates/repo/repo_master.html
index 76a86fa..88d2af6 100644
--- a/Allura/allura/templates/repo/repo_master.html
+++ b/Allura/allura/templates/repo/repo_master.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% if hasattr(c.app, 'repo') %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/request_merge.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/request_merge.html b/Allura/allura/templates/repo/request_merge.html
index 7d37c7d..02b9061 100644
--- a/Allura/allura/templates/repo/request_merge.html
+++ b/Allura/allura/templates/repo/request_merge.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/tags.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/tags.html b/Allura/allura/templates/repo/tags.html
index 01175bd..ef4640e 100644
--- a/Allura/allura/templates/repo/tags.html
+++ b/Allura/allura/templates/repo/tags.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/tarball.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/tarball.html b/Allura/allura/templates/repo/tarball.html
index fa053c9..91f6f0b 100644
--- a/Allura/allura/templates/repo/tarball.html
+++ b/Allura/allura/templates/repo/tarball.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 {% block title %}
 {{c.project.name}} / {{c.app.config.options.mount_label}} / Commit {{commit.shorthand_id()}}


[2/3] Override newline after license header in jinja2 templates

Posted by pe...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/repo/tree.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/tree.html b/Allura/allura/templates/repo/tree.html
index 551e205..e1e6e86 100644
--- a/Allura/allura/templates/repo/tree.html
+++ b/Allura/allura/templates/repo/tree.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 {% do g.register_forge_css('css/forge/hilite.css') %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/search_index.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/search_index.html b/Allura/allura/templates/search_index.html
index fe9e2f7..ea2b566 100644
--- a/Allura/allura/templates/search_index.html
+++ b/Allura/allura/templates/search_index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/setup_openid_user.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/setup_openid_user.html b/Allura/allura/templates/setup_openid_user.html
index 8a2f695..ee14125 100644
--- a/Allura/allura/templates/setup_openid_user.html
+++ b/Allura/allura/templates/setup_openid_user.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}Login Form{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin.html b/Allura/allura/templates/site_admin.html
index d81b65f..8e82374 100644
--- a/Allura/allura/templates/site_admin.html
+++ b/Allura/allura/templates/site_admin.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar=False %}
 {% if page == 'new_projects' %}
   {% set hide_left_bar=True %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin_add_subscribers.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_add_subscribers.html b/Allura/allura/templates/site_admin_add_subscribers.html
index 87d7e42..660e55f 100644
--- a/Allura/allura/templates/site_admin_add_subscribers.html
+++ b/Allura/allura/templates/site_admin_add_subscribers.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set page="add_subscribers" %}
 {% extends 'allura:templates/site_admin.html' %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin_api_tickets.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_api_tickets.html b/Allura/allura/templates/site_admin_api_tickets.html
index 9de7651..fbb6724 100644
--- a/Allura/allura/templates/site_admin_api_tickets.html
+++ b/Allura/allura/templates/site_admin_api_tickets.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set page="api_tickets" %}
 {% extends 'allura:templates/site_admin.html' %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin_index.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_index.html b/Allura/allura/templates/site_admin_index.html
index 41c6f43..a03bed1 100644
--- a/Allura/allura/templates/site_admin_index.html
+++ b/Allura/allura/templates/site_admin_index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set page="index" %}
 {% extends 'allura:templates/site_admin.html' %}
 {% block content %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin_new_projects.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_new_projects.html b/Allura/allura/templates/site_admin_new_projects.html
index 51b06bf..aae9e48 100644
--- a/Allura/allura/templates/site_admin_new_projects.html
+++ b/Allura/allura/templates/site_admin_new_projects.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set page="new_projects" %}
 {% extends 'allura:templates/site_admin.html' %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin_reclone_repo.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_reclone_repo.html b/Allura/allura/templates/site_admin_reclone_repo.html
index ca2925b..f1b28b4 100644
--- a/Allura/allura/templates/site_admin_reclone_repo.html
+++ b/Allura/allura/templates/site_admin_reclone_repo.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set page="reclone_repo" %}
 {% extends 'allura:templates/site_admin.html' %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin_stats.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_stats.html b/Allura/allura/templates/site_admin_stats.html
index ecc8fe9..86262d5 100644
--- a/Allura/allura/templates/site_admin_stats.html
+++ b/Allura/allura/templates/site_admin_stats.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set page="stats" %}
 {% extends 'allura:templates/site_admin.html' %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin_task_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_task_list.html b/Allura/allura/templates/site_admin_task_list.html
index 1124547..d5e7750 100644
--- a/Allura/allura/templates/site_admin_task_list.html
+++ b/Allura/allura/templates/site_admin_task_list.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set page="task_manager" %}
 {% extends 'allura:templates/site_admin.html' %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin_task_new.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_task_new.html b/Allura/allura/templates/site_admin_task_new.html
index 290c83a..2244e77 100644
--- a/Allura/allura/templates/site_admin_task_new.html
+++ b/Allura/allura/templates/site_admin_task_new.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set page="task_manager" %}
 {% set sidebar_rel = '../' %}
 {% extends 'allura:templates/site_admin.html' %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/site_admin_task_view.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_task_view.html b/Allura/allura/templates/site_admin_task_view.html
index 166c923..c107382 100644
--- a/Allura/allura/templates/site_admin_task_view.html
+++ b/Allura/allura/templates/site_admin_task_view.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set page = 'task_manager' %}
 {% set sidebar_rel = '../../' %}
 {% extends 'allura:templates/site_admin.html' %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/tool_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/tool_list.html b/Allura/allura/templates/tool_list.html
index e271007..4dfe568 100644
--- a/Allura/allura/templates/tool_list.html
+++ b/Allura/allura/templates/tool_list.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/trovecategories.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/trovecategories.html b/Allura/allura/templates/trovecategories.html
index a40a3f6..f0267c7 100644
--- a/Allura/allura/templates/trovecategories.html
+++ b/Allura/allura/templates/trovecategories.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/user_availability.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_availability.html b/Allura/allura/templates/user_availability.html
index 4e9b3b8..c10cdee 100644
--- a/Allura/allura/templates/user_availability.html
+++ b/Allura/allura/templates/user_availability.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/user_contacts.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_contacts.html b/Allura/allura/templates/user_contacts.html
index 225027a..7495508 100644
--- a/Allura/allura/templates/user_contacts.html
+++ b/Allura/allura/templates/user_contacts.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/user_info.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_info.html b/Allura/allura/templates/user_info.html
index ddb56d6..7e49658 100644
--- a/Allura/allura/templates/user_info.html
+++ b/Allura/allura/templates/user_info.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/user_prefs.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_prefs.html b/Allura/allura/templates/user_prefs.html
index 88d0712..2efb388 100644
--- a/Allura/allura/templates/user_prefs.html
+++ b/Allura/allura/templates/user_prefs.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/user_skills.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_skills.html b/Allura/allura/templates/user_skills.html
index 9a25944..fbc1945 100644
--- a/Allura/allura/templates/user_skills.html
+++ b/Allura/allura/templates/user_skills.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/user_subs.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_subs.html b/Allura/allura/templates/user_subs.html
index 7fad7a2..e94bbd7 100644
--- a/Allura/allura/templates/user_subs.html
+++ b/Allura/allura/templates/user_subs.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/admin_field.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/admin_field.html b/Allura/allura/templates/widgets/admin_field.html
index a6bdd21..5fb4130 100644
--- a/Allura/allura/templates/widgets/admin_field.html
+++ b/Allura/allura/templates/widgets/admin_field.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div data-name="{{field.name}}">
   <div class="grid-4">
     {% if field.label and field.show_label %}<label>{{field.label}}</label>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/admin_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/admin_form.html b/Allura/allura/templates/widgets/admin_form.html
index 06d760c..f516d12 100644
--- a/Allura/allura/templates/widgets/admin_form.html
+++ b/Allura/allura/templates/widgets/admin_form.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="{{method}}"
        {% if enctype %}enctype="{{enctype}}"{% endif %}
       action="{{action}}">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/analytics.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/analytics.html b/Allura/allura/templates/widgets/analytics.html
index b269427..3ff1186 100644
--- a/Allura/allura/templates/widgets/analytics.html
+++ b/Allura/allura/templates/widgets/analytics.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% if g.theme.jinja_macros %}
     {% import g.theme.jinja_macros as theme_macros with context %}
 {% endif %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/attachment.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/attachment.html b/Allura/allura/templates/widgets/attachment.html
index b3c3d91..653e863 100644
--- a/Allura/allura/templates/widgets/attachment.html
+++ b/Allura/allura/templates/widgets/attachment.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   <hr/>
   {% if value.is_image() %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/attachment_add.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/attachment_add.html b/Allura/allura/templates/widgets/attachment_add.html
index 47db28f..8ed2ab5 100644
--- a/Allura/allura/templates/widgets/attachment_add.html
+++ b/Allura/allura/templates/widgets/attachment_add.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="post"
       action="{{action}}"
       enctype="multipart/form-data">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/attachment_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/attachment_list.html b/Allura/allura/templates/widgets/attachment_list.html
index 5815241..09d8177 100644
--- a/Allura/allura/templates/widgets/attachment_list.html
+++ b/Allura/allura/templates/widgets/attachment_list.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   {% if attachments %}
     {% set attachments = attachments|list %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/discussion.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/discussion.html b/Allura/allura/templates/widgets/discussion.html
index 4b8d2d2..41ef5d7 100644
--- a/Allura/allura/templates/widgets/discussion.html
+++ b/Allura/allura/templates/widgets/discussion.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Discussion{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/discussion_header.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/discussion_header.html b/Allura/allura/templates/widgets/discussion_header.html
index 1a8b5ab..801a21a 100644
--- a/Allura/allura/templates/widgets/discussion_header.html
+++ b/Allura/allura/templates/widgets/discussion_header.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,5 +15,5 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>{{g.markdown.convert(value.description)|safe}}</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/download_button.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/download_button.html b/Allura/allura/templates/widgets/download_button.html
index 3e93044..44e3b36 100644
--- a/Allura/allura/templates/widgets/download_button.html
+++ b/Allura/allura/templates/widgets/download_button.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,5 +15,5 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <p><span class="download-button-{{project._id}}" style="margin-bottom: 1em; display: block;"></span></p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/edit_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/edit_post.html b/Allura/allura/templates/widgets/edit_post.html
index 5d87394..65762f3 100644
--- a/Allura/allura/templates/widgets/edit_post.html
+++ b/Allura/allura/templates/widgets/edit_post.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   <form method="post" action="{{action}}"
         enctype="multipart/form-data">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/field_cluster.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/field_cluster.html b/Allura/allura/templates/widgets/field_cluster.html
index 3a2aa90..e99e88c 100644
--- a/Allura/allura/templates/widgets/field_cluster.html
+++ b/Allura/allura/templates/widgets/field_cluster.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:py="http://genshi.edgewall.org/"
      xmlns:xi="http://www.w3.org/2001/XInclude"

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/file_chooser.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/file_chooser.html b/Allura/allura/templates/widgets/file_chooser.html
index c714ece..7c89594 100644
--- a/Allura/allura/templates/widgets/file_chooser.html
+++ b/Allura/allura/templates/widgets/file_chooser.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
    <input type="button" id="{{name}}" class="file_chooser" value="Choose File"/>
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/flag_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/flag_post.html b/Allura/allura/templates/widgets/flag_post.html
index 08a5bd1..b539e04 100644
--- a/Allura/allura/templates/widgets/flag_post.html
+++ b/Allura/allura/templates/widgets/flag_post.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="POST" action="{{action}}">
     <input type="hidden" name="delete" value="True"/>
     <a href="" title="Flag as inappropriate or spam" class="flag_post ico-l"><b data-icon="{{g.icons['flag'].char}}" class="ico {{g.icons['flag'].css}}"></b> <span>Flag</span></a>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/forge_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/forge_form.html b/Allura/allura/templates/widgets/forge_form.html
index 86ed140..8adde73 100644
--- a/Allura/allura/templates/widgets/forge_form.html
+++ b/Allura/allura/templates/widgets/forge_form.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="{{method}}"
       {% if enctype %}enctype="{{enctype}}"{% endif %}
       action="{{action}}">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/include.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/include.html b/Allura/allura/templates/widgets/include.html
index 308b4aa..a4078f0 100644
--- a/Allura/allura/templates/widgets/include.html
+++ b/Allura/allura/templates/widgets/include.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div{{attrs|default({}, true)|xmlattr}}>
   {{artifact.html_text|safe}}
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/label_edit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/label_edit.html b/Allura/allura/templates/widgets/label_edit.html
index 0a4c6cd..78b81e2 100644
--- a/Allura/allura/templates/widgets/label_edit.html
+++ b/Allura/allura/templates/widgets/label_edit.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   <input id="{{id}}" name="{{name}}" type="text" value="{% if value %}{{value}}{% endif %}" class="label_edit {{className}}"{% if placeholder %} placeholder="{{placeholder}}"{% endif %}>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/lightbox.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/lightbox.html b/Allura/allura/templates/widgets/lightbox.html
index ef990f9..e251a16 100644
--- a/Allura/allura/templates/widgets/lightbox.html
+++ b/Allura/allura/templates/widgets/lightbox.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div id="lightbox_{{name}}" class="modal" style="display:none">
   <b data-icon="{{g.icons['close'].char}}" class="ico {{g.icons['close'].css}} close"></b>
   {{content|safe}}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/markdown_edit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/markdown_edit.html b/Allura/allura/templates/widgets/markdown_edit.html
index a5013e8..7c15df0 100644
--- a/Allura/allura/templates/widgets/markdown_edit.html
+++ b/Allura/allura/templates/widgets/markdown_edit.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 <div class="markdown_edit">
   <a href="#" class="markdown_preview btn" title="Preview"><b data-icon="{{g.icons['search'].char}}" class="ico {{g.icons['search'].css}}"></b> Preview</a>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/moderate_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_post.html b/Allura/allura/templates/widgets/moderate_post.html
index 06ea8db..4ff074c 100644
--- a/Allura/allura/templates/widgets/moderate_post.html
+++ b/Allura/allura/templates/widgets/moderate_post.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="POST" action="{{action}}">
     <input type="hidden" name="delete" value="True"/>
     <a href="" class="moderate_post little_link"><span>Delete</span></a>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/moderate_posts.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_posts.html b/Allura/allura/templates/widgets/moderate_posts.html
index 89abcf1..2babc7f 100644
--- a/Allura/allura/templates/widgets/moderate_posts.html
+++ b/Allura/allura/templates/widgets/moderate_posts.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form {{widget.j2_attrs({'name':name, 'id':id, 'method':method, 'action':action, 'enctype':enctype})}}
       {{attrs|default({}, true)|xmlattr}}>
   <fieldset class="grid-19">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/neighborhood_add_project.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/neighborhood_add_project.html b/Allura/allura/templates/widgets/neighborhood_add_project.html
index fbf6d5d..5a45019 100644
--- a/Allura/allura/templates/widgets/neighborhood_add_project.html
+++ b/Allura/allura/templates/widgets/neighborhood_add_project.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form action="{{action}}" method="POST">
 
     <div class="welcome">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/neighborhood_overview_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/neighborhood_overview_form.html b/Allura/allura/templates/widgets/neighborhood_overview_form.html
index f9e58a9..6b63d3b 100644
--- a/Allura/allura/templates/widgets/neighborhood_overview_form.html
+++ b/Allura/allura/templates/widgets/neighborhood_overview_form.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
   <form method="POST" action="update" enctype="multipart/form-data">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/neighborhood_project_select.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/neighborhood_project_select.html b/Allura/allura/templates/widgets/neighborhood_project_select.html
index e070f0b..b917a0c 100644
--- a/Allura/allura/templates/widgets/neighborhood_project_select.html
+++ b/Allura/allura/templates/widgets/neighborhood_project_select.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   <input type="text" id="{{name}}" name="{{name}}" class="ui-autocomplete-input neighborhood-project-select{{className and ' %s' % className or ''}}" value="{{value and value.username or ''}}"/>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/new_topic_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/new_topic_post.html b/Allura/allura/templates/widgets/new_topic_post.html
index 0259027..bc1450a 100644
--- a/Allura/allura/templates/widgets/new_topic_post.html
+++ b/Allura/allura/templates/widgets/new_topic_post.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="post" action="{{action}}">
     {% if show_subject %}
     <div class="grid-19">&nbsp;</div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/page_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/page_list.html b/Allura/allura/templates/widgets/page_list.html
index e196f26..a5f39b2 100644
--- a/Allura/allura/templates/widgets/page_list.html
+++ b/Allura/allura/templates/widgets/page_list.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   <div class="page_list">
     {% set paginator = widget.paginator(count, page, limit) %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/page_size.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/page_size.html b/Allura/allura/templates/widgets/page_size.html
index 9df8dfa..baed90a 100644
--- a/Allura/allura/templates/widgets/page_size.html
+++ b/Allura/allura/templates/widgets/page_size.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="get">
   {% for k,v in widget.url_params.iteritems() %}
     <input type="hidden" name="{{k}}" value="{{v}}"/>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/post_thread.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_thread.html b/Allura/allura/templates/widgets/post_thread.html
index 6d5057b..3877500 100644
--- a/Allura/allura/templates/widgets/post_thread.html
+++ b/Allura/allura/templates/widgets/post_thread.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <!-- post_thread -->
 <li>
 {{widget.parent_widget.widgets.post.display(

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index ec2bc67..f9c881a 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
 {% if page == 0 %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/project_list_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/project_list_widget.html b/Allura/allura/templates/widgets/project_list_widget.html
index 0cdb43b..13fccca 100644
--- a/Allura/allura/templates/widgets/project_list_widget.html
+++ b/Allura/allura/templates/widgets/project_list_widget.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div class="list">
   {% if not projects %}
     <p>No projects found</p>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/project_screenshots.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/project_screenshots.html b/Allura/allura/templates/widgets/project_screenshots.html
index 47cd43d..14c2d6f 100644
--- a/Allura/allura/templates/widgets/project_screenshots.html
+++ b/Allura/allura/templates/widgets/project_screenshots.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% for ss in project.get_screenshots() %}
   <div class="grid-6" style="text-align: center">
     <a href="{{project.url()}}screenshot/{{ss.filename}}"><img src="{{project.url()}}screenshot/{{ss.filename}}/thumb" alt="Screenshot thumbnail"/></a>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/project_summary.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/project_summary.html b/Allura/allura/templates/widgets/project_summary.html
index 3b100d2..8f772d3 100644
--- a/Allura/allura/templates/widgets/project_summary.html
+++ b/Allura/allura/templates/widgets/project_summary.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% if display_mode == 'list' %}
 <div class="list card{% if show_proj_icon%} proj_icon{% endif %}"
 	{%- if columns == 2 %} style="width: 330px"{% elif columns == 3 %} style="width: 220px"{% endif %}>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/project_user_combo.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/project_user_combo.html b/Allura/allura/templates/widgets/project_user_combo.html
index 4abfee2..1dc851a 100644
--- a/Allura/allura/templates/widgets/project_user_combo.html
+++ b/Allura/allura/templates/widgets/project_user_combo.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <select id="{{id}}" name="{{name}}" class="project-user-combobox{{className and ' %s' % className or ''}}">
 {% for o in options %}
   <option{% if o.selected %} selected{% endif %} value="{{o.html_value}}">{{o.label|e}}</option>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/project_user_select.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/project_user_select.html b/Allura/allura/templates/widgets/project_user_select.html
index 9a04b3e..23c4347 100644
--- a/Allura/allura/templates/widgets/project_user_select.html
+++ b/Allura/allura/templates/widgets/project_user_select.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   <input type="text" id="{{id}}" name="{{name}}" class="ui-autocomplete-input project_user_select{{className and ' %s' % className or ''}}" value="{{value and value.username or value or ''}}"/>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/repo/commit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/commit.html b/Allura/allura/templates/widgets/repo/commit.html
index 9aef440..0858365 100644
--- a/Allura/allura/templates/widgets/repo/commit.html
+++ b/Allura/allura/templates/widgets/repo/commit.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/repo/commit_browser.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/commit_browser.html b/Allura/allura/templates/widgets/repo/commit_browser.html
index 80d84c3..d3720d0 100644
--- a/Allura/allura/templates/widgets/repo/commit_browser.html
+++ b/Allura/allura/templates/widgets/repo/commit_browser.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <p id="commit_browser_canvas_message">This commit browser uses JS canvas but unfortunately your browser does not support it.</p>
 <div id="graph_holder" class="grid-19">
   <canvas id="commit_highlighter" width="750" height="300"></canvas>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html
index 8725a9a..d7307a5 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% from 'allura:templates/jinja_master/lib.html' import email_gravatar, abbr_date with context %}
 <div>
   {%if is_file%}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/repo/revision.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/revision.html b/Allura/allura/templates/widgets/repo/revision.html
index 0fbd0da..48df9c1 100644
--- a/Allura/allura/templates/widgets/repo/revision.html
+++ b/Allura/allura/templates/widgets/repo/revision.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% from 'allura:templates/jinja_master/lib.html' import email_gravatar, abbr_date with context %}
 <div class="commit-details">
     <div class="commit-message">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/repo/tree_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/tree_widget.html b/Allura/allura/templates/widgets/repo/tree_widget.html
index 44b23c5..957ec11 100644
--- a/Allura/allura/templates/widgets/repo/tree_widget.html
+++ b/Allura/allura/templates/widgets/repo/tree_widget.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 <table>
 {% set ls = list(tree.ls()) %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/search_results.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/search_results.html b/Allura/allura/templates/widgets/search_results.html
index c30dfa4..3d28f49 100644
--- a/Allura/allura/templates/widgets/search_results.html
+++ b/Allura/allura/templates/widgets/search_results.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="GET" action=".">
   <div class="grid-10">
     <input type="text" name="q" value="{{q}}" class="search-query" title="Search App"/>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/sortable_repeated_field.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/sortable_repeated_field.html b/Allura/allura/templates/widgets/sortable_repeated_field.html
index 4a8cf51..fecf101 100644
--- a/Allura/allura/templates/widgets/sortable_repeated_field.html
+++ b/Allura/allura/templates/widgets/sortable_repeated_field.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:py="http://genshi.edgewall.org/"
      class="$container_cls"

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/sortable_table.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/sortable_table.html b/Allura/allura/templates/widgets/sortable_table.html
index af548b4..f9cc757 100644
--- a/Allura/allura/templates/widgets/sortable_table.html
+++ b/Allura/allura/templates/widgets/sortable_table.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:py="http://genshi.edgewall.org/"
      class="$container_cls"

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/state_field.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/state_field.html b/Allura/allura/templates/widgets/state_field.html
index 9fc3896..c2c36e9 100644
--- a/Allura/allura/templates/widgets/state_field.html
+++ b/Allura/allura/templates/widgets/state_field.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:py="http://genshi.edgewall.org/"
      xmlns:xi="http://www.w3.org/2001/XInclude"

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/subscribe.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/subscribe.html b/Allura/allura/templates/widgets/subscribe.html
index 33b5edb..a88c7e4 100644
--- a/Allura/allura/templates/widgets/subscribe.html
+++ b/Allura/allura/templates/widgets/subscribe.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% if value %}
   {% if style == 'icon' %}
     <a href="{{action}}?unsubscribe=True" class="artifact_unsubscribe active" title="Unsubscribe from this {{thing}}"><b data-icon="{{g.icons['mail'].char}}" class="ico {{g.icons['mail'].css}}" title="Unsubscribe from this {{thing}}"></b></a>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/subscription_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/subscription_form.html b/Allura/allura/templates/widgets/subscription_form.html
index 7461002..b138c58 100644
--- a/Allura/allura/templates/widgets/subscription_form.html
+++ b/Allura/allura/templates/widgets/subscription_form.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div {{attrs|default({}, true)|xmlattr}} class="discussion_subscription_form">
   <div class="clear"></div>
   <div class="pagination_size">{{widget.fields['page_list'].display(limit=limit, page=page, count=count)}}</div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/thread_header.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_header.html b/Allura/allura/templates/widgets/thread_header.html
index ed5aaec..13c69fe 100644
--- a/Allura/allura/templates/widgets/thread_header.html
+++ b/Allura/allura/templates/widgets/thread_header.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div>
   {% if limit %}
   <div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/thread_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_widget.html b/Allura/allura/templates/widgets/thread_widget.html
index 9c063d3..90b47ce 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
 <div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/threads_table.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/threads_table.html b/Allura/allura/templates/widgets/threads_table.html
index a1d3284..bfc0088 100644
--- a/Allura/allura/templates/widgets/threads_table.html
+++ b/Allura/allura/templates/widgets/threads_table.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
 <div{{ {'id': div_id}|xmlattr }}>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/Allura/allura/templates/widgets/vote.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/vote.html b/Allura/allura/templates/widgets/vote.html
index 74c3063..06f40d7 100644
--- a/Allura/allura/templates/widgets/vote.html
+++ b/Allura/allura/templates/widgets/vote.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set can_vote = c.user and c.user != c.user.anonymous()
                   and h.has_access(artifact, 'post')() %}
 {% set voted = artifact.user_voted(c.user) %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeActivity/forgeactivity/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/templates/index.html b/ForgeActivity/forgeactivity/templates/index.html
index 87caaab..e4ad26a 100644
--- a/ForgeActivity/forgeactivity/templates/index.html
+++ b/ForgeActivity/forgeactivity/templates/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% set hide_left_bar = True %}
 {% extends g.theme.master %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeActivity/forgeactivity/templates/widgets/follow.html
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/templates/widgets/follow.html b/ForgeActivity/forgeactivity/templates/widgets/follow.html
index ff041d2..78ae48f 100644
--- a/ForgeActivity/forgeactivity/templates/widgets/follow.html
+++ b/ForgeActivity/forgeactivity/templates/widgets/follow.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <a  href="{{action}}?follow={{not following}}"
     class="artifact_follow{{ ' active' if following }}"
     title="{{'Stop %sing' % action_label if following else action_label|capitalize}} {{thing}}"><b

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog/admin_exfeed.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog/admin_exfeed.html b/ForgeBlog/forgeblog/templates/blog/admin_exfeed.html
index aff9113..9fc417a 100644
--- a/ForgeBlog/forgeblog/templates/blog/admin_exfeed.html
+++ b/ForgeBlog/forgeblog/templates/blog/admin_exfeed.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="POST" action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/set_exfeed">
   <label class="grid-13">Existing external feeds:</label>
   <div class="grid-13">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog/admin_options.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog/admin_options.html b/ForgeBlog/forgeblog/templates/blog/admin_options.html
index e1c27d4..8c549a0 100644
--- a/ForgeBlog/forgeblog/templates/blog/admin_options.html
+++ b/ForgeBlog/forgeblog/templates/blog/admin_options.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <!DOCTYPE html>
 <form action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/set_options" method="post">
     <label class="grid-7" for="show_discussion">Allow discussion/commenting on posts</label>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog/edit_post.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog/edit_post.html b/ForgeBlog/forgeblog/templates/blog/edit_post.html
index 2651088..c908a67 100644
--- a/ForgeBlog/forgeblog/templates/blog/edit_post.html
+++ b/ForgeBlog/forgeblog/templates/blog/edit_post.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}:

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog/edit_posts.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog/edit_posts.html b/ForgeBlog/forgeblog/templates/blog/edit_posts.html
index f5b04bd..5c87a3c 100644
--- a/ForgeBlog/forgeblog/templates/blog/edit_posts.html
+++ b/ForgeBlog/forgeblog/templates/blog/edit_posts.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog/index.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog/index.html b/ForgeBlog/forgeblog/templates/blog/index.html
index ebf215d..9a90f7b 100644
--- a/ForgeBlog/forgeblog/templates/blog/index.html
+++ b/ForgeBlog/forgeblog/templates/blog/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog/post.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog/post.html b/ForgeBlog/forgeblog/templates/blog/post.html
index 753fd23..c0caad3 100644
--- a/ForgeBlog/forgeblog/templates/blog/post.html
+++ b/ForgeBlog/forgeblog/templates/blog/post.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}: {{post.title}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog/post_diff.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog/post_diff.html b/ForgeBlog/forgeblog/templates/blog/post_diff.html
index 922cc5c..bfe0199 100644
--- a/ForgeBlog/forgeblog/templates/blog/post_diff.html
+++ b/ForgeBlog/forgeblog/templates/blog/post_diff.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / {{p1.title}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog/post_history.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog/post_history.html b/ForgeBlog/forgeblog/templates/blog/post_history.html
index 24f71b4..fd1efbf 100644
--- a/ForgeBlog/forgeblog/templates/blog/post_history.html
+++ b/ForgeBlog/forgeblog/templates/blog/post_history.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}  / {{title}}{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog/search.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog/search.html b/ForgeBlog/forgeblog/templates/blog/search.html
index 89df072..b8574ca 100644
--- a/ForgeBlog/forgeblog/templates/blog/search.html
+++ b/ForgeBlog/forgeblog/templates/blog/search.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Search{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog_widgets/page_list.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/page_list.html b/ForgeBlog/forgeblog/templates/blog_widgets/page_list.html
index d313e15..bbc9725 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/page_list.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/page_list.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div style="margin: 10px">
   {% set paginator = widget.paginator(count, page, limit) %}
   <div style="float: right">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog_widgets/post_form.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/post_form.html b/ForgeBlog/forgeblog/templates/blog_widgets/post_form.html
index b4365cf..ecfc16c 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/post_form.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/post_form.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <div class="editbox">
 <form method="{{method}}"
       {% if enctype %}enctype="{{enctype}}"{% endif %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html b/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
index c660d4b..c3de748 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 <div style="margin-bottom: 10px">
   <h3>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
index 9f69958..27d2ac6 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
 {{value.html_text|safe}}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeChat/forgechat/templates/chat/chat_lib.html
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/templates/chat/chat_lib.html b/ForgeChat/forgechat/templates/chat/chat_lib.html
index b08f4a4..89faf7d 100644
--- a/ForgeChat/forgechat/templates/chat/chat_lib.html
+++ b/ForgeChat/forgechat/templates/chat/chat_lib.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% macro checkout_info(app) %}
   {% if app.channel.channel %}
   <p>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeChat/forgechat/templates/chat/day.html
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/templates/chat/day.html b/ForgeChat/forgechat/templates/chat/day.html
index f470608..913eb7d 100644
--- a/ForgeChat/forgechat/templates/chat/day.html
+++ b/ForgeChat/forgechat/templates/chat/day.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% import "forgechat:templates/chat/chat_lib.html" as clib %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeChat/forgechat/templates/chat/index.html
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/templates/chat/index.html b/ForgeChat/forgechat/templates/chat/index.html
index dfc4f78..06bafde 100644
--- a/ForgeChat/forgechat/templates/chat/index.html
+++ b/ForgeChat/forgechat/templates/chat/index.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% import "forgechat:templates/chat/chat_lib.html" as clib %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeChat/forgechat/templates/chat/search.html
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/templates/chat/search.html b/ForgeChat/forgechat/templates/chat/search.html
index dc2a8e5..59566c6 100644
--- a/ForgeChat/forgechat/templates/chat/search.html
+++ b/ForgeChat/forgechat/templates/chat/search.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 {% import "forgechat:templates/chat/chat_lib.html" as clib %}
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html
index 09304e4..626b2b3 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 {% if value == c.add_forum -%}
     {% set value = {} -%}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum_short.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum_short.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum_short.html
index d317dcc..701022c 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum_short.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/add_forum_short.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 <form method="{{method}}" action="{{action}}" enctype="multipart/form-data" id="new_forum_form">
   <input type="hidden" name="add_forum.app_id" value="{{app and app.config._id}}">
   <div class="grid-6">

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6f801213/ForgeDiscussion/forgediscussion/templates/discussion_widgets/discussion.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/discussion.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/discussion.html
index 5df3794..6d7302d 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/discussion.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/discussion.html
@@ -1,4 +1,4 @@
-{#
+{#-
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -15,7 +15,7 @@
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-#}
+-#}
 {% extends g.theme.master %}
 
 {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Discussion{% endblock %}