Merge branch 'master' into release/produkcija

admin/survey/SurveyAdminAjax.php

@@ -417,29 +417,45 @@ class SurveyAdminAjax {
 			
 			echo '<h2>'.$lang['srv_ime'].'</h2>';
 			
-			echo '<div class="quick_title_edit_label taLeft floatLeft">'.$lang['srv_novaanketa_polnoime'].':</div>';
+
-			echo '<div class="floatLeft" >';
+            echo '<div class="quick_title_setting">';
-			echo '<input type="text" id="novaanketa_naslov_1" name="novaanketa_naslov_1" value="'.$naslov.'" class="full" maxlength="'.ANKETA_NASLOV_MAXLENGTH.'"  onfocus="if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" />';
+
-			echo '<span id="novaanketa_naslov_1_chars" class="spaceLeft">'.mb_strlen($naslov, 'UTF-8').'/'.ANKETA_NASLOV_MAXLENGTH.'</span>';
+			echo '  <div class="title_line">'.$lang['srv_novaanketa_polnoime'].':</div>';
-			echo '<br class="clr"/><i class="gray small">'.$lang['srv_interno_ime'].'</i>';
+			echo '  <div class="setting_line">';
-			echo '</div>';
+			echo '      <input type="text" id="novaanketa_naslov_1" name="novaanketa_naslov_1" value="'.$naslov.'" class="medium" maxlength="'.ANKETA_NASLOV_MAXLENGTH.'"  onfocus="if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" />';
+			echo '      <span id="novaanketa_naslov_1_chars" class="counter">'.mb_strlen($naslov, 'UTF-8').'/'.ANKETA_NASLOV_MAXLENGTH.'</span>';
+			echo '  </div>';
+			echo '  <div class="opomba_line">';
+			echo        $lang['srv_interno_ime'];
+			echo '  </div>';
+
+            echo '</div>';
 			
-			echo '<br class="clr"/><br class="clr"/>';
+
-			
+            echo '<div class="quick_title_setting">';
-			echo '<div class="quick_title_edit_label taLeft floatLeft">'.$lang['srv_novaanketa_kratkoime'].':</div>';
+
-			echo '<div class="floatLeft">';
+			echo '  <div class="title_line">'.$lang['srv_novaanketa_kratkoime'].':</div>';
+			echo '  <div class="setting_line">';
 			$name_changed = ($naslov != $akronim) ? '1' : '0';
-			echo '<input type="text" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="'.$akronim.'" class="full" maxlength="'.ANKETA_AKRONIM_MAXLENGTH.'"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" changed="'.$name_changed.'" />';
+			echo '      <input type="text" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="'.$akronim.'" class="medium" maxlength="'.ANKETA_AKRONIM_MAXLENGTH.'"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" changed="'.$name_changed.'" />';
-			echo '<span id="novaanketa_akronim_1_chars" class="spaceLeft">'.mb_strlen($akronim, 'UTF-8').'/'.ANKETA_AKRONIM_MAXLENGTH.'</span>';
+			echo '      <span id="novaanketa_akronim_1_chars" class="counter">'.mb_strlen($akronim, 'UTF-8').'/'.ANKETA_AKRONIM_MAXLENGTH.'</span>';
-			echo '<br class="clr"/><i class="gray small">'.$lang['srv_objavljeno_ime'].'</i>';
+			echo '  </div>';
-			echo '</div>';
+			echo '  <div class="opomba_line">';
-			
+            echo        $lang['srv_objavljeno_ime'];
-			echo '<br class="clr"/><br class="clr"/>';
+			echo '  </div>';
-			
+
-			echo '<div class="quick_title_edit_label taLeft floatLeft">'.$lang['srv_list_no_data_create_note'].':</div>';
+            echo '</div>';
-			echo '<div class="floatLeft">';
+
-			echo '<textarea id="novaanketa_opis_1" name="novaanketa_opis_1" class="full" rows="3">'.$row['intro_opomba'].'</textarea>';
+
-			echo '</div>';
+            echo '<div class="quick_title_setting">';
+
+			echo '  <div class="title_line">'.$lang['srv_list_no_data_create_note'].':</div>';
+			echo '  <div class="setting_line">';
+			echo '      <textarea id="novaanketa_opis_1" name="novaanketa_opis_1" class="full" rows="3">'.$row['intro_opomba'].'</textarea>';
+			echo '  </div>';
+
+            echo '</div>';
+
 			
 			echo '<script>';
 			echo "$('#novaanketa_naslov_1').keyup(function(){
@@ -473,12 +489,10 @@ class SurveyAdminAjax {
 			    ";
 			echo '</script>';
 			
-			
+			           
-	        //echo '<span class="floatleft spaceLeft" title="'.$lang['srv_settings_quick'].'"><a class="" href="#" onclick="quick_title_edit_save(\'true\'); return false;"><span>'.$lang['srv_settings_quick'].'</span></a></span>';
+            echo '<div class="button_holder">';
-           
+	        echo '  <button class="medium white-blue" title="'.$lang['srv_cancel'].'" onclick="quick_title_edit_cancel(); return false;">'.$lang['srv_cancel'].'</button>';
-            echo '<div class="buttons_holder">';
+			echo '  <button class="medium blue" title="'.$lang['srv_save_profile_yes'].'" onclick="quick_title_edit_save(); return false;">'.$lang['srv_save_profile_yes'].'</button>';
-			echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_save_profile_yes'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="quick_title_edit_save(); return false;"><span>'.$lang['srv_save_profile_yes'].'</span></a></span>';
-	        echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="quick_title_edit_cancel(); return false;"><span>'.$lang['srv_cancel'].'</span></a></span>';
             echo '</div>';
             
 			echo '</div>';

admin/survey/classes/class.GDPR.php

@@ -376,8 +376,8 @@ class GDPR{
 
 			echo '<p class="bold bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</p>';
 			
-			echo '<div class="table-horizontal-scroll-wrapper1" id="gdrp_requests_unresolved">';
+			echo '<div class="table-horizontal-scroll-wrapper-outer" id="gdrp_requests_unresolved">';
-        	echo '<div class="table-horizontal-scroll-wrapper2">';
+			echo '<div class="table-horizontal-scroll-wrapper-inner">';
 			
 			echo '<table class="gdpr_surveys requests">';
 
@@ -491,6 +491,9 @@ class GDPR{
 								ORDER BY date(r.datum) ASC");
 		if(mysqli_num_rows($sql) > 0){
 
+            echo '<div class="table-horizontal-scroll-wrapper-outer">';
+			echo '<div class="table-horizontal-scroll-wrapper-inner">';
+
 			echo '<table class="gdpr_surveys requests all">';
 
 			echo '<tr>';
@@ -564,6 +567,9 @@ class GDPR{
 			}
 
 			echo '</table>';
+
+            echo '</div>';
+            echo '</div>';
 		}
 		else{
 			echo '<p>'.$lang['srv_gdpr_requests_none'].'</p>';
@@ -588,6 +594,9 @@ class GDPR{
 			echo '	<span class="requests_table_title"><span id="requests_table_title_plus">+</span><span id="requests_table_title_minus" style="display:none;">-</span> '.$lang['srv_gdpr_requests_done'].'</span>';
 			echo '</a>';
 			
+            echo '<div class="table-horizontal-scroll-wrapper-outer">';
+			echo '<div class="table-horizontal-scroll-wrapper-inner">';
+
 			echo '<table class="gdpr_surveys requests" id="table_requests_done" style="margin-top:0; display:none;">';
 
 			echo '<tr>';
@@ -661,6 +670,9 @@ class GDPR{
 			}
 
 			echo '</table>';
+
+            echo '</div>';
+            echo '</div>';
 		}
 	}
 
@@ -1224,6 +1236,7 @@ class GDPR{
 		$request_list_done = self::getUserRequests($ank_id, $status=1);
 
 		if(count($request_list) > 0){
+
 			echo '<table class="gdpr_surveys requests">';
 
 			echo '<tr>';
@@ -1811,20 +1824,17 @@ class GDPR{
 				}
 
 				$resultX = $MA->sendMail($content, $subject);
-		   }
+		    }
-		   catch (Exception $e){
+		    catch (Exception $e){
-		   }			
+		    }			
 			
 			// Vrnemo vse ok
-        if($jezik == '2'){
+            if($jezik == '2'){
-            $success_text = 'Your request for the deletion, change or insight into your personal information for a particular survey is submitted to 
+                $success_text = 'Your request for the deletion, change or insight into your personal information for a particular survey is submitted to the author of the survey.<br>The author of the survey must, within a month since you submitted the request, execute your request and inform you about it.<br>If the author fails to do so within 30 days, we will delete the survey, including your information.';
-                            the author of the survey. The author of the survey must, within a month since you submitted the request, execute your 
+            }
-                            request and inform you about it. If the author fails to do so within 30 days, we will delete the survey, including your information.';
+            else {
-        }else {
+                $success_text = 'Prošnja za izbris, spremembo ali vpogled do vaših osebnih podatkov iz določene ankete je posredovana avtorju ankete.<br>Avtor ankete mora v roku meseca dni od oddane zahteve urediti vašo zahtevo in vas o tem obvestiti.<br>Če v roku 30 dni avtor tega ne izvede, bomo anketo izbrisali, vključno z vašimi podatki.';
-            $success_text = 'Prošnja za izbris, spremembo ali vpogled do vaših osebnih podatkov iz določene ankete je posredovana avtorju ankete. 
+            }
-                            Avtor ankete mora v roku meseca dni od oddane zahteve urediti vašo zahtevo in vas o tem obvestiti. 
-                            Če v roku 30 dni avtor tega ne izvede, bomo anketo izbrisali, vključno z vašimi podatki.';
-        }
 
 			$response = json_encode(array('success' => $success_text), true);
 		}
@@ -1985,8 +1995,7 @@ class GDPR{
 			
 			// Poslji prosnjo
 			echo '			<p>'.$lang['srv_gdpr_drupal_end'].'</p>';
-			//echo '			<input name="submit" value="'.$lang['srv_potrdi'].'" class="regfield" type="submit"><br />';
+			echo '			<input name="submit" value="'.$lang['srv_potrdi2'].'" class="regfield" type="button" onClick="sendGDPRRequest();">';
-			echo '			<input name="submit" value="'.$lang['srv_potrdi'].'" class="regfield" type="button" onClick="sendGDPRRequest();"><br />';
 			
 			echo '		</form>';
 		}

admin/survey/classes/tracking/CrossRoad.php

@@ -566,8 +566,10 @@ class CrossRoad {
 
                 # GDPR
                 case 'gdpr':
-                    if ($_GET['m'] == 'gdpr_requests' || $_GET['m'] == 'gdpr_requests_all')
+                    if ($_GET['m'] == 'gdpr_requests')
                         $layout_width = 'wide';  
+                    elseif ($_GET['m'] == 'gdpr_requests_all')
+                        $layout_width = 'fullwidth';  
                     else
                         $layout_width = 'narrow';  
 

admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php

@@ -47,10 +47,12 @@ class SurveyGeoIP{
         echo '<p class="bold">'.$lang['srv_geoip_warning'].'</p>';
 
 
-		echo '<div>';
+		echo '<div class="geoip_holder">';
-        echo '<div class="floatLeft">';
+
         
 		// Izpis tabele frekvenc
+        echo '<div class="geoip_table_holder">';
+
 		echo '<table class="geoip_table">';
 		
 		// Prva vrstica
@@ -109,7 +111,7 @@ class SurveyGeoIP{
         // Google maps on right of table
         if(count($this->countriesLocationsData)>0){
 
-            echo '<div class="floatLeft" style="margin: 15px 0px 0px 50px;">';
+            echo '<div class="geoip_map_holder">';
 
             if(count($this->countriesLocationsData) > 1)
                 $this->displayNavigationMaps();
@@ -122,6 +124,8 @@ class SurveyGeoIP{
             
             echo '<script type="text/javascript">passMapDataRaw('.json_encode($cities).');googleMapsAPIProcedura(initializeMapGeneralForIPs);</script>';
         }
+        
+
         echo '</div>';
 	}
 	
@@ -248,29 +252,9 @@ class SurveyGeoIP{
         $countries = mb_convert_encoding($this->countriesLocationsData, "UTF-8", "ISO-8859-1");
         $cities = mb_convert_encoding($this->data['all']['all']['cities'], "UTF-8", "ISO-8859-1");
 
-        echo '<div class="secondNavigation">';
+        echo '<div class="geoip_navigation">';
-        echo '<ul class="secondNavigation">';
+        echo '  <a class="active" id="geoip_cities" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($cities).');\'>'.$lang['srv_geoip_map_cities'].'</a>';
-
+        echo '  <a id="geoip_countries" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($countries).');\'>'.$lang['srv_geoip_map_countries'].'</a>';
-        echo'<li>';
-        echo '<a class="no-img active" id="geoip_cities" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($cities).');\'>';
-        echo '<span class="label">' . $lang['srv_geoip_map_cities'] . '</span>';
-        echo '</a>';
-        echo'</li>';
-
-        #space
-        echo'<li class="displayNone">';
-        echo'</li>';
-
-        echo'<li>';
-        echo '<a class="no-img" id="geoip_countries" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($countries).');\'>';
-        echo '<span class="label">' . $lang['srv_geoip_map_countries'] . '</span>';
-        echo '</a>';
-        echo'</li>';
-
-        echo'</ul>';
         echo '</div>';
-
-        echo '<br class="clr" />';
-        echo '<br class="clr" />';
     }
 }

frontend/simple/classes/DisplayController.php

@@ -475,42 +475,45 @@ class DisplayController{
                         echo '<img class="povezave_img" src="public/img/icons/icon_kako_deluje.svg" alt="kako deluje">';
                         echo '<h2>'.$lang["povezave__kako_deluje_h2"].'</h2>';
                         echo '<p> '.$lang["povezave__kako_deluje_text"].' </p>';
-                        echo '<a id="povezave-btn"href="https://www.1ka.si/d/sl/pomoc"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        if($lang['id'] == '1')
+                            echo '<a id="povezave-btn"href="https://www.1ka.si/d/sl/pomoc" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        else
+                            echo '<a id="povezave-btn"href="https://www.1ka.si/d/en/help" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
                     echo '</div>';
 
                     echo '<div class= "col"> ';
                         echo '<img class="povezave_img" src="public/img/icons/icon_o_1ka.svg" alt="o 1ka">';
                         echo '<h2>'.$lang["povezave_o_1ka_h2"].'</h2>';
                         echo '<p> '.$lang["povezave_o_1ka_text"].' </p>';
-                        echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/o-1ka/splosen-opis"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        if($lang['id'] == '1')
+                            echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/o-1ka/splosen-opis" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        else
+                            echo ' <a id="povezave-btn" href="https://www.1ka.si/d/en/about/general-description" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
                     echo '</div>';
 
                     echo '<div class= "col"> ';
                         echo '<img class="povezave_img" src="public/img/icons/icon_1ka_podpora.svg" alt="1ka podpora">';
                         echo '<h2>'.$lang["povezave_1ka_podpora_h2"].'</h2>';
                         echo '<p> '.$lang["povezave_1ka_podpora_text"].' </p>';
-                        echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/pomoc"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        if($lang['id'] == '1')
+                            echo ' <a id="povezave-btn" href="https://www.1ka.si/help1KA" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        else
+                            echo ' <a id="povezave-btn" href="https://www.1ka.si/a/72864?Q1=292032&language=2" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
                     echo '</div>';
 
                     echo '<div class= "col"> ';
                         echo '<img class="povezave_img" src="public/img/icons/icon_arnes_podpora.svg" alt="arnes podpora">';
                         echo '<h2>'.$lang["povezave_arnes_podpora_h2"].'</h2>';
                         echo '<p> '.$lang["povezave_arnes_podpora_text"].' </p>';
-                        echo ' <a id="povezave-btn" href="https://www.arnes.si/zavod-arnes/kontakti/"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        if($lang['id'] == '1')
+                            echo ' <a id="povezave-btn" href="https://www.arnes.si/zavod-arnes/kontakti/" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        else
+                            echo ' <a id="povezave-btn" href="https://www.arnes.si/about-arnes/contact-us/" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
                     echo '</div>';
 
                 echo '</div>';
             echo '</div>';
-        echo '</div>';
+        echo '</div>';    
-
-
-
-        // APP SUBTITLE
-        /*echo '<div class="app_subtitle">';
-        echo $lang['app_aai_installation'];
-        echo '</div>';*/
-
-        
     }
 
     // Izris okna za login na prvi strani

frontend/simple/css/style.css

@@ -273,13 +273,6 @@ footer .footer_content .col .logo_holder img {
   background-color: #4ca0ea;
 }
 
-.aai .cookie_notice button {
-  background-color: #e35205;
-}
-.aai .cookie_notice button:hover {
-  background-color: #fa6c21;
-}
-
 body.landing_page #main,
 body.register #main,
 body.login #main,
@@ -723,82 +716,6 @@ body.reset_password_activate div.label {
 }
 
 /******************************/
-body.landing_page #content.aai #main,
-body.register #content.aai #main,
-body.login #content.aai #main,
-body.login_noEmail #content.aai #main {
-  min-height: auto;
-  background-image: url("../img/landing_page_image_aai.png");
-}
-body.landing_page #content.aai #main .landing_page_window,
-body.register #content.aai #main .landing_page_window,
-body.login #content.aai #main .landing_page_window,
-body.login_noEmail #content.aai #main .landing_page_window {
-  width: 500px;
-  padding: 50px;
-  margin-top: 70px;
-  text-align: center;
-  box-shadow: 1px 1px 4px 1px #999;
-}
-body.landing_page #content.aai #main .landing_page_window .app_title,
-body.register #content.aai #main .landing_page_window .app_title,
-body.login #content.aai #main .landing_page_window .app_title,
-body.login_noEmail #content.aai #main .landing_page_window .app_title {
-  width: 500px;
-  margin: 0;
-  color: #333;
-}
-body.landing_page #content.aai #main .landing_page_window .arnes_logo,
-body.register #content.aai #main .landing_page_window .arnes_logo,
-body.login #content.aai #main .landing_page_window .arnes_logo,
-body.login_noEmail #content.aai #main .landing_page_window .arnes_logo {
-  margin: 30px 0;
-}
-body.landing_page #content.aai #main .landing_page_window .arnes_logo img,
-body.register #content.aai #main .landing_page_window .arnes_logo img,
-body.login #content.aai #main .landing_page_window .arnes_logo img,
-body.login_noEmail #content.aai #main .landing_page_window .arnes_logo img {
-  width: 200px;
-  height: auto;
-}
-body.landing_page #content.aai #main .landing_page_window .tab,
-body.register #content.aai #main .landing_page_window .tab,
-body.login #content.aai #main .landing_page_window .tab,
-body.login_noEmail #content.aai #main .landing_page_window .tab {
-  font-size: 16px;
-  text-transform: none;
-  line-height: 24px;
-}
-body.landing_page #content.aai #main .landing_page_window input[type=button],
-body.register #content.aai #main .landing_page_window input[type=button],
-body.login #content.aai #main .landing_page_window input[type=button],
-body.login_noEmail #content.aai #main .landing_page_window input[type=button] {
-  width: auto;
-  padding: 18px 30px;
-  margin: 30px 0 10px 0;
-  font-weight: 600;
-  text-transform: none;
-  background-color: #e35205;
-  border-radius: 5px;
-}
-body.landing_page #content.aai #main .landing_page_window input[type=button]:hover,
-body.register #content.aai #main .landing_page_window input[type=button]:hover,
-body.login #content.aai #main .landing_page_window input[type=button]:hover,
-body.login_noEmail #content.aai #main .landing_page_window input[type=button]:hover {
-  background-color: #fa6c21;
-}
-body.landing_page #content.aai #main .app_subtitle,
-body.register #content.aai #main .app_subtitle,
-body.login #content.aai #main .app_subtitle,
-body.login_noEmail #content.aai #main .app_subtitle {
-  width: 500px;
-  margin: 10px auto;
-  color: #333;
-  font-size: 20px;
-  font-weight: 600;
-  text-shadow: none;
-}
-
 /* Mobile prilagoditve */
 @media screen and (max-width: 700px) {
   header nav {

lang/1.php

@@ -2355,6 +2355,7 @@ $lang = array (
 	"srv_statistics_edit" 	=>	 "Uvodni tekst h rezultatom",
     "srv_zapri"             =>	 "Zapri",
     "srv_potrdi"            =>	 "Potrdi",
+    "srv_potrdi2"           =>	 "Potrdi",
     "srv_potrdi_new"        =>	 "Ustvari novo anketo",
     "srv_create_new"        =>	 "Kreiraj",
 	"srv_create_survey"     =>	 "Ustvari Anketo",

lang/2.php

@@ -2340,6 +2340,7 @@ $lang = array (
 	"srv_statistics_edit" 	=>	"Intro text for results",
     "srv_zapri"             =>  "Close",
     "srv_potrdi"            =>  "Confirm",
+    "srv_potrdi2"           =>	"Submit",
     "srv_potrdi_new"        =>  "Confirm",
     "srv_create_new"        =>	"Create",
 	"srv_create_survey"     =>	"Create Survey",

public/css/admin_new.css

@@ -10145,6 +10145,21 @@ div .table-horizontal-scroll-wrapper2 table {
   margin: 0px;
 }
 
+.table-horizontal-scroll-wrapper-outer {
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+}
+.table-horizontal-scroll-wrapper-outer .table-horizontal-scroll-wrapper-inner {
+  overflow-x: auto;
+  width: 100%;
+}
+.table-horizontal-scroll-wrapper-outer .table-horizontal-scroll-wrapper-inner table {
+  width: 100%;
+  table-layout: auto !important;
+  margin-bottom: 0;
+}
+
 /*
     Placljive vsebine
 */
@@ -11151,6 +11166,11 @@ table.variableView {
   width: 100%;
 }
 
+.fullwidth #gdpr_nastavitve {
+  padding: 0 16px;
+  box-sizing: border-box;
+}
+
 table.gdpr_surveys {
   table-layout: fixed;
   width: 100%;
@@ -13302,6 +13322,35 @@ div.drop_setting_transition {
   background-color: #F8F8F8;
 }
 
+/*
+    Status - ip lokacija
+*/
+.page_geoip_location .geoip_holder {
+  display: flex;
+  margin: 16px 0 0 0;
+}
+.page_geoip_location .geoip_holder .geoip_table_holder {
+  width: 100%;
+}
+.page_geoip_location .geoip_holder .geoip_table_holder .geoip_table {
+  width: 100%;
+  margin: 0;
+}
+.page_geoip_location .geoip_holder .geoip_map_holder {
+  margin: 0 0 0 32px;
+}
+.page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation {
+  display: flex;
+  margin-bottom: 16px;
+}
+.page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation a {
+  margin-right: 16px;
+  color: #808080;
+}
+.page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation a:hover, .page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation a.active {
+  color: #1E88E5;
+}
+
 /*
     Branching ikone, radio, checkboxi...
 */
@@ -21779,12 +21828,21 @@ span.faicon.st-besede-popup {
 /* Survey title edit */
 #quick_title_edit {
   position: relative;
-  width: 720px;
-  height: 265px;
 }
-#quick_title_edit .quick_title_edit_label {
+#quick_title_edit .quick_title_setting {
-  width: 145px;
+  margin-bottom: 16px;
-  font-weight: 600;
+}
+#quick_title_edit .quick_title_setting .setting_line {
+  display: flex;
+  align-items: center;
+}
+#quick_title_edit .quick_title_setting .setting_line input {
+  margin-right: 8px;
+}
+#quick_title_edit .quick_title_setting .opomba_line {
+  font-size: 14px;
+  font-style: italic;
+  color: #a9a9a9;
 }
 
 /*
@@ -26821,6 +26879,9 @@ ul#merge li {
   overflow: hidden;
   font-size: 14px;
 }
+.quick_edit_container #edit_survey_data .quick_edit_inner {
+  width: 100%;
+}
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka {
   box-sizing: border-box;
   width: 100%;
@@ -26843,6 +26904,12 @@ ul#merge li {
   font-weight: 700;
   font-size: 20px;
 }
+.quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka .naslov .spremenljivka_info {
+  margin-top: 4px;
+  color: #a9a9a9;
+  font-size: 14px;
+  font-weight: 400;
+}
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka .variable_holder {
   height: auto !important;
 }

resources/sass/admin_new/components/table/table.scss

@@ -70,18 +70,36 @@ div {
         width: 100%;
 
         margin: 8px 0;
-  }
+    }
 
     .table-horizontal-scroll-wrapper2 {
         display: table-cell;
         overflow-x: auto;
         width: 100%;
 
-    table {
+        table {
-        width: 100%;
+            width: 100%;
-        border-collapse: collapse;
+            border-collapse: collapse;
-        white-space: nowrap;
+            white-space: nowrap;
-        margin: 0px;
+            margin: 0px;
+        }
     }
-  }
+}
-}
+
+.table-horizontal-scroll-wrapper-outer{
+    display: table;
+    table-layout: fixed;
+    width: 100%;
+
+    .table-horizontal-scroll-wrapper-inner{
+        overflow-x: auto;
+        width: 100%;
+
+        table {
+            width: 100%;
+            table-layout: auto !important;
+
+            margin-bottom: 0;
+        }
+    }
+}

resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss

@@ -1,5 +1,10 @@
 // GDPR tabele
 
+.fullwidth #gdpr_nastavitve{
+    padding: 0 16px;
+    box-sizing: border-box;
+}
+
 table {
     &.gdpr_surveys {
         table-layout: fixed;

resources/sass/admin_new/pages/survey_data/quick_edit.scss

@@ -228,7 +228,8 @@
 
 
         .quick_edit_inner {
-            
+            width: 100%;
+
             .spremenljivka {
                 box-sizing: border-box;
                 width: 100%;
@@ -249,6 +250,14 @@
                         font-weight: 700;
                         font-size: 20px;
                     }
+                    
+                    .spremenljivka_info{
+                        margin-top: 4px;
+                        
+                        color:#a9a9a9;
+                        font-size: 14px;
+                        font-weight: 400;
+                    }
                 }
                 .variable_holder {
                     height: auto !important;

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

@@ -3,12 +3,28 @@
 #quick_title_edit {
 	position: relative;
 
-	width: 720px;
+    .quick_title_setting{
-	height: 265px;
+        margin-bottom: 16px;
+
+        .title_line{
+            
+        }
+        
+        .setting_line{
+            display: flex;
+            align-items: center;
+
+            input{
+                margin-right: 8px;
+            }
+        }
+
+        .opomba_line{
+            font-size: 14px;
+            font-style: italic;
+            color: #a9a9a9;
+        }
 
-    .quick_title_edit_label {
-        width: 145px;
-        font-weight: 600;
     }
 }
 

resources/sass/admin_new/pages/survey_status/geoip.scss

@@ -0,0 +1,40 @@
+/*
+    Status - ip lokacija
+*/
+
+.page_geoip_location{
+
+    .geoip_holder{
+        display: flex;
+
+        margin: 16px 0 0 0;
+
+        .geoip_table_holder {
+            width: 100%;
+            
+            .geoip_table {
+                width: 100%;
+                margin: 0;
+            }
+        }
+
+        .geoip_map_holder{
+            margin: 0 0 0 32px;
+
+            .geoip_navigation{
+                display: flex;
+                margin-bottom: 16px;
+
+                a{
+                    margin-right: 16px;
+                    color: $very-dark-gray2;
+
+                    &:hover,
+                    &.active{
+                        color: $blue; 
+                    }
+                }
+            }
+        }
+    }
+}

