X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=7d5128e3493ca116d65fe5fae7220ee266742ab5;hb=1e59ea3b6c29afeaf938fdb47729d2ec5f2cf7fc;hp=0e65f27bdaca5b3c70a01d34c25829884a4766b0;hpb=ff74c45c811734751b090f858b35fae17d729ce6;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 0e65f27..7d5128e 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -169,7 +169,7 @@ mkws.defaultTemplate = function(name) {
 	return '\
 <table>\
   <tr>\
-    <th>{{translate "Title"}}</th>\
+    <th>{{mkws-translate "Title"}}</th>\
     <td>\
       {{md-title}}\
       {{#if md-title-remainder}}\
@@ -182,44 +182,44 @@ mkws.defaultTemplate = function(name) {
   </tr>\
   {{#if md-date}}\
   <tr>\
-    <th>{{translate "Date"}}</th>\
+    <th>{{mkws-translate "Date"}}</th>\
     <td>{{md-date}}</td>\
   </tr>\
   {{/if}}\
   {{#if md-author}}\
   <tr>\
-    <th>{{translate "Author"}}</th>\
+    <th>{{mkws-translate "Author"}}</th>\
     <td>{{md-author}}</td>\
   </tr>\
   {{/if}}\
   {{#if md-electronic-url}}\
   <tr>\
-    <th>{{translate "Links"}}</th>\
+    <th>{{mkws-translate "Links"}}</th>\
     <td>\
       {{#each md-electronic-url}}\
-	<a href="{{this}}">Link{{index1}}</a>\
+	<a href="{{this}}">Link{{mkws-index1}}</a>\
       {{/each}}\
     </td>\
   </tr>\
   {{/if}}\
-  {{#if-any location having="md-subject"}}\
+  {{#mkws-if-any location having="md-subject"}}\
   <tr>\
-    <th>{{translate "Subject"}}</th>\
+    <th>{{mkws-translate "Subject"}}</th>\
     <td>\
-      {{#first location having="md-subject"}}\
+      {{#mkws-first location having="md-subject"}}\
 	{{#if md-subject}}\
-	  {{#commaList md-subject}}\
-	    {{this}}{{/commaList}}\
+	  {{#mkws-commaList md-subject}}\
+	    {{this}}{{/mkws-commaList}}\
 	{{/if}}\
-      {{/first}}\
+      {{/mkws-first}}\
     </td>\
   </tr>\
-  {{/if-any}}\
+  {{/mkws-if-any}}\
   <tr>\
-    <th>{{translate "Locations"}}</th>\
+    <th>{{mkws-translate "Locations"}}</th>\
     <td>\
-      {{#commaList location}}\
-	{{attr "@name"}}{{/commaList}}\
+      {{#mkws-commaList location}}\
+	{{mkws-attr "@name"}}{{/mkws-commaList}}\
     </td>\
   </tr>\
 </table>\
@@ -239,9 +239,9 @@ mkws.defaultTemplate = function(name) {
     } else if (name === "Image") {
 	return '\
       <a href="#" id="{{_id}}" onclick="{{_onclick}}">\
-        {{#first md-thumburl}}\
+        {{#mkws-first md-thumburl}}\
 	  <img src="{{this}}" alt="{{../md-title}}"/>\
-        {{/first}}\
+        {{/mkws-first}}\
 	<br/>\
       </a>\
 ';
@@ -330,44 +330,37 @@ mkws.pagerNext = function(tname) {
 
 
     function resizePage() {
-	var list = ["mkwsSwitch", "mkwsLang"];
-
-	var targetWidth = mkws.config.responsive_design_width;
+	var threshhold = mkws.config.responsive_design_width;
         var width = $(window).width();
-
-        if (mkws.width === undefined) {
-            // No state change, since we have no previous state
-        } else if (mkws.width > targetWidth && width <= targetWidth) {
-            log("wide -> narrow");
-        } else if (mkws.width <= targetWidth && width > targetWidth) {
-            log("narrow -> wide");
+        var from, to, method;
+
+        if ((mkws.width === undefined || mkws.width > threshhold) &&
+                   width <= threshhold) {
+            from = "wide"; to = "narrow"; method = "hide";
+        } else if ((mkws.width === undefined || mkws.width <= threshhold) &&
+                   width > threshhold) {
+            from = "narrow"; to = "wide"; method = "show";
         }
+        mkws.width = width;
 
-	if (mkws.width > targetWidth && width <= targetWidth) {
-	    log("changing from wide to narrow: " + width);
-	    $(".mkwsTermlist-Container-wide").hide();
-	    $(".mkwsTermlist-Container-narrow").show();
+        if (from) {
+	    log("changing from " + from + " to " + to + ": " + width);
 	    for (var tname in mkws.teams) {
-                mkws.teams[tname].queue("resize-narrow").publish();
-		$(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlist-Container-narrow.mkwsTeam_" + tname));
-		for(var i = 0; i < list.length; i++) {
-		    $("." + list[i] + ".mkwsTeam_" + tname).hide();
-		}
-	    }
-        } else if (mkws.width <= targetWidth && width > targetWidth) {
-	    log("changing from narrow to wide: " + width);
-	    $(".mkwsTermlist-Container-wide").show();
-	    $(".mkwsTermlist-Container-narrow").hide();
-	    for (var tname in mkws.teams) {
-                mkws.teams[tname].queue("resize-wide").publish();
-		$(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlist-Container-wide.mkwsTeam_" + tname));
-		for(var i = 0; i < list.length; i++) {
-		    $("." + list[i] + ".mkwsTeam_" + tname).show();
-		}
+                var team = mkws.teams[tname];
+                team.visitWidgets(function (t, w) {
+                    var w1 = team.widget(t + "-Container-" + from);
+                    var w2 = team.widget(t + "-Container-" + to);
+                    if (w1) {
+                        $(w1.node).hide();
+                    }
+                    if (w2) {
+                        $(w2.node).show();
+		        $(w.node).appendTo($(w2.node));
+                    }
+                });
+                team.queue("resize-" + to).publish();
 	    }
 	}
-
-        mkws.width = width;
     };
 
 
@@ -432,7 +425,7 @@ mkws.pagerNext = function(tname) {
                 myTeam.addWidget(myWidget);
                 var newHTML = this.innerHTML;
                 if (newHTML !== oldHTML) {
-                    log("widget " + tname + ":" + type + " HTML changed from '" + oldHTML + "' to '" + newHTML + "': reparse!");
+                    log("widget " + tname + ":" + type + " HTML changed: reparsing");
                     makeWidgetsWithin(level+1, $(this));
                 }
             });
@@ -512,15 +505,15 @@ mkws.pagerNext = function(tname) {
 	var now = $.now();
 	log("Walking MKWS nodes took " + (now-then) + " ms");
 
-//        for (var tName in mkws.teams) {
-//            var myTeam = mkws.teams[tName]
-//            var types = myTeam.widgetTypes();
-//            log("TEAM '" + tName + "' = " + myTeam + " has widget types " + types);
-//            for (var i = 0; i < types.length; i++) {
-//                var type = types[i];
-//                log("  has widget of type '" + type + "': " + myTeam.widget(type));
-//            }
-//        }
+        /*
+        for (var tName in mkws.teams) {
+            var myTeam = mkws.teams[tName]
+            log("TEAM '" + tName + "' = " + myTeam + " ...");
+            myTeam.visitWidgets(function(t, w) {
+                log("  has widget of type '" + t + "': " + w);
+            });
+        }
+        */
 
 	if (mkws.config.use_service_proxy) {
 	    authenticateSession(mkws.config.service_proxy_auth,