Make the window title configurable

diff --git a/client/src/app.js b/client/src/app.js
index c6eba1a3c076a43dac30891557ca3e0bffa2eee7..7fd8e809effb9866aefbc4b5a28ae9038b5c1456 100644 (file)
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -133,6 +133,9 @@ _kiwi.global = {
         _kiwi.global.settings = _kiwi.model.DataStore.instance('kiwi.settings');\r
         _kiwi.global.settings.load();\r
 \r
+        // Set the window title\r
+        window.document.title = opts.server_settings.window_title || 'Kiwi IRC';\r
+\r
         locale = _kiwi.global.settings.get('locale');\r
         if (!locale) {\r
             $.getJSON(opts.base_path + '/assets/locales/magic.json', continueStart);\r

diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index e31a71e7f67af103f82b3359b5639795f499950f..aeed33dd4e13d4e4153dc52bbd5febd8a1dfc739 100644 (file)
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -5,7 +5,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">\r
 <base target="_blank">\r
 \r
-<title> KiwiIRC </title>\r
+<title> Kiwi IRC </title>\r
 \r
 <link rel="shortcut icon" href="<%base_path%>/assets/img/favicon.ico">\r
 \r

diff --git a/client/src/views/application.js b/client/src/views/application.js
index 2f0af27d78a74b114bc9f1bb73ca88aa2ae585b9..1e0950002dd7a286e655124cd88b4d790f09a958 100644 (file)
--- a/client/src/views/application.js
+++ b/client/src/views/application.js
@@ -192,7 +192,7 @@ _kiwi.view.Application = Backbone.View.extend({
                 var tmr;
                 var has_focus = true;
                 var state = 0;
-                var default_title = 'Kiwi IRC';
+                var default_title = _kiwi.app.server_settings.window_title;
                 var title = 'Kiwi IRC';
 
                 this.setTitle = function (new_title) {

diff --git a/config.example.js b/config.example.js
index a86fdb1047920990118bec1bd24dddcfe5597d85..355cc02a6994e10ce0b619f7f5e5e19bdf31cd15 100644 (file)
--- a/config.example.js
+++ b/config.example.js
@@ -78,6 +78,11 @@ conf.default_encoding = 'utf8';
 */
 //conf.default_gecos = 'Web IRC Client';
 
+/*
+* Window title
+*/
+conf.window_title = 'Kiwi IRC';
+
 
 /*
  * Client side plugins

diff --git a/server/httphandler.js b/server/httphandler.js
index ee8b7e181afd63a4139d3ca25de9bc24e1e694e3..0aef2c0d12471797f3aff82f7efe7ef9b20746c4 100644 (file)
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -306,6 +306,13 @@ function generateSettings(request, debug, callback) {
         vars.server_settings.client = config.get().client;
     }
 
+    // Get the window title
+    if (config.get().window_title) {
+        vars.server_settings.window_title = config.get().window_title;
+    } else {
+        vars.server_settings.window_title = 'Kiwi IRC';
+    }
+
     // Any client plugins?
     if (config.get().client_plugins && config.get().client_plugins.length > 0) {
         vars.client_plugins = config.get().client_plugins;