Merge branch 'master' into templateallthemarkup

diff --git a/examples/htdocs/mkws-widget-credo-bs.js b/examples/htdocs/mkws-widget-credo-bs.js
index 7c143c1..49651ea 100644 (file)
--- a/examples/htdocs/mkws-widget-credo-bs.js
+++ b/examples/htdocs/mkws-widget-credo-bs.js
@@ -25,14 +25,14 @@ mkws.registerWidgetType('Credo', function() {
   var that = this;
 
   this.team.registerTemplate('CredoImage', '\
-      <div class="col-md-3 col-sm-4 col-xs-6">\
+      <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">\
        <a href="{{mkws-googleurl md-electronic-url}}" target="_blank">\
         {{#mkws-first md-thumburl}}\
          <img src="{{this}}" alt="{{../md-title}}"/>\
         {{/mkws-first}}\
        <br/>\
        </a>\
-       <p>{{md-title}}</p>\
+       <p>{{{md-title}}}</p>\
       </div>\
 ');
 
@@ -47,8 +47,6 @@ mkws.registerWidgetType('Credo', function() {
   s.push('</div></div>');
 
   s.push('<div class="col-md-4">');
-  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' })));
   s.push('</div>');
@@ -56,21 +54,19 @@ mkws.registerWidgetType('Credo', function() {
   s.push('</div>');
   
   s.push('<div class="row">');
-  s.push(section('image col-md-12', 'Images', this.subwidget('GoogleImage', { maxrecs: 4, template: 'CredoImage' })));
+  s.push(section('image col-md-12', 'Images', this.subwidget('GoogleImage', { maxrecs: 4, template: 'CredoImage', target: 'google_images_js' })));
   s.push('</div>');
   
 
   s.push('<div class="row clearfix">');
-  s.push(section('entries clearfix col-md-4 col-sm-6', 'Credo Entries',
-                    this.subwidget('Records', { _team: 'main' })));
+  s.push(section('entries clearfix col-md-4 col-sm-6', 'News',
+                 this.subwidget('Records', { _team: 'news', targetfilter: 'categories=news', perpage: 10 })));
   s.push(section('articles clearfix col-md-4 col-sm-6', 'Articles',
-                    this.subwidget('Records', { _team: 'articles', targetfilter: 'categories=articles' })));
+                    this.subwidget('Records', { _team: 'articles', targetfilter: 'categories=articles', perpage: 10 })));
   s.push(section('books clearfix col-md-4 col-sm-6', 'Books',
-                    this.subwidget('Records', { _team: 'books', targetfilter: 'categories=books' })));
-  s.push(section('news col-md-4 col-sm-6', 'News',
-                    this.subwidget('Records', { _team: 'news', targetfilter: 'categories=news' })));
-  s.push(section('resources col-md-4 col-sm-6', 'Suggested Resources',
-                    "### Not yet implemented"));
+                    this.subwidget('Records', { _team: 'books', targetfilter: 'categories=books', perpage: 10 })));
+  s.push(section('news col-md-4 col-sm-6', 'Results from all targets',
+                    this.subwidget('Records', { _team: 'main' })));
   s.push('</div>');
   this.node.html(s.join(''));
 
@@ -111,8 +107,3 @@ mkws.registerWidgetType('Credo', function() {
     return s.join('');
   }
 });
-
-
-mkws.registerWidgetType('Mindmap', function() {
-  this.node.html("### We do not yet have a Mindmap widget");
-});

diff --git a/examples/htdocs/mkws-widget-credo.js b/examples/htdocs/mkws-widget-credo.js
index 59a9a13..052aaec 100644 (file)
--- a/examples/htdocs/mkws-widget-credo.js
+++ b/examples/htdocs/mkws-widget-credo.js
@@ -32,7 +32,7 @@ mkws.registerWidgetType('Credo', function() {
         {{/mkws-first}}\
        <br/>\
        </a>\
-       <p>{{md-title}}</p>\
+       <p>{{{md-title}}}</p>\
       </div>\
 ');
 
@@ -47,12 +47,10 @@ mkws.registerWidgetType('Credo', function() {
                  this.subwidget('Reference', { _team: 'ref', paragraphs: 1 })));
   // The Images widget needs to be in our team so we can set its template
   s.push(section('image', 'Images',
-                 this.subwidget('GoogleImage', { maxrecs: 4, template: 'CredoImage' })));
+                 this.subwidget('GoogleImage', { maxrecs: 3, template: 'CredoImage', target: 'google_images_js' })));
   s.push('</td>');
 
   s.push('<td class="side">');
-  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' })));
   s.push('</td>');
@@ -61,16 +59,14 @@ mkws.registerWidgetType('Credo', function() {
 
   s.push('<tr><td colspan="2"><hr class="divider"/></td></tr>');
 
-  s.push(sectionRow('entries', 'Credo Entries',
-                    this.subwidget('Records', { _team: 'main' })));
+  s.push(sectionRow('entries', 'News',
+                    this.subwidget('Records', { _team: 'news', targetfilter: 'categories=news', perpage: 10 })));
   s.push(sectionRow('articles', 'Articles',
-                    this.subwidget('Records', { _team: 'articles', targetfilter: 'categories=articles' })));
+                    this.subwidget('Records', { _team: 'articles', targetfilter: 'categories=articles', perpage: 10 })));
   s.push(sectionRow('books', 'Books',
-                    this.subwidget('Records', { _team: 'books', targetfilter: 'categories=books' })));
-  s.push(sectionRow('news', 'News',
-                    this.subwidget('Records', { _team: 'news', targetfilter: 'categories=news' })));
-  s.push(sectionRow('resources', 'Suggested Resources',
-                    "### Not yet implemented"));
+                    this.subwidget('Records', { _team: 'books', targetfilter: 'categories=books', perpage: 10 })));
+  s.push(sectionRow('news', 'Results from all targets',
+                    this.subwidget('Records', { _team: 'main' })));
 
   s.push('</table>');
 
@@ -112,8 +108,3 @@ mkws.registerWidgetType('Credo', function() {
     return s.join('');
   }
 });
-
-
-mkws.registerWidgetType('Mindmap', function() {
-  this.node.html("### We do not yet have a Mindmap widget");
-});

diff --git a/examples/htdocs/ref-bootstrap.html b/examples/htdocs/ref-bootstrap.html
index 91430f0..503a8fe 100644 (file)
--- a/examples/htdocs/ref-bootstrap.html
+++ b/examples/htdocs/ref-bootstrap.html
@@ -33,8 +33,16 @@
     </script>
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
     <script type="text/javascript" src="mkws-widget-credo-bs.js"></script>
+    <style>
+      .mkwsCredo {
+        max-width: 1440px;
+      }
+      .mkwsGoogleImage img {
+        max-width: 95%;
+      }
+    </style>
   </head>
   <body>
-    <div class='mkwsCredo page-header container' autosearch='!param!q'></div>
+    <div class='mkwsCredo page-header container-fluid' autosearch='!param!q'></div>
   </body>
 </html>

diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index e7ab19f..39513d9 100644 (file)
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -43,8 +43,8 @@ function widget($, team, type, node) {
     }
     
     for (var name in overrides) {
+      log(this + " overrode property " + name + "='" + overrides[name] + "' (was '" + attrs[name] + "') for " + type + " subwidget");
       attrs[name] = overrides[name];
-      log(this + " overrode property " + name + "='" + attrs[name] + "' for " + type + " subwidget");
     }
 
     if (defaults) {