incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [05/16] git commit: [#5175] ticket:544 Fix title for merge request pages
Date Thu, 27 Feb 2014 16:18:22 GMT
[#5175] ticket:544 Fix title for merge request pages


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

Branch: refs/heads/cj/7210
Commit: 63bd019d329d63e4f1f16dc3155adeedf23b139d
Parents: 045cf23
Author: tramzzz <steh44@gmail.com>
Authored: Mon Feb 24 21:47:24 2014 +0200
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Wed Feb 26 05:23:00 2014 +0000

----------------------------------------------------------------------
 Allura/allura/templates/repo/merge_request.html  | 6 +-----
 Allura/allura/templates/repo/merge_requests.html | 6 +-----
 Allura/allura/templates/repo/request_merge.html  | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/63bd019d/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 4454066..3c79654 100644
--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -19,11 +19,7 @@
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}
-  {% if c.app.repo %}
-    Repository: {{c.app.repo.name}}
-  {% else %}
-    Repository
-  {% endif %}
+  {{c.project.name}} / {{c.app.config.options.mount_label}} / Merge Request #{{req.request_number}}:
{{req.summary}} ({{req.status}})
 {% endblock %}
 
 {% block header %}{{c.app.config.options.mount_label}}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/63bd019d/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 b1d83c6..2c37a45 100644
--- a/Allura/allura/templates/repo/merge_requests.html
+++ b/Allura/allura/templates/repo/merge_requests.html
@@ -19,11 +19,7 @@
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}
-  {% if c.app.repo %}
-    Repository: {{c.app.repo.name}}
-  {% else %}
-    Repository
-  {% endif %}
+  {{c.project.name}} / {{c.app.config.options.mount_label}} / Merge Requests
 {% endblock %}
 
 {% block header %}{{c.app.config.options.mount_label}} Merge Requests{% endblock %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/63bd019d/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 a55a67c..ad5222d 100644
--- a/Allura/allura/templates/repo/request_merge.html
+++ b/Allura/allura/templates/repo/request_merge.html
@@ -19,11 +19,7 @@
 {% extends 'allura:templates/repo/repo_master.html' %}
 
 {% block title %}
-  {% if c.app.repo %}
-    Repository: {{c.app.repo.name}}
-  {% else %}
-    Repository
-  {% endif %}
+  {{c.project.name}} / {{c.app.config.options.mount_label}} / Request merge
 {% endblock %}
 
 {% block header %}Request merge of {{c.app.config.options.mount_label}} {% endblock %}


Mime
View raw message