Merge branch 'master' of https://git.1ka.si:/git/1ka

# Conflicts:
#	public/css/admin_new.css

admin/survey/classes/class.SurveyList.php

@@ -880,65 +880,63 @@ class SurveyList {
 		global $global_user_id;
 		global $lang;
 				
-		// ali imamo star napreden vmesnik za moje ankete
-		$advancedMySurveys = UserSetting::getInstance()->getUserSetting('advancedMySurveys');
 
-		// Nastavitve zgoraj - nekatere niso prikazane pri searchu
+		// Gumba za ustvarjanje ankete - nekatere niso prikazane pri searchu
 		if($this->isSearch != 1){
 			
 			// Gumb za ustvarjanje ankete	        
-			echo '<div id="anketa_new_float">';
+			echo '<div class="first_line">';
 			$this->new_anketa_div();
 			echo '</div>';
-				
-			// Paginacija
-			echo '<div id="pagination">';
-			$this->displayPagiantion();
-			echo '</div>';
 		}		
 		
-		// Sort gumb - samo v novem vmesniku
-		if($advancedMySurveys != 1 && $this->onlyPhone == false){
-			echo '<div id="sortButton">';
-			$this->displaySortButton();
-			echo '</div>';
-		}
 
-		// Gumb za filtriranje - samo v novem vmesniku
+        // Druga vrstica - filtri in iskanje
-		//if($this->g_adminType <= 1){
+        echo '<div class="second_line">';
-		if($advancedMySurveys != 1 && $this->onlyPhone == false){
-			//echo '<div id="filterButton">';
-			$this->displayFilterButton();
-			//echo '</div>';
-		}
-		
-		// Preklop na pogled s folderji (samo ce imamo nov vmesnik)
-		if($this->isSearch != 1){
-			if($advancedMySurveys != 1 && $this->onlyPhone == false){
-				//echo '<div id="folderSwitch">';
-				$this->displayFolderSwitch();
-				//echo '</div>';
-			}
-		}
 
         // Nastavitve zgoraj - nekatere niso prikazane pri searchu
 		if($this->isSearch != 1){	
-			// Gumb z nastavitvami pogleda - za star vmesnik
-			if ($this->onlyPhone == false && $advancedMySurveys == 1){
-				$this->displaySettingsUrl();
-			}
 			
 			// Okno za search po mojeih anketah
 			echo '<div id="searchMySurveys">';
 			$this->displaySearch();	
 			echo '</div>';
+
+            // Paginacija		
+			echo '<div class="pagination top">';
+			$this->displayPagiantion();
+			echo '</div>';
 		}	
 
-		// Izris seznama anket - star oz. nov design
+        // Filtri na desni
-		if($advancedMySurveys == 1){
+		if($this->onlyPhone == false){
-			$this->displaySurveyList();
+
+            echo '<div class="filters">';
+
+            // Preklop na pogled s folderji (samo ce imamo nov vmesnik)
+			if($this->isSearch != 1){
+				//echo '<div id="folderSwitch">';
+				$this->displayFolderSwitch();
+				//echo '</div>';
 			}
-		else{
+
+		    // Gumb za filtriranje
+			//echo '<div id="filterButton">';
+			$this->displayFilterButton();
+			//echo '</div>';
+		
+            // Gumb za sortiranje
+		    echo '<div id="sortButton">';
+			$this->displaySortButton();
+			echo '</div>';
+
+            echo '</div>';
+		}
+
+        echo '</div>';
+
+		
+		// Izris seznama anket
         if($this->show_folders == 1 && $this->isSearch != 1){
             
             // Info box za posamezno anketo (hover)
@@ -983,10 +981,9 @@ class SurveyList {
         
         // Paginacija - se na dnu - ni prikazana pri searchu
         if($this->isSearch != 1){
-				echo '<div id="pagination" class="bottom">';
+            echo '<div class="pagination bottom">';
             $this->displayPagiantion();
-				echo '</div><br /><br />';
+            echo '</div>';
-			}
         }
 	}
 	
@@ -1133,14 +1130,20 @@ class SurveyList {
         global $admin_type;
         global $site_url;
 
-        echo '<span id="buttonCreate" class="floatLeft"><a href="' . $site_url . 'admin/survey/index.php?a=ustvari_anketo" title="' . $lang['srv_create_survey'] . '">';
+        echo '<a href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo" title="'.$lang['srv_create_survey'].'">';
+        echo '  <button class="large blue button_create">';
         echo $lang['srv_create_survey'];
-        echo '</a></span>';
+        echo '  </button>';
+        echo '</a>';
 
         // uporabniki z vklopljeno moznostjo imajo tudi hitro ustvarjanje ankete (brez vnosa imena in izbire skina)
         $oneclickCreateMySurveys = UserSetting::getInstance()->getUserSetting('oneclickCreateMySurveys');
         if ($oneclickCreateMySurveys == 1) {
-            echo '<span class="floatLeft" style="margin:10px 0 0 20px; font-weight:600;"><a style="vertical-align:0px; line-height:18px;" href="#" onclick="newAnketaBlank();" title="' . $lang['one_click_create'] . '"><span style="vertical-align:top;" class="faicon add icon-blue-hover-orange"></span> <span>'.$lang['one_click_create'].'</span></a>';
+            echo '<div class="button_quick_create">';
+            echo '  <a href="#" onclick="newAnketaBlank();" title="'.$lang['one_click_create'].'">';
+            echo '      <span class="faicon add"></span><span>'.$lang['one_click_create'].'</span>';
+            echo '  </a>';
+            echo '</div>';
         }
     }
 	

admin/survey/classes/tracking/CrossRoad.php

@@ -552,8 +552,10 @@ class CrossRoad {
                 # MOJE ANKETE
                 case 'pregledovanje':
                 default:
-                    $layout_width = 'fullwidth';
+                    $layout_width = 'wide';
+                    
                     if ($_GET['a'] == 'ustvari_anketo') {
+                        $layout_width = 'fullwidth';
                         $layout_menu = 'menu_left';
                         $hide_header = 'hide_header';
                     }

public/css/admin_new.css

@@ -10832,6 +10832,114 @@ and open the template in the editor.
 /* 
     Specific pages scss
 */
+/*
+    Gumbi na vrhu pri mojih anketah
+*/
+#survey_list .first_line {
+  display: flex;
+  justify-content: left;
+  align-items: center;
+  margin-bottom: 40px;
+}
+#survey_list .first_line .button_quick_create {
+  margin-left: 32px;
+}
+#survey_list .first_line .button_quick_create a {
+  text-decoration: none;
+  font-weight: 600;
+}
+#survey_list .first_line .button_quick_create .faicon {
+  margin-right: 8px;
+}
+
+/*
+    Filtri na vrhu pri mojih anketah
+*/
+#survey_list .second_line {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 40px;
+}
+#survey_list .second_line #searchMySurveys {
+  width: 33%;
+}
+#survey_list .second_line #searchMySurveys form {
+  display: flex;
+}
+#survey_list .second_line .filters {
+  display: flex;
+  justify-content: end;
+  align-items: center;
+  width: 33%;
+}
+#survey_list .second_line .filters #filterButton,
+#survey_list .second_line .filters #sortButton,
+#survey_list .second_line .filters #folderSwitch {
+  cursor: pointer;
+  box-sizing: border-box;
+  margin-left: 16px;
+  padding: 12px 8px;
+  border: 1px #C4C4C4 solid;
+  border-radius: 2px;
+}
+#survey_list .second_line .filters #filterButton #filterSettings,
+#survey_list .second_line .filters #filterButton #sortSettings,
+#survey_list .second_line .filters #sortButton #filterSettings,
+#survey_list .second_line .filters #sortButton #sortSettings {
+  visibility: hidden;
+  opacity: 0;
+  position: absolute;
+  right: 0;
+  z-index: 9999;
+  width: 160px;
+  margin-top: 12px;
+  padding: 0 10px;
+  text-align: left;
+  font-size: 12px;
+  font-weight: 400;
+  background-color: white;
+}
+#survey_list .second_line .filters #filterButton:hover #filterSettings,
+#survey_list .second_line .filters #filterButton:hover #sortSettings,
+#survey_list .second_line .filters #sortButton:hover #filterSettings,
+#survey_list .second_line .filters #sortButton:hover #sortSettings {
+  visibility: visible;
+  opacity: 1;
+}
+#survey_list .pagination {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+#survey_list .pagination.top {
+  width: 33%;
+}
+#survey_list .pagination.bottom {
+  margin-top: 32px;
+}
+
+/*
+    Seznam anket pri mojih anketah
+*/
+#survey_list .div_sl_new table#surveyList_new {
+  width: 100%;
+}
+#survey_list .div_sl_new table#surveyList_new tr td {
+  vertical-align: middle;
+  border-bottom: 1px #D3D3D3 solid;
+}
+#survey_list .div_sl_new table#surveyList_new tr.sl_header_new td {
+  height: 62px;
+  padding: 0 8px;
+  vertical-align: middle;
+  font-size: 16px;
+  font-weight: 600;
+  background-color: #F8F8F8;
+  border-top: 1px #D3D3D3 solid;
+  border-bottom: 1px #D3D3D3 solid;
+}
+
 /*
     Branching ikone, radio, checkboxi...
 */

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

