projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3c338c9
)
Change all mkwsStyle.css references to mkws.css
author
Mike Taylor
<mike@indexdata.com>
Fri, 11 Oct 2013 12:00:27 +0000
(13:00 +0100)
committer
Mike Taylor
<mike@indexdata.com>
Fri, 11 Oct 2013 12:00:27 +0000
(13:00 +0100)
15 files changed:
examples/htdocs/index-full.html
patch
|
blob
|
history
examples/htdocs/index-jakub.html
patch
|
blob
|
history
examples/htdocs/index-jasmine-popup.html
patch
|
blob
|
history
examples/htdocs/index-jasmine.html
patch
|
blob
|
history
examples/htdocs/index-jquery.html
patch
|
blob
|
history
examples/htdocs/index-lowlevel.html
patch
|
blob
|
history
examples/htdocs/index-mike.html
patch
|
blob
|
history
examples/htdocs/index-mobile.html
patch
|
blob
|
history
examples/htdocs/index-popup.html
patch
|
blob
|
history
examples/htdocs/index-wolfram.html
patch
|
blob
|
history
examples/htdocs/index.html
patch
|
blob
|
history
test/spec/mkws-index-simple.spec.js
patch
|
blob
|
history
tools/htdocs/README.markdown
patch
|
blob
|
history
tools/htdocs/index.html
patch
|
blob
|
history
tools/htdocs/whitepaper.markdown
patch
|
blob
|
history
diff --git
a/examples/htdocs/index-full.html
b/examples/htdocs/index-full.html
index
6b5313a
..
3cf6e31
100644
(file)
--- a/
examples/htdocs/index-full.html
+++ b/
examples/htdocs/index-full.html
@@
-5,7
+5,7
@@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="copyright" content="(c) 1999-2013 IndexData ApS, http://indexdata.com" />
<title>MKWS demo: full configuration</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="copyright" content="(c) 1999-2013 IndexData ApS, http://indexdata.com" />
<title>MKWS demo: full configuration</title>
- <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
<script type="text/javascript">
var mkws_config = {
lang: "da",
<script type="text/javascript">
var mkws_config = {
lang: "da",
diff --git
a/examples/htdocs/index-jakub.html
b/examples/htdocs/index-jakub.html
index
a9ef9f1
..
9433603
100644
(file)
--- a/
examples/htdocs/index-jakub.html
+++ b/
examples/htdocs/index-jakub.html
@@
-2,7
+2,7
@@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo client</title>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo client</title>
- <link rel="stylesheet" type="text/css" href="http://mkws-origin/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="http://mkws-origin/mkws.css" />
<script type="text/javascript">
var mkws_config = {
pazpar2_url: "http://mkws-origin/service-proxy/",
<script type="text/javascript">
var mkws_config = {
pazpar2_url: "http://mkws-origin/service-proxy/",
diff --git
a/examples/htdocs/index-jasmine-popup.html
b/examples/htdocs/index-jasmine-popup.html
index
3f26fe2
..
38e673b
100644
(file)
--- a/
examples/htdocs/index-jasmine-popup.html
+++ b/
examples/htdocs/index-jasmine-popup.html
@@
-4,7
+4,7
@@
<title>MKWS demo: jQuery popup plugin with jasmine</title>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
<title>MKWS demo: jQuery popup plugin with jasmine</title>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
<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="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>
diff --git
a/examples/htdocs/index-jasmine.html
b/examples/htdocs/index-jasmine.html
index
9b97b78
..
818123c
100644
(file)
--- a/
examples/htdocs/index-jasmine.html
+++ b/
examples/htdocs/index-jasmine.html
@@
-2,7
+2,7
@@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo: Wolfram's playground</title>
<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="../../tools/htdocs/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
<script type="text/javascript">
var mkws_config = {
/*
<script type="text/javascript">
var mkws_config = {
/*
diff --git
a/examples/htdocs/index-jquery.html
b/examples/htdocs/index-jquery.html
index
0ca2c5b
..
f46a040
100644
(file)
--- a/
examples/htdocs/index-jquery.html
+++ b/
examples/htdocs/index-jquery.html
@@
-3,7
+3,7
@@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo: jQuery plugin</title>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo: jQuery plugin</title>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
</head>
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
</head>
diff --git
a/examples/htdocs/index-lowlevel.html
b/examples/htdocs/index-lowlevel.html
index
4b04393
..
d2e8ed7
100644
(file)
--- a/
examples/htdocs/index-lowlevel.html
+++ b/
examples/htdocs/index-lowlevel.html
@@
-2,7
+2,7
@@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo: low-level subcomponents</title>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo: low-level subcomponents</title>
- <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
<style type="text/css">
#mkwsTermlists div.facet {
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
<style type="text/css">
#mkwsTermlists div.facet {
diff --git
a/examples/htdocs/index-mike.html
b/examples/htdocs/index-mike.html
index
2e05259
..
a9f8b42
100644
(file)
--- a/
examples/htdocs/index-mike.html
+++ b/
examples/htdocs/index-mike.html
@@
-2,7
+2,7
@@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo: Mike's playground</title>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo: Mike's playground</title>
- <link rel="stylesheet" type="text/css" href="http://x.mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="http://x.mkws.indexdata.com/mkws.css" />
<script type="text/javascript">
var mkws_config = {
responsive_design_width: 600,
<script type="text/javascript">
var mkws_config = {
responsive_design_width: 600,
diff --git
a/examples/htdocs/index-mobile.html
b/examples/htdocs/index-mobile.html
index
28785ef
..
268528a
100644
(file)
--- a/
examples/htdocs/index-mobile.html
+++ b/
examples/htdocs/index-mobile.html
@@
-5,7
+5,7
@@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="copyright" content="(c) 1999-2013 IndexData ApS, http://indexdata.com" />
<title>MKWS demo: mobile-screen resizing</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="copyright" content="(c) 1999-2013 IndexData ApS, http://indexdata.com" />
<title>MKWS demo: mobile-screen resizing</title>
- <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
<script type="text/javascript">
var mkws_config = {
lang: "da",
<script type="text/javascript">
var mkws_config = {
lang: "da",
diff --git
a/examples/htdocs/index-popup.html
b/examples/htdocs/index-popup.html
index
2d1ba09
..
b27b252
100644
(file)
--- a/
examples/htdocs/index-popup.html
+++ b/
examples/htdocs/index-popup.html
@@
-4,7
+4,7
@@
<title>MKWS demo: popup search box</title>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
<title>MKWS demo: popup search box</title>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
- <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
<script type="text/javascript">
mkws_config = {
<script type="text/javascript">
mkws_config = {
@@
-50,7
+50,7
@@
can have MasterKey searching with minimal effort.
The following files must be hosted on mkws.indexdata.com:
mkws.js
The following files must be hosted on mkws.indexdata.com:
mkws.js
- mkwsStyle.css
+ mkws.css
/libjs-pz2/pz2api.1.js (*)
The following files make up the application:
/libjs-pz2/pz2api.1.js (*)
The following files make up the application:
diff --git
a/examples/htdocs/index-wolfram.html
b/examples/htdocs/index-wolfram.html
index
fd0d51e
..
29f9642
100644
(file)
--- a/
examples/htdocs/index-wolfram.html
+++ b/
examples/htdocs/index-wolfram.html
@@
-4,7
+4,7
@@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo: Wolfram's playground</title>
<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="../../tools/htdocs/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
<script type="text/javascript">
var mkws_config = {
/*
<script type="text/javascript">
var mkws_config = {
/*
diff --git
a/examples/htdocs/index.html
b/examples/htdocs/index.html
index
1344211
..
a943c30
100644
(file)
--- a/
examples/htdocs/index.html
+++ b/
examples/htdocs/index.html
@@
-2,7
+2,7
@@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo client</title>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo client</title>
- <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
</head>
<body>
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
</head>
<body>
diff --git
a/test/spec/mkws-index-simple.spec.js
b/test/spec/mkws-index-simple.spec.js
index
50ebd65
..
9ae5a69
100644
(file)
--- a/
test/spec/mkws-index-simple.spec.js
+++ b/
test/spec/mkws-index-simple.spec.js
@@
-33,7
+33,7
@@
function html_check(file, tags_array, ignore_doctype) {
expect(html).toMatch(/<meta .*?charset=utf-8/i);
expect(html).toMatch(/<title>.+<\/title>/i);
expect(html).toMatch(/<meta .*?charset=utf-8/i);
expect(html).toMatch(/<title>.+<\/title>/i);
- expect(html).toMatch(/<link .*?type="text\/css" href=".*?\/?mkwsStyle.css"/);
+ expect(html).toMatch(/<link .*?type="text\/css" href=".*?\/?mkws.css"/);
for (var i = 0, data = ""; i < tags.length; i++) {
for (var i = 0, data = ""; i < tags.length; i++) {
diff --git
a/tools/htdocs/README.markdown
b/tools/htdocs/README.markdown
index
f702e43
..
7230231
100644
(file)
--- a/
tools/htdocs/README.markdown
+++ b/
tools/htdocs/README.markdown
@@
-19,7
+19,7
@@
can have MasterKey searching with minimal effort.
The following files are hosted on `mkws.indexdata.com`:
The following files are hosted on `mkws.indexdata.com`:
-* `mkwsStyle.css`
+* `mkws.css`
* `mkws.js`
* `/libjs-pz2/pz2api.1.js`
* `mkws-complete.js` -- a single file consisting of `mkws.js`,
* `mkws.js`
* `/libjs-pz2/pz2api.1.js`
* `mkws-complete.js` -- a single file consisting of `mkws.js`,
@@
-35,7
+35,7
@@
whatever makes up the application itself:
Prerequisites:
~~~
Prerequisites:
~~~
- <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" href="http://mkws.indexdata.com/mkws.css" />
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
~~~
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
~~~
diff --git
a/tools/htdocs/index.html
b/tools/htdocs/index.html
index
61fe17b
..
1d9b45a
100644
(file)
--- a/
tools/htdocs/index.html
+++ b/
tools/htdocs/index.html
@@
-36,7
+36,7
@@
additional prerequisites such as jQuery.
</li>
<li>
additional prerequisites such as jQuery.
</li>
<li>
- <a href="mkwsStyle.css">mkwsStyle.css</a>
+ <a href="mkws.css">mkws.css</a>
--
A stylesheet which styles only MasterKey widgets, and does not
otherwise interfere with application-site's styles.
--
A stylesheet which styles only MasterKey widgets, and does not
otherwise interfere with application-site's styles.
diff --git
a/tools/htdocs/whitepaper.markdown
b/tools/htdocs/whitepaper.markdown
index
db9115b
..
8cc4d42
100644
(file)
--- a/
tools/htdocs/whitepaper.markdown
+++ b/
tools/htdocs/whitepaper.markdown
@@
-54,7
+54,7
@@
The following is a complete MKWS-based searching application:
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo client</title>
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MKWS demo client</title>
<script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
- <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
+ <link rel="stylesheet" href="http://mkws.indexdata.com/mkws.css" />
</head>
<body>
<div id="mkwsSearch"></div>
</head>
<body>
<div id="mkwsSearch"></div>
@@
-83,7
+83,7
@@
header, which are loaded from the tool site mkws.indexdata.com:
* `mkws-complete.js`
contains all the JavaScript needed by the widget-set.
* `mkws-complete.js`
contains all the JavaScript needed by the widget-set.
-* `mkwsStyle.css`
+* `mkws.css`
provides the default CSS styling
Second, within the HTML body, `<div>` elements with special IDs that
provides the default CSS styling
Second, within the HTML body, `<div>` elements with special IDs that
@@
-180,7
+180,7
@@
following lower-level components provided instead:
Customisation of MKWS searching widgets can also be achieved by
overriding the styles set in the toolkit's CSS stylesheet. The default
Customisation of MKWS searching widgets can also be achieved by
overriding the styles set in the toolkit's CSS stylesheet. The default
-styles can be inspected in `mkwsStyle.css` and overridden in any
+styles can be inspected in `mkws.css` and overridden in any
styles that appears later in the HTML than that file. At the simplest
level, this might just mean changing fonts, sizes and colours, but
more fundamental changes are also possible.
styles that appears later in the HTML than that file. At the simplest
level, this might just mean changing fonts, sizes and colours, but
more fundamental changes are also possible.