Redesign - popravki napak - urejanje teme

admin/survey/classes/class.SurveyDiagnostics.php

@@ -144,7 +144,7 @@ class SurveyDiagnostics
 			}
 		
 		
-		SurveySetting::getInstance()->Init($this->anketa);
+		SurveySetting::getInstance()->Init($this->sid);
 		$preview_disableif = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disableif');
 		$preview_disablealert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disablealert');
 		$preview_displayifs = SurveySetting::getInstance()->getSurveyMiscSetting('preview_displayifs');
@@ -166,7 +166,7 @@ class SurveyDiagnostics
 		// TESTIRANJE
 		echo '<h2>'.$lang['srv_diagnostika_testiranje'].'</h2>';
 
-		echo '<p class="bottom16">'.$lang['srv_diagnostika_testiranje_notea'].'<a href="index.php?anketa=' . $this->anketa . '&a=testiranje&m=testnipodatki">'.$lang['srv_diagnostika_testiranje_noteb'].'</a>'.$lang['srv_diagnostika_testiranje_notec'].'</p>';
+		echo '<p class="bottom16">'.$lang['srv_diagnostika_testiranje_notea'].'<a href="index.php?anketa=' . $this->sid . '&a=testiranje&m=testnipodatki">'.$lang['srv_diagnostika_testiranje_noteb'].'</a>'.$lang['srv_diagnostika_testiranje_notec'].'</p>';
 
 		echo '<div class="button_holder">';
 		echo '<div class="input_box">';

admin/survey/classes/class.SurveyTheme.php

