From 0bc2d9c96abf0f0a85f6e804ff9c892649b28cb9 Mon Sep 17 00:00:00 2001
From: E Rasche <hxr@hx42.org>
Date: Sun, 2 Jul 2017 05:45:09 +0000
Subject: [PATCH 1/3] Uniform html titles

---
 templates/base.mako                                  |  8 +++++++-
 templates/base/base_panels.mako                      | 12 +++++++-----
 templates/display_base.mako                          |  2 +-
 templates/js-app.mako                                |  8 +++++++-
 templates/user/logout.mako                           |  2 +-
 templates/webapps/galaxy/admin/center.mako           |  2 +-
 templates/webapps/galaxy/base_panels.mako            |  2 +-
 templates/webapps/galaxy/dataset/display.mako        |  2 +-
 templates/webapps/galaxy/dataset/errors.mako         |  8 +++++++-
 templates/webapps/galaxy/galaxy.panels.mako          | 10 +++++++---
 templates/webapps/galaxy/history/list_published.mako |  2 +-
 templates/webapps/galaxy/mobile/form.mako            |  8 +++++++-
 templates/webapps/galaxy/mobile/index.mako           |  7 ++++++-
 templates/webapps/galaxy/root/tool_runner.mako       |  7 ++++++-
 templates/webapps/reports/base_panels.mako           |  2 +-
 templates/webapps/tool_shed/admin/center.mako        |  2 +-
 templates/webapps/tool_shed/base_panels.mako         |  2 +-
 .../webapps/tool_shed/repository/tool_form.mako      |  8 +++++++-
 18 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/templates/base.mako b/templates/base.mako
index 22af35c1e4f..c1bdd1ba3da 100644
--- a/templates/base.mako
+++ b/templates/base.mako
@@ -13,7 +13,13 @@
         ## Force IE to standards mode, and prefer Google Chrome Frame if the user has already installed it
         <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
 
-        <title>${self.title()}</title>
+        <title>
+            Galaxy
+            %if app.config.brand:
+            | ${app.config.brand}
+            %endif
+            | ${self.title()}
+        </title>
         ## relative href for site root
         <link rel="index" href="${ h.url_for( '/' ) }"/>
         ${self.metas()}
diff --git a/templates/base/base_panels.mako b/templates/base/base_panels.mako
index 0beaa5d6540..96612f8eadd 100644
--- a/templates/base/base_panels.mako
+++ b/templates/base/base_panels.mako
@@ -166,11 +166,13 @@
         ## Force IE to standards mode, and prefer Google Chrome Frame if the user has already installed it
         <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
 
-        %if app.config.brand:
-            <title>${self.title()} / ${app.config.brand}</title>
-        %else:
-            <title>${self.title()}</title>
-        %endif
+        <title>
+            Galaxy
+            %if app.config.brand:
+            | ${app.config.brand}
+            %endif
+            | ${self.title()}
+        </title>
         ## relative href for site root
         <link rel="index" href="${ h.url_for( '/' ) }"/>
         ${self.stylesheets()}
diff --git a/templates/display_base.mako b/templates/display_base.mako
index d80d31d3347..f0780e2f31c 100644
--- a/templates/display_base.mako
+++ b/templates/display_base.mako
@@ -17,7 +17,7 @@
 ##
 
 <%def name="title()">
-    Galaxy | ${iff( item.published, "Published ", iff( item.importable , "Accessible ", iff( item.users_shared_with, "Shared ", "Private " ) ) ) + get_class_display_name( item.__class__ )} | ${get_item_name( item ) | h}
+    ${iff( item.published, "Published ", iff( item.importable , "Accessible ", iff( item.users_shared_with, "Shared ", "Private " ) ) ) + get_class_display_name( item.__class__ )} | ${get_item_name( item ) | h}
 </%def>
 
 <%def name="init()">
diff --git a/templates/js-app.mako b/templates/js-app.mako
index 4deff5a7e4b..ad3e4368a4b 100644
--- a/templates/js-app.mako
+++ b/templates/js-app.mako
@@ -9,7 +9,13 @@
         ## Force IE to standards mode, and prefer Google Chrome Frame if the user has already installed it
         <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
 
-        <title>Galaxy</title>
+        <title>
+            Galaxy
+            %if app.config.brand:
+            | ${app.config.brand}
+            %endif
+            | ${self.title()}
+        </title>
         ## relative href for site root
         <link rel="index" href="${ h.url_for( '/' ) }"/>
         ## TODO: use loaders to move everything but the essentials below the fold
diff --git a/templates/user/logout.mako b/templates/user/logout.mako
index fe0a0376bb9..ff0c3fe3e60 100644
--- a/templates/user/logout.mako
+++ b/templates/user/logout.mako
@@ -32,7 +32,7 @@ def inherit(context):
     </style>
 </%def>
 
-<%def name="title()">Galaxy :: Logout</%def>
+<%def name="title()">Logout</%def>
 
 <%def name="center_panel()">
     ${self.body()}
