From d260e70f12df694b16d021036a3093627bf25fb5 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 29 Sep 2022 13:40:18 +0200
Subject: [PATCH] [Redizajn 1KA v2] - Uporabniki --> Dodaj uporabnika v1

---
 admin/survey/SurveyAdminSettings.php          |  6 +--
 public/css/admin_new.css                      | 52 +++++++------------
 .../admin_new/pages/settings/uporabniki.scss  | 49 ++++++-----------
 3 files changed, 35 insertions(+), 72 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index ab40db73e..fc6a919ee 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -9161,8 +9161,6 @@ class SurveyAdminSettings {
 		echo '<div id="new_user_option">';
         echo '<form class="manager_add_user" name="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">';
         
-		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>';
@@ -9192,9 +9190,7 @@ class SurveyAdminSettings {
 		echo '</div>';
 		echo '</div>';
 
-		echo '</div>';
-
-		echo '<div class="button_holder">';
+		echo '<div class="button_holder top16">';
         echo '<button class="medium blue" onClick="document.manager_add_user.submit();">'.$lang['create_add'].'</button>';
         echo '</div>';
         echo '</form>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index c360c4eb8..d00450472 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -11545,55 +11545,41 @@ div.subpage_uporabniki .data_table_top_holder #end {
 div.subpage_uporabniki div.users_list_box {
   padding: 0 12px;
 }
-div.subpage_uporabniki div.add_user {
-  margin-bottom: 32px;
-}
-div.subpage_uporabniki div.add_user div#dodajanje_horizontal {
-  display: flex;
-  flex-direction: row;
-  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;
-  width: fit-content;
-  margin-top: 8px;
-}
-div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.button_holder {
-  margin: 32px 0 0 0;
-}
-div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder {
+div.subpage_uporabniki .users_list_box #new_user_option .setting_holder,
+div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder {
   margin-bottom: 16px;
 }
-div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder:last-of-type {
+div.subpage_uporabniki .users_list_box #new_user_option .setting_holder:last-of-type,
+div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder:last-of-type {
   margin-bottom: 0;
 }
-div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal {
+div.subpage_uporabniki .users_list_box #new_user_option .setting_holder.horizontal,
+div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.horizontal {
   display: flex;
   flex-direction: row;
   align-items: center;
   gap: 16px;
-  margin-bottom: 0;
+  margin-bottom: 16;
 }
-div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal .setting_holder {
+div.subpage_uporabniki .users_list_box #new_user_option .setting_holder.horizontal .setting_holder,
+div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.horizontal .setting_holder {
   display: flex;
   flex-direction: column;
-  margin-bottom: 16px;
+  margin-bottom: 0;
 }
-div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder select.dropdown {
+div.subpage_uporabniki .users_list_box #new_user_option .setting_holder select.dropdown,
+div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder select.dropdown {
   width: 500px;
 }
-div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder p.bottom4 {
+div.subpage_uporabniki .users_list_box #new_user_option .setting_holder p.bottom4,
+div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder p.bottom4 {
   margin-bottom: 4px;
 }
-
-table#unconfirmed_mail_user_list {
+div.subpage_uporabniki .users_list_box #new_user_option div.button_holder,
+div.subpage_uporabniki .users_list_box #existing_user_option div.button_holder {
+  margin: 32px 0 0 0;
+}
+div.subpage_uporabniki table#unconfirmed_mail_user_list {
   border-left: 1px solid #E5E5E5;
   border-right: 1px solid #E5E5E5;
 }
diff --git a/resources/sass/admin_new/pages/settings/uporabniki.scss b/resources/sass/admin_new/pages/settings/uporabniki.scss
index 0571dfde9..3cdf2fbc5 100644
--- a/resources/sass/admin_new/pages/settings/uporabniki.scss
+++ b/resources/sass/admin_new/pages/settings/uporabniki.scss
@@ -86,33 +86,11 @@ div.subpage_uporabniki {
 
     // Dodajanje
 
-    div.add_user {
-        margin-bottom: 32px;
-        
-        div#dodajanje_horizontal {
-            display: flex;
-            flex-direction: row;
-            width: fit-content;
-            align-self: center;
+    .users_list_box {
 
-            div#dodajanje_left {
-                padding-right: 32px;
-                margin-right: 32px;
-                border-right: 1px solid $gray;
-            }
+        #new_user_option,
+        #existing_user_option {
 
-            div.add_user_fields_wrapper {
-                display: flex;
-                flex-direction: column;
-                width: fit-content;
-    
-                margin-top: 8px;
-            }
-
-            div.button_holder {
-                margin: 32px 0 0 0;
-            }
-    
             .setting_holder {
                 margin-bottom: 16px;
                 
@@ -124,30 +102,33 @@ div.subpage_uporabniki {
                     flex-direction: row;
                     align-items: center;
                     gap: 16px;
-                    margin-bottom: 0;
+                    margin-bottom: 16;
         
                     .setting_holder {
                         display: flex;
                         flex-direction: column;
-                        margin-bottom: 16px;
+                        margin-bottom: 0;
                     }
                 }
-
+        
                 select.dropdown {
                     width: 500px;
                 }
-
+        
                 p.bottom4 {
                     margin-bottom: 4px;
                 }
             }
+    
+            div.button_holder {
+                margin: 32px 0 0 0;
+            }
 
         }
     }
-    
-}
 
-table#unconfirmed_mail_user_list {
-    border-left: 1px solid $gray;
-    border-right: 1px solid $gray;
+    table#unconfirmed_mail_user_list {
+        border-left: 1px solid $gray;
+        border-right: 1px solid $gray;
+    }
 }
\ No newline at end of file