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

ceskaexpedice · Dec 17, 2015 · 77f91aa · 77f91aa
2 parents 8ddd0cf + 2ed03a5
commit 77f91aa
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 9 deletions.
diff --git a/client/src/main/resources/k5client.properties b/client/src/main/resources/k5client.properties
@@ -215,7 +215,7 @@ ctx.actions.sites.fb=Share Fb ...
 ctx.actions.sites.gp=Share Google plus ... 
 
 buttons.showinfo=Show info
-facet.model_path=Type of title
+facet.model_path=Type of document
 searchinside.dialog=Search inside this document
 facet.rok=Year
 common.results=Results
@@ -295,7 +295,7 @@ feedback.title=Error
 feedback.email.title=Your name or email 
 feedback.message.title=Message
 
-feedback.footer.title=\u26A0 Feedback
+feedback.footer.title=\u26a0 Feedback
 feedback.message.placeholder=Error in document 
 
 
@@ -306,7 +306,7 @@ generatepdf.busy.message=Please repeat the action later
 generatepdf.wait.title=Generating pdf
 generatepdf.wait.message=Generating pdf, wait please
 generatepdf.wait.pagelimit= Number of printing page is :
-facet.typ_titulu=Type of title
+facet.typ_titulu=Type of document
 query.placeholder=Search digital library
 buttons.outofdocument=Leave document
 browse.placeholder=Search in titles and authors
@@ -333,3 +333,10 @@ mods.page.partType.listOfIllustrations=list of illustrations
 mods.page.partType.listOfMaps=list of maps
 mods.page.partType.listOfTables=list of tables
 mods.page.partType.tableOfContents=table of contents
+
+dctitle.none=unknown
+
+common.founded=Found
+common.page.singural=page
+common.page.plural_1=pages
+common.page.plural_2=pages
diff --git a/client/src/main/resources/k5client_cs.properties b/client/src/main/resources/k5client_cs.properties
@@ -38,7 +38,7 @@ common.all= Všechny
 common.apply=Aplikovat
 common.browse=Procházet
 common.change=Změna
-common.close=Zavrít
+common.close=Zavřít
 common.saveandclose=Zavřít a uložit
 
 common.url.handle=Persistentní URL
@@ -183,7 +183,7 @@ mods.subtitle=Podnázev
 mods.title.alternative=Souběžný název
 facets.used=Použité filtry
 buttons.showinfo=Zobrazit informace
-facet.model_path=Typ titulu
+facet.model_path=Typ dokumentu
 searchinside.dialog=Hledání v rámci dokumentu
 facet.rok=Rok vydání
 common.results=Výsledky
@@ -277,7 +277,7 @@ generatepdf.busy.message=Opakujte akci později
 generatepdf.wait.title=Generuju pdf
 generatepdf.wait.message=Čekejte, generuju pdf
 generatepdf.wait.pagelimit= Počet generovaných stránek je :
-facet.typ_titulu=Typ titulu
+facet.typ_titulu=Typ dokumentu
 query.placeholder=Hledej v digitální knihovně
 buttons.outofdocument=Opustit dokument
 browse.placeholder=Hledat v názvech a autorech
@@ -304,3 +304,10 @@ mods.page.partType.listOfIllustrations=seznam ilustrací
 mods.page.partType.listOfMaps=seznam map
 mods.page.partType.listOfTables=seznam tabulek
 mods.page.partType.tableOfContents=obsah
+
+dctitle.none=neuvedeno
+
+common.found=Bylo nalezeno
+common.page.singural=stránka
+common.page.plural_1=stránky
+common.page.plural_2=stránek
diff --git a/client/src/main/webapp/WEB-INF/css/styles.css b/client/src/main/webapp/WEB-INF/css/styles.css
@@ -19,6 +19,8 @@
         "policy.public.color"   : "#00dd00",
         "policy.private.color"  :"#dd0000",
 
+        "linkColor"             : "white",
+
 
         "hitColor"              :  "rgba(0, 30, 60, 0.7)",
 
@@ -45,6 +47,10 @@ body {
     height:100%;    
 }
 
+a{
+    color: $params.linkColor;
+}
+
 /*
 body * {
     position: relative;

diff --git a/client/src/main/webapp/js/browse.js b/client/src/main/webapp/js/browse.js
@@ -157,7 +157,11 @@ Browse.prototype = {
                 var doc = arr[i];
                 var div = $('<li/>', {class: 'res policy'});
                 div.data("pid", doc.PID);
-                var title = $('<span class="title">' + doc['dc.title'] + '</span>');
+                var dcTitle = doc['dc.title'];
+                if(dcTitle.length === 0){
+                    dcTitle = K5.i18n.translatable("dctitle.none");
+                }
+                var title = $('<span class="title">' + dcTitle + '</span>');
                 title.click(function() {
                     K5.api.gotoDisplayingItemPage($(this).parent().data("pid"));
                 });

diff --git a/client/src/main/webapp/js/leftthumbs.js b/client/src/main/webapp/js/leftthumbs.js
@@ -176,11 +176,11 @@ LeftThumbs.prototype = {
                 $(this).tooltip("option", "content", $(this).data("tt"));
             });
             $('td.thumb').removeClass("hit chit");
-            this.getHits();
+            this.getHits(true);
         }
         cleanWindow();
     },
-    getHits: function() {
+    getHits: function(showalert) {
         if ($("#q").val() === "") {
             return;
         }
@@ -195,11 +195,24 @@ LeftThumbs.prototype = {
             var q = "q=" + $("#q").val() + "&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, _.bind(function(data) {
+                var numFound = data.response.numFound;
                 console.log("Hits: " + data.response.numFound);
                 //console.log(JSON.stringify(data));
                 this.hits = data.response.docs;
                 this.highlighting = data.highlighting;
                 this.setHitClass();
+
+                if(showalert){
+                    var key = 'common.page.plural_2';
+                    if (numFound > 4) {
+                        key = 'common.page.plural_2';
+                    } else if (numFound > 1) {
+                        key = 'common.page.plural_1';
+                    } else {
+                        key = 'common.page.singural';
+                    }
+                    alert(K5.i18n.ctx.dictionary["common.found"] + " " + numFound + " " + K5.i18n.ctx.dictionary[key]);
+                }
             }, this));
         } else {
             this.setHitClass();