Issue/59

api/index.php

@@ -135,6 +135,8 @@ function close($db, $commit=False)
 
 switch ($method) {
     case "lang":
+      if( empty($default_lang) or 
+          !isset($default_lang) ) $default_lang = "en";
         print json_encode($lang[$default_lang]);
         break;
     case "listEmpty":

css/list.css

@@ -64,6 +64,7 @@
 .show-zoomed {
     display: inherit;
 }
+
 .info-box {
     font-size: 12px;
     background-color: #696969;
@@ -73,27 +74,28 @@
 }
 
 .date {
-    color: #ccc;
+    color: #fff;
     font-style: italic;
     font-size: 10px;
     text-align: right;
-    padding: 5px 5px 0 0;
+    padding: 5px 20px 0 0;
     height: 15px;
 }
+
 .keyword {
-    padding-top: 5px;
     overflow: hidden;
-    width: 80px;
+    width: 165px;
     text-overflow: ellipsis;
-    padding: 0 0 10px 10px;
-    color: #ccc;
+    padding: 0 10px 10px 10px;
+    color: #fff;
+    white-space: nowrap;
 }
+
 .bottom-button-container {
     text-align: center;
     margin: 10px 0;
 }
 
 .btn-container {
-    flex:1;
-    text-align: right;
+    display:inline-block;
 }

css/style.css

@@ -14,13 +14,15 @@
     src: url('webfonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
 }
 
-html {
-    height:100%;
+html, body {
+    margin: 0;
+    height: 100%;
 }
 
 button {
     font-family: 'Montserrat', sans-serif;
 }
+
 button:focus {
     outline: none;
 }
@@ -48,14 +50,17 @@ input:focus {
 }
 
 .logo {
-    height: 31px;
-    position: absolute;
-    left: 30px;
+    height: 31px;    
 }
 
 .top {
     background-color: black;
     padding: 20px;
+    display: flex;
+    justify-content: space-between;
+}
+
+.btn-row {
     text-align: right;
 }
 
@@ -68,12 +73,18 @@ input:focus {
     color: white;
     border: none;
     padding: 6px 12px;
-    margin-left: 12px;
+    margin: 6px;
     font-size: 12px;
     cursor: pointer;
     position: relative;
 }
 
+@media (hover: none) and (pointer: coarse) {
+   .btn {
+    font-size: 14px;
+    padding: 10px 16px;
+   } 
+}
 .btn.success {
     background-color: #3BB41B;
 }
@@ -129,18 +140,27 @@ btn.warn:hover {
 
 .filter-text {
     font-size: 14px;
-    padding-right: 20px;
     display: inline-block;
+    color: #626262;
+    font-weight: normal;
+    padding-right: 20px;
+}
+
+.filter-text-label {
+    height:22px;
 }
 
 .filter-box {
-    display: flex;
     border-bottom: solid 1px grey;
     padding: 10px;
     align-items: center;
     line-height: 30px;
 }
 
+.filter-box input {
+    width:150px;
+}
+
 .badge {
     position: absolute;
     right: -10px;

js/edit/keywords.tag

@@ -7,6 +7,7 @@
 
         function onData(data){
             that.keywords = data.keywords;
+            console.log('bla',data);
             that.update();
         };
 

js/list/docFilter.tag

@@ -1,14 +1,24 @@
 <doc-filter>
     <div class="filter-box">
-        <div class="filter-text"><lang-text ref="Date_From"></lang-text>: <input type="date" ref="datefrom" oninput="{onDateFromInput}"></div>
-        <div class="filter-text"><lang-text ref="Date_To"></lang-text>: <input type="date" ref="dateto" oninput="{onDateToInput}"></div>
-        <div class="filter-text"><lang-text ref="Hidden_Keyword"></lang-text>:
+        <div class="filter-text">
+            <div class="filter-text-label"><lang-text ref="Date_From"></lang-text>:</div>         
+            <input type="date" ref="datefrom" oninput="{onDateFromInput}">
+        </div>
+        <div class="filter-text">
+            <div class="filter-text-label"><lang-text ref="Date_To"></lang-text>: </div>        
+            <input type="date" ref="dateto" oninput="{onDateToInput}">
+        </div>
+        <div class="filter-text">
+            <div class="filter-text-label"><lang-text ref="Hidden_Keyword"></lang-text>:</div>
             <input list="listedkeywords" type="text" ref="searchfieldkeyword" onkeydown="{onSearchKeywordKeydown}">
             <datalist id="listedkeywords">
                 <option each={keyword in listedKeywords} value="{keyword}">{keyword}</option>
             </datalist>
         </div>
-        <div class="filter-text"><lang-text ref="Search"></lang-text>: <input type="text" ref="searchfield" onkeydown="{onSearchKeydown}"></div>
+        <div class="filter-text">
+            <div class="filter-text-label"><lang-text ref="Search"></lang-text>: </div>
+            <input type="text" ref="searchfield" onkeydown="{onSearchKeydown}">
+        </div>
         <div class="btn-container">
             <button id="reset_date" click="{onResetClick}" class="btn default">Reset</button>
         </div>

js/navBar.tag

@@ -1,13 +1,14 @@
 <nav-bar>
     <div class="top">
         <img class="logo" src="images/logo.png" alt="">
-
-        <button onclick="{onNoKeywordClick}" ref="noKeyword" class="btn default {disabled: noTagCount == 0}"><i class="fa fa-fw fa-tag"></i> <lang-text ref="without_keyword"></lang-text> <label class="badge">{noTagCount}</label></button>
-        <button onclick="{onNoDateClick}" ref="noDate" class="btn default {disabled: noDateCount == 0}"><i class="fa fa-fw fa-calendar"></i> <lang-text ref="without_date"></lang-text> <label class="badge">{noDateCount}</label></button>
-        <button onclick="{onUploadClick}" ref="upload" class="btn success"><i class="fa fa-fw fa-upload"></i> <lang-text ref="Upload"></lang-text></button>
-        <button onclick="{onDeleteClick}" ref="delete" class="btn danger"><i class="fa fa-fw fa-trash-alt"></i> <lang-text ref="Delete"></lang-text></button>
-        <button onclick="{onBackClick}" ref="back" class="btn default"><i class="fa fa-fw fa-arrow-left"></i> <lang-text ref="Back"></lang-text></button>
-        <button onclick="{onLogoutClick}" ref="logout" class="btn danger"><i class="fa fa-fw fa-sign-out-alt"></i> <lang-text ref="Logout"></lang-text></button>
+        <div class="btn-row">
+            <button onclick="{onNoKeywordClick}" ref="noKeyword" class="btn default {disabled: noTagCount == 0}"><i class="fa fa-fw fa-tag"></i> <lang-text ref="without_keyword"></lang-text> <label class="badge">{noTagCount}</label></button>
+            <button onclick="{onNoDateClick}" ref="noDate" class="btn default {disabled: noDateCount == 0}"><i class="fa fa-fw fa-calendar"></i> <lang-text ref="without_date"></lang-text> <label class="badge">{noDateCount}</label></button>
+            <button onclick="{onUploadClick}" ref="upload" class="btn success"><i class="fa fa-fw fa-upload"></i> <lang-text ref="Upload"></lang-text></button>
+            <button onclick="{onDeleteClick}" ref="delete" class="btn danger"><i class="fa fa-fw fa-trash-alt"></i> <lang-text ref="Delete"></lang-text></button>
+            <button onclick="{onBackClick}" ref="back" class="btn default"><i class="fa fa-fw fa-arrow-left"></i> <lang-text ref="Back"></lang-text></button>
+            <button onclick="{onLogoutClick}" ref="logout" class="btn danger"><i class="fa fa-fw fa-sign-out-alt"></i> <lang-text ref="Logout"></lang-text></button>
+        </div>
     </div>
     <script>
         const that = this;

js/stores/docDetail.store.js

@@ -21,7 +21,7 @@ function DocDetailStore(){
                 }
                 else {
                     response.json().then(data =>{
-                        that.doc = data;
+                        that.doc = data;                    
                         that.trigger('docDetails', data);
                     });
                 }