projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: a353544)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 8 Apr 2014 15:47:56 +0000 (15:47 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 8 Apr 2014 15:47:56 +0000 (15:47 +0000)
examples/htdocs/mike.html patch | blob | history
tools/htdocs/mkws.css patch | blob | history

diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index bf7c598..88a2531 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -24,14 +24,6 @@
     <script type="text/javascript" src="http://x.mkws.indexdata.com/pazpar2/js/pz2.js"></script>
     <script type="text/javascript" src="http://x.mkws.indexdata.com/mkws.js"></script>
   </head>
-  <body>
-    <div id="mkwsSwitch"></div>
-    <div id="mkwsLang"></div>
-    <div id="mkwsSearch"></div>
-    <div id="mkwsResults"></div>
-    <div id="mkwsTargets"></div>
-    <div id="mkwsStat"></div>
-  </body>
 <!--
   <body>
     <svg width="100" height="100">
@@ -39,7 +31,6 @@
     </svg>
   </body>
 -->
-<!--
   <body>
     <div id="mkwsSwitch"></div>
     <div id="mkwsLang"></div>
@@ -48,7 +39,11 @@
     <table width="100%" border="0" cellpadding="6" cellspacing="0">
       <tr>
        <td class="mkwsTermlistContainer1" width="250" valign="top">
-         <div class="mkwsTermlists" data-mkws-config='{ "facets": ["xtargets", "author", "subject"] }'></div>
+         <div>
+           <div class="title">Termlists</div>
+           <div class="mkwsFacet mkwsTeam_AUTO" data-mkws-facet="subject"></div>
+           <div class="mkwsFacet mkwsTeam_AUTO" data-mkws-facet="xtargets"></div>
+         </div>
        </td>
        <td class="mkwsMOTDContainer" valign="top">
          <div class="mkwsRanking"></div>
@@ -56,6 +51,9 @@
          <div class="mkwsNavi"></div>
          <div class="mkwsRecords"></div>
        </td>
+       <td width="250" valign="top">
+         <div class="mkwsFacet mkwsTeam_AUTO" data-mkws-facet="author"></div>
+       </td>
       </tr>
       <tr>
        <td colspan="2">
@@ -66,12 +64,7 @@
     <div id="mkwsTargets"></div>
     <div id="mkwsStat"></div>
     <div id="mkwsMOTD">Speak, friend, and enter!</div>
-    <div style="background: #ffffe0; border: 1px solid #e0e080; padding: 0.2em 1em;">
-      <h2>Logging</h2>
-      <p class="mkwsLog"/>
-    </div>
   </body>
--->
 <!--
   <body>
     <table width="100%" border="1">
diff --git a/tools/htdocs/mkws.css b/tools/htdocs/mkws.css
index 3677d65..e0dcebd 100644 (file)
--- a/tools/htdocs/mkws.css
+++ b/tools/htdocs/mkws.css
@@ -2,6 +2,7 @@
 .mkwsSwitch,
 .mkwsSearch,
 .mkwsTermlists,
+.mkwsFacet,
 .mkwsRanking,
 .mkwsPager,
 .mkwsNavi,
@@ -56,7 +57,7 @@
 
 .mkwsSwitch a,
 .mkwsLang a,
-.mkwsTermlists a,
+.mkwsFacet a,
 .mkwsRanking a,
 .mkwsPager a,
 .mkwsNavi a,
@@ -68,7 +69,7 @@
 
 .mkwsSwitch a:hover,
 .mkwsLang a:hover,
-.mkwsTermlists a:hover,
+.mkwsFacet a:hover,
 .mkwsPager a:hover,
 .mkwsRecords a:hover,
 .mkwsRecord a:hover {
@@ -133,7 +134,7 @@
     float: right;
 }
 
-.mkwsTermlists div.termtitle {
+.mkwsFacet div.termtitle {
     font-weight: bold;
 }
 
MasterKey Widget Set