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
tools/htdocs/mkws.js

@@@ -4,14 -2,34 +4,13 @@@
    <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>
Simple merge