projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 1d881c1 92f689d)
Merge remote-tracking branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 23 Aug 2013 09:19:44 +0000 (11:19 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 23 Aug 2013 09:19:44 +0000 (11:19 +0200)
Conflicts:
examples/htdocs/index-wolfram.html

1  2 
examples/htdocs/index-wolfram.html patch | diff1 | diff2 | blob | history
tools/htdocs/mkws.js patch | diff1 | diff2 | blob | history

diff --combined examples/htdocs/index-wolfram.html
index fccb853,5e7bd2b..545a09d
--- 1/examples/htdocs/index-wolfram.html
--- 2/examples/htdocs/index-wolfram.html
+++ b/examples/htdocs/index-wolfram.html
@@@ -1,22 -1,40 +1,21 @@@
 +<?xml version="1.0"?>
 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
    <head>
      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
      <title>MKWS demo: Wolfram's playground</title>
 -    <link rel="stylesheet" type="text/css" href="mkwsStyle.css" />
 +    <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkwsStyle.css" />
      <script type="text/javascript">
        var mkws_config = {
-         switch_menu: false,
-         /*
++      /*
          service_proxy_url : "/service-proxy/",
          service_proxy_auth : "/service-proxy-auth/",
 -        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.4.4.min.js"></script>
 -    <script type="text/javascript" src="libjs-pz2/pz2api.1.js"></script>
 -    <script type="text/javascript" src="mkws.js"></script>
 +    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
 +    <script type="text/javascript" src="../../tools/htdocs/mkws.js"></script>
      <style type="text/css">
        #mkwsTermlists div.facet {
        float:left;
@@@ -32,7 -50,6 +31,6 @@@
      <table width="100%" border="0">
        <tr>
          <td>
-           <div id="mkwsSwitch"></div>
            <div id="mkwsLang"></div>
            <div id="mkwsSearch"></div>
          </td>
diff --combined tools/htdocs/mkws.js
index d5eb267,025fa8a..484773e
--- 1/tools/htdocs/mkws.js
--- 2/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@@ -524,7 -524,6 +524,6 @@@ function mkws_html_all(config) 
        sort_default: "relevance",
        perpage_default: 20,
        query_width: 50,
-       switch_menu: false,     /* show/hide Records|Targets menu */
        lang_menu: true,        /* show/hide language menu */
        sort_menu: true,        /* show/hide sort menu */
        perpage_menu: true,     /* show/hide perpage menu */
@@@ -672,11 -671,6 +671,6 @@@ function mkws_html_switch(config) 
         No information available yet.\
        </div>');
      $("#mkwsTargets").css("display", "none");
- 
-     if (!config.switch_menu) {
-       debug("disable switch menu");
-         $("#mkwsSwitch").css("display", "none");
-     }
  }
  
  function mkws_html_sort(config) {
@@@ -984,13 -978,4 +978,13 @@@ function debug(string) 
  
  
  /* magic */
 -$(document).ready(function() { mkws_html_all(mkws_config) });
 +$(document).ready(function() {
 +    try {
 +      mkws_html_all(mkws_config)
 +    }
 +
 +    catch (e) {
 +      mkws_config.error = e.message;
 +      // alert(e.message);
 +    }
 +});
MasterKey Widget Set