allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [allura] 03/03: [#8330] better titles on some other tools too
Date Fri, 30 Aug 2019 17:34:08 GMT
This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8330
in repository https://gitbox.apache.org/repos/asf/allura.git

commit fb8aeaabc4bfff2b7df0eaecafbc30bf067ce40e
Author: Dave Brondsema <dave@brondsema.net>
AuthorDate: Fri Aug 30 13:22:10 2019 -0400

    [#8330] better titles on some other tools too
---
 Allura/allura/templates/discussion/index.html                  |  2 +-
 Allura/allura/templates/discussion/thread.html                 |  2 +-
 Allura/allura/templates/repo/log.html                          | 10 ++--------
 .../forgediscussion/templates/discussionforums/index.html      |  2 +-
 .../forgediscussion/templates/discussionforums/thread.html     |  2 +-
 ForgeGit/forgegit/templates/git/index.html                     |  8 +-------
 ForgeSVN/forgesvn/templates/svn/index.html                     |  8 +-------
 7 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/Allura/allura/templates/discussion/index.html b/Allura/allura/templates/discussion/index.html
index 8d05ccd..1b840af 100644
--- a/Allura/allura/templates/discussion/index.html
+++ b/Allura/allura/templates/discussion/index.html
@@ -18,7 +18,7 @@
 -#}
 {% extends g.theme.master %}
 
-{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Discussion{%
endblock %}
+{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / {{h.really_unicode(discussion.name)}}{%
endblock %}
 
 {% block header %}{{h.really_unicode(discussion.name)}}{% endblock %}
 
diff --git a/Allura/allura/templates/discussion/thread.html b/Allura/allura/templates/discussion/thread.html
index 87e718b..9b5de22 100644
--- a/Allura/allura/templates/discussion/thread.html
+++ b/Allura/allura/templates/discussion/thread.html
@@ -20,7 +20,7 @@
 
 {% block title %}
   {{c.project.name}} / {{c.app.config.options.mount_label}} / 
-  {{thread.subject and '%s:%s' % (thread.discussion.name, (thread.subject or '(no subject)'))
or thread.discussion.name}}
+  {{thread.subject and '%s: %s' % (thread.discussion.name, (thread.subject or '(no subject)'))
or thread.discussion.name}}
 {% endblock %}
 
 {% block header %}{{'subject' in thread and thread.subject or '(no subject)'}}{% endblock
%}
diff --git a/Allura/allura/templates/repo/log.html b/Allura/allura/templates/repo/log.html
index 2081da3..42c1864 100644
--- a/Allura/allura/templates/repo/log.html
+++ b/Allura/allura/templates/repo/log.html
@@ -18,15 +18,9 @@
 -#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
-{% block title %}
-  {% if c.app.repo %}
-    Repository: {{c.app.repo.name}}
-  {% else %}
-    Repository
-  {% endif %}
-{% endblock %}
+{% block title %}{{c.project.name}} / {{ (path and path.lstrip('/')) or c.app.config.options.mount_label
}} Commit Log{% endblock %}
 
-{% block header %}{{c.app.config.options.mount_label}} Log{% endblock %}
+{% block header %}{{path or c.app.config.options.mount_label}} Commit Log{% endblock %}
 
 {% block content %}
   <br style="clear:both"/>
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index 4de5b94..93acf7c 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -19,7 +19,7 @@
 {% extends g.theme.master %}
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
-{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Forums{% endblock
%}
+{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}{% endblock %}
 
 {% block header %}{{c.app.config.options.mount_label}}{% endblock %}
 
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
index f6cb8d5..c453d79 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
@@ -20,7 +20,7 @@
 
 {% block title %}
   {{c.project.name}} / {{c.app.config.options.mount_label}} / 
-  {{thread.subject and '%s:%s' % (thread.discussion.name, (thread.subject or '(no subject)'))
or thread.discussion.name}}
+  {{thread.subject and '%s: %s' % (thread.discussion.name, (thread.subject or '(no subject)'))
or thread.discussion.name}}
 {% endblock %}
 
 {% block header %}{{'subject' in thread and thread.subject or '(no subject)'}}{% endblock
%}
diff --git a/ForgeGit/forgegit/templates/git/index.html b/ForgeGit/forgegit/templates/git/index.html
index e09175e..73a5291 100644
--- a/ForgeGit/forgegit/templates/git/index.html
+++ b/ForgeGit/forgegit/templates/git/index.html
@@ -18,13 +18,7 @@
 -#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
-{% block title %}
-  {% if c.app.repo %}
-    Git Repository: {{c.app.repo.name}}
-  {% else %}
-    Git Repository
-  {% endif %}
-{% endblock %}
+{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}{% endblock %}
 
 {% block header %}{{c.app.config.options.mount_label}}{% endblock %}
 
diff --git a/ForgeSVN/forgesvn/templates/svn/index.html b/ForgeSVN/forgesvn/templates/svn/index.html
index fb5d474..4bf9267 100644
--- a/ForgeSVN/forgesvn/templates/svn/index.html
+++ b/ForgeSVN/forgesvn/templates/svn/index.html
@@ -18,13 +18,7 @@
 -#}
 {% extends 'allura:templates/repo/repo_master.html' %}
 
-{% block title %}
-  {% if c.app.repo %}
-    SVN Repository: {{c.app.repo.name}}
-  {% else %}
-    SVN Repository
-  {% endif %}
-{% endblock %}
+{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}{% endblock %}
 
 {% block header %}{{c.app.config.options.mount_label}}{% endblock %}
 


Mime
View raw message