@@ -341,8 +341,9 @@ class SurveyTheme {
 		$simple_name = $this->current_skin;
 		
 		if ($row['skin_profile'] == 0) {
-			$skin_name = $this->strip_name($simple_name);
+			$skin_name = self::strip_name($simple_name);
-		} else {
+		} 
+        else {
 			$sqla = sisplet_query("SELECT name FROM srv_theme_profiles WHERE id = '".$row['skin_profile']."'");
 			$rowa = mysqli_fetch_array($sqla);
 			$skin_name = $rowa['name'];
@@ -359,8 +360,11 @@ class SurveyTheme {
 		echo '</div>';
 
         if($row['skin_profile'] == 0){
+			$preview_link = SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme='.$simple_name.'';
 			$modify_link = '\'index.php?anketa=' . $this->sid . '&a=theme-editor&profile_new=' . $simple_name . '\'';
-		}else {
+		}
+        else {
+			$preview_link = SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['skin_profile'];
 			$modify_link = '\'index.php?anketa=' . $this->sid . '&a=theme-editor&profile=' . $row['skin_profile'] . '\'';
 		}
 
@@ -368,8 +372,7 @@ class SurveyTheme {
 		echo '<div class="options">';
 
 		//Predogled
-		$src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].'';
+		echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
-		echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
 		echo '<span class="faicon fa-desktop"></span>';
 		echo $lang['srv_poglejanketo2'];
 		echo '</div>';
@@ -389,7 +392,7 @@ class SurveyTheme {
 		$simple_name = $this->current_mobile_skin;
 
 		if ($row['skin_profile_mobile'] == 0) {
-			$skin_name = $this->strip_name($simple_name);
+			$skin_name = self::strip_name($simple_name);
 		} else {
 			$sqla = sisplet_query("SELECT name FROM srv_theme_profiles_mobile WHERE id = '".$row['skin_profile_mobile']."'");
 			$rowa = mysqli_fetch_array($sqla);
@@ -402,24 +405,26 @@ class SurveyTheme {
 		echo '<span class="desc">('.$lang['srv_current_theme_mobile'].')</span>';
 		echo '</div>';
 
-		if($row['skin_profile'] == 0){
+        if($row['skin_profile_mobile'] == 0){
-			$modify_link = '\'index.php?anketa=' . $this->sid . '&a=theme-editor&profile_new_mobile=' . $simple_name . '\'';
+			$preview_link_mobile = SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme='.$simple_name.'&mobile=1';
-		}else {
+			$modify_link_mobile = '\'index.php?anketa=' . $this->sid . '&a=theme-editor&mobile=1&profile_new_mobile=' . $simple_name . '\'';
-			$modify_link = '\'index.php?anketa=' . $this->sid . '&a=theme-editor&profile=' . $row['skin_profile'] . '\'';
+		}
+        else {
+			$preview_link_mobile = SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['skin_profile_mobile'].'&mobile=1';
+			$modify_link_mobile = '\'index.php?anketa=' . $this->sid . '&a=theme-editor&mobile=1&profile=' . $row['skin_profile_mobile'] . '\'';
 		}
 
 		//Gumbi
 		echo '<div class="options">';
 
 		//Predogled
-		$src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].'&mobile=1';
+		echo '<div class="button theme_links_preview" src="'.$preview_link_mobile.'" title="'.$lang['srv_poglejanketo2'].'">';
-		echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
 		echo '<span class="faicon fa-desktop"></span>';
 		echo $lang['srv_poglejanketo2'];
 		echo '</div>';
 
 		//Prilagodi		
-		echo '<div class="button" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
+		echo '<div class="button" onclick="window.location.href='.$modify_link_mobile.'" title="'.$lang['srv_te_theme_edit'].'">';
 		echo '<span class="faicon palette"></span>';
 		echo $lang['srv_te_theme_edit'];
 		echo '</div>';
@@ -662,8 +667,8 @@ class SurveyTheme {
 			}
 		}
 
-		//Splošne teme - GRID
 
+		// Splošne teme - GRID
 		if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) {
 			
 			foreach ($this->groups[$groupId]['skins'] AS $skinid => $skin) {
@@ -690,10 +695,16 @@ class SurveyTheme {
 				
 				// Ime teme
 				echo '<span class="theme_name">';			
-				echo $this->strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? ' ('.$lang['default'].')' : ''));
+				echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? ' ('.$lang['default'].')' : ''));
+
 				// Vprasajcki
-				if($simple_name == 'Embed' || $simple_name == 'Embed2' || $simple_name == 'Fdv' || $simple_name == 'Uni' || $simple_name == 'Slideshow')
+				if( in_array($simple_name, array('Fdv', 'Cdi', 'Uni', 'MobileFdv', 'MobileCdi', 'MobileUni')) ){
+                    echo ' '.Help::display('srv_skins_Fdv');
+                }	
+                elseif($simple_name == 'Embed' || $simple_name == 'Embed2' || $simple_name == 'Slideshow'){
                     echo ' '.Help::display('srv_skins_'.$simple_name);
+                }
+
 				if($groupId == -1)
 					echo ' (CSS)';					
 				echo '</span>';
@@ -717,7 +728,9 @@ class SurveyTheme {
 				echo '  <span class="faicon fa-desktop"></span>';
 				echo '</div>';
 
-				//Prilagodi
+				// Prilagodi - samo ce je tema aktivna
+                if($is_current_skin || $is_current_mobile_skin){
+
                     if ($groupId == -3)
                         $link = 'index.php?anketa='.$this->sid.'&a=theme-editor&profile_new_mobile='.$rowa['mobile_skin'];
                     else
@@ -726,6 +739,7 @@ class SurveyTheme {
                     echo '<div class="button" onclick="window.location.href=\''.$link.'\'" title="'.$lang['srv_te_theme_edit'].'">';
                     echo '  <span class="faicon palette"></span>';
                     echo '</div>';
+                }	
 				
 				echo '</div>';
 				
@@ -802,9 +816,10 @@ class SurveyTheme {
 
 	function changeProgressbar() {
 		$progressbar = $_POST['progressbar'];
-		$strUpdate = "UPDATE srv_anketa SET progressbar = '$progressbar' WHERE id=".$this->sid;
+
-		$updated = sisplet_query($strUpdate);
+		$updated = sisplet_query("UPDATE srv_anketa SET progressbar = '$progressbar' WHERE id=".$this->sid);
 		sisplet_query("COMMIT");
+
 		SurveyInfo :: getInstance()->resetSurveyData();
 	}
 	
@@ -935,16 +950,24 @@ class SurveyTheme {
 	}
 	
 	// iz imena skina odstrani uid stevilko userja in _
-	function strip_name ($simple_name) {
+	static function strip_name ($simple_name) {
+		global $lang;
 
 		// Popravimo se default skine - vstavimo presledek da lepse izgleda
 		$skins = array(
-			'1kaBlue (Privzeto)', '1kaRed', '1kaOrange', '1kaGreen', '1kaPurple', '1kaBlack', '1kaOffice', '1kaNature',
+			'1kaBlue ('.$lang['default'].')', '1kaBlue', '1kaRed', '1kaOrange', '1kaGreen', '1kaPurple', '1kaBlack', '1kaOffice', '1kaNature',
-			'MobileBlue (Privzeto)', 'MobileRed', 'MobileOrange', 'MobileGreen', 'MobilePurple', 'MobileBlack',
+			'MobileBlue ('.$lang['default'].')', 'MobileBlue', 'MobileRed', 'MobileOrange', 'MobileGreen', 'MobilePurple', 'MobileBlack',
 			'MobileUni', 'MobileFdv', 'MobileCdi'
 		);
 		if(in_array($simple_name, $skins)){
-			$simple_name = preg_replace('/(?<!\ )[A-Z]/', ' $0', $simple_name);
+
+            $name_array = explode(' ', $simple_name);
+            $name_array[0] = preg_replace('/(?<!\ )[A-Z]/', ' $0', $name_array[0]);
+
+			$simple_name = $name_array[0];
+            
+            if(isset($name_array[1]))
+                $simple_name .= ' '.$name_array[1];
 		}
 		
 		if ( is_numeric( substr($simple_name, 0, strpos($simple_name, '_')) ) )

admin/survey/classes/class.SurveyThemeEditor.php

@@ -51,15 +51,16 @@ class SurveyThemeEditor {
 		$sqla = sisplet_query("SELECT id, name, logo FROM srv_theme_profiles".$this->mobile." WHERE id='$this->profile'");
 		$rowa = mysqli_fetch_array($sqla);
 		
-		self::new_theme_alert($rowa['name']);
+        $skin_name = SurveyTheme::strip_name($rowa['name']);
+
+        
+		self::new_theme_alert($skin_name);
+		
 
 		echo '<div id="theme-edit-wrap">';
 		echo '<div id="theme-editor">';
 		
-		$sql = sisplet_query("SELECT name FROM srv_theme_profiles".$mobile." WHERE id = '".$_GET['profile']."'");
+		echo '<h2>'.$lang['srv_themes_mod2'].': <span class="name">'.$skin_name.'</span></h2>';
-		$row = mysqli_fetch_array($sql);
-		
-		echo '<h2>'.$lang['srv_themes_mod2'].': <span class="name">'.$row['name'].'</span></h2>';
 
 		echo '<input type="hidden" name="profile" id="profile" value="'.$this->profile.'">';
 		
@@ -69,7 +70,7 @@ class SurveyThemeEditor {
 		echo '<div id="picker"></div>';
 			
 		echo '<h3>'.$lang['srv_skinname'].'</h3>';
-		echo '<input type="text" class="text medium" id="skin-name" name="skin-name" value="'.$rowa['name'].'" onblur="te_change_name(this);">';
+		echo '<input type="text" class="text medium" id="skin-name" name="skin-name" value="'.$skin_name.'" onblur="te_change_name(this);">';
 
 		// Mobilni skin nima logotipa
 		if($mobile != 1){
@@ -89,22 +90,25 @@ class SurveyThemeEditor {
 		if($mobile != 1){
 			$sqlg = sisplet_query("SELECT id FROM srv_grupa WHERE ank_id = '$this->anketa'");	
 			if (mysqli_num_rows($sqlg) > 1) {
+
+                $sqlAnketa = sisplet_query("SELECT progressbar FROM srv_anketa WHERE id='$this->anketa'");
+                $rowAnketa = mysqli_fetch_array($sqlAnketa);	
+
 				echo '<h3>'.$lang['srv_te_progressbar'].'</h3>';
 
 				echo '<div class="setting_holder">';
 				echo '<span class="setting_title">' . $lang['srv_te_progressbar_show'] . '</span>';
 
 				echo '<div class="setting_item" id="theme_progressbar">';
-				echo '<input type="radio" id="theme_progressbar_1" name="progressbar" value="1"' . ($row['progressbar'] == 1 ? ' checked="checked"' : '') . ' autocomplete="off"/>';
+				echo '<input type="radio" id="theme_progressbar_1" name="progressbar" value="1"' . ($rowAnketa['progressbar'] == 1 ? ' checked="checked"' : '') . ' autocomplete="off"/>';
 				echo '<label for="theme_progressbar_1">' . $lang['yes'] . '</label> ';
 				echo '</div>';
 				echo '<div class="setting_item" id="theme_progressbar">';
-				echo '<input type="radio" id="theme_progressbar_0" name="progressbar" value="0"' . ($row['progressbar'] == 0 ? ' checked="checked"' : '') . ' autocomplete="off"/>';
+				echo '<input type="radio" id="theme_progressbar_0" name="progressbar" value="0"' . ($rowAnketa['progressbar'] == 0 ? ' checked="checked"' : '') . ' autocomplete="off"/>';
 				echo '<label for="theme_progressbar_0">' . $lang['no1'] . '</label> ';
 				echo '</div>';
 							
 				echo '</div>';
-
 			}
 		}
 		
@@ -121,7 +125,7 @@ class SurveyThemeEditor {
 		$this->displayOption(6, 3);
 		echo '</div>';
 		
-		echo '<h3>'.$lang['srv_te_question_border'].'</h3>';
+		echo '<h3>'.$lang['srv_te_question_text'].'</h3>';
 		echo '<div class="columns">';
 		$this->displayOption(2, 1);
 		$this->displayOption(2, 4);
@@ -178,8 +182,6 @@ class SurveyThemeEditor {
 		$this->displayOption(9, 14);
 		echo '</div>';
 				
-		//echo '<p><label><input type="checkbox" name="current_skin" value="1" '.($row['skin_profile'] == $rowa['id']?'checked disabled':'').' onchange="$(this).attr(\'disabled\', true); te_change_profile(\''.$this->profile.'\'); return false;"> '.$lang['srv_save_set_theme'].'</label></p>';
-		
 		echo '<div class="button_holder">';
 		echo '<button class="medium white-blue" onClick="window.location='.$preklici_url.';return false;">'.$lang['edit1338'].'</button>';				
 		echo '<button class="medium blue" onClick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=tema\';return false;">'.$lang['edit1337'].'</button>';
@@ -246,10 +248,11 @@ class SurveyThemeEditor {
 				echo '<option value="'.$key.'"'.($key==$row['value']?' selected':'').' style="font-family: '.$val.'; font-size:13px">'.substr($val, 0, strpos($val, ',')).'</option>';
 			}
 			echo '</select> ';
-			echo '</div> ';
 			
 			if ($row['value'] != '')
-				echo '<a href="#" onclick="te_remove_setting(\''.$id.'\', \''.$type.'\'); return false;" title="'.$lang['srv_te_remove_setting'].'"><span class="sprites arrow_undo"></span></a>';
+				echo '<a href="#" onclick="te_remove_setting(\''.$id.'\', \''.$type.'\'); return false;" title="'.$lang['srv_te_remove_setting'].'"><span class="faicon trash"></span></a>';
+
+            echo '</div> ';
 
 		// barva pisave, barva ozadja
 		} elseif (($type == 3 && $id != 1) || in_array($type, [2, 9, 10, 13, 15, 16])) {
@@ -275,8 +278,11 @@ class SurveyThemeEditor {
 			
 			echo '<div id="color-'.$id.'-'.$type.'" '.($row['value']==''?'style="display:none;"':'').'>';
 			echo '<input type="text" class="text large colorwell auto-save" id="color'.$id.'-'.$type.'" name="color'.$id.'-'.$type.'" value="'.$value.'" data-id="'.$id.'" data-type="'.$type.'"> ';
-			echo '<a href="#" onclick="te_remove_setting(\''.$id.'\', \''.$type.'\'); return false;" title="'.$lang['srv_te_remove_setting'].'"></a>';
 			echo '</div>';
+
+            if ($row['value'] != '')
+                echo '<a href="#" onclick="te_remove_setting(\''.$id.'\', \''.$type.'\'); return false;" title="'.$lang['srv_te_remove_setting'].'"><span class="faicon trash"></span></a>';
+
 			echo '</div>';
 		
 		// velikost pisave
@@ -290,10 +296,11 @@ class SurveyThemeEditor {
 				echo '<option value="'.$i.'"'.($i==$row['value']?' selected':'').' style="font-size: '.$i.'%;">'.$i.'%</option>';
 			}
 			echo '</select> ';
-			echo '</div> ';
 			
 			if ($row['value'] != '')
-				echo '<a href="#" onclick="te_remove_setting(\''.$id.'\', \''.$type.'\'); return false;" title="'.$lang['srv_te_remove_setting'].'"><span class="sprites arrow_undo"></span></a>';
+				echo '<a href="#" onclick="te_remove_setting(\''.$id.'\', \''.$type.'\'); return false;" title="'.$lang['srv_te_remove_setting'].'"><span class="faicon trash"></span></a>';
+		
+            echo '</div> ';
 
 		// border vprasanja	
 		} elseif ($type == 5) {

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

@@ -322,10 +322,21 @@ div#theme-edit-wrap{
             }
 
             div.setting_box {
+                position: relative;
 
                 display: flex;
                 flex-direction: column;
 
+                >a{
+                    position: absolute;
+                    right: -18px;
+                    top: 28px;
+
+                    .faicon:before{
+                        font-size: 14px;
+                    }
+                }
+
                 select,
                 input,
                 div.input_box {

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

@@ -203,7 +203,7 @@
         }
 
         .toolbox_expand_segments_holder{
-            max-height: 450px;
+            max-height: 400px;
             overflow-y: scroll;
 
             padding-bottom: 16px;