diff --git a/templates/webapps/galaxy/admin/center.mako b/templates/webapps/galaxy/admin/center.mako
index d87009949c4..8bed99c55e9 100644
--- a/templates/webapps/galaxy/admin/center.mako
+++ b/templates/webapps/galaxy/admin/center.mako
@@ -1,7 +1,7 @@
 <%inherit file="/base.mako"/>
 <%namespace file="/message.mako" import="render_msg" />
 
-<%def name="title()">Galaxy Administration</%def>
+<%def name="title()">Administration</%def>
 
 <h2>Administration</h2>
 Please visit <a href="https://galaxyproject.org/admin" target="_blank">the Galaxy administration hub</a> to learn how to keep your Galaxy in best shape.
diff --git a/templates/webapps/galaxy/base_panels.mako b/templates/webapps/galaxy/base_panels.mako
index 735ee10d615..dc3fa31e8be 100644
--- a/templates/webapps/galaxy/base_panels.mako
+++ b/templates/webapps/galaxy/base_panels.mako
@@ -3,7 +3,7 @@
 <%namespace name="mod_masthead" file="/webapps/galaxy/galaxy.masthead.mako"/>
 
 ## Default title
-<%def name="title()">Galaxy</%def>
+<%def name="title()"></%def>
 
 <%def name="javascripts()">
 ${parent.javascripts()}
diff --git a/templates/webapps/galaxy/dataset/display.mako b/templates/webapps/galaxy/dataset/display.mako
index 4feef6d97e5..b22a1d3c1ad 100644
--- a/templates/webapps/galaxy/dataset/display.mako
+++ b/templates/webapps/galaxy/dataset/display.mako
@@ -44,7 +44,7 @@
 </%def>
 
 <%def name="title()">
-    Galaxy | ${get_class_display_name( item.__class__ )} | ${get_item_name( item ) | h}
+    ${get_class_display_name( item.__class__ )} | ${get_item_name( item ) | h}
 </%def>
 
 <%def name="render_item_links( data )">
diff --git a/templates/webapps/galaxy/dataset/errors.mako b/templates/webapps/galaxy/dataset/errors.mako
index 7e7f989c7cf..17df5868296 100644
--- a/templates/webapps/galaxy/dataset/errors.mako
+++ b/templates/webapps/galaxy/dataset/errors.mako
@@ -1,7 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
     <head>
-        <title>Dataset generation errors</title>
+        <title>
+            Galaxy
+            %if app.config.brand:
+            | ${app.config.brand}
+            %endif
+            | Dataset generation errors
+        </title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <link href="/static/style/base.css" rel="stylesheet" type="text/css" />
         <style>
diff --git a/templates/webapps/galaxy/galaxy.panels.mako b/templates/webapps/galaxy/galaxy.panels.mako
index eaef84c2140..08f74fb142c 100644
--- a/templates/webapps/galaxy/galaxy.panels.mako
+++ b/templates/webapps/galaxy/galaxy.panels.mako
@@ -159,9 +159,13 @@
         <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1">
 
         <title>
-        %if self.galaxy_config['title']:
-            ${self.galaxy_config['title']}
-        %endif
+            Galaxy
+            %if app.config.brand:
+            | ${app.config.brand}
+            %endif
+            %if self.galaxy_config['title']:
+            | ${self.galaxy_config['title']}
+            %endif
         </title>
 
         ${self.stylesheets()}
diff --git a/templates/webapps/galaxy/history/list_published.mako b/templates/webapps/galaxy/history/list_published.mako
index b56ac7368d4..09b2502509b 100644
--- a/templates/webapps/galaxy/history/list_published.mako
+++ b/templates/webapps/galaxy/history/list_published.mako
@@ -10,7 +10,7 @@
 </%def>
 
 <%def name="title()">
-    Galaxy | Published Histories
+    Published Histories
 </%def>
 
 <%def name="stylesheets()">
diff --git a/templates/webapps/galaxy/mobile/form.mako b/templates/webapps/galaxy/mobile/form.mako
index 35069d9c75c..29d4e56dadc 100644
--- a/templates/webapps/galaxy/mobile/form.mako
+++ b/templates/webapps/galaxy/mobile/form.mako
@@ -3,7 +3,13 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <title>${form.title}</title>
+  <title>
+    Galaxy
+    %if app.config.brand:
+    | ${app.config.brand}
+    %endif
+    ${form.title}
+  </title>
   <meta name="viewport" content="width=devicewidth; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
   <link rel="apple-touch-icon" href="${h.url_for('/static/iui/iui-logo-touch-icon.png')}" />
   <meta name="apple-touch-fullscreen" content="YES" />
diff --git a/templates/webapps/galaxy/mobile/index.mako b/templates/webapps/galaxy/mobile/index.mako
index 98ed4912b4f..80e88e93e46 100644
--- a/templates/webapps/galaxy/mobile/index.mako
+++ b/templates/webapps/galaxy/mobile/index.mako
@@ -2,7 +2,12 @@
          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>Galaxy</title>
