projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: d43b169)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 9 Jul 2013 11:07:20 +0000 (11:07 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 9 Jul 2013 11:07:20 +0000 (11:07 +0000)
experiments/spclient/index-full.html patch | blob | history
experiments/spclient/index-mike.html patch | blob | history
experiments/spclient/mkws.js patch | blob | history
experiments/spclient/mkwsStyle.css patch | blob | history

diff --git a/experiments/spclient/index-full.html b/experiments/spclient/index-full.html
index 5e3f76b..f82d261 100644 (file)
--- a/experiments/spclient/index-full.html
+++ b/experiments/spclient/index-full.html
@@ -49,6 +49,16 @@
     <div id="mkwsSearch"></div>
     <div id="mkwsResults"></div>
     <div id="mkwsTargets"></div>
+    <div id="mkwsMOTD">
+      <p>
+       <b>Welcome to the MasterKey Widget Set demo.</b>
+      </p>
+      <p>
+       Enter a search above to begin, or
+       <a href="http://mkws.indexdata.com/"
+          >Visit the MKWS home page to find out more</a>.
+      </p>
+    </div>
     <div id="footer">
       <div id="mkwsStat"></div>
       <span>Powered by MKWS &copy; 2013 <a target="_new" href="http://www.indexdata.com">Index Data</a></span>
diff --git a/experiments/spclient/index-mike.html b/experiments/spclient/index-mike.html
index c9b2632..69cbc96 100644 (file)
--- a/experiments/spclient/index-mike.html
+++ b/experiments/spclient/index-mike.html
@@ -3,80 +3,27 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Mike's playground</title>
     <link rel="stylesheet" href="mkwsStyle.css" />
-    <script type="text/javascript">
-      var mkws_config = {
-         switch_menu: true,
-         language_Arabic: {
-             "Authors": "الكتاب",
-             "Subjects": "المواضيع",
-             "Sources": "مصادر",
-             "Termlists": "العضو الأجل",
-             "Next": "التالي",
-             "Prev": "السابق",
-             "Search": "بحث",
-             "Sort by": "الترتيب حسب",
-             "and show": "وعرض",
-             "per page": "في كل صفحة",
-             "Displaying": "عرض",
-             "to": "إلى",
-             "of": "من",
-             "found": "أسس",
-             "Title": "لقب",
-             "Author": "الكاتب",
-             "Date": "تاريخ",
-             "Subject": "موضوع",
-             "Location": "موقع",
-             "Records": "أهداف",
-             "Targets": "السجلات"
-         }
-      };
-    </script>
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
     <script type="text/javascript" src="mkws.js"></script>
-    <style type="text/css">
-      #mkwsTermlists div.facet {
-      float:left;
-      width: 30%;
-      margin: 0.3em;
-      }
-      #mkwsStat {
-      text-align: right;
-      }
-    </style>
   </head>
   <body>
-    <table width="100%" border="0">
-      <tr>
-        <td>
-          <div id="mkwsSwitch"></div>
-          <div id="mkwsLang"></div>
-          <div id="mkwsSearch"></div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div style="height:500px; overflow: auto">
-            <div id="mkwsPager"></div>
-            <div id="mkwsNavi"></div>
-            <div id="mkwsRecords"></div>
-            <div id="mkwsTargets"></div>
-            <div id="mkwsRanking"></div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div style="height:300px; overflow: hidden">
-            <div id="mkwsTermlists"></div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div id="mkwsStat"></div>
-        </td>
-      </tr>
-    </table>
+    <div id="mkwsSwitch"></div>
+    <div id="mkwsLang"></div>
+    <div id="mkwsSearch"></div>
+    <div id="mkwsResults"></div>
+    <div id="mkwsTargets"></div>
+    <div id="mkwsStat"></div>
+    <div id="mkwsMOTD">
+      <p>
+       <b>Welcome to the MasterKey Widget Set demo.</b>
+      </p>
+      <p>
+       Enter a search above to begin, or
+       <a href="http://mkws.indexdata.com/"
+          >Visit the MKWS home page to find out more</a>.
+      </p>
+    </div>
   </body>
 </html>
+
diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index dfd1c19..98ac5ee 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -413,22 +413,26 @@ function switchView(view) {
     var results = document.getElementById('mkwsResults') ||
                  document.getElementById('mkwsRecords');
     var blanket = document.getElementById('mkwsBlanket');
+    var motd    = document.getElementById('mkwsEmbeddedMOTD');
 
     switch(view) {
         case 'targets':
             if (targets) targets.style.display = "block";
             if (results) results.style.display = "none";
             if (blanket) blanket.style.display = "none";
+            if (motd) motd.style.display = "none";
             break;
         case 'records':
             if (targets) targets.style.display = "none";
             if (results) results.style.display = "block";
             if (blanket) blanket.style.display = "block";
+            if (motd) motd.style.display = "none";
             break;
        case 'none':
             if (targets) targets.style.display = "none";
             if (results) results.style.display = "none";
             if (blanket) blanket.style.display = "none";
+            if (motd) motd.style.display = "none";
             break;
         default:
             alert("Unknown view '" + view + "'");
@@ -586,6 +590,7 @@ function mkws_html_all(config) {
             <div id="mkwsPager"></div>\
             <div id="mkwsNavi"></div>\
             <div id="mkwsRecords"></div>\
+            <div id="mkwsEmbeddedMOTD"></div>\
           </td>\
         </tr>\
       </table>');
@@ -617,6 +622,12 @@ function mkws_html_all(config) {
 
     // on first page, hide the termlist
     $(document).ready(function() { $("#mkwsTermlists").hide(); } );
+    var elem = document.getElementById("mkwsMOTD");
+    if (elem) {
+       // Move the MOTD from the provided element down into the embedded one
+       document.getElementById("mkwsEmbeddedMOTD").innerHTML = elem.innerHTML;
+        elem.style.display = "none";
+    }
 }
 
 /* Responsive web design - change layout on the fly depending on
diff --git a/experiments/spclient/mkwsStyle.css b/experiments/spclient/mkwsStyle.css
index 49f3b9f..08e2fbf 100644 (file)
--- a/experiments/spclient/mkwsStyle.css
+++ b/experiments/spclient/mkwsStyle.css
@@ -8,7 +8,8 @@
 #mkwsRecords,
 #mkwsTargets,
 #mkwsStat,
-#mkwsShiftedTermlists {
+#mkwsShiftedTermlists,
+#mkwsEmbeddedMOTD {
     font-family: Gill Sans, "Gillius ADF", Gillius, GilliusADF, Verdana, Sans-Serif;
 }
 
MasterKey Widget Set