Changeset 7395

Timestamp:

Jun 12, 2017, 10:44:36 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2091: Add a configuration setting for application title

A new configuration setting in base.config:

• app.title

Location:

trunk

Files:

• config/dist/base.config (modified) (1 diff)
• doc/src/docbook/appendix/base.config.xml (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/taglib/Head.java (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/taglib/Page.java (modified) (4 diffs)

trunk/config/dist/base.config

@@ -206 +206 @@
 # General section
 # ===============
+
+# Title that is displayed in the browser tab. Use $VERSION to include
+# the current BASE version and $SERVER to include the server name.
+app.title = BASE $VERSION @ $SERVER
 
 # The path to the directory where uploaded files are stored

trunk/doc/src/docbook/appendix/base.config.xml

@@ -700 +700 @@
   <simplesect id="appendix.base.config.other">
     <title>Other settings</title>
-    
+
     <variablelist>
+    <varlistentry>
+      <term><property>app.title</property></term>
+      <listitem>
+        <para>
+        The title that is displayed in the browser tab. Use <code>$VERSION</code>
+        to include the current BASE version and <code>$SERVER</code> to include the 
+        server name.
+          </para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term><property>userfiles</property></term>

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/Head.java

@@ -338 +338 @@
       appendStyles(sb, fontStyles, !"display".equals(longTexts), skinContext);
       appendScripts(sb, skinContext);
-      
-      String title = page.getTitle();
-      if (title == null)
-      {
-        title = page.getBaseVersion() + " @ " + page.getServerName();
-      }
-      sb.append("\t<title>").append(title).append("</title>\n");
+
+      sb.append("\t<title>").append(page.getTitle()).append("</title>\n");
     }
 

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/Page.java

@@ -27 +27 @@
 
 import net.sf.basedb.core.Application;
+import net.sf.basedb.core.Config;
 import net.sf.basedb.core.SessionControl;
 import net.sf.basedb.core.Version;
@@ -212 +213 @@
   private static String BASE_VERSION = null;
   
+  /**
+    The default page title.
+    @since 3.12
+  */
+  private static String DEFAULT_PAGE_TITLE = null;
+  
   private static String MAX_URL_LENGTH = null;
 
@@ -245 +252 @@
     MAX_URL_LENGTH = maxUrlLength > 0 ? String.valueOf(maxUrlLength) : null;
     ROOT = ((HttpServletRequest)pageContext.getRequest()).getContextPath()+"/";
-    BASE_VERSION = "BASE " + Version.getMajor() + "." + 
-      Version.getMinor() + "." + Version.getMaintenance() + Version.getSuffix();
+    BASE_VERSION = Version.getMajor() + "." + Version.getMinor() + "." + Version.getMaintenance() + Version.getSuffix();
     SERVER_NAME = Application.getHostName();
+    DEFAULT_PAGE_TITLE = Config.getString("app.title", "BASE $VERSION @ $SERVER")
+      .replace("$VERSION", BASE_VERSION)
+      .replace("$SERVER", SERVER_NAME);
     initialized = true;
   }
@@ -269 +278 @@
   public String getTitle()
   {
-    return title;
+    return title == null ? DEFAULT_PAGE_TITLE : title;
   }