From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 28 May 2014 14:24:06 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~578^2
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=cd29fab932f1968b834f714ce60f96dc30117f01;hp=fd209c6d475186f192f8281f29ae2e9759a449a4;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
---

diff --git a/examples/htdocs/mkws-widget-credo.js b/examples/htdocs/mkws-widget-credo.js
index 90ac5f9..a41ec88 100644
--- a/examples/htdocs/mkws-widget-credo.js
+++ b/examples/htdocs/mkws-widget-credo.js
@@ -43,7 +43,7 @@ mkws.registerWidgetType('Credo', function() {
   s.push('<tr class="front">');
 
   s.push('<td class="main">');
-  s.push(section('encyclopaedia', 'Topic Page: ### title',
+  s.push(section('encyclopaedia', 'Topic Page: <span class="x-mkws-title"/>',
                  this.subwidget('Reference', { _team: 'ref' })));
   // The Images widget needs to be in our team so we can set its template
   s.push(section('image', 'Images',
@@ -51,7 +51,7 @@ mkws.registerWidgetType('Credo', function() {
   s.push('</td>');
 
   s.push('<td class="side">');
-  s.push(section('mindmap', 'Create a Mind Map for ### title',
+  s.push(section('mindmap', 'Create a Mind Map for <span class="x-mkws-title"/>',
                  this.subwidget('Mindmap', { _team: 'main', facet: 'subject' })));
   s.push(section('topics', 'Related Topics',
                  this.subwidget('Facet', { _team: 'main', facet: 'subject' })));
@@ -76,6 +76,22 @@ mkws.registerWidgetType('Credo', function() {
 
   this.node.html(s.join(''));
 
+  // Fill in the titles from the query once widgets have all been prepared
+  var that = this;
+  this.team.queue("ready").subscribe(function() {
+    var query = toTitleCase(that.config.query);
+    that.log("got query '" + query + "' from team config");
+    mkws.$('.x-mkws-title').html(query);
+    mkws.$('title').html("MKWS: " + query);
+
+    // Derived from http://stackoverflow.com/questions/196972/convert-string-to-title-case-with-javascript
+    function toTitleCase(str) {
+      return str.replace(/\w\S*/g, function(txt) {
+        return txt.charAt(0).toUpperCase() + txt.substr(1);
+      });
+    }
+  });
+
 
   function section(xclass, title, content) {
     var s = [];