Merge branch 'master' of github.com:ceskaexpedice/kramerius

ceskaexpedice · Feb 18, 2016 · 5366549 · 5366549
2 parents fbb47f5 + b6fef34
commit 5366549
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/client/src/main/resources/k5client_cs.properties b/client/src/main/resources/k5client_cs.properties
@@ -93,7 +93,7 @@ ctx.actions.printtitle=Tisk titulu
 
 ctx.actions.print=Tisk
 
-ctx.actions.persistenturl=Persisentní URL ...
+ctx.actions.persistenturl=Persistentní URL ...
 ctx.actions.print=Tisk celé stránky
 ctx.actions.printpart=Pouze část stránky
 ctx.actions.printpage=Tisk celé stránky

diff --git a/client/src/main/webapp/WEB-INF/registration_form.vm b/client/src/main/webapp/WEB-INF/registration_form.vm
@@ -123,7 +123,7 @@
                 results.push({
                     "message":"missing repeatedpassword field", //I18N,
                     "validated": false,
-                    "ident":"#registration_error_differentpasswords"
+                    "ident":"#registration_ error_differentpasswords"
                 });
             } else {
                 results.push({

diff --git a/client/src/main/webapp/js/item/downloadItem.js b/client/src/main/webapp/js/item/downloadItem.js
@@ -55,7 +55,7 @@ DownloadItem.prototype.init = function() {
 
     function _message() {
         var optionsdiv = $("<div/>");
-        var span = $("<span/>",{"id":"download_action_message"});
+        var span = $("<span/>",{"id":"download_action_message", "class":"translate","data-key":"downloads.message"});
         optionsdiv.append(span);
         return optionsdiv;
     }

diff --git a/client/src/main/webapp/js/viewers/itemthumbs.js b/client/src/main/webapp/js/viewers/itemthumbs.js
@@ -180,7 +180,7 @@ ItemThumbs.prototype = {
             }
             q += "&rows=5000&fq=pid_path:" + pid_path.replace(/:/g, "\\:") + "*";
             var hl = "&hl=true&hl.fl=text_ocr&hl.mergeContiguous=true&hl.snippets=2";
-            K5.api.askForSolr(q + hl + fq, _.bind(function(data) {
+            K5.api.askForSolr(q + hl, _.bind(function(data) {
                 console.log("Hits: " + data.response.numFound);
                 //console.log(JSON.stringify(data));
                 this.hits = data.response.docs;

diff --git a/search/web/inc/details/tree.jsp b/search/web/inc/details/tree.jsp
@@ -503,12 +503,12 @@
                     if(fq!=""){
                         fq += " OR ";
                     }
-                    fq += "pid_path:" + getPidPath(id).replace(/:/g, "\\:") + "*";
+                    fq += "pid_path:" + getPidPath(id).replace(/:/g, "\\:").toLowerCase() + "*";
                 });
                 fq = "&fq=" + fq;
             }else{
                 var fqval = $('#item_tree>li>ul>li:first').attr("id").split('_')[1];
-                fq = "&fq=pid_path:" + fqval.replace(/:/g, "\\:") + "*";
+                fq = "&fq=pid_path:" + fqval.toLowerCase().replace(/:/g, "\\:") + "*";
             }
             //var url = "searchXSL.jsp?q="+q+"&offset="+offset+"&xsl=insearch.xsl&collapsed=false&facet=false&fq=pid_path:"+pid+"*";
             var url = "inc/details/searchInside.jsp?q="+q+"&offset="+offset+"&xsl=insearch.xsl&collapsed=false&facet=false" + fq;