Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

diff --git a/src/mkws-widget-termlists.js b/src/mkws-widget-termlists.js
index 36cfc1d..e29ede0 100644 (file)
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -19,7 +19,6 @@ mkws.registerWidgetType('Facet', function() {
     }
 
     var that = this;
-    var teamName = that.team.name();
     var name = that.config.facet;
     var ref = facetConfig[name] || alert("no facet definition for '" + name + "'");
     var caption = ref[0];
@@ -29,6 +28,7 @@ mkws.registerWidgetType('Facet', function() {
     that.team.queue("termlists").subscribe(function(data) {
        data = data[name];
 
+       var teamName = that.team.name();
        var acc = [];
        acc.push('<div class="termtitle">' + mkws.M(caption) + '</div>');
        for (var i = 0; i < data.length && i < max; i++) {

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 6370952..3901f67 100644 (file)
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -181,24 +181,24 @@ mkws.registerWidgetType('Pager', function() {
                ? firstClkbl + 2*onsides
                : pages;
 
-           var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
+           var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span> | ';
            if (currentPage > 1)
                prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + teamName + '\');">'
-               +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
+               +'&#60;&#60; ' + M('Prev') + '</a> | ';
 
            var middle = '';
            for(var i = firstClkbl; i <= lastClkbl; i++) {
                var numLabel = i;
                if(i == currentPage)
-                   numLabel = '<b>' + i + '</b>';
+                   numLabel = '<span class="mkwsSelected">' + i + '</span>';
 
                middle += '<a href="#" onclick="mkws.showPage(\'' + teamName + '\', ' + i + ')"> '
                    + numLabel + ' </a>';
            }
 
-           var next = '<b> | </b><span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
+           var next = ' | <span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
            if (pages - currentPage > 0)
-               next = '<b> | </b><a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
+               next = ' | <a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
                + M('Next') + ' &#62;&#62;</a>';
 
            var predots = '';

diff --git a/tools/htdocs/mkws.css b/tools/htdocs/mkws.css
index e0dcebd..f3acc34 100644 (file)
--- a/tools/htdocs/mkws.css
+++ b/tools/htdocs/mkws.css
@@ -192,3 +192,9 @@
 .mkwsBytarget table tbody tr td {
     padding: 0.2em 0.5em;
 }
+
+.mkwsSelected {
+    padding: 0.1em 0.5em;
+    background: #508751;
+    color: white;
+}