Include Organisation name in an "Overall Title"

addresses #6

Change-Id: I29db4164b4c6867bd3580f5ae87aaee1554285a6

diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ
index bedc99e10b359d31e54ffb438c6ce4e8bdf60dcc..101385d816c7b3272788a931050c20311614954a 100644 (file)
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <!-- <link rel="alternate" type="application/rss+xml" title="Newsfeed" href="//blog.SomeCA.org/feed"> -->
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <meta charset="utf-8">
         <!-- <link rel="alternate" type="application/rss+xml" title="Newsfeed" href="//blog.SomeCA.org/feed"> -->
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

-        <title><?=$title?></title>
+        <title><?=_SomeCA?> - <?=$title?></title>

         <meta name="description" content="">
         <link rel="stylesheet" href="<?=$static?>/css/jquery-ui-timepicker-addon.css">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="description" content="">
         <link rel="stylesheet" href="<?=$static?>/css/jquery-ui-timepicker-addon.css">
         <meta name="viewport" content="width=device-width, initial-scale=1">

diff --git a/src/org/cacert/gigi/pages/MainPage.java b/src/org/cacert/gigi/pages/MainPage.java
index 44930b0861cc11434332e8a8c02bef40a2b6ddf1..a24188a5ad6d381edac7da6a20bd1f48cb0ef964 100644 (file)
--- a/src/org/cacert/gigi/pages/MainPage.java
+++ b/src/org/cacert/gigi/pages/MainPage.java
@@ -13,7 +13,7 @@ public class MainPage extends Page {
     Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ"));
 
     public MainPage() {
     Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ"));
 
     public MainPage() {

-        super("SomeCA - Home");
+        super("Home");

     }
 
     @Override
     }
 
     @Override