+    <title>
+        Galaxy
+        %if app.config.brand:
+        | ${app.config.brand}
+        %endif
+    </title>
     
     <style>
     li > a > div {
diff --git a/templates/webapps/galaxy/root/tool_runner.mako b/templates/webapps/galaxy/root/tool_runner.mako
index f6b77e1241a..c90a9bda53f 100644
--- a/templates/webapps/galaxy/root/tool_runner.mako
+++ b/templates/webapps/galaxy/root/tool_runner.mako
@@ -1,7 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
     <head>
-        <title>Galaxy</title>
+        <title>
+            Galaxy
+            %if app.config.brand:
+            | ${app.config.brand}
+            %endif
+        </title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <link href="${h.url_for('/static/style/base.css')}" rel="stylesheet" type="text/css" />
         <script type="text/javascript">
diff --git a/templates/webapps/reports/base_panels.mako b/templates/webapps/reports/base_panels.mako
index 085f69008e7..686863295b3 100644
--- a/templates/webapps/reports/base_panels.mako
+++ b/templates/webapps/reports/base_panels.mako
@@ -7,7 +7,7 @@
 
 
 ## Default title
-<%def name="title()">Galaxy Reports</%def>
+<%def name="title()">Reports</%def>
 
 ## Masthead
 <%def name="masthead()">
diff --git a/templates/webapps/tool_shed/admin/center.mako b/templates/webapps/tool_shed/admin/center.mako
index 038281f0e63..712ef102101 100644
--- a/templates/webapps/tool_shed/admin/center.mako
+++ b/templates/webapps/tool_shed/admin/center.mako
@@ -2,7 +2,7 @@
 <%namespace file="/message.mako" import="render_msg" />
 
 
-<%def name="title()">Galaxy Administration</%def>
+<%def name="title()">Administration</%def>
 
 %if message:
     ${render_msg( message, status )}
diff --git a/templates/webapps/tool_shed/base_panels.mako b/templates/webapps/tool_shed/base_panels.mako
index 3efd1000059..6621c4cd3a7 100644
--- a/templates/webapps/tool_shed/base_panels.mako
+++ b/templates/webapps/tool_shed/base_panels.mako
@@ -1,7 +1,7 @@
 <%inherit file="/base/base_panels.mako"/>
 
 ## Default title
-<%def name="title()">Galaxy Tool Shed</%def>
+<%def name="title()">Tool Shed</%def>
 
 <%def name="javascripts()">
     ${parent.javascripts()}
diff --git a/templates/webapps/tool_shed/repository/tool_form.mako b/templates/webapps/tool_shed/repository/tool_form.mako
index eaa0b3e6ecc..c3313f32692 100644
--- a/templates/webapps/tool_shed/repository/tool_form.mako
+++ b/templates/webapps/tool_shed/repository/tool_form.mako
@@ -11,7 +11,13 @@
 
 <html>
     <head>
-        <title>Galaxy tool preview</title>
+        <title>
+            Galaxy
+            %if app.config.brand:
+            | ${app.config.brand}
+            %endif
+            | Tool Preview
+        </title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         ${h.css( "base" )}
     </head>

From 3f03774616634a6126405c1ff934f0f338197c8b Mon Sep 17 00:00:00 2001
From: E Rasche <hxr@hx42.org>
Date: Sun, 2 Jul 2017 05:27:55 +0000
Subject: [PATCH 2/3] Redundant

---
 lib/galaxy/webapps/galaxy/controllers/library.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/webapps/galaxy/controllers/library.py b/lib/galaxy/webapps/galaxy/controllers/library.py
index 3df63fa6584..68623a2bbca 100644
--- a/lib/galaxy/webapps/galaxy/controllers/library.py
+++ b/lib/galaxy/webapps/galaxy/controllers/library.py
@@ -87,7 +87,7 @@ class Library( BaseUIController ):
         }
         return trans.fill_template( 'galaxy.panels.mako',
                                     config={
-                                        'title': 'Galaxy Data Libraries',
+                                        'title': 'Data Libraries',
                                         'app': app } )
 
     @web.expose

From e88986f3897aa661197bcaf22077e5f3cc515cef Mon Sep 17 00:00:00 2001
From: E Rasche <hxr@hx42.org>
Date: Sun, 2 Jul 2017 06:00:38 +0000
Subject: [PATCH 3/3] Accidental inclusion

---
 templates/js-app.mako | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/js-app.mako b/templates/js-app.mako
index ad3e4368a4b..b32ddd0f033 100644
--- a/templates/js-app.mako
+++ b/templates/js-app.mako
@@ -14,7 +14,6 @@
             %if app.config.brand:
             | ${app.config.brand}
             %endif
-            | ${self.title()}
         </title>
         ## relative href for site root
         <link rel="index" href="${ h.url_for( '/' ) }"/>