@@ -0,0 +1,3 @@
+@import "top_buttons";
+@import "top_filters";
+@import "survey_list";

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

@@ -0,0 +1,34 @@
+/*
+    Seznam anket pri mojih anketah
+*/
+
+#survey_list .div_sl_new{
+
+    table#surveyList_new{
+        width: 100%;
+
+        tr{
+            
+            td{
+                vertical-align: middle;
+
+                border-bottom: 1px $dark-gray2 solid;
+            }
+
+            &.sl_header_new td{
+                height: 62px;
+                padding: 0 8px;
+
+                vertical-align: middle;
+
+                font-size: 16px;
+                font-weight: 600;
+
+                background-color: $light-gray;
+
+                border-top: 1px $dark-gray2 solid;
+                border-bottom: 1px $dark-gray2 solid;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+/*
+    Gumbi na vrhu pri mojih anketah
+*/
+
+#survey_list .first_line{
+
+    display: flex;
+    justify-content: left;
+    align-items: center;
+
+    margin-bottom: 40px;
+        
+    .button_create {
+
+    }
+
+    .button_quick_create {
+        margin-left: 32px;
+
+        a{
+            text-decoration: none;
+
+            font-weight: 600;
+        }
+
+        .faicon{
+            margin-right: 8px;
+        }
+    }
+}

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

@@ -0,0 +1,101 @@
+/*
+    Filtri na vrhu pri mojih anketah
+*/
+
+#survey_list{
+
+    .second_line{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        margin-bottom: 40px;
+
+        // Iskanje po anketah
+        #searchMySurveys{
+            width: 33%;
+
+            form{
+                display: flex;
+            }
+        }
+			
+        // Filtri
+        .filters{
+            display: flex;
+            justify-content: end;
+            align-items: center;
+
+            width: 33%;
+            
+            #filterButton,
+            #sortButton,
+            #folderSwitch{
+                cursor: pointer;
+
+                box-sizing: border-box;
+                margin-left: 16px;
+                padding: 12px 8px;
+
+                border: 1px $dark-gray solid;
+                border-radius: 2px;
+            }
+
+
+            // Gumb za sort in filtriranje - nastavitve na hover
+            #filterButton,
+            #sortButton{
+
+                #filterSettings,
+                #sortSettings{
+                    visibility: hidden;
+                    opacity: 0;
+                    
+                    position: absolute;
+                    right: 0;
+                    z-index: 9999;
+                    
+                    width: 160px;
+                    margin-top: 12px;
+                    padding: 0 10px;
+                    
+                    text-align: left;
+                    font-size: 12px;
+                    font-weight: 400;
+                    
+                    background-color: white;
+                }
+
+                &:hover{
+                    
+                    #filterSettings,
+                    #sortSettings{
+                        visibility: visible;
+                        opacity: 1;
+                    }
+                }
+            }
+            
+            // Gumb za mape
+            #folderSwitch{
+
+            }
+        }
+        
+    }
+
+    // Paginacija
+    .pagination{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        &.top{
+            width: 33%;
+        }
+
+        &.bottom{
+            margin-top: 32px;
+        }
+    }
+}