commit a5559649db3dbc0e5c3cf63201479ba990aa0fda
Author: Anděl Ondřej <ondrej.andel@marbes.cz>
Date:   Thu Apr 8 16:47:15 2021 +0200

    Bug #8550: Oprava chyb ze schůzky 8.4.

diff --git a/application/view/header.html b/application/view/header.html
index fd8dfc4..2570690 100644
--- a/application/view/header.html
+++ b/application/view/header.html
@@ -1,7 +1,8 @@
 <div class="row app-header">
     <div class="col-xs-12 col-sm-12 my-auto ">
         <h1 class="mx-auto title">
-            Dalimilova kronika
+            Staročeská kronika tak řečeného DALIMILA
         </h1>
+        <h3 class="mx-auto title">Databáze slov a tvarů</h3>
     </div>
 </div>
diff --git a/application/view/library/vanillaSelectBox/vanillaSelectBox.css b/application/view/library/vanillaSelectBox/vanillaSelectBox.css
index 5170688..f50931d 100644
--- a/application/view/library/vanillaSelectBox/vanillaSelectBox.css
+++ b/application/view/library/vanillaSelectBox/vanillaSelectBox.css
@@ -75,7 +75,7 @@ li.disabled{
 
 .vsb-main button{
 	min-width: 120px;
-	border-radius: 0;
+	border-radius: 5px;
 	width: 100%;
 	text-align: left;
 	z-index: 1;
diff --git a/application/view/library/vanillaSelectBox/vanillaSelectBox.js b/application/view/library/vanillaSelectBox/vanillaSelectBox.js
index 0e3ba6c..fbb72b3 100644
--- a/application/view/library/vanillaSelectBox/vanillaSelectBox.js
+++ b/application/view/library/vanillaSelectBox/vanillaSelectBox.js
@@ -90,7 +90,7 @@ function vanillaSelectBox(domSelector, options) {
         maxHeight: 400,
         translations: { "all": "All", "items": "items","selectAll":"Vybrat vše","clearAll":"Vyčistit filr"},
         search: false,
-        placeHolder: "Nevybráno",
+        placeHolder: "nevybráno",
 		stayOpen:false,
         disableSelectAll: false,
     }
@@ -145,7 +145,7 @@ function vanillaSelectBox(domSelector, options) {
     if(selector === ".vsb-main button"){
        cssArray= [
                 {"key":"min-width","value":"120px"},
-                {"key":"border-radius","value":"0"},
+                {"key":"border-radius","value":"5px"},
                 {"key":"width","value":"100%"},
                 {"key":"text-align","value":"left"},
                 {"key":"z-index","value":"1"},
@@ -544,7 +544,7 @@ function vanillaSelectBox(domSelector, options) {
                 //self.title.textContent = selectedTexts;
                 let result = nrActives;
                 if(nrActives < 1){
-                    result = "Nevybráno";
+                    result = "nevybráno";
                 } else if(nrActives === 1){
                     result += " rukopis";
                 } else if(nrActives < 5){
@@ -743,7 +743,7 @@ vanillaSelectBox.prototype.setValue = function (values) {
                 //self.title.textContent = selectedTexts;
                 let result = nrActives;
                 if(nrActives < 1){
-                    result = "Nevybráno";
+                    result = "nevybráno";
                 } else if(nrActives === 1){
                     result += " rukopis";
                 } else if(nrActives < 5){
diff --git a/application/view/modals/detailModal.html b/application/view/modals/detailModal.html
index d35e906..88ddaa4 100644
--- a/application/view/modals/detailModal.html
+++ b/application/view/modals/detailModal.html
@@ -9,18 +9,18 @@
                 <div class="container">
                     <div class="row">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Slovo:</label>
+                            <label>Lemma:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="word"></i>
+                            <i id="lemma"></i>
                         </div>
                     </div>
                     <div class="row">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Lemma:</label>
+                            <label>Slovní tvar:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="lemma"></i>
+                            <i id="word"></i>
                         </div>
                     </div>
                     <div class="row">
@@ -31,6 +31,30 @@
                             <i id="date"></i>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col-xs-12 col-sm-4">
+                            <label>Poznámka 1:</label>
+                        </div>
+                        <div class="col-xs-12 col-sm-8">
+                            <i id="description"></i>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-xs-12 col-sm-4">
+                            <label>Poznámka 2:</label>
+                        </div>
+                        <div class="col-xs-12 col-sm-8">
+                            <i id="description2"></i>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-xs-12 col-sm-4">
+                            <label>Poznámka 3:</label>
+                        </div>
+                        <div class="col-xs-12 col-sm-8">
+                            <i id="description3"></i>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="col-xs-12 col-sm-4">
                             <label>Rukopisy:</label>
@@ -97,76 +121,76 @@
                             <i id="countability"></i>
                         </div>
                     </div>
-                    <div class="row" id="gender-wrapper">
+                    <div class="row" id="mood-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Rod:</label>
+                            <label>Způsob:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="gender"></i>
+                            <i id="mood"></i>
                         </div>
                     </div>
-                    <div class="row" id="shape-wrapper">
+                    <div class="row" id="time-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Tvar:</label>
+                            <label>Čas:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="shape"></i>
+                            <i id="time"></i>
                         </div>
                     </div>
-                    <div class="row" id="grade-wrapper">
+                    <div class="row" id="v-type-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Stupeň:</label>
+                            <label>Slovesný rod:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="grade"></i>
+                            <i id="v-type"></i>
                         </div>
                     </div>
-                    <div class="row" id="type-wrapper">
+                    <div class="row" id="vid-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Druh:</label>
+                            <label>Slovesný vid:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="type"></i>
+                            <i id="vid"></i>
                         </div>
                     </div>
-                    <div class="row" id="time-wrapper">
+                    <div class="row" id="irregular-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Čas:</label>
+                            <label>Neurčitý slovesný tvar:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="time"></i>
+                            <i id="irregular"></i>
                         </div>
                     </div>
-                    <div class="row" id="mood-wrapper">
+                    <div class="row" id="gender-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Způsob:</label>
+                            <label>Rod:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="mood"></i>
+                            <i id="gender"></i>
                         </div>
                     </div>
-                    <div class="row" id="irregular-wrapper">
+                    <div class="row" id="shape-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Neurčitý slovesný tvar:</label>
+                            <label>Tvar:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="irregular"></i>
+                            <i id="shape"></i>
                         </div>
                     </div>
-                    <div class="row" id="v-type-wrapper">
+                    <div class="row" id="grade-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Slovesný rod:</label>
+                            <label>Stupeň:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="v-type"></i>
+                            <i id="grade"></i>
                         </div>
                     </div>
-                    <div class="row" id="vid-wrapper">
+                    <div class="row" id="type-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label>Slovesný vid:</label>
+                            <label>Druh:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <i id="vid"></i>
+                            <i id="type"></i>
                         </div>
                     </div>
                     <div class="row" id="k-type-wrapper">
@@ -196,10 +220,13 @@
 
         modal.find('#word').text(data_obj.word);
         modal.find('#lemma').text(data_obj.lemma.lemma);
+        modal.find('#description').text(data_obj.description === ""? "-" :  data_obj.description);
+        modal.find('#description2').text(data_obj.description2 === ""? "-" :  data_obj.description2);
+        modal.find('#description3').text(data_obj.description3 === ""? "-" :  data_obj.description3);
         modal.find('#date').text(convertDate(data_obj.date));
         modal.find('#manuscript').text(renderManuscript(data_obj.manuscript, false));
         modal.find('#position').text(data_obj.position1 + (data_obj.position2 ? ("/" + data_obj.position2 + (data_obj.positiondetail ? "/"  + data_obj.positiondetail :  "")) : ""));
-        modal.find('#namedentity').text(data_obj.namedentity === 1? "Ano" :  "Ne");
+        modal.find('#namedentity').text(data_obj.namedentity === 1? "ano" :  "ne");
         modal.find('#context').text(data_obj.context === ""? "-" :  data_obj.context);
 
         const morphem = data_obj.tag.tag;
@@ -310,16 +337,16 @@
     }
 
     const codeToWordclass = {
-        "N": "Substantivum",
-        "A": "Adjektivum",
-        "P": "Pronomen",
-        "C": "Numeralie",
-        "V": "Verbum",
-        "D": "Adverbium",
-        "R": "Prepozice",
-        "J": "Konjunkce",
-        "I": "Interjekce",
-        "T": "Partikule"
+        "N": "substantivum",
+        "A": "adjektivum",
+        "P": "pronomen",
+        "C": "numeralie",
+        "V": "verbum",
+        "D": "adverbium",
+        "R": "prepozice",
+        "J": "konjunkce",
+        "I": "interjekce",
+        "T": "partikule"
     };
 
     const wordclassToNum = {
@@ -374,87 +401,87 @@
     };
 
     const codeToCase = {
-        "1": "Nominativ",
-        "2": "Genitiv",
-        "3": "Dativ",
-        "4": "Akuzativ",
-        "5": "Vokativ",
-        "6": "Lokál",
-        "7": "Instrumentál"
+        "1": "nominativ",
+        "2": "genitiv",
+        "3": "dativ",
+        "4": "akuzativ",
+        "5": "vokativ",
+        "6": "lokál",
+        "7": "instrumentál"
     };
 
     const codeToCountability = {
-            "S": "Singulár",
-            "P": "Plurál",
-            "D": "Duál"
+        "S": "singulár",
+        "P": "plurál",
+        "D": "duál"
     };
 
     const codeToGender = {
-            "M": "Maskulinum",
-            "F": "Femininum",
-            "N": "Neutrum"
+            "M": "maskulinum",
+            "F": "femininum",
+            "N": "neutrum"
     };
 
     const codeToGrade = {
-        "1": "Pozitiv",
-        "2": "Komparativ",
-        "3": "Superlativ"
+        "1": "pozitiv",
+        "2": "komparativ",
+        "3": "superlativ"
     };
 
     const codeToKType = {
-        "V": "Větná",
-        "C": "Členská",
-        "N": "Navazovací",
-        "P": "Spojení s přechodníkem"
+        "V": "větná",
+        "C": "členská",
+        "N": "navazovací",
+        "P": "spojení s přechodníkem"
     };
 
     const codeToShape = {
-        "C": "Složený",
-        "N": "Jmenný"
+        "C": "složený",
+        "N": "jmenný"
     };
 
     const codeToVid = {
-        "P": "Perfektivum",
-        "I": "Imperfektivum",
+        "P": "perfektivum",
+        "I": "imperfektivum",
     };
 
     const codeToVType = {
-        "A": "Aktivum",
-        "P": "Pasivum",
+        "A": "aktivum",
+        "P": "pasivum",
     };
 
     const codeToTime= {
-        "P": "Prézens",
-        "A": "Aorist",
-        "R": "Préteritum",
-        "I": "Imperfektum",
-        "H": "Plusquamperfektum",
-        "F": "Futurum"
+        "P": "prézens",
+        "A": "aorist",
+        "R": "préteritum",
+        "I": "imperfektum",
+        "H": "plusquamperfektum",
+        "F": "futurum"
     };
 
     const codeToType = {
-        "P": "Personalia",
-        "S": "Posesiva",
-        "D": "Demonstrativa",
-        "Q": "Interogativa",
-        "J": "Relativa",
-        "Z": "Indefinita",
-        "L": "Limitativa",
-        "W": "Negativa",
+        "P": "posesivum",
+        "S": "personale",
+        "D": "demonstrativum",
+        "Q": "interogativum",
+        "J": "relativum",
+        "Z": "indefinitum",
+        "L": "limitativum",
+        "W": "negativum",
     };
 
     const codeToMood = {
-        "d": "Indikativ",
-        "i": "Imperativ",
-        "c": "Kondicionál"
+        "d": "indikativ",
+        "i": "imperativ",
+        "c": "kondicionál"
     };
 
     const codeToIrregular = {
-        "f": "Infinitiv",
-        "S": "Supinum",
-        "e": "Přech. přítomný",
-        "m": "Přech. minulý",
-        "A": "Part. perf. akt.",
-        "P": "Part. perf. akt."
+        "f": "infinitiv",
+        "S": "supinum",
+        "e": "přech. přítomný",
+        "m": "přech. minulý",
+        "A": "part. perf. akt.",
+        "P": "part. perf. akt."
     };
 </script>
\ No newline at end of file
diff --git a/application/view/modals/editModal.html b/application/view/modals/editModal.html
index 9449502..428b0c6 100644
--- a/application/view/modals/editModal.html
+++ b/application/view/modals/editModal.html
@@ -9,18 +9,18 @@
                 <div class="container">
                     <div class="row my-1">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="word">Slovo:</label>
+                            <label for="lemma">Lemma:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <input class="min-wdth" id="word"/>
+                            <input class="min-wdth" id="lemma"/>
                         </div>
                     </div>
                     <div class="row my-1">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="lemma">Lemma:</label>
+                            <label for="word">Slovo:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <input class="min-wdth" id="lemma"/>
+                            <input class="min-wdth" id="word"/>
                         </div>
                     </div>
                     <div class="row my-1">
@@ -72,23 +72,47 @@
                             <input class="min-wdth" id="context"/>
                         </div>
                     </div>
+                    <div class="row my-1">
+                        <div class="col-xs-12 col-sm-4">
+                            <label for="description">Poznámka 1:</label>
+                        </div>
+                        <div class="col-xs-12 col-sm-8">
+                            <input class="min-wdth" id="description"/>
+                        </div>
+                    </div>
+                    <div class="row my-1">
+                        <div class="col-xs-12 col-sm-4">
+                            <label for="description2">Poznámka 2:</label>
+                        </div>
+                        <div class="col-xs-12 col-sm-8">
+                            <input class="min-wdth" id="description2"/>
+                        </div>
+                    </div>
+                    <div class="row my-1">
+                        <div class="col-xs-12 col-sm-4">
+                            <label for="description3">Poznámka 3:</label>
+                        </div>
+                        <div class="col-xs-12 col-sm-8">
+                            <input class="min-wdth" id="description3"/>
+                        </div>
+                    </div>
                     <div class="row my-1">
                         <div class="col-xs-12 col-sm-4">
                             <label for="wordclass">Slovní druh:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
                             <select class="min-wdth" onchange="changeWordType()"  id="wordclass">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "N">Substantiva</option>
-                                <option value = "A">Adjektiva</option>
-                                <option value = "P">Pronomina</option>
-                                <option value = "C">Numeralia</option>
-                                <option value = "V">Verba</option>
-                                <option value = "D">Adverbia</option>
-                                <option value = "R">Prepozice</option>
-                                <option value = "J">Konjunkce</option>
-                                <option value = "I">Interjekce</option>
-                                <option value = "T">Partikule</option>
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "N">substantivum</option>
+                                <option value = "A">adjektivum</option>
+                                <option value = "P">pronomen</option>
+                                <option value = "C">numeralie</option>
+                                <option value = "V">verbum</option>
+                                <option value = "D">adverbium</option>
+                                <option value = "R">prepozice</option>
+                                <option value = "J">konjunkce</option>
+                                <option value = "T">partikule</option>
+                                <option value = "I">interjekce</option>
                             </select>
                         </div>
                     </div>
@@ -100,7 +124,7 @@
                         </div>
                         <div class="col-xs-12 col-sm-8">
                             <select class="min-wdth" id="person">
-                                <option selected="selected" value = "">Nevybráno</option>
+                                <option selected="selected" value = "">nevybráno</option>
                                 <option value = "1">1.</option>
                                 <option value = "2">2.</option>
                                 <option value = "3">3.</option>
@@ -113,14 +137,14 @@
                         </div>
                         <div class="col-xs-12 col-sm-8">
                             <select class="min-wdth" id="case">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "1">Nominativ</option>
-                                <option value = "2">Genitiv</option>
-                                <option value = "3">Dativ</option>
-                                <option value = "4">Akuzativ</option>
-                                <option value = "5">Vokativ</option>
-                                <option value = "6">Lokál</option>
-                                <option value = "7">Instrumentál</option>
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "1">nominativ</option>
+                                <option value = "2">genitiv</option>
+                                <option value = "3">dativ</option>
+                                <option value = "4">akuzativ</option>
+                                <option value = "5">vokativ</option>
+                                <option value = "6">lokál</option>
+                                <option value = "7">instrumentál</option>
                             </select>
                         </div>
                     </div>
@@ -130,135 +154,135 @@
                         </div>
                         <div class="col-xs-12 col-sm-8">
                             <select class="min-wdth" id="countability">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "S">Singulár</option>
-                                <option value = "P">Plurál</option>
-                                <option value = "D">Duál</option>
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "S">singulár</option>
+                                <option value = "P">plurál</option>
+                                <option value = "D">duál</option>
                             </select>
                         </div>
                     </div>
-                    <div class="row my-1" id="gender-wrapper">
+                    <div class="row my-1" id="mood-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="gender">Rod:</label>
+                            <label for="mood">Způsob:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <select class="min-wdth" id="gender">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "M">Maskulinum</option>
-                                <option value = "F">Femininum</option>
-                                <option value = "N">Neutrum</option>
+                            <select class="min-wdth" id="mood" onchange="moodChange()">
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "d">indikativ</option>
+                                <option value = "i">imperativ</option>
+                                <option value = "c">kondicionál</option>
                             </select>
                         </div>
                     </div>
-                    <div class="row my-1" id="shape-wrapper">
+                    <div class="row my-1" id="time-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="shape">Tvar:</label>
+                            <label for="time">Čas:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <select class="min-wdth" id="shape">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "C">Složený</option>
-                                <option value = "N">Jmenný</option>
+                            <select class="min-wdth" id="time">
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "P">prézens</option>
+                                <option value = "A">aorist</option>
+                                <option value = "R">préteritum</option>
+                                <option value = "I">imperfektum</option>
+                                <option value = "H">plusquamperfektum</option>
+                                <option value = "F">futurum</option>
                             </select>
                         </div>
                     </div>
-                    <div class="row my-1" id="grade-wrapper">
+                    <div class="row my-1" id="v-type-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="grade">Stupeň:</label>
+                            <label for="v-type">Slovesný rod:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <select class="min-wdth" id="grade">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "1">Pozitiv</option>
-                                <option value = "2">Komparativ</option>
-                                <option value = "3">Superlativ</option>
+                            <select class="min-wdth" id="v-type">
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "A">aktivum</option>
+                                <option value = "P">pasivum</option>
                             </select>
                         </div>
                     </div>
-                    <div class="row my-1" id="type-wrapper">
+                    <div class="row my-1" id="vid-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="type">Druh:</label>
+                            <label for="vid">Slovesný vid:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <select class="min-wdth" id="type">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "P">Personalia</option>
-                                <option value = "S">Posesiva</option>
-                                <option value = "D">Demonstrativa</option>
-                                <option value = "Q">Interogativa</option>
-                                <option value = "J">Relativa</option>
-                                <option value = "Z">Indefinita</option>
-                                <option value = "L">Limitativa</option>
-                                <option value = "W">Negativa</option>
+                            <select class="min-wdth" id="vid">
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "P">perfektivum</option>
+                                <option value = "I">imperfektivum </option>
                             </select>
                         </div>
                     </div>
-                    <div class="row my-1" id="time-wrapper">
+                    <div class="row my-1" id="irregular-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="time">Čas:</label>
+                            <label for="irregular">Neurčitý slovesný tvar:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <select class="min-wdth" id="time">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "P">Prézens</option>
-                                <option value = "A">Aorist</option>
-                                <option value = "R">Préteritum</option>
-                                <option value = "I">Imperfektum</option>
-                                <option value = "H">Plusquamperfektum</option>
-                                <option value = "F">Futurum</option>
+                            <select class="min-wdth" id="irregular" onchange="irregularChange()">
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "f">infinitiv</option>
+                                <option value = "S">supinum</option>
+                                <option value = "e">přech. přítomný</option>
+                                <option value = "m">přech. minulý</option>
+                                <option value = "A">part. perf. akt.</option>
+                                <option value = "P">part. perf. pas.</option>
                             </select>
                         </div>
                     </div>
-                    <div class="row my-1" id="mood-wrapper">
+                    <div class="row my-1" id="gender-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="mood">Způsob:</label>
+                            <label for="gender">Rod:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <select class="min-wdth" id="mood" onchange="moodChange()">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "d">Indikativ</option>
-                                <option value = "i">Imperativ</option>
-                                <option value = "c">Kondicionál</option>
+                            <select class="min-wdth" id="gender">
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "M">maskulinum</option>
+                                <option value = "F">femininum</option>
+                                <option value = "N">neutrum</option>
                             </select>
                         </div>
                     </div>
-                    <div class="row my-1" id="irregular-wrapper">
+                    <div class="row my-1" id="shape-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="irregular">Neurčitý slovesný tvar:</label>
+                            <label for="shape">Tvar:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <select class="min-wdth" id="irregular" onchange="irregularChange()">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "f">Infinitiv</option>
-                                <option value = "S">Supinum</option>
-                                <option value = "e">Přech. přítomný</option>
-                                <option value = "m">Přech. minulý</option>
-                                <option value = "A">Part. perf. akt.</option>
-                                <option value = "P">Part. perf. pas.</option>
+                            <select class="min-wdth" id="shape">
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "C">složený</option>
+                                <option value = "N">jmenný</option>
                             </select>
                         </div>
                     </div>
-                    <div class="row my-1" id="v-type-wrapper">
+                    <div class="row my-1" id="grade-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="v-type">Slovesný rod:</label>
+                            <label for="grade">Stupeň:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <select class="min-wdth" id="v-type">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "A">Aktivum</option>
-                                <option value = "P">Pasivum</option>
+                            <select class="min-wdth" id="grade">
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "1">pozitiv</option>
+                                <option value = "2">komparativ</option>
+                                <option value = "3">superlativ</option>
                             </select>
                         </div>
                     </div>
-                    <div class="row my-1" id="vid-wrapper">
+                    <div class="row my-1" id="type-wrapper">
                         <div class="col-xs-12 col-sm-4">
-                            <label for="vid">Slovesný vid:</label>
+                            <label for="type">Druh:</label>
                         </div>
                         <div class="col-xs-12 col-sm-8">
-                            <select class="min-wdth" id="vid">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "P">Perfektivum</option>
-                                <option value = "I">Imperfektivum </option>
+                            <select class="min-wdth" id="type">
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "P">personalia</option>
+                                <option value = "S">posesiva</option>
+                                <option value = "D">demonstrativa</option>
+                                <option value = "Q">interogativa</option>
+                                <option value = "J">relativa</option>
+                                <option value = "Z">indefinita</option>
+                                <option value = "L">limitativa</option>
+                                <option value = "W">negativa</option>
                             </select>
                         </div>
                     </div>
@@ -268,11 +292,11 @@
                         </div>
                         <div class="col-xs-12 col-sm-8">
                             <select class="min-wdth" id="k-type">
-                                <option selected="selected" value = "">Nevybráno</option>
-                                <option value = "V">Větná</option>
-                                <option value = "C">Členská</option>
-                                <option value = "N">Navazovací</option>
-                                <option value = "P">Spojení s přechodníkem</option>
+                                <option selected="selected" value = "">nevybráno</option>
+                                <option value = "V">větná</option>
+                                <option value = "C">členská</option>
+                                <option value = "N">navazovací</option>
+                                <option value = "P">spojení s přechodníkem</option>
                             </select>
                         </div>
                     </div>
@@ -292,7 +316,7 @@
         const pseudo_id = button.data('pseudo-id');// Extract info from data-* attributes
         const title = button.data('title');// Extract info from data-* attributes
         $('#manuscript-m').multiSelect({
-            'noneText': 'Nevybráno',
+            'noneText': 'nevybráno',
         });
 
         let modal = $(this);
@@ -550,6 +574,9 @@
         "#position",
         "#namedentity",
         "#context",
+        "#description",
+        "#description2",
+        "#description3",
         "#wordclass"
     ];
 
@@ -577,6 +604,9 @@
 
         if(data !== null){
             modal.find("#context").val(data.context);
+            modal.find("#description").val(data.description);
+            modal.find("#description2").val(data.description2);
+            modal.find("#description3").val(data.description3);
             modal.find("#namedentity").prop('checked', data.namedentity === 1);
 
             let position = data.position1;
@@ -652,6 +682,9 @@
         formData.append("lemma", modal.find("#lemma")[0].value);
         formData.append("manuscript", modal.find("#manuscript-m")[0].value);
         formData.append("context", modal.find("#context")[0].value);
+        formData.append("description", modal.find("#description")[0].value);
+        formData.append("description2", modal.find("#description2")[0].value);
+        formData.append("description3", modal.find("#description3")[0].value);
 
         //morphem creation
         let morphem = "";
diff --git a/application/view/searchContent.php b/application/view/searchContent.php
index 049ec95..596d400 100644
--- a/application/view/searchContent.php
+++ b/application/view/searchContent.php
@@ -21,14 +21,14 @@
 
 <div class="search-filters container" onload="filtersChange()">
     <div class="row">
-        <div class="mr-3">
-            <label for="wordshape" class="mr-2">Slovo</label>
-            <input type="text" id="wordshape">
-        </div>
         <div class="mr-3">
             <label for="lemma" class="mr-2">Lemma</label>
             <input type="text" id="lemma">
         </div>
+        <div class="mr-3">
+            <label for="wordshape" class="mr-2">Slovní tvar</label>
+            <input type="text" id="wordshape">
+        </div>
         <div class="mr-3">
             <label for="source" class="mr-2">Rukopisný pramen</label>
             <select id="source" multiple>
@@ -54,22 +54,25 @@
             <label for="location" class="mr-2">Pozice</label>
             <input type="text" id="location">
         </div>
-
+        <div class="mr-3">
+            <label for="description2" class="mr-2">Poznámka 2</label>
+            <input type="text" id="description2" />
+        </div>
 
         <div class="mr-3">
             <label for="wordclass" class="mr-2">Slovní druh</label>
             <select onchange="filtersChange()"  id="wordclass">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "N">Substantiva</option>
-                <option value = "A">Adjektiva</option>
-                <option value = "P">Pronomina</option>
-                <option value = "C">Numeralia</option>
-                <option value = "V">Verba</option>
-                <option value = "D">Adverbia</option>
-                <option value = "R">Prepozice</option>
-                <option value = "J">Konjunkce</option>
-                <option value = "I">Interjekce</option>
-                <option value = "T">Partikule</option>
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "N">substantivum</option>
+                <option value = "A">adjektivum</option>
+                <option value = "P">pronomen</option>
+                <option value = "C">numeralie</option>
+                <option value = "V">verbum</option>
+                <option value = "D">adverbium</option>
+                <option value = "R">prepozice</option>
+                <option value = "J">konjunkce</option>
+                <option value = "T">partikule</option>
+                <option value = "I">interjekce</option>
             </select>
         </div>
 
@@ -176,7 +179,7 @@
                             false
                         ]);
                         movedNode = document.getElementById("filter-case");
-                        beforeNode = document.getElementById("filter-but");
+                        beforeNode = document.getElementById("filter-control-div");
                         movedNode.parentNode.insertBefore(movedNode, beforeNode);
                         break;
                     case "D":
@@ -312,7 +315,7 @@
         <div class="mr-3" id="filter-person">
             <label for="person" class="mr-2">Osoba</label>
             <select id="person">
-                <option selected="selected" value = "">Nevybráno</option>
+                <option selected="selected" value = "">nevybráno</option>
                 <option value = "1">1.</option>
                 <option value = "2">2.</option>
                 <option value = "3">3.</option>
@@ -321,129 +324,132 @@
         <div class="mr-3" id="filter-case">
             <label for="case" class="mr-2">Pád</label>
             <select id="case">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "1">Nominativ</option>
-                <option value = "2">Genitiv</option>
-                <option value = "3">Dativ</option>
-                <option value = "4">Akuzativ</option>
-                <option value = "5">Vokativ</option>
-                <option value = "6">Lokál</option>
-                <option value = "7">Instrumentál</option>
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "1">nominativ</option>
+                <option value = "2">genitiv</option>
+                <option value = "3">dativ</option>
+                <option value = "4">akuzativ</option>
+                <option value = "5">vokativ</option>
+                <option value = "6">lokál</option>
+                <option value = "7">instrumentál</option>
             </select>
         </div>
         <div class="mr-3" id="filter-countability">
             <label for="countability" class="mr-2">Číslo</label>
             <select id="countability">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "S">Singulár</option>
-                <option value = "P">Plurál</option>
-                <option value = "D">Duál</option>
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "S">singulár</option>
+                <option value = "P">plurál</option>
+                <option value = "D">duál</option>
+            </select>
+        </div>
+        <div class="mr-3" id="filter-mood">
+            <label for="mood" class="mr-2">Způsob</label>
+            <select id="mood" onchange="moodChange()">
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "d">indikativ</option>
+                <option value = "i">imperativ</option>
+                <option value = "c">kondicionál</option>
+            </select>
+        </div>
+        <div class="mr-3" id="filter-time">
+            <label for="time" class="mr-2">Čas</label>
+            <select id="time">
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "P">prézens</option>
+                <option value = "A">aorist</option>
+                <option value = "R">préteritum</option>
+                <option value = "I">imperfektum</option>
+                <option value = "H">plusquamperfektum</option>
+                <option value = "F">futurum</option>
+            </select>
+        </div>
+        <div class="mr-3" id="filter-v-type">
+            <label for="v-type" class="mr-2">Slovesný rod</label>
+            <select id="v-type">
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "A">aktivum</option>
+                <option value = "P">pasivum</option>
+            </select>
+        </div>
+        <div class="mr-3" id="filter-vid">
+            <label for="vid" class="mr-2">Vid</label>
+            <select id="vid">
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "P">perfektivum</option>
+                <option value = "I">imperfektivum </option>
+            </select>
+        </div>
+        <div class="mr-3" id="filter-irregular">
+            <label for="irregular" class="mr-2">Neurčitý slovesný tvar</label>
+            <select id="irregular" onchange="irregularChange()">
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "f">infinitiv</option>
+                <option value = "S">supinum</option>
+                <option value = "e">přech. přítomný</option>
+                <option value = "m">přech. minulý</option>
+                <option value = "A">part. perf. akt.</option>
+                <option value = "P">part. perf. pas.</option>
             </select>
         </div>
         <div class="mr-3" id="filter-gender">
             <label for="gender" class="mr-2">Rod</label>
             <select id="gender">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "M">Maskulinum</option>
-                <option value = "F">Femininum</option>
-                <option value = "N">Neutrum</option>
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "M">maskulinum</option>
+                <option value = "F">femininum</option>
+                <option value = "N">neutrum</option>
             </select>
         </div>
         <div class="mr-3" id="filter-shape">
             <label for="shape" class="mr-2">Tvar</label>
             <select id="shape">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "C">Složený</option>
-                <option value = "N">Jmenný</option>
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "C">složený</option>
+                <option value = "N">jmenný</option>
             </select>
         </div>
         <div class="mr-3" id="filter-grade">
             <label for="grade" class="mr-2">Stupeň</label>
             <select id="grade">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "1">Pozitiv</option>
-                <option value = "2">Komparativ</option>
-                <option value = "3">Superlativ</option>
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "1">pozitiv</option>
+                <option value = "2">komparativ</option>
+                <option value = "3">superlativ</option>
             </select>
         </div>
         <div class="mr-3" id="filter-type">
             <label for="type" class="mr-2">Druh</label>
             <select id="type">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "P">Personalia</option>
-                <option value = "S">Posesiva</option>
-                <option value = "D">Demonstrativa</option>
-                <option value = "Q">Interogativa</option>
-                <option value = "J">Relativa</option>
-                <option value = "Z">Indefinita</option>
-                <option value = "L">Limitativa</option>
-                <option value = "W">Negativa</option>
-            </select>
-        </div>
-        <div class="mr-3" id="filter-time">
-            <label for="time" class="mr-2">Čas</label>
-            <select id="time">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "P">Prézens</option>
-                <option value = "A">Aorist</option>
-                <option value = "R">Préteritum</option>
-                <option value = "I">Imperfektum</option>
-                <option value = "H">Plusquamperfektum</option>
-                <option value = "F">Futurum</option>
-            </select>
-        </div>
-        <div class="mr-3" id="filter-mood">
-            <label for="mood" class="mr-2">Způsob</label>
-            <select id="mood" onchange="moodChange()">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "d">Indikativ</option>
-                <option value = "i">Imperativ</option>
-                <option value = "c">Kondicionál</option>
-            </select>
-        </div>
-        <div class="mr-3" id="filter-irregular">
-            <label for="irregular" class="mr-2">Neurčitý slovesný tvar</label>
-            <select id="irregular" onchange="irregularChange()">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "f">Infinitiv</option>
-                <option value = "S">Supinum</option>
-                <option value = "e">Přech. přítomný</option>
-                <option value = "m">Přech. minulý</option>
-                <option value = "A">Part. perf. akt.</option>
-                <option value = "P">Part. perf. pas.</option>
-            </select>
-        </div>
-        <div class="mr-3" id="filter-v-type">
-            <label for="v-type" class="mr-2">Slovesný rod</label>
-            <select id="v-type">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "A">Aktivum</option>
-                <option value = "P">Pasivum</option>
-            </select>
-        </div>
-        <div class="mr-3" id="filter-vid">
-            <label for="vid" class="mr-2">Vid</label>
-            <select id="vid">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "P">Perfektivum</option>
-                <option value = "I">Imperfektivum </option>
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "P">personalia</option>
+                <option value = "S">posesiva</option>
+                <option value = "D">demonstrativa</option>
+                <option value = "Q">interogativa</option>
+                <option value = "J">relativa</option>
+                <option value = "Z">indefinita</option>
+                <option value = "L">limitativa</option>
+                <option value = "W">negativa</option>
             </select>
         </div>
         <div class="mr-3" id="filter-k-type">
             <label for="k-type" class="mr-2">Typ</label>
             <select id="k-type">
-                <option selected="selected" value = "">Nevybráno</option>
-                <option value = "V">Větná</option>
-                <option value = "C">Členská</option>
-                <option value = "N">Navazovací</option>
-                <option value = "P">Spojení s přechodníkem</option>
+                <option selected="selected" value = "">nevybráno</option>
+                <option value = "V">větná</option>
+                <option value = "C">členská</option>
+                <option value = "N">navazovací</option>
+                <option value = "P">spojení s přechodníkem</option>
             </select>
         </div>
 
         <!-- send button-->
-        <button class="ml-auto btn" id="filter-but" onclick="callFilter()">
-            Filtrovat
-        </button>
+        <div class="ml-auto" id="filter-control-div">
+            <i class="mr-1 my-auto" id="hit-count">0 záznamů</i>
+            <button class="btn" id="filter-but" onclick="callFilter()">
+                Filtrovat
+            </button>
+        </div>
     </div>
 </div>
 
@@ -451,10 +457,12 @@
     <table class="table table-striped">
         <thead>
         <tr>
-            <th scope="col">Slovo</th>
             <th scope="col">Lemma</th>
+            <th scope="col">Slovní tvar</th>
+            <th scope="col">Morfologie</th>
             <th scope="col">Rukopisy</th>
             <th scope="col">Pozice</th>
+            <th scope="col">Poznámka 2</th>
             <th scope="col"></th>
         </tr>
         </thead>
@@ -490,6 +498,7 @@
                     //regular
                     formData.append("lemma", document.getElementById("lemma").value);
                     formData.append("word", document.getElementById("wordshape").value);
+                    formData.append("description2", document.getElementById("description2").value);
 
                     //positions
                     const positionSplit = document.getElementById("location").value.split("/");
@@ -539,7 +548,7 @@
                         filterData(formData);
                     }
 
-                    // (A2) AJAX - USE HTTP:// NOT FILE://
+                    // (A2) AJAX - USE HTTP:// NOT FILE:/
                     let xhr = new XMLHttpRequest();
                     xhr.open("POST", "./controller/TableController.php");
                     xhr.onload = function(){
@@ -552,6 +561,15 @@
                             document.getElementById("no-data-label").style.display = "none";
                             document.getElementById("paging-control").style.display = "";
                         }
+
+                        if(parsedJSON.count === 1){
+                            document.getElementById("hit-count").innerText = "1 záznamů";
+                        } else if(parsedJSON.count < 5){
+                            document.getElementById("hit-count").innerText = parsedJSON.count +" záznamů";
+                        } else {
+                            document.getElementById("hit-count").innerText = parsedJSON.count +" záznamů";
+                        }
+
                         itemCount = parsedJSON.count;
                         pageCount = Math.ceil(itemCount / itemPerPage);
                         document.getElementById("page-label").value = (pageIndex + 1) + " / " + pageCount;
@@ -565,7 +583,7 @@
                     let output = "";
                     for(let i = 0; i < manuscripts.length; i++){
                         if(shorten)
-                            output += codeToManuscriptShort[manuscripts[i]];
+                            output += ("<span title=\""+ codeToManuscript[manuscripts[i]] +"\">" + codeToManuscriptShort[manuscripts[i]] + "</span>");
                         else
                             output += codeToManuscript[manuscripts[i]];
 
@@ -583,12 +601,14 @@
                     let result = "";
                     data.forEach((item,id) => {
                         result += "<tr>";
-                        result += "<td>" + item.word + "</td>";
                         result += "<td>" + item.lemma.lemma + "</td>";
+                        result += "<td>" + item.word + "</td>";
+                        result += "<td>" + item.tag.tag + "</td>";
                         result += "<td>" + renderManuscript(item.manuscript) + "</td>";
                         result += "<td>" + item.position1 + (item.position2 ? ("/" + item.position2 + (item.positiondetail ? "/"  + item.positiondetail :  "")) : "")  + "</td>";
+                        result += "<td>" + item.description2 + "</td>";
                         result += "<td class=\"action-td\">" +
-                            /*"<button class=\"btn mr-1\" title=\"Upravit\"  data-toggle=\"modal\" data-target=\"#edit-modal\" data-pseudo-id='" + id + "' data-title=\"Upravit záznam\"><i class=\"fa fa-pencil\"></i></button>" + //TODO ADMIN ONLY*/
+                            "<button class=\"btn mr-1\" title=\"Upravit\"  data-toggle=\"modal\" data-target=\"#edit-modal\" data-pseudo-id='" + id + "' data-title=\"Upravit záznam\"><i class=\"fa fa-pencil\"></i></button>" + //TODO ADMIN change , regular send report
                             "<button class=\"btn\" title=\"Detail\"  data-toggle=\"modal\" data-target=\"#detail-modal\" data-pseudo-id='" + id + "'><i class=\"fa fa-search\"></i></button>" +
                             "</td>";
                         result += "</tr>";
diff --git a/application/view/style.css b/application/view/style.css
index 613be00..0f6c781 100644
--- a/application/view/style.css
+++ b/application/view/style.css
@@ -3,13 +3,13 @@ html, body, .container-fluid {
 }
 
 .app-header {
-  background-image: linear-gradient(#A8A4A2, #4B4B4B);
+  background-image: linear-gradient( #A5ca79, #376039);
   height: 15%;
 }
 
 .app-header .title {
   width: max-content;
-  font-family: "Lucida Calligraphy", cursive;
+  font-family: "Georgia, Arial, sans-serif", cursive;
 }
 
 .app-content {
@@ -17,52 +17,46 @@ html, body, .container-fluid {
 }
 
 .app-content .menu {
-  background-color: #a8a4a2;
+  background-color: #e0e9d8;
   border-right: #4B4B4B solid 2px;
 }
 
 .app-content .menu a {
-  color: #4B4B4B;
+  color: black;
   background-color: transparent;
 }
 
 .app-content .menu a:hover,
 .app-content .menu a:focus {
-  color: #a8a4a2;
-  background-color: #707070;
+  background-color: #bde48e;
   text-decoration: none;
   border-radius: 15px 50px 50px 15px;
 }
 
 .app-content .menu .active{
-  color: #a8a4a2;
-  background-color: #4B4B4B;
+  background-color: #A5ca79;
   text-decoration: none;
   border-radius: 15px 50px 50px 15px;
 }
 
 .app-content .content {
-  background-color: #c9c5c2;
+  background-color: #ecf5e4;
   height: 100%;
   flex-direction: column;
 }
 
 .app-footer {
   text-align: center;
-  background-image: linear-gradient(#4B4B4B,#A8A4A2);
+  background-image: linear-gradient( #A5ca79, #376039);
   height: 5%;
 }
 
 .modal-body {
-  background-color: #c9c5c2;
+  background-color: #ecf5e4;
 }
 
 .modal-header, .modal-footer {
-  background-color: #A8A4A2;
-}
-
-.modal-header .modal-title {
-  color: #4B4B4B;
+  background-image: linear-gradient( #A5ca79, #376039);
 }
 
 .app-content .content .search-results {
@@ -75,6 +69,7 @@ html, body, .container-fluid {
 }
 
 input, select {
+  border-radius: 5px;
   border: 1px solid grey;
   margin-left: 2px;
   font-size: 14px;
@@ -86,6 +81,10 @@ input, select {
   min-width: 200px;
 }
 
+.btn{
+  background-color: #A5ca79;
+}
+
 select {
   padding: 6px 18px 6px 12px;
   appearance: none;
@@ -136,6 +135,7 @@ select::-ms-expand {
 }
 
 .multi-select-button {
+  border-radius: 5px;
   border: 1px solid grey;
   display: inline-block;
   font-size: 0.875em;
