[Redizajn 1KA] - Urejanje --> Nastavitve --> Standardne besede - v7

admin/survey/SurveyAdminSettings.php

@@ -2252,7 +2252,7 @@ class SurveyAdminSettings {
 		echo '<td><div class="standardna-beseda"><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div>';
 
 		if($editor == 1) 
-			echo '<span class="faicon edit2 sb-edit blue"'.$onclick.' style="display:none;"></span>';
+			echo '<span class="faicon edit-vprasanje sb-edit blue"'.$onclick.' style="display:none;"></span>';
 
 		echo '<textarea name="srvlang_'.$text.$lang_id.'" id="polje_srvlang_'.$text.$lang_id.'"  style="display:none;">'.$value.'</textarea>';
 		echo '</div></td>';
@@ -4267,9 +4267,11 @@ class SurveyAdminSettings {
 	function arhivi_testdata() {
 		global $lang;
 		
-		$str_testdata = "SELECT count(*) FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1' OR testdata='2')";
+		$str_testdata = "SELECT count(*) as cnt, day(time_insert) as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1' OR testdata='2') GROUP BY day(time_insert)";
 		$query_testdata = sisplet_query($str_testdata);
-		list($testdata) = mysqli_fetch_row($query_testdata);
+		while ($testdata = mysqli_fetch_array($query_testdata)) {
+			echo $testdata[cnt] . $testdata[time];
+		}
 		
 		$str_testdata_auto = "SELECT count(*), add_date, add_uid FROM srv_testdata_archive WHERE ank_id='".$this->anketa."' GROUP BY add_date";
 		$query_testdata_auto = sisplet_query($str_testdata_auto);

admin/survey/script/js-lang.php

@@ -194,6 +194,7 @@ lang('srv_trans_lang');
 lang('srv_manager_remove_alert');
 lang('srv_resevanje_foto_pre_result');
 lang('srv_vrednost_correct');
+lang('srv_editor_title');
 
 
 //LOKACIJA

admin/survey/script/script.js

@@ -4796,16 +4796,20 @@ function inline_jezik_edit(id_value){
 
 	id.replaceWith('<div class="fixed-position"><div id="vrednost_edit">'+
 
-	'<br><textarea name="'+id_value+'" id="'+id_value+'">'+id.html()+'</textarea>'+
+	'<h2><span class="faicon edit-vprasanje st-besede-popup blue"></span><span>'+lang['srv_editor_title']+'</span></h2>'+
+
+	'<div class="popup_close"><a href="#" onclick="inline_jezik_reset(\''+id_value+'\');">✕</a></div>'+
+	
+	'<textarea name="'+id_value+'" id="'+id_value+'">'+id.html()+'</textarea>'+
 	
 	// Hidden textarea kamor shranimo staro vrednost, da jo lahko ponastavimo
-	'<textarea name="old_val_'+id_value+'" style="visibility:hidden; display:none;">'+id.html()+'</textarea><br />'+	
+	'<textarea name="old_val_'+id_value+'" style="visibility:hidden; display:none;">'+id.html()+'</textarea>'+	
 
     // Gumb shrani / zapri
 
-		'<div class="button_holder">'+
+		'<div class="button_holder popup">'+
-		'<button class="medium white-blue" onclick="inline_jezik_reset(\''+id_value+'\');">'+lang['srv_zapri']+'</button>'+			
+		'<button class="white-blue popup_button" onclick="inline_jezik_reset(\''+id_value+'\');">'+lang['srv_zapri']+'</button>'+			
-		'<button class="medium blue" onclick="inline_jezik_save(\''+id_value+'\');">'+lang['save']+'</button>'+
+		'<button class="blue popup_button" onclick="inline_jezik_save(\''+id_value+'\');">'+lang['save']+'</button>'+
 		'</div>'+
 	
 	'</div></div>');

resources/sass/admin_new/components/form/button.scss

@@ -13,14 +13,6 @@ submit{
 
     // Button sizes
 
-    &.table-inline{
-        padding: 4px 20px;
-        width: fit-content;
-        font-size: 14px;
-        border-radius: 2px;
-        margin-left: 16px;
-    }
-    
     &.small{
         padding: 5px 32px;
         min-width: 160px;
@@ -36,6 +28,18 @@ submit{
         min-width: 160px;
         font-size: 20px;
     }
+    &.table-inline{
+        padding: 4px 20px;
+        width: fit-content;
+        font-size: 14px;
+        border-radius: 2px;
+        margin-left: 16px;
+    }
+    &.popup_button{
+        padding: 4px 8px;
+        min-width: 128px;
+        font-size: 16px;
+    }
 
 
     // Button colors

resources/sass/admin_new/components/popup/basic.scss

@@ -109,7 +109,7 @@
     .button_holder{
         justify-content: end !important;
 
-        margin: 16px 0 0 0;
+        margin: 20px 0 0 0;
 
         button:last-child{
             margin-right: 0;

resources/sass/admin_new/pages/my_surveys/standardne_besede.scss

@@ -14,7 +14,7 @@ table#standard_words_table {
                 box-sizing: border-box;
                 border-radius: 2px;
         
-                padding: 8px 20px 8px 8px;
+                padding: 4px 8px;
                 width: 92%;
                 min-height: 32px;
         
@@ -26,9 +26,14 @@ table#standard_words_table {
                 }
             }
         
-            span.faicon.sb-edit {
+            span.faicon.edit-vprasanje {
                 margin-left: 8px;
                 cursor: pointer;
+                
+                transition: 0.2s;
+                &:hover{
+                    color: $dark-blue;
+                }
             }
         
         }
@@ -42,3 +47,8 @@ table#standard_words_table {
         }
     }
 }
+
+span.faicon.st-besede-popup {
+    margin-right: 6px;
+    pointer-events: none;
+}