@@ -, +, @@
---
koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 20 +-
.../opac-tmpl/ccsr/en/includes/doc-head-close.inc | 3 +
koha-tmpl/opac-tmpl/ccsr/en/js/commons.js | 71 +++++++
.../en/lib/jquery/plugins/jquery.cookie.min.js | 1 +
.../ccsr/en/lib/jquery/plugins/jquery.json.js | 199 ++++++++++++++++++++
koha-tmpl/opac-tmpl/ccsr/images/sprite.png | Bin 8381 -> 3380 bytes
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 18 +-
.../opac-tmpl/prog/en/modules/opac-results.tt | 2 +-
koha-tmpl/opac-tmpl/prog/images/sprite.png | Bin 3348 -> 3380 bytes
9 files changed, 311 insertions(+), 3 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/js/commons.js
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/plugins/jquery.cookie.min.js
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/plugins/jquery.json.js
--- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
+++ a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
@@ -786,7 +786,7 @@ a.tag_add {
font-size : 100%;
font-weight : bold;
padding-left : 31px;
- color : #336699;
+ color : #007FAE;
cursor : pointer;
}
.searchresults a.highlight_toggle {
@@ -1162,6 +1162,10 @@ a.cancel {
font-size: 90%;
}
+.addto {
+ white-space: nowrap;
+}
+
.cartlist {
margin-top : 5px;
}
@@ -2876,3 +2880,17 @@ a.reviewlink,a.reviewlink:visited {
display: block;
overflow: auto;
}
+
+.details_link {
+ display : none;
+}
+
+.details_link a {
+ display: inline-block;
+ padding : 5px 24px;
+ text-decoration: none;
+ background-image: url("../../images/sprite.png"); /* Print */
+ background-position: -5px -1138px;
+ background-repeat: no-repeat;
+ white-space: nowrap;
+}
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
+++ a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
@@ -39,6 +39,9 @@
+
+
+
[% IF ( OPACAmazonCoverImages ) %]
--- a/koha-tmpl/opac-tmpl/ccsr/en/js/commons.js
+++ a/koha-tmpl/opac-tmpl/ccsr/en/js/commons.js
@@ -0,0 +1,71 @@
+// Extends jQuery API
+// http://www.wskidmore.com/downloads/jquery-uniqueArray.min.js
+jQuery.extend({uniqueArray:function(e){if($.isArray(e)){var c={};var a,b;for(b=0,a=e.length;b
+ */
+(function ($) {
+ 'use strict';
+
+ var escape = /["\\\x00-\x1f\x7f-\x9f]/g,
+ meta = {
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"' : '\\"',
+ '\\': '\\\\'
+ },
+ hasOwn = Object.prototype.hasOwnProperty;
+
+ /**
+ * jQuery.toJSON
+ * Converts the given argument into a JSON representation.
+ *
+ * @param o {Mixed} The json-serializable *thing* to be converted
+ *
+ * If an object has a toJSON prototype, that will be used to get the representation.
+ * Non-integer/string keys are skipped in the object, as are keys that point to a
+ * function.
+ *
+ */
+ $.toJSON = typeof JSON === 'object' && JSON.stringify ? JSON.stringify : function (o) {
+ if (o === null) {
+ return 'null';
+ }
+
+ var pairs, k, name, val,
+ type = $.type(o);
+
+ if (type === 'undefined') {
+ return undefined;
+ }
+
+ // Also covers instantiated Number and Boolean objects,
+ // which are typeof 'object' but thanks to $.type, we
+ // catch them here. I don't know whether it is right
+ // or wrong that instantiated primitives are not
+ // exported to JSON as an {"object":..}.
+ // We choose this path because that's what the browsers did.
+ if (type === 'number' || type === 'boolean') {
+ return String(o);
+ }
+ if (type === 'string') {
+ return $.quoteString(o);
+ }
+ if (typeof o.toJSON === 'function') {
+ return $.toJSON(o.toJSON());
+ }
+ if (type === 'date') {
+ var month = o.getUTCMonth() + 1,
+ day = o.getUTCDate(),
+ year = o.getUTCFullYear(),
+ hours = o.getUTCHours(),
+ minutes = o.getUTCMinutes(),
+ seconds = o.getUTCSeconds(),
+ milli = o.getUTCMilliseconds();
+
+ if (month < 10) {
+ month = '0' + month;
+ }
+ if (day < 10) {
+ day = '0' + day;
+ }
+ if (hours < 10) {
+ hours = '0' + hours;
+ }
+ if (minutes < 10) {
+ minutes = '0' + minutes;
+ }
+ if (seconds < 10) {
+ seconds = '0' + seconds;
+ }
+ if (milli < 100) {
+ milli = '0' + milli;
+ }
+ if (milli < 10) {
+ milli = '0' + milli;
+ }
+ return '"' + year + '-' + month + '-' + day + 'T' +
+ hours + ':' + minutes + ':' + seconds +
+ '.' + milli + 'Z"';
+ }
+
+ pairs = [];
+
+ if ($.isArray(o)) {
+ for (k = 0; k < o.length; k++) {
+ pairs.push($.toJSON(o[k]) || 'null');
+ }
+ return '[' + pairs.join(',') + ']';
+ }
+
+ // Any other object (plain object, RegExp, ..)
+ // Need to do typeof instead of $.type, because we also
+ // want to catch non-plain objects.
+ if (typeof o === 'object') {
+ for (k in o) {
+ // Only include own properties,
+ // Filter out inherited prototypes
+ if (hasOwn.call(o, k)) {
+ // Keys must be numerical or string. Skip others
+ type = typeof k;
+ if (type === 'number') {
+ name = '"' + k + '"';
+ } else if (type === 'string') {
+ name = $.quoteString(k);
+ } else {
+ continue;
+ }
+ type = typeof o[k];
+
+ // Invalid values like these return undefined
+ // from toJSON, however those object members
+ // shouldn't be included in the JSON string at all.
+ if (type !== 'function' && type !== 'undefined') {
+ val = $.toJSON(o[k]);
+ pairs.push(name + ':' + val);
+ }
+ }
+ }
+ return '{' + pairs.join(',') + '}';
+ }
+ };
+
+ /**
+ * jQuery.evalJSON
+ * Evaluates a given json string.
+ *
+ * @param str {String}
+ */
+ $.evalJSON = typeof JSON === 'object' && JSON.parse ? JSON.parse : function (str) {
+ /*jshint evil: true */
+ return eval('(' + str + ')');
+ };
+
+ /**
+ * jQuery.secureEvalJSON
+ * Evals JSON in a way that is *more* secure.
+ *
+ * @param str {String}
+ */
+ $.secureEvalJSON = typeof JSON === 'object' && JSON.parse ? JSON.parse : function (str) {
+ var filtered =
+ str
+ .replace(/\\["\\\/bfnrtu]/g, '@')
+ .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+ .replace(/(?:^|:|,)(?:\s*\[)+/g, '');
+
+ if (/^[\],:{}\s]*$/.test(filtered)) {
+ /*jshint evil: true */
+ return eval('(' + str + ')');
+ }
+ throw new SyntaxError('Error parsing JSON, source is not valid.');
+ };
+
+ /**
+ * jQuery.quoteString
+ * Returns a string-repr of a string, escaping quotes intelligently.
+ * Mostly a support function for toJSON.
+ * Examples:
+ * >>> jQuery.quoteString('apple')
+ * "apple"
+ *
+ * >>> jQuery.quoteString('"Where are we going?", she asked.')
+ * "\"Where are we going?\", she asked."
+ */
+ $.quoteString = function (str) {
+ if (str.match(escape)) {
+ return '"' + str.replace(escape, function (a) {
+ var c = meta[a];
+ if (typeof c === 'string') {
+ return c;
+ }
+ c = a.charCodeAt();
+ return '\\u00' + Math.floor(c / 16).toString(16) + (c % 16).toString(16);
+ }) + '"';
+ }
+ return '"' + str + '"';
+ };
+
+}(jQuery));
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -846,7 +846,7 @@ a.tag_add {
font-size : 100%;
font-weight : bold;
padding-left : 31px;
- color : #336699;
+ color : #006699;
cursor : pointer;
}
.searchresults a.highlight_toggle {
@@ -1223,6 +1223,10 @@ a.cancel {
font-size: 90%;
}
+.addto {
+ white-space: nowrap;
+}
+
.cartlist {
margin-top : 5px;
}
@@ -3063,3 +3067,15 @@ padding: 0.1em 0;
display: block;
overflow: auto;
}
+.details_link {
+ display : none;
+}
+.details_link a {
+ display: inline-block;
+ padding : 5px 24px;
+ text-decoration: none;
+ background-image: url("../../images/sprite.png"); /* Print */
+ background-position: -5px -1138px;
+ background-repeat: no-repeat;
+ white-space: nowrap;
+}
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -529,7 +529,7 @@ $(document).ready(function(){
Tag status here.
[% END %]
- Browse selected biblios >>
+ Browse selected records