resources/sass/admin_new/pages/survey_status/survey_status.scss

@@ -1,3 +1,4 @@
 @import "summary";
 @import "nonresponse";
-@import "status_advanced";
+@import "status_advanced";
+@import "geoip";

resources/sass/frontend_simple/modules/aai.scss

@@ -1,69 +0,0 @@
-body.landing_page,
-body.register,
-body.login,
-body.login_noEmail{
-
-    #content.aai #main{
-        min-height: auto;
-
-        background-image: url("../img/landing_page_image_aai.png");
-
-        .landing_page_window{
-            width: 500px;
-            padding: 50px;
-            margin-top: 70px;
-
-            text-align: center;
-
-            box-shadow: 1px 1px 4px 1px #999;
-
-            .app_title{
-                width: 500px;
-                margin: 0;
-
-                color: #333;
-            }
-
-            .arnes_logo{
-                margin: 30px 0;
-
-                img{
-                    width: 200px;
-                    height: auto;
-                }
-            }
-
-            .tab{
-                font-size: 16px;
-                text-transform: none;
-                line-height: 24px;
-            }
-
-            input[type="button"]{
-                width: auto;
-                padding: 18px 30px;
-                margin: 30px 0 10px 0;
-
-                font-weight: 600;
-                text-transform: none;
-
-                background-color: rgb(227, 82, 5);
-                border-radius: 5px;
-
-                &:hover{
-                    background-color: lighten(rgb(227, 82, 5), 10%);
-                }
-            }
-        }
-
-        .app_subtitle{
-            width: 500px;
-            margin: 10px auto;
-
-            color: #333;
-            font-size: 20px;
-            font-weight: 600;
-            text-shadow: none;
-        }
-    }
-}

resources/sass/frontend_simple/modules/cookie.scss

@@ -53,14 +53,3 @@
         }
     }
 }
-
-.aai .cookie_notice{
-
-    button{
-        background-color: #e35205;
-
-        &:hover{
-            background-color: #fa6c21;
-        }
-    }
-}

resources/sass/frontend_simple/style.scss

@@ -23,9 +23,6 @@
 @import "./modules/landing_page.scss";
 @import "./modules/pages.scss";
 
-// AAI
-@import "./modules/aai.scss";
-
 
 // Mobile popravki
 @import "./basic/mobile.scss";