[Redizajn 1KA] - Uporabniki

admin/survey/SurveyAdminSettings.php

@@ -9326,6 +9326,7 @@ class SurveyAdminSettings {
 		echo '<table id="all_users_list" class="usersTable">';
         
         echo '<thead><tr>';
+        echo '<th>'.$lang['edit2'].'</th>';
         echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
         echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>';
         echo '<th>' . $lang['admin_type'] . '</th>';
@@ -9338,7 +9339,6 @@ class SurveyAdminSettings {
         echo '<th>' . $lang['users_gdpr_title'] . '</th>';
         echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
         echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
-        echo '<th>'.$lang['edit2'].'</th>';
         echo '</tr></thead>';
         
         echo '</table>';

admin/survey/classes/class.Dostop.php

@@ -1186,6 +1186,9 @@ class Dostop {
 
             foreach ($vsi as $uporabnik) {
                 $seznam[] = [
+					'<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
+                    '<span class="gray"> | </span><a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
+                    '<span class="gray"> | </span><a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>',
                     iconv(mb_detect_encoding( $uporabnik->name, mb_detect_order(), true), "UTF-8", $uporabnik->name) .' '.iconv(mb_detect_encoding( $uporabnik->surname, mb_detect_order(), true), "UTF-8", $uporabnik->surname),
                     (!empty($uporabnik->second_email) ? iconv(mb_detect_encoding(  $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding(  $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
                     $this->userTypeToText($uporabnik->type),
@@ -1197,10 +1200,7 @@ class Dostop {
                     (!empty($uporabnik->st_managerjev) ? $uporabnik->st_managerjev : 0),
                     $lang["users_gdpr".$uporabnik->gdpr_agree],
                     $uporabnik->registriran,
-                    $uporabnik->last_login,
-                    '<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
-                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
-                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>'
+                    $uporabnik->last_login
                 ];
             }
         }

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

@@ -5,9 +5,4 @@
 
 @import "archives";
 @import "import_export";
-@import "missing_values";
-@import "standardne_besede";
 @import "podatki";
-@import "oblika_teme";
-@import "nastavitve_komentarji";
-

resources/sass/admin_new/pages/pages.scss

@@ -24,4 +24,6 @@
 @import "survey_data/survey_data";
 @import "survey_analysis/survey_analysis";
 
+@import "users/users";
+
 

resources/sass/admin_new/pages/survey_edit/survey_edit.scss

@@ -14,6 +14,10 @@
 
 // Urejanje -> Nastavitve
 @import "survey_settings/survey_settings";
+@import "oblika_teme";
+@import "nastavitve_komentarji";
+@import "missing_values";
+@import "standardne_besede";
 
 // Popupi
 @import "popups/popups";

resources/sass/admin_new/pages/users/users.scss

@@ -0,0 +1,81 @@
+//Gumbi
+.dt-buttons {
+	margin: 0 12px 16px 12px;
+}
+
+button.dt-button {
+
+    padding: 5px 32px;
+    font-size: 14px;
+
+    margin-right: 4px;
+	
+    color: $white;
+	background-color: $blue;
+	&:hover, .active {
+		background-color: darken($blue, 3%);
+	}
+}
+
+//Dodatni gumbi za vidnost stolpcev
+.dt-button-collection {
+	padding-top: 48px;
+}
+
+button.buttons-columnVisibility {
+	color: $black;
+    background-color: $gray;
+    border: 1px solid  $black;
+    &:hover {
+        background-color: darken($gray, 5%);
+    }
+
+	&.active {
+		color: $blue;
+        background-color: $white;
+        border: 1px solid $blue;
+        &:hover {
+            background-color: darken($white, 5%);
+        }
+	}
+
+    margin-bottom: 8px;
+    margin-right: 4px;
+}
+
+// Search + število prikazanih
+.dataTables_length {
+    margin-left: 12px;
+
+    select {
+        border: 1px solid $dark-gray;
+        box-sizing: border-box;
+        border-radius: 2px;
+        cursor: pointer;
+
+        font-size: 16px;
+        padding: 3px 7px;
+
+        option {
+            font-size: 16px;
+            line-height: 18px;             
+        }
+    }
+}
+
+.dataTables_filter {
+
+    input {
+        border: 1px solid $dark-gray;
+        box-sizing: border-box;
+        border-radius: 2px;
+
+        height: 40px;
+        font-size: 16px;
+        padding: 9px 7px;
+    }
+}
+
+.dataTables_info {
+    margin-left: 12px;
+}