[Redizajn 1KA] - Uporabniki --> Moji uporabniki - v2

admin/survey/SurveyAdminAjax.php

@@ -4279,7 +4279,7 @@ class SurveyAdminAjax {
 
             echo '<div id="preview_spremenljivka">';
             
-            echo '<div class="popup_close"><a href="#" onClick="preview_spremenljivka_cancle(); return false;">✕</a></div>';
+            echo '<div class="popup_close"><a href="#" onClick="preview_spremenljivka_cancel(); return false;">✕</a></div>';
 
 			include_once('../../main/survey/app/global_function.php');
 			new \App\Controllers\SurveyController(true);
@@ -4306,7 +4306,7 @@ class SurveyAdminAjax {
             
 			echo '<div class="buttons_holder">';
 			echo '<span class="floatRight">';
-			echo ' <div class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="preview_spremenljivka_cancle(); return false;"><span>' . $lang['srv_zapri'] . '</span></a></div> ';
+			echo ' <div class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="preview_spremenljivka_cancel(); return false;"><span>' . $lang['srv_zapri'] . '</span></a></div> ';
 			echo ' <div class="buttonwrapper spaceRight floatRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.open(\''.$site_url.'admin/survey/ajax.php?t=branching&a=spremenljivka_preview_print&anketa='.$this->anketa.'&spremenljivka='.$_POST['spremenljivka'].'\', \'print\', \'scrollbars=1\');  return false;"><span><img src="img_0/printer.png" /> ' . $lang['hour_print2'] . '</span></a></div> ';
 			echo '</span>';
 			echo '</div>';

admin/survey/SurveyAdminSettings.php

@@ -9208,30 +9208,34 @@ class SurveyAdminSettings {
 
 		echo '<div class="add_user_fields_wrapper">';
 
+		echo '<div class="setting_holder horizontal">';
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['name'].':</span>';
+		echo '<input type="text" class="text large" id="name" name="name">';
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['surname'].':</span>';
+		echo '<input type="text" class="text large" id="surname" name="surname">';
+		echo '</div>';
+		echo '</div>';
+
 		echo '<div class="setting_holder">';
 		echo '<p>'.$lang['email'].':</p>';
 		echo '<input type="email" class="text large" id="email" name="email"> '.(empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'');
 		echo '</div>';
 
-		echo '<div class="setting_holder">';
+		echo '<div class="setting_holder horizontal">';
-		echo '<p>'.$lang['name'].':</p>';
-		echo '<input type="text" class="text large" id="name" name="name">';
-		echo '</div>';
-
-		echo '<div class="setting_holder">';
-		echo '<p>'.$lang['surname'].':</p>';
-		echo '<input type="text" class="text large" id="surname" name="surname">';
-		echo '</div>';
-
 		echo '<div class="setting_holder">';
 		echo '<p>'.$lang['password'].':</p>';
 		echo '<input type="password" class="text large" id="password" name="password"> '.(empty($_GET['add']) && $_GET['error']=='pass'?'<span class="red">'.$lang['pass_doesnt_match'].'</span>':'');
 		echo '</div>';
 
 		echo '<div class="setting_holder">';
-		echo '<p>'.$lang['again'].':</p>';
+		echo '<p>'.$lang['password_confirm'].':</p>';
 		echo '<input type="password" class="text large" id="password2" name="password2">';
 		echo '</div>';
+		echo '</div>';
 
 		echo '</div>';
 

lang/1.php

@@ -5856,15 +5856,15 @@ $lang = array (
 	"srv_head_demografska_vprasanja"			=>	'Priporočamo standardna socio-demografska vprašanja (<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/standardna-demografija" target="_blank"><span class="bold">Podrobnosti</span></a>)',
 	"srv_manager_add_user_label"				=>	'Izberite uporabnika',
 	"srv_manager_add_user"						=>	'Dodajte novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo o podrobnostih dostopa obveščen na e-mail.</span>',
-	"srv_manager_add_user2"						=>	'Dodajte si obstoječega uporabnika nad, katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail.</span>',
+	"srv_manager_add_user2"						=>	'Dodajte si obstoječega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail.</span>',
-	"srv_manager_add_user3"						=>	'Dodajte si obstoječega uporabnika nad, katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)',
+	"srv_manager_add_user3"						=>	'Dodajte si obstoječega uporabnika, nad katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)',
 	"srv_manager_add_user4"						=>	'<span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>',
 	"srv_manager_rem_user2"						=>	'Odstranite uporabnika iz svojega pregleda',
 	"srv_manager_manager"						=>	'Uporabniki, ki imajo managerski pregled nad vašimi anketami',
 	"srv_manager_count"			    			=>	'Dodeljeni uporabniki',
 	"srv_manager_remove_alert"	    			=>	'Ste prepričani, da želite odstraniti uporabnika iz pregleda?',
 	"srv_manager_add_admin"	    			    =>	'Dodaj uporabnika v pregled',
-	"srv_manager_add_user_popup"				=>	'Dodajte obstoječega uporabnika nad katerim bo uporabnik pregled',
+	"srv_manager_add_user_popup"				=>	'Dodajte obstoječega uporabnika, nad katerim bo uporabnik imel pregled',
 	"srv_manager_count_manager"				    =>	'Managerji',
 	"create"		            				=>	'Ustvari',
 	"create_add"		            		    =>	'Ustvari in dodaj',

public/css/admin_new.css

@@ -10556,14 +10556,17 @@ div.subpage_uporabniki div.add_user {
 div.subpage_uporabniki div.add_user div#dodajanje_horizontal {
   display: flex;
   flex-direction: row;
-  gap: 64px;
   width: fit-content;
   align-self: center;
 }
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal div#dodajanje_left {
+  padding-right: 32px;
+  margin-right: 32px;
+  border-right: 1px solid #E5E5E5;
+}
 div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.add_user_fields_wrapper {
   display: flex;
   flex-direction: column;
-  align-items: flex-end;
   width: fit-content;
   margin-top: 8px;
 }
@@ -10576,6 +10579,18 @@ div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder {
 div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder:last-of-type {
   margin-bottom: 0;
 }
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 16px;
+  margin-bottom: 0;
+}
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal .setting_holder {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 16px;
+}
 div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder select.dropdown {
   width: 500px;
 }

resources/sass/admin_new/pages/settings/uporabniki.scss

@@ -90,14 +90,18 @@ div.subpage_uporabniki {
         div#dodajanje_horizontal {
             display: flex;
             flex-direction: row;
-            gap: 64px;
             width: fit-content;
             align-self: center;
 
+            div#dodajanje_left {
+                padding-right: 32px;
+                margin-right: 32px;
+                border-right: 1px solid $gray;
+            }
+
             div.add_user_fields_wrapper {
                 display: flex;
                 flex-direction: column;
-                align-items: flex-end;
                 width: fit-content;
     
                 margin-top: 8px;
@@ -109,10 +113,22 @@ div.subpage_uporabniki {
     
             .setting_holder {
                 margin-bottom: 16px;
-        
                 &:last-of-type {
                     margin-bottom: 0;
                 }
+                &.horizontal {
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    gap: 16px;
+                    margin-bottom: 0;
+        
+                    .setting_holder {
+                        display: flex;
+                        flex-direction: column;
+                        margin-bottom: 16px;
+                    }
+                }
 
                 select.dropdown {
                     width: 500px;