</tr>\r
</table>\r
<script type="text/javascript">\r
- $("#mkwsSearch").hide();\r
+ $(".mkwsSearch").hide();\r
\r
document.onclick = clickfunc;\r
var selectedtext="";\r
<div class="mkwsResults"></div>
<div class="mkwsTargets"></div>
<div class="mkwsStat"></div>
+ <div class="mkwsBuilder"></div>
</body>
</html>
jQuery.pazpar2({
"layout": "popup", /* "table" [default], "div", "popup" */
"id_button": "input.mkwsButton", /* submit button id in search field */
- "id_popup": "#mkwsPopup", /* internal id of popup window */
+ "id_popup": ".mkwsPopup", /* internal id of popup window */
"width": 990, /* popup width, should be at least 800 */
"height": 760 /* popup height, should be at least 600 */
});
<link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
<style type="text/css">
- #mkwsTermlists div.facet {
+ .mkwsTermlists div.facet {
float:left;
width: 30%;
margin: 0.3em;
}
- #mkwsStat {
+ .mkwsStat {
text-align: right;
}
</style>
<script type="text/javascript" src="src/jquery.json-2.4.js"></script>
<script type="text/javascript" src="src/mkws.js"></script>
<style type="text/css">
- #mkwsTermlists div.facet {
+ .mkwsTermlists div.facet {
float:left;
width: 30%;
margin: 0.3em;
}
- #mkwsStat {
+ .mkwsStat {
text-align: right;
}
</style>
<link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
<script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
<style type="text/css">
- #mkwsTermlists div.facet {
+ .mkwsTermlists div.facet {
float:left;
width: 30%;
margin: 0.3em;
}
- #mkwsStat {
+ .mkwsStat {
text-align: right;
}
</style>
service_proxy_auth : "/service-proxy-testauth"
};
</script>
- <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
- <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
- <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
- <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+ <script type="text/javascript" src="src/jquery-1.10.0.min.js"></script>
+ <script type="text/javascript" src="src/pz2.js"></script>
+ <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
+ <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
+
<!-- <script type="text/javascript" src="src/mkws.js"></script> -->
<script type="text/javascript" src="src/mkws-handlebars.js"></script>
<script type="text/javascript" src="src/mkws-core.js"></script>
<script type="text/javascript" src="src/mkws-widget-record.js"></script>
<style type="text/css">
- #mkwsTermlists div.facet {
+ .mkwsTermlists div.facet {
float:left;
width: 30%;
margin: 0.3em;
}
- #mkwsStat {
+ .mkwsStat {
text-align: right;
}
</style>
<title>MKWS demo: Wolfram's playground</title>
<link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
<style type="text/css">
- #mkwsTermlists div.facet {
+ .mkwsTermlists div.facet {
float:left;
width: 30%;
margin: 0.3em;
}
- #mkwsStat {
+ .mkwsStat {
text-align: right;
}
</style>
</tr>
</table>
- <script type="text/javascript" src="tools/htdocs/mkws-complete.js"></script>
+ <script type="text/javascript" src="src/mkws-complete.js"></script>
<!-- <script type="text/javascript" src="https://mkws.indexdata.com/mkws-complete.js"></script> -->
<script type="text/javascript">
var height = config.height || 760;
var width = config.width || 880;
var id_button = config.id_button || "input.mkwsButton";
- var id_popup = config.id_popup || "#mkwsPopup";
+ var id_popup = config.id_popup || ".mkwsPopup";
debug("popup height: " + height + ", width: " + width);
// service-proxy or pazpar2
pazpar2: function(config) {
- if (config == null || typeof config != 'object') {
+ if (config == null || typeof config != 'object') {
config = {};
}
- var id_popup = config.id_popup || "#mkwsPopup";
- id_popup = id_popup.replace(/^#/, "");
+ var id_popup = config.id_popup || ".mkwsPopup";
+ id_popup = id_popup.replace(/^[#\.]/, "");
// simple layout
var div = '\
-<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 class="mkwsSwitch"></div>\
+<div class="mkwsLang"></div>\
+<div class="mkwsSearch"></div>\
+<div class="mkwsResults"></div>\
+<div class="mkwsTargets"></div>\
+<div class="mkwsStat"></div>';
// new table layout
var table = '\
<style type="text/css">\
- #mkwsTermlists div.facet {\
+ .mkwsTermlists div.facet {\
float:left;\
width: 30%;\
margin: 0.3em;\
}\
- #mkwsStat {\
+ .mkwsStat {\
text-align: right;\
}\
</style>\
<table width="100%" border="0">\
<tr>\
<td>\
- <div id="mkwsSwitch"></div>\
- <div id="mkwsLang"></div>\
- <div id="mkwsSearch"></div>\
+ <div class="mkwsSwitch"></div>\
+ <div class="mkwsLang"></div>\
+ <div class="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 class="mkwsPager"></div>\
+ <div class="mkwsNavi"></div>\
+ <div class="mkwsRecords"></div>\
+ <div class="mkwsTargets"></div>\
+ <div class="mkwsRanking"></div>\
</div>\
</td>\
</tr>\
<tr>\
<td>\
<div style="height:300px; overflow: hidden">\
- <div id="mkwsTermlists"></div>\
+ <div class="mkwsTermlists"></div>\
</div>\
</td>\
</tr>\
<tr>\
<td>\
- <div id="mkwsStat"></div>\
+ <div class="mkwsStat"></div>\
</td>\
</tr>\
</table>';
var popup = '\
-<div id="mkwsSearch"></div>\
-<div id="' + id_popup + '">\
- <div id="mkwsSwitch"></div>\
- <div id="mkwsLang"></div>\
- <div id="mkwsResults"></div>\
- <div id="mkwsTargets"></div>\
- <div id="mkwsStat"></div>\
+<div class="mkwsSearch"></div>\
+<div class="' + id_popup + '">\
+ <div class="mkwsSwitch"></div>\
+ <div class="mkwsLang"></div>\
+ <div class="mkwsResults"></div>\
+ <div class="mkwsTargets"></div>\
+ <div class="mkwsStat"></div>\
</div>'
if (config && config.layout == 'div') {
node_modules
+logs/error_log
+logs/jasmine-dev
+logs/mkws-jasmine-access.log
+logs/mkws-jasmine-error.log
+logs/mkws-jasmine-rewrite.log
clean-tmp:
rm -rf ${TMP_DIR}
mkdir -p ${TMP_DIR}
- touch ${TMP_DIR}/.gitignore
+ touch ${TMP_DIR}/.gitkeep
mkws-complete-syntax-check:
${MAKE} -C../src mkws-complete.min.js
+++ /dev/null
-error_log
-jasmine-dev
-mkws-jasmine-access.log
-mkws-jasmine-error.log
-mkws-jasmine-rewrite.log
describe("Check active clients author", function () {
it("check for active clients after limited author search", function () {
waitsFor(function () {
- var clients = $("div#mkwsStat span.clients");
+ var clients = $("div.mkwsStat span.clients");
//debug("clients: " + clients.text());
return clients.length == 1 && clients.text().match("/[1-9]+[0-9]+$");
}, "wait for Active clients: x/y", 5 * jasmine_config.second);
runs(function () {
- var clients = $("div#mkwsStat span.clients");
+ var clients = $("div.mkwsStat span.clients");
debug("span.clients: " + clients.text());
expect(clients.text()).toMatch("/[1-9]+[0-9]+$");
}
waitsFor(function () {
- var clients = $("div#mkwsStat span.clients");
+ var clients = $("div.mkwsStat span.clients");
//debug("clients: " + clients.text());
return clients.length == 1 && clients.text().match("/1$");
}, "wait for Active clients: x/1", 5 * jasmine_config.second);
runs(function () {
- var clients = $("div#mkwsStat span.clients");
+ var clients = $("div.mkwsStat span.clients");
debug("span.clients: " + clients.text());
expect(clients.text()).toMatch("/1$");
});
}
waitsFor(function () {
- var clients = $("div#mkwsStat span.clients");
+ var clients = $("div.mkwsStat span.clients");
debug("clients: " + clients.text());
if (clients.length == 1 && clients.text().match("0/1$")) {
return true;
}, "wait for Active clients: 0/1", 4 * jasmine_config.second);
runs(function () {
- var clients = $("div#mkwsStat span.clients");
+ var clients = $("div.mkwsStat span.clients");
debug("span.clients: " + clients.text());
expect(clients.text()).toMatch("0/1$");
});
--- /dev/null
+# Configuration for the apache web server -*- apache -*-
+
+# pazpar2 / service proxy config
+<VirtualHost *:80>
+ ServerName mkws-ne
+ ServerAlias mkws-ne
+
+ ServerAdmin webmaster@indexdata.com
+ ErrorLog /var/log/apache2/mkws-dev-error.log
+ CustomLog /var/log/apache2/mkws-dev-access.log combined
+
+ RewriteEngine on
+ RewriteLogLevel 1
+ RewriteLog /var/log/apache2/mkws-dev-rewrite.log
+
+ DocumentRoot /indexdata/gitprojects/mkws/examples/htdocs
+ #Alias /tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
+ #Alias /src /home/indexdata/mkws-dev/src
+ #Alias /test /home/indexdata/mkws-dev/test
+ #Alias /jasmine /home/indexdata/mkws-dev/examples/jasmine
+
+ # CORS setting
+ #Header set Access-Control-Allow-Credentials true
+ #Headers set Access-Control-Allow-Origin "*"
+
+ # compress text output
+ <Location />
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml
+ SetOutputFilter DEFLATE
+ </Location>
+
+ # jasmine test account
+ RewriteRule /service-proxy-testauth /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+
+ # mkws devel account (e.g. memached testing)
+ RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P]
+
+ ProxyPass /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+ ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+
+ ProxyPass /pazpar2/ http://mk2-test.indexdata.com/test-pazpar2/
+ ProxyPassReverse /pazpar2/ http://mk2-test.indexdata.com/test-pazpar2/
+
+</VirtualHost>
+