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 21:39:06 UTC

[1/2] git commit: Fix commenting in Genshi templates

Updated Branches:
  refs/heads/master 6f8012136 -> 346b15058


Fix commenting in Genshi 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/f6e6b726
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f6e6b726
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f6e6b726

Branch: refs/heads/master
Commit: f6e6b7265a1b44e00b5b846982591fc7a9775292
Parents: 6f80121
Author: Peter Hartmann <pe...@apache.org>
Authored: Thu Apr 18 21:37:33 2013 +0200
Committer: Peter Hartmann <pe...@apache.org>
Committed: Thu Apr 18 21:37:33 2013 +0200

----------------------------------------------------------------------
 Allura/allura/templates/widgets/field_cluster.html |    4 ++--
 .../templates/widgets/sortable_repeated_field.html |    4 ++--
 .../allura/templates/widgets/sortable_table.html   |    4 ++--
 Allura/allura/templates/widgets/state_field.html   |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f6e6b726/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 e99e88c..e014e5c 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/f6e6b726/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 fecf101..dc41694 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/f6e6b726/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 f9cc757..40cdeca 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/f6e6b726/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 c2c36e9..e3da307 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"


[2/2] git commit: Fix newline issue in ForgeShortUrl template

Posted by pe...@apache.org.
Fix newline issue in ForgeShortUrl template

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/346b1505
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/346b1505
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/346b1505

Branch: refs/heads/master
Commit: 346b15058fe3412b4bc997c0e2c68838b668112b
Parents: f6e6b72
Author: Peter Hartmann <pe...@apache.org>
Authored: Thu Apr 18 21:38:25 2013 +0200
Committer: Peter Hartmann <pe...@apache.org>
Committed: Thu Apr 18 21:38:25 2013 +0200

----------------------------------------------------------------------
 ForgeShortUrl/forgeshorturl/templates/add.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/346b1505/ForgeShortUrl/forgeshorturl/templates/add.html
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/templates/add.html b/ForgeShortUrl/forgeshorturl/templates/add.html
index fc2f0c2..4deece9 100644
--- a/ForgeShortUrl/forgeshorturl/templates/add.html
+++ b/ForgeShortUrl/forgeshorturl/templates/add.html
@@ -16,7 +16,7 @@
        specific language governing permissions and limitations
        under the License.
 -#}
-    <form method="post" action="{{c.project.url()}}admin/{{app.config.options.mount_point}}/add">
+{# fixes identation #}    <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>
         <label class="grid-13">Full URL</label>