Merge branch 'master' into release/produkcija

.gitignore

@@ -48,4 +48,5 @@ docker
 /composer.bat
 /composer.phar
 /composer.lock
-/.favorites.json
+/.favorites.json
+main/survey/skins/1045_test.css

admin/survey/BranchingAjax.php

@@ -1608,16 +1608,16 @@ class BranchingAjax {
 		// pogoji so ok
 		if ($code === true) {
 			if ($_GET['izpis'] == 'long') {
-				echo '<p style="text-align: center"><b>'.$lang['srv_check_pogoji_ok'].'!</b></p>';
+				
+				echo '<h2>'.$lang['srv_check_pogoji_ok2'].'</h2>';
+                echo '<div class="popup_close"><a href="#" onClick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">✕</a></div>';        
+
+				echo '<p>'.$lang['srv_check_pogoji_ok'].'!</p>';
 			
-				?>
+				echo '<div class="button_holder">';
-				<script>
+				echo '<button class="medium blue" onClick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</button>';
-				$(function () {
+				echo '</div>';
-                    $('#check_pogoji').animate({opacity: 1.0}, 3000).fadeOut('slow');
+
-                    $('#fade').fadeOut("slow");
-				})
-				</script>
-				<?php
 			} else {
 				echo '1';
 			}
@@ -1641,7 +1641,7 @@ class BranchingAjax {
 				if ($code['type'] == 'if') {
 					$sql = sisplet_query("SELECT id, number FROM srv_if WHERE id = '$code[id]'");
 					$row = mysqli_fetch_array($sql);
-					echo '<p>'.$lang['srv_check_pogoji_if'].' <a href="javascript:condition_editing(\''.$row['id'].'\');"><b>'.$row['number'].'</b></a></p>';
+					echo '<p class="bottom16">'.$lang['srv_check_pogoji_if'].' <a class="noline" href="javascript:condition_editing(\''.$row['id'].'\');"><b>'.$row['number'].'</b></a>.</p>';
 				
 				// napaka v podifih, ki so nastavljeni na vrednosti spremenljivk
 				} elseif ($code['type'] == 'podif') {
@@ -1684,18 +1684,20 @@ class BranchingAjax {
 				}
 				
 				echo '</p>';
-			
+
-				//echo '<p class="as_link" onclick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</p>';
+				echo '<div class="button_holder">';
-                echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</a></div></span>';
+				echo '<button class="medium blue" onClick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</button>';
+				echo '</div>';
 			} 
 			else {
                 echo '<h2>'.$lang['srv_check_pogoji_not_ok'].'</h2>';
                 echo '<div class="popup_close"><a href="#" onClick="$(\'#surveyTrajanje\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">✕</a></div>';        
 
 				echo '<p>'.$lang['srv_check_pogoji_not_ok_txt'].'</p>';
-				
+
-				//echo '<p class="as_link" onclick="$(\'#surveyTrajanje\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</p>';
+				echo '<div class="button_holder">';
-                echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#surveyTrajanje\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</a></div></span>';
+        		echo '<button class="medium blue" onclick="$(\'#surveyTrajanje\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</button>';
+        		echo '</div>';
             }		
 		}
     }
@@ -1789,7 +1791,6 @@ class BranchingAjax {
 		$results = $_POST['results'];
 		
 		$status1 = $_POST['status1'];
-		$status2 = $_POST['status2'];
 		
 		if($what == 'finish_author' || $what == 'finish_respondent_cms' || $what == 'finish_respondent' || $what == 'finish_other' | $what == 'finish_other_emails') {
 			sisplet_query("INSERT INTO srv_alert (ank_id, $what) VALUES ('$this->anketa', '$results')
@@ -1800,7 +1801,7 @@ class BranchingAjax {
 		}
 		
 		$b = new Branching($this->anketa);
-		$b->toolbox_settings($status1, $status2);
+		$b->toolbox_settings($status1);
     }
     
     
@@ -2323,19 +2324,27 @@ class BranchingAjax {
 		global $site_url;
 		
 		$rowanketa = SurveyInfo::getInstance()->getSurveyRow();
-		
+
-		echo '<textarea name="vsebina" id="vsebina_'.$spremenljivka.'_'.$view.'" style="width:100%; height:50px; margin-bottom:10px; border:1px red solid;"></textarea><br />';
+		echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
-		echo '<input type="submit" value="'.$lang['send'].'" onclick="add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', $(\'#vsebina_'.$spremenljivka.'_'.$view.'\').val()); return false;" />';
+        
-		
+		echo '<div class="button_holder bottom0">';
+
+        if($_GET['a'] == 'comment_manage')
+		    echo '  <button class="medium white-blue" onClick="closeCommentQtip(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>';
+        else
+		    echo '  <button class="medium white-blue" onClick="toggleAddComment(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>';
+
+		echo '  <button class="medium blue" onclick="add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', $(\'#vsebina_'.$spremenljivka.'_'.$view.'\').val()); return false;">'.$lang['srv_comments_new'].'</button>';
+		echo '</div>';
+
 		if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) {
-		
+			echo '<div class="comment_bottom">';
-			echo '<div style="float:right">';
 			
 			// Link na pregled splosnih komentarjev
-			echo '<span style="margin-right: 20px;"><a href="'.$site_url.'/admin/survey/index.php?anketa='.$this->anketa.'&a=komentarji_anketa">'.$lang['srv_comment_overview'].'</a></span>';	
+			echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$this->anketa.'&a=komentarji_anketa" class="noline">'.$lang['srv_comment_overview'].'</a>';	
 			
 			// Link na nastavitve komentarjev
-			echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$this->anketa.'&a=urejanje">'.$lang['settings'].'</a>';
+			echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$this->anketa.'&a=urejanje" class="noline">'.$lang['settings'].'</a>';
 			
 			echo '</div>';
 		}	
@@ -2669,6 +2678,30 @@ class BranchingAjax {
 		$b->repare_condition($if);
 		$b->calculation_editing_inner($condition);
 	}
+
+    function ajax_quota_sort() {
+		Common::getInstance()->Init($this->anketa);
+    	Common::getInstance()->updateEditStamp();
+    	
+    	$condition = $_POST['condition'];
+    	$sortable = $_POST['sortable'];
+    	$sortable = explode('&', $sortable);
+    	
+    	$i=1;
+    	foreach ($sortable AS $val) {
+			$quota = explode('=', $val);
+			$quota = $quota[1];
+			
+			$s = sisplet_query("UPDATE srv_quota SET vrstni_red='{$i}' WHERE id='{$quota}'");
+			if (!$s) echo mysqli_error($GLOBALS['connect_db']);
+
+			$i++;
+    	}
+    	
+		$b = new Branching($this->anketa);
+		$b->repare_condition($if);
+		//$b->calculation_editing_inner($condition);
+	}
 	
 	function ajax_spremenljivka_preview_print() {
 		global $lang;
@@ -2693,11 +2726,11 @@ class BranchingAjax {
 		</head>
 		<body>
 		<?
-	
-		echo '<div id="printIcon">';
-		echo '<a href="#" onclick="window.print(); return false;"><span class="faicon print_small icon-grey_dark_link"></span> '.$lang['hour_print2'].'</a>';
-		echo '</div>';
 
+		echo '<div class="button_holder print_button">';
+		echo '<button class="small blue" onclick="window.print(); return false;">'.$lang['hour_print2'].'</button>';
+		echo '</div>';
+	
         include_once('../../main/survey/app/global_function.php');
         new \App\Controllers\SurveyController(true);
 
@@ -2715,7 +2748,7 @@ class BranchingAjax {
             save('forceShowSpremenljivka', true);
             \App\Controllers\Vprasanja\VprasanjaController::getInstance()->displaySpremenljivka($_GET['spremenljivka']);
 		}
-		
+
 		?>
 		</body>
 		</html>
@@ -2725,7 +2758,7 @@ class BranchingAjax {
 	function ajax_toolbox_add_advanced () {
 		
 		$b = new Branching($this->anketa);
-		$b->toolbox_add_advanced();
+		$b->toolbox_add_advanced($popup=true);
 	}
 	function ajax_toggle_toolbox () {
 		
@@ -2759,15 +2792,27 @@ class BranchingAjax {
         
         echo '<div class="popup_close"><a href="#" onClick="$(\'#vrednost_edit\').hide().html(\'\'); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
 
-		echo '<h2>'.$lang['srv_find_replace'].'</h2>';
+		echo '<h2><span class="faicon blue replace"></span>'.$lang['srv_find_replace'].'</h2>';
 		
-		echo '<p class="gray">'.$lang['srv_find_text'].'</p>';
+		echo '<p class="bottom16">'.$lang['srv_find_text'].'</p>';
-		
+
-		echo '<p><label style="display:inline-block; width:100px">'.$lang['srv_find'].': </label><input type="text" name="find" style="width:200px"><span id="find_count" style="color:red; margin:0 20px"></span></p>';
+		echo '<div class="setting_holder">';
-		echo '<p><label style="display:inline-block; width:100px">'.$lang['srv_replace_with'].': </label><input type="text" name="replace" style="width:200px"></p>';
+		echo '<p>'.$lang['srv_find'].':</p>';
-		
+		echo '<div class="find-holder">';
-		echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" onclick="find_replace_do(); return false;" href="#"><span>'.$lang['srv_replace'].'</span></a></div></span>';
+		echo '<input type="text" class="text large" name="find">';
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray btn_savesettings" onclick="$(\'#vrednost_edit\').hide().html(\'\'); $(\'#fade\').fadeOut(); return false;" href="#"><span>'.$lang['srv_cancel'].'</span></a></div></span>';	
+		echo '<span class="red" id="find_count" style="margin-left: 16px;"></span>';
+		echo '</div>';
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
+		echo '<p>'.$lang['srv_replace_with'].':</p>';
+		echo '<input type="text" class="text large" name="replace">';
+		echo '</div>';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="$(\'#vrednost_edit\').hide().html(\'\'); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_cancel'].'</button>';              
+        echo '<button class="medium blue" onclick="find_replace_do(); return false;">'.$lang['srv_replace'].'</button>';
+        echo '</div>';
 	}
 	
 	function ajax_find_replace_count() {

admin/survey/Glasovanje.php

@@ -100,222 +100,238 @@ class Glasovanje {
 		global $site_path;
 		global $admin_type;
 
-		echo '<div class="header_holder">'.NEW_LINE;
+		echo '<div class="header">';
-		echo '<div class="header_content">'.NEW_LINE;
+		echo    $lang['srv_glasovanja_settings'].Help :: display('srv_type_glasovanje');
-		echo '    <div class="header_left">' . $lang['srv_glasovanja_settings'] . Help :: display('srv_type_glasovanje') . '</div>' . NEW_LINE;
-		echo '<div class="clr"></div>';
-		echo '</div>';
 		echo '</div>';
 
 		$sql2 = sisplet_query("SELECT * FROM srv_glasovanje WHERE ank_id='$this->anketa'");
 		$row2 = mysqli_fetch_array($sql2);
 
 		$row = Cache::srv_spremenljivka($row2['spr_id']);
-		
 		$rowA = SurveyInfo::getInstance()->getSurveyRow();
 
-		//Vkljucenost ankete (embeddana ali samostojna)
+
+		// Vkljucenost ankete (embeddana ali samostojna)
 		echo '<fieldset>';
-		echo '<legend>' . $lang['glasovanja_embed'] . '</legend>';
+
-		echo '<label for="glasovanja_embed_0" class="pointer"><input type="radio" name="glasovanja_embed" value="0" id="glasovanja_embed_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'embed\')" ' . ($row2['embed'] == 0 ? ' checked' : '') . '/>' . $lang['glasovanja_embed_off'] . '</label><br /> ';
+		echo '  <div class="setting_title">' . $lang['glasovanja_embed'] . ':</div>';
-		echo '<label for="glasovanja_embed_1" class="pointer"><input type="radio" name="glasovanja_embed" value="1" id="glasovanja_embed_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'embed\')" ' . ($row2['embed'] == 1 ? ' checked' : '') . '/>' . $lang['glasovanja_embed_on'];
+        echo '  <div class="setting_row">';
-                if($row2['embed'] != 0)
+		echo '      <input type="radio" name="glasovanja_embed" value="0" id="glasovanja_embed_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'embed\')" ' . ($row2['embed'] == 0 ? ' checked' : '') . '/><label for="glasovanja_embed_0">'.$lang['glasovanja_embed_off'] .'</label>';
-			echo ' (<a href="index.php?anketa=' . $this->anketa . '&a=vabila&m=url&js=open">' . $lang['srv_embed_link'] . '</a>)';
+        echo '  </div>';
-                echo '</label> ';
+        echo '  <div class="setting_row">';
+		echo '      <input type="radio" name="glasovanja_embed" value="1" id="glasovanja_embed_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'embed\')" ' . ($row2['embed'] == 1 ? ' checked' : '') . '/><label for="glasovanja_embed_1">'.$lang['glasovanja_embed_on'].'</label> ';
+        echo '  </div>';
+
 		echo '</fieldset>';
 
 
-		//Izbira spola ob resevanju
+		// Izbira spola ob resevanju
 		echo '<fieldset>';
-		echo '<legend>' . $lang['glasovanja_spol'] . '</legend>';
+
-		//echo '<span class="nastavitveSpan4"><label>' . $lang['srv_alert_respondent'] . ':</label></span>';
+		echo '  <div class="setting_title">' . $lang['glasovanja_spol'] . ':</div>';
-		echo '<label for="glasovanja_spol_1" class="pointer"><input type="radio" name="glasovanja_spol" value="1" id="glasovanja_spol_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'spol\')" ' . ($row2['spol'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
+        echo '  <div class="setting_row">';
-		echo '<label for="glasovanja_spol_0" class="pointer"><input type="radio" name="glasovanja_spol" value="0" id="glasovanja_spol_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'spol\')" ' . ($row2['spol'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label> ';
+		echo '      <input type="radio" name="glasovanja_spol" value="1" id="glasovanja_spol_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'spol\')" ' . ($row2['spol'] == 1 ? ' checked' : '') . '/><label for="glasovanja_spol_1">' . $lang['yes'] . '</label> ';
-		echo '</fieldset>';
+        echo '      <input type="radio" name="glasovanja_spol" value="0" id="glasovanja_spol_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'spol\')" ' . ($row2['spol'] == 0 ? ' checked' : '') . '/><label for="glasovanja_spol_0">' . $lang['no1'] . '</label> ';
+		echo '  </div>';
+
+        echo '</fieldset>';
 
 
-		//Prikaz dodatnih strani
+		// Prikaz dodatnih strani
 		echo '<fieldset>';
-		echo '<legend>' . $lang['glasovanja_strani'] . '</legend>';
 
-		echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_strani_intro'] . ':</label></span>';
+		echo '<div class="setting_title">' . $lang['glasovanja_strani_intro'] . ':</div>';
-		echo '<label for="glasovanja_intro_1" class="pointer"><input type="radio" name="glasovanja_intro" value="1" id="glasovanja_intro_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_intro\')" ' . ($rowA['show_intro'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
+        echo '  <div class="setting_row">';
-		echo '<label for="glasovanja_intro_0" class="pointer"><input type="radio" name="glasovanja_intro" value="0" id="glasovanja_intro_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_intro\')" ' . ($rowA['show_intro'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label><br /> ';
+		echo '      <input type="radio" name="glasovanja_intro" value="1" id="glasovanja_intro_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_intro\')" ' . ($rowA['show_intro'] == 1 ? ' checked' : '') . '/><label for="glasovanja_intro_1">' . $lang['yes'] . '</label>';
+		echo '      <input type="radio" name="glasovanja_intro" value="0" id="glasovanja_intro_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_intro\')" ' . ($rowA['show_intro'] == 0 ? ' checked' : '') . '/><label for="glasovanja_intro_0">' . $lang['no1'] . '</label>';
+        echo '  </div>';
+
+		echo '  <div class="setting_title">' . $lang['glasovanja_strani_outro'] . ':</div>';
+        echo '  <div class="setting_row">';
+		echo '      <input type="radio" name="glasovanja_concl" value="1" id="glasovanja_concl_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_concl\')" ' . ($rowA['show_concl'] == 1 ? ' checked' : '') . '/><label for="glasovanja_concl_1">' . $lang['yes'] . '</label> ';
+		echo '      <input type="radio" name="glasovanja_concl" value="0" id="glasovanja_concl_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_concl\')" ' . ($rowA['show_concl'] == 0 ? ' checked' : '') . '/><label for="glasovanja_concl_0">' . $lang['no1'] . '</label> ';
+		echo '  </div>';
 
-		echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_strani_outro'] . ':</label></span>';
-		echo '<label for="glasovanja_concl_1" class="pointer"><input type="radio" name="glasovanja_concl" value="1" id="glasovanja_concl_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_concl\')" ' . ($rowA['show_concl'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
-		echo '<label for="glasovanja_concl_0" class="pointer"><input type="radio" name="glasovanja_concl" value="0" id="glasovanja_concl_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_concl\')" ' . ($rowA['show_concl'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label> ';
-		
 		echo '</fieldset>';
 
 		
 		// Prikaz naslova...
 		echo '<fieldset>';
-		echo '<legend>' . $lang['glasovanja_naslov'] . '</legend>';
+
-		
 		// prikaz naslova ankete
 		SurveySetting::getInstance()->Init($this->anketa);
-		$survey_hide_title = SurveySetting::getInstance()->getSurveyMiscSetting('survey_hide_title');			
+		$survey_hide_title = SurveySetting::getInstance()->getSurveyMiscSetting('survey_hide_title');		
-		echo '<span class="nastavitveSpan4" style="width: 140px;"><label>' . $lang['glasovanja_results_survey_title'] . ':</label></span>';
-		echo '<label><input type="radio" name="survey_hide_title" value="0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'survey_hide_title\')" '.($survey_hide_title == 0 ? ' checked="checked"' : '').'>' . $lang['yes'] . '</label> ';
-		echo '<label><input type="radio" name="survey_hide_title" value="1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'survey_hide_title\')" '.($survey_hide_title == 1 ? ' checked="checked"' : '').'>' . $lang['no1'] . '</label><br />';
-		
-		//anketa v arhivu - prikaz arhiva
-		echo '<span class="nastavitveSpan4" style="width: 140px;"><label>' . $lang['glasovanja_results_archive'] . ':</label>'. Help :: display('srv_glasovanje_archive').'</span>';
-		echo '<label for="stat_archive_1" class="pointer"><input type="radio" name="stat_archive" value="1" id="stat_archive_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_archive\')" ' . ($row2['stat_archive'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
-		echo '<label for="stat_archive_0" class="pointer"><input type="radio" name="stat_archive" value="0" id="stat_archive_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_archive\')" ' . ($row2['stat_archive'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label><br /> ';
 
+		echo '  <div class="setting_title">' . $lang['glasovanja_results_survey_title'] . ':</div>';
+        echo '  <div class="setting_row">';	
+		echo '      <input type="radio" name="survey_hide_title" id="survey_hide_title_0" value="0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'survey_hide_title\')" '.($survey_hide_title == 0 ? ' checked="checked"' : '').'><label for="survey_hide_title_0">' . $lang['yes'] . '</label>';
+		echo '      <input type="radio" name="survey_hide_title" id="survey_hide_title_1" value="1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'survey_hide_title\')" '.($survey_hide_title == 1 ? ' checked="checked"' : '').'><label for="survey_hide_title_1">' . $lang['no1'] . '</label>';
+        echo '  </div>';
+        
+		//anketa v arhivu - prikaz arhiva
+		echo '  <div class="setting_title">' . $lang['glasovanja_results_archive'].' '.Help :: display('srv_glasovanje_archive').':</div>';
+        echo '  <div class="setting_row">';	
+		echo '      <input type="radio" name="stat_archive" value="1" id="stat_archive_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_archive\')" ' . ($row2['stat_archive'] == 1 ? ' checked' : '') . '/><label for="stat_archive_1">' . $lang['yes'] . '</label>';
+		echo '      <input type="radio" name="stat_archive" value="0" id="stat_archive_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_archive\')" ' . ($row2['stat_archive'] == 0 ? ' checked' : '') . '/><label for="stat_archive_0">' . $lang['no1'] . '</label>';
+        echo '  </div>';
+        
 		echo '</fieldset>';
 		
 		
-		//Prikaz statistike - nastavitve		
+		// Prikaz statistike - nastavitve		
 		echo '<fieldset>';
-		echo '<legend>' . $lang['glasovanja_results'] . '</legend>';
+        
-		
+		echo '<div class="setting_title">' . $lang['glasovanja_results'] . ':</div>';
-		//prikaz statistike
+        echo '  <div class="setting_row">';	
-		echo '<span class="nastavitveSpan4" style="width: 100%;"><label>' . $lang['srv_stat_on'] . ':</label></span><br />';
+		echo '      <input type="radio" name="show_stat" value="1" id="show_stat_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat\')" ' . ($row['stat'] == 1 ? ' checked' : '') . '/><label for="show_stat_1">' . $lang['yes'] . '</label>';
-		echo '<label for="show_stat_1" class="pointer"><input type="radio" name="show_stat" value="1" id="show_stat_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat\')" ' . ($row['stat'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
+		echo '      <input type="radio" name="show_stat" value="0" id="show_stat_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat\')" ' . ($row['stat'] == 0 ? ' checked' : '') . '/><label for="show_stat_0">' . $lang['no1'] . '</label>';
-		echo '<label for="show_stat_0" class="pointer"><input type="radio" name="show_stat" value="0" id="show_stat_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat\')" ' . ($row['stat'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label> ';
+		echo '      <input type="radio" name="show_stat" value="2" id="show_stat_2" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat\')" ' . ($row['stat'] == 2 ? ' checked' : '') . '/><label for="show_stat_2">' . $lang['glasovanja_results_admin'] . '</label>';
-		echo '<label for="show_stat_2" class="pointer"><input type="radio" name="show_stat" value="2" id="show_stat_2" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat\')" ' . ($row['stat'] == 2 ? ' checked' : '') . '/>' . $lang['glasovanja_results_admin'] . '</label><br /> ';
+        echo '  </div>';
-	
+
 		if($row['stat'] > 0){
 
 			// prikaz stevila glasov, v procentih in z grafom
-            echo '<div>';
+			echo '  <div class="setting_title">' . $lang['glasovanja_results_type'] . ':</div>';
-			echo '<span class="nastavitveSpan5" style="width: 100%;"><label>' . $lang['glasovanja_results_type'] . ':</label></span><br />';
+            echo '  <div class="setting_row">';
-			echo '<label for="glasovanja_results" class="pointer"><input type="checkbox" name="glasovanja_results" value="1" id="glasovanja_results" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'show_results\')" ' . ($row2['show_results'] == 1 ? ' checked' : '') . '/>' . $lang['glasovanja_results_count'] . '</label> ';
+			echo '      <input type="checkbox" name="glasovanja_results" value="1" id="glasovanja_results" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'show_results\')" ' . ($row2['show_results'] == 1 ? ' checked' : '') . '/><label for="glasovanja_results">' . $lang['glasovanja_results_count'] . '</label> ';
-			echo '<label for="glasovanja_percent" class="pointer"><input type="checkbox" name="glasovanja_percent" value="1" id="glasovanja_percent" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'show_percent\')" ' . ($row2['show_percent'] == 1 ? ' checked' : '') . '/>' . $lang['glasovanja_results_percent'] . '</label> ';
+			echo '      <input type="checkbox" name="glasovanja_percent" value="1" id="glasovanja_percent" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'show_percent\')" ' . ($row2['show_percent'] == 1 ? ' checked' : '') . '/><label for="glasovanja_percent">' . $lang['glasovanja_results_percent'] . '</label> ';
-			echo '<label for="glasovanja_graph" class="pointer"><input type="checkbox" name="glasovanja_graph" value="1" id="glasovanja_graph" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'show_graph\')" ' . ($row2['show_graph'] == 1 ? ' checked' : '') . '/>' . $lang['glasovanja_results_graph'] . '</label><br /> ';
+			echo '      <input type="checkbox" name="glasovanja_graph" value="1" id="glasovanja_graph" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'show_graph\')" ' . ($row2['show_graph'] == 1 ? ' checked' : '') . '/><label for="glasovanja_graph">' . $lang['glasovanja_results_graph'] . '</label><br /> ';
-            echo '</div>';
+            echo '  </div>';
 
 			// prikaz stevila glasov
-            echo '<div>';
+			echo '  <div class="setting_title">' . $lang['glasovanja_results_allcount'] . ':</div>';
-			echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_results_allcount'] . ':</label></span>';
+            echo '  <div class="setting_row">';
-			echo '<label for="glasovanja_count_0" class="pointer"><input type="radio" name="glasovanja_count" value="0" id="glasovanja_count_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_count\')" ' . ($row2['stat_count'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label> ';
+			echo '      <input type="radio" name="glasovanja_count" value="0" id="glasovanja_count_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_count\')" ' . ($row2['stat_count'] == 0 ? ' checked' : '') . '/><label for="glasovanja_count_0">' . $lang['no1'] . '</label>';
-			echo '<label for="glasovanja_count_1" class="pointer"><input type="radio" name="glasovanja_count" value="1" id="glasovanja_count_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_count\')" ' . ($row2['stat_count'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label><br /> ';
+			echo '      <input type="radio" name="glasovanja_count" value="1" id="glasovanja_count_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_count\')" ' . ($row2['stat_count'] == 1 ? ' checked' : '') . '/><label for="glasovanja_count_1">' . $lang['yes'] . '</label>';
-            echo '</div>';
+            echo '  </div>';
 
 			// prikaz casa glasovanja
-            echo '<div>';
+			echo '<div class="setting_title">' . $lang['glasovanja_results_time'] . ':</div>';
-			echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_results_time'] . ':</label></span>';
+            echo '  <div class="setting_row">';
-			echo '<label for="glasovanja_time_0" class="pointer"><input type="radio" name="glasovanja_time" value="0" id="glasovanja_time_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_time\')" ' . ($row2['stat_time'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label> ';
+			echo '      <input type="radio" name="glasovanja_time" value="0" id="glasovanja_time_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_time\')" ' . ($row2['stat_time'] == 0 ? ' checked' : '') . '/><label for="glasovanja_time_0">' . $lang['no1'] . '</label>';
-			echo '<label for="glasovanja_time_1" class="pointer"><input type="radio" name="glasovanja_time" value="1" id="glasovanja_time_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_time\')" ' . ($row2['stat_time'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label><br /> ';
+			echo '      <input type="radio" name="glasovanja_time" value="1" id="glasovanja_time_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_time\')" ' . ($row2['stat_time'] == 1 ? ' checked' : '') . '/><label for="glasovanja_time_1">' . $lang['yes'] . '</label>';
-            echo '</div>';
+            echo '  </div>';
 
 			// prikaz naslova vprasanja
-            echo '<div>';
+			echo '<div class="setting_title">' . $lang['glasovanja_results_title'] . ':</div>';
-			echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_results_title'] . ':</label></span>';
+            echo '  <div class="setting_row">';
-			echo '<label for="glasovanja_title_1" class="pointer"><input type="radio" name="glasovanja_title" value="1" id="glasovanja_title_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_title\')" ' . ($row2['show_title'] == 1 ? ' checked' : '') . '/>' . $lang['no1'] . '</label> ';
+			echo '      <input type="radio" name="glasovanja_title" value="1" id="glasovanja_title_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_title\')" ' . ($row2['show_title'] == 1 ? ' checked' : '') . '/><label for="glasovanja_title_1">' . $lang['no1'] . '</label>';
-			echo '<label for="glasovanja_title_0" class="pointer"><input type="radio" name="glasovanja_title" value="0" id="glasovanja_title_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_title\')" ' . ($row2['show_title'] == 0 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
+			echo '      <input type="radio" name="glasovanja_title" value="0" id="glasovanja_title_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_title\')" ' . ($row2['show_title'] == 0 ? ' checked' : '') . '/><label for="glasovanja_title_0">' . $lang['yes'] . '</label>';
-            echo '</div>';
+            echo '  </div>';
 		}
+
 		echo '</fieldset>';
 
 		
 		// SPODNJE EXTRA NASTAVITVE
-		echo '<div id="glas_extra_settings" '.($displayExtra==0 ? ' style="display: none;"' : '').' >';
 
-			// TRAJANJE
+        // gumb VEC
-			echo '    <fieldset>'. NEW_LINE;
+        echo '<div class="expand_holder">';
-			echo '    <legend>' . $lang['duration'] . '</legend>'. NEW_LINE;
-
-			echo '<span class="nastavitveSpan4" style="width: 100%;"><label>' . $lang['srv_starts'] . ':</label></span>';
-			echo '<p><input id="starts" type="text" name="starts" value="' . date('d.m.Y', strtotime($rowA['starts'])) . '" disabled autocomplete="off"></p>';
-
-			echo '<span class="nastavitveSpan4" style="width: 100%;"><label>' . $lang['srv_expire'] . ':</label></span>';
-			echo '<p><input id="expire" type="text" name="expire" value="' . date('d.m.Y', strtotime($rowA['expire'])) . '" disabled autocomplete="off"></p>';
-
-            echo '<script type="text/javascript">	
-
-                    $(document).ready(function() {
-            			$( "#starts" ).datepicker({
-							showOtherMonths: true,
-							selectOtherMonths: true,
-							changeMonth: true,
-							changeYear: true,
-							dateFormat: "dd.mm.yy",
-							showAnim: "slideDown",
-							showOn: "button",
-							buttonText: "",
-							onSelect: function(selected, evnt) {
-								edit_glasovanje(\'' . $rowA['spr_id'] . '\', this.value, \'starts\')
-            				}
-            			});
-                        $( "#expire" ).datepicker({
-							showOtherMonths: true,
-							selectOtherMonths: true,
-							changeMonth: true,
-							changeYear: true,
-							dateFormat: "dd.mm.yy",
-							showAnim: "slideDown",
-							showOn: "button",
-							buttonText: "",
-							onSelect: function(selected, evnt) {
-								edit_glasovanje(\'' . $rowA['spr_id'] . '\', this.value, \'expire\')
-            				}
-            			});
-            		});
-                </script>';
-
-			echo '    </fieldset>';
-
-
-			// Izbira skina za glasovanje				
-
-			echo '<fieldset>';
-			echo '<legend>' . $lang['srv_themes'] . '</legend>';
-
-
-			// Izbira skina za anketo
-			echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_theme'] . ':</label></span>';
-
-            echo '<select name="skin_anketa" id="skin_anketa" onChange="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'skin_anketa\')">' . NEW_LINE;
-
-            $st = new SurveyTheme();
-			$skins = $st->getGroups();
-			foreach ($skins['0']['skins'] as $key => $skin) {
-
-				$simple_name = preg_replace("/\.css$/", '', $skin);
-
-				// Default skin po novem izkljucimo
-				if ($simple_name != 'Default') {
-                    echo '  <option value="'.$simple_name.'"' . ($rowA['skin'] == $simple_name ? ' selected="selected"' : '') . '>'.($simple_name == '1kaBlue' ? $simple_name.' (' . $lang['default'] . ')' : $simple_name).'</option>' . NEW_LINE;
-				}
-			}
-
-			echo '</select><br>' . NEW_LINE;
-			
-
-			// Izbira skina za statistiko
-			echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_stat_theme'] . ':</label></span>';
-
-			$dir = opendir($site_path . 'main/survey/skins/glasovanje/');
-
-			echo '<select name="skin" id="skin" onChange="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'skin\')">' . NEW_LINE;
-			while ($file = readdir($dir)) {
-				if ($file != '.' && $file != '..' && $file != '.svn' && strtolower(substr($file, -4, 4)) == '.css')
-					echo '            <option value="' . substr($file, 0, -4) . '"' . ($row2['skin'] == substr($file, 0, -4) ? ' selected="selected"' : '') . '>' . substr($file, 0, -4) . '</option>' . NEW_LINE;
-				elseif ($file != '.' && $file != '..' && $file != '.svn' && strtolower(substr($file, -4, 4)) != '.css') {
-					if (is_file($site_path . 'main/survey/skins/' . $file . '/' . $file . '.css')) {
-						echo '            <option value="' . $file . '"' . ($row2['skin'] == $file ? ' selected="selected"' : '') . '>' . $file . '</option>' . NEW_LINE;
-					}
-				}
-			}
-			echo '</select>' . NEW_LINE;
-			
-			echo '</fieldset>';
-			
-		echo '</div>';
-	
-		// gumb VEC
 		if($displayExtra==1){
-			echo '<span class="more" style="display:none;"><a href="#" onClick="glas_extra_settings();">'.$lang['srv_more'].'</a></span>';
+            echo '<span class="more" style="display:none;"><a href="#" onClick="glas_extra_settings();">'.$lang['srv_publication_survey_settings_more'].'<span class="faicon arrow2_d"></span></a></span>';
-			echo '<span class="less"><a href="#" onClick="glas_extra_settings();">'.$lang['srv_less'].'</a></span>';
+			echo '<span class="less"><a href="#" onClick="glas_extra_settings();">'.$lang['srv_publication_survey_settings_less'].'<span class="faicon arrow2_u"></span></a></span>';
 		}
 		else{
-			echo '<span class="more"><a href="#" onClick="glas_extra_settings();">'.$lang['srv_more'].'</a></span>';			
+            echo '<span class="more"><a href="#" onClick="glas_extra_settings();">'.$lang['srv_publication_survey_settings_more'].'<span class="faicon arrow2_d"></span></a></span>';			
-			echo '<span class="less" style="display:none;"><a href="#" onClick="glas_extra_settings();">'.$lang['srv_less'].'</a></span>';
+			echo '<span class="less" style="display:none;"><a href="#" onClick="glas_extra_settings();">'.$lang['srv_publication_survey_settings_less'].'<span class="faicon arrow2_u"></span></a></span>';
 		}
+        echo '</div>';
+
+
+		echo '<div id="glas_extra_settings" '.($displayExtra==0 ? ' style="display: none;"' : '').' >';
+
+        // TRAJANJE
+        echo '<fieldset>';
+
+        echo '  <div class="setting_row half-half">';
+        echo '      <div class="setting_title">' . $lang['srv_starts2'] . ':</div>';
+        echo '      <input id="starts" class="small" type="text" name="starts" value="' . date('d.m.Y', strtotime($rowA['starts'])) . '" disabled autocomplete="off">';
+        echo '  </div>';
+        
+        echo '  <div class="setting_row half-half">';
+        echo '      <div class="setting_title">' . $lang['srv_expire2'] . ':</div>';
+        echo '      <input id="expire" class="small" type="text" name="expire" value="' . date('d.m.Y', strtotime($rowA['expire'])) . '" disabled autocomplete="off">';
+        echo '  </div>';
+
+        echo '<script type="text/javascript">	
+
+                $(document).ready(function() {
+                    $( "#starts" ).datepicker({
+                        showOtherMonths: true,
+                        selectOtherMonths: true,
+                        changeMonth: true,
+                        changeYear: true,
+                        dateFormat: "dd.mm.yy",
+                        showAnim: "slideDown",
+                        showOn: "button",
+                        buttonText: "",
+                        onSelect: function(selected, evnt) {
+                            edit_glasovanje(\'' . $rowA['spr_id'] . '\', this.value, \'starts\')
+                        }
+                    });
+                    $( "#expire" ).datepicker({
+                        showOtherMonths: true,
+                        selectOtherMonths: true,
+                        changeMonth: true,
+                        changeYear: true,
+                        dateFormat: "dd.mm.yy",
+                        showAnim: "slideDown",
+                        showOn: "button",
+                        buttonText: "",
+                        onSelect: function(selected, evnt) {
+                            edit_glasovanje(\'' . $rowA['spr_id'] . '\', this.value, \'expire\')
+                        }
+                    });
+                });
+            </script>';
+
+        echo '    </fieldset>';
+
+
+        // Izbira skina za glasovanje
+        echo '<fieldset>';
+
+        // Izbira skina za anketo
+        echo '  <div class="setting_row half-half">';
+        echo '      <div class="setting_title">' . $lang['glasovanja_theme2'] . '</div>';
+        echo '      <select name="skin_anketa" id="skin_anketa" class="dropdown small" onChange="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'skin_anketa\')">';
+
+        $st = new SurveyTheme();
+        $skins = $st->getGroups();
+        foreach ($skins['0']['skins'] as $key => $skin) {
+
+            $simple_name = preg_replace("/\.css$/", '', $skin);
+
+            // Default skin po novem izkljucimo
+            if ($simple_name != 'Default') {
+                echo '  <option value="'.$simple_name.'"' . ($rowA['skin'] == $simple_name ? ' selected="selected"' : '') . '>'.($simple_name == '1kaBlue' ? $simple_name.' (' . $lang['default'] . ')' : $simple_name).'</option>';
+            }
+        }
+
+        echo '      </select>';
+        echo '  </div>';
+        
+
+        // Izbira skina za statistiko
+        echo '  <div class="setting_row half-half">';
+        echo '      <div class="setting_title">' . $lang['glasovanja_stat_theme2'] . ':</div>';
+        echo '      <select name="skin" id="skin" class="dropdown small" onChange="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'skin\')">';
+        $dir = opendir($site_path . 'main/survey/skins/glasovanje/');
+        while ($file = readdir($dir)) {
+            if ($file != '.' && $file != '..' && $file != '.svn' && strtolower(substr($file, -4, 4)) == '.css')
+                echo '            <option value="' . substr($file, 0, -4) . '"' . ($row2['skin'] == substr($file, 0, -4) ? ' selected="selected"' : '') . '>' . substr($file, 0, -4) . '</option>';
+            elseif ($file != '.' && $file != '..' && $file != '.svn' && strtolower(substr($file, -4, 4)) != '.css') {
+                if (is_file($site_path . 'main/survey/skins/' . $file . '/' . $file . '.css')) {
+                    echo '            <option value="' . $file . '"' . ($row2['skin'] == $file ? ' selected="selected"' : '') . '>' . $file . '</option>';
+                }
+            }
+        }
+        echo '      </select>';
+        echo '  </div>';
+        
+        echo '</fieldset>';
+        
+		echo '</div>';
     }
 	
 	/**
@@ -326,7 +342,7 @@ class Glasovanje {
 
 		$Branching = new Branching($this->anketa);
 		
-		echo '<li id="branching_'.$spremenljivka.'" class="spr">';
+		echo '<li id="branching_'.$spremenljivka.'" class="spr spr_tip_1">';
 
 		$Branching->vprasanje($spremenljivka);
 
@@ -386,15 +402,12 @@ class Glasovanje {
 			// <-- Editor teksta vprasanja --- 
 			echo '<div class="spremenljivka_tekst_form">';
 	        echo '<div class="naslov naslov_inline" contenteditable="'.(!$this->locked?'true':'false').'" spr_id="'.$id.'" tabindex="1" '.(strpos($text, $selectall)!==false?' default="1"':'').'>'.$text.'</div>';
-			echo '<div class="clr"></div>';        
+  
 			// opomba
 			if ($opomba != '') {
-				echo '<table style="margin-top:5px; width:100%"><tr>';
+				echo '<div class="opomba_holder">';
-				echo '<td style="width:120px;">'.$lang['note'].' ('.$lang['srv_internal'].'):</td>';
+                echo '*'.$lang['note'].' ('.$lang['srv_internal'].'): '.$opomba;
-				echo '<td >';
+                echo '</div>';
-				echo '<span>'.$opomba.'</span>';
-				echo '</td>';
-				echo '</tr></table>';
 			}
 			echo '</div>';
 
@@ -438,12 +451,10 @@ class Glasovanje {
 
 			echo '<div id="editor_display_' . $id. '" class="editor_display" >';
 			echo '<div class="editor_display_small pointer lightRed" onclick="editor_display(\'' . $id . '\'); $(this).parent().hide();" style="width:auto;" title="'.$lang['srv_editor'].'">';
-			//echo '<img src="img_' . $this->skin . '/settings.png" />';
 			echo $lang['srv_editor'] . '<span style="font-size: large;">&nbsp;&#187;</span>';
 			echo'</div>';
 			echo '</div>';
 			echo '<textarea name="naslov_' . $id . '" class="texteditor naslov" id="naslov_' . $id . '" >' . $text . '</textarea>';
-			echo '<div class="clr"></div>';
 
 			// opomba
 			echo '<table style="margin-top:5px; width:100%"><tr>';

admin/survey/Help.php

@@ -7,7 +7,7 @@ class Help {
     * ce smo v editmodu se bo prikazal textbox za urejanje helpa
     * ce smo v navadnem modu se bo prikazal help box
     */
-    public static function display ($what) {
+    public static function display ($what, $title='') {
         global $admin_type, $lang;
         
         $sql = sisplet_query("SELECT help FROM srv_help WHERE what='$what' AND lang='$lang[id]'");
@@ -15,10 +15,10 @@ class Help {
         $help = $row['help'];
         
         if ($admin_type == 0 && isset($_COOKIE['edithelp'])) {
-            return ' <a href="/" id="help_'.$what.'" lang="'.$lang['id'].'" class="edithelp" onclick="return false;" title_txt="">(?)</a>';  
+            return ' <a href="/" id="help_'.$what.'" lang="'.$lang['id'].'" class="edithelp" onclick="return false;" title_txt="">'.(empty($title) ? '(?)' : '<span class="faicon help2 title20"></span>').'</a>';  
         } 
         elseif ($help != '') {
-            return ' <a href="/" id="help_'.$what.'" lang="'.$lang['id'].'" class="help" onclick="return false;" title_txt="">(?)</a>';
+            return ' <a href="/" id="help_'.$what.'" lang="'.$lang['id'].'" class="help" onclick="return false;" title_txt="">'.(empty($title) ? '(?)' : '<span class="faicon help2 title20"></span>').'</a>';
         }
         
     }
@@ -29,10 +29,16 @@ class Help {
     static function edit_toggle () {
         global $lang;
         
-        if (isset($_COOKIE['edithelp']))
+        if (isset($_COOKIE['edithelp'])) {
-            echo '<label><a href="ajax.php?t=help&a=edit_off" title="'.$lang['help'].'">'.$lang['srv_insend'].'</a></label>';
+            echo '<div class="button_holder botom0">';
-        else
+            echo '<button class="medium blue" onClick="window.location.href=\'ajax.php?t=help&a=edit_off\';return false;">'.$lang['srv_insend'].'</button>';				
-            echo '<label><a href="ajax.php?t=help&a=edit_on" title="'.$lang['help'].'">'.$lang['start'].'</a></label>';
+            echo '</div>';
+        }
+        else {
+            echo '<div class="button_holder bottom0">';
+            echo '<button class="medium blue" onClick="window.location.href=\'ajax.php?t=help&a=edit_on\';return false;">'.$lang['start'].'</button>';				
+            echo '</div>';
+        }
     }
     
     function ajax () {

admin/survey/ajax.php

@@ -14,6 +14,10 @@ if (isDebug()){
 	error_reporting(E_ALL ^ E_NOTICE);
 	ini_set('display_errors', '1');
 }
+else{
+    error_reporting(E_ALL ^ E_NOTICE ^ E_STRICT);
+    ini_set('display_errors', '0');
+}
 
 Common::start();
 
@@ -502,6 +506,10 @@ elseif ($_GET['t'] == 'library') {
     $l = new Library();
     $l->ajax();
 } 
+elseif ($_GET['t'] == 'libraryBranching') {
+    $lb = new LibraryBranching($anketa);
+    $lb->ajax();
+} 
 elseif ($_GET['t'] == 'help') {
     $h = new Help();
     $h->ajax();

admin/survey/api/api_test.php

@@ -7,23 +7,27 @@
 
 
 // Nastavimo url api-ja
-//$api_url = 'http://localhost/admin/survey/api/api.php';
+//$api_url = 'http://test.1ka.si/admin/survey/api/api.php';
-$api_url = 'http://test.1ka.si/admin/survey/api/api.php';
 //$api_url = 'https://www.1ka.si/admin/survey/api/api.php';
 
 // Nastavimo identifier in key userja
 $identifier = 'a1c3b90fdae3c45d';
 $private_key = 'e60032141a7aae518f9938636b963fc14d58d40025dc7b6b82f4e69b8a42599e';
 
+$api_url = 'http://localhost/admin/survey/api/api.php';
+$identifier = '0d712128f7fe5707';
+$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be';
+
 
 // Nastavimo parametre
-$ank_id = '8086';
+//$ank_id = '8086';
-$action = 'getSurveyQuestions';
+//$action = 'getSurveyQuestions';
+$action = 'createSurvey';
 
 
 // Izvedemo klic (GET ali POST)
-$result = executeGET();
+//$result = executeGET();
-//$result = executePOST();
+$result = executePOST();
 
 
 
@@ -82,7 +86,7 @@ function executePOST(){
 	
 	// GET params
 	$params = 'action='.$action;		// Funkcija, ki jo želimo izvesti
-	$params .= '&ank_id='.$ank_id;		// ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
+	//$params .= '&ank_id='.$ank_id;		// ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
 			
 	// POST data
 	$post_data = array(
@@ -99,6 +103,19 @@ function executePOST(){
         "param_string" => "rekid=5406729&dnid=10352449&brand=MORA&ser=Žiak Pavel Žiak - GOREMO (Víglaš)&serenota=Pavel Žiak - GOREMO&sercenter=SC Slovakia&drzava=Slovakia"
     );*/
 
+    $post_data = array(
+		"naslov_vprasalnika"    => "naslovovoovvo",
+		"survey_type"           => 0,
+		"besedilo_vprasanja"    => "text vprasasa",
+		"vrsta_vprasanja"       => 0,
+		"other"                 => "Other:",
+        "Odgovori" => array(
+            "Text of option 1",
+            "Text of option 2",
+            "Text of option 3"
+        )
+    );
+
 
 	// Pripravimo podatke za hashiranje
 	$request_method = 'POST';

admin/survey/api/class.ApiSurvey.php

@@ -2150,15 +2150,16 @@ class ApiSurvey {
         // GLASOVANJE
         if ($survey_type == 0) {
 
-            $sql = sisplet_query("INSERT INTO srv_anketa (id, hash, naslov, akronim, db_table, starts, expire, dostop, insert_uid, insert_time, edit_uid, edit_time, cookie, text, url, intro_opomba, survey_type, lang_admin, lang_resp, active, skin, show_intro, show_concl, locked, mobile_created) " .
+            $sql = sisplet_query("INSERT INTO srv_anketa 
-                    "VALUES ('', '".$hash."', $naslov', '$akronim', '1', $starts, $expire, '0', '$global_user_id', NOW(), '$global_user_id', NOW(), '$SurveyCookie', '', '$url', '', '0', '$lang_admin', '$lang_resp', '0', '1kaBlue', '0', '0', '0', '$mobile_created')");
+                                    (id, hash, naslov, akronim, db_table, starts, expire, dostop, insert_uid, insert_time, edit_uid, edit_time, cookie, text, url, intro_opomba, survey_type, lang_admin, lang_resp, active, skin, show_intro, show_concl, locked, mobile_created)
+                                    VALUES 
+                                    ('', '".$hash."', '$naslov', '$akronim', '1', $starts, $expire, '0', '$global_user_id', NOW(), '$global_user_id', NOW(), '$SurveyCookie', '', '$url', '', '0', '$lang_admin', '$lang_resp', '0', '1kaBlue', '0', '0', '0', '$mobile_created')");
 
             if (!$sql) {
                 $error = mysqli_error($GLOBALS['connect_db']);
             }
             $anketa = mysqli_insert_id($GLOBALS['connect_db']);
 
-
             if ($anketa > 0) {
 
                 $url .= 'a/' . $hash;
@@ -2223,7 +2224,7 @@ class ApiSurvey {
             $show_concl = ($zakljucek['hide_zakljucek'] == '1') ? 0 : 1;
 
             $sql = sisplet_query("INSERT INTO srv_anketa (id, hash, naslov, akronim, db_table, starts, expire, dostop, insert_uid, insert_time, edit_uid, edit_time, cookie, text, url, intro_opomba, survey_type, lang_admin, lang_resp, active, skin, introduction, conclusion, show_intro, show_concl, locked, mobile_created) " .
-                    "VALUES ('', '".$hash."', $naslov', '$akronim', '1', $starts, $expire, '0', '$global_user_id', NOW(), '$global_user_id', NOW(), '$SurveyCookie', '', '$url', '', '2', '$lang_admin', '$lang_resp', '$autoActiveSurvey', '1ka', '$uvod_besedilo', '$zakljucek_besedilo', '$show_intro', '$show_concl', '1', '$mobile_created')");
+                    "VALUES ('', '".$hash."', '$naslov', '$akronim', '1', $starts, $expire, '0', '$global_user_id', NOW(), '$global_user_id', NOW(), '$SurveyCookie', '', '$url', '', '2', '$lang_admin', '$lang_resp', '$autoActiveSurvey', '1ka', '$uvod_besedilo', '$zakljucek_besedilo', '$show_intro', '$show_concl', '1', '$mobile_created')");
             if (!$sql) {
                 $error = mysqli_error($GLOBALS['connect_db']);
             }
@@ -3531,7 +3532,7 @@ class ApiSurvey {
                 if ($add) {
                     $f = @fopen($site_path . '.htaccess', 'a');
                     if ($f !== false) {
-                        fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(.*)			' . $link . "&foo=\$1&%{QUERY_STRING}");
+                        fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(?!-)(.*)			' . $link . "&foo=\$1&%{QUERY_STRING}");
                         fclose($f);
 
                         $sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')");
@@ -3638,7 +3639,7 @@ class ApiSurvey {
                 if ($add) {
                     $f = @fopen($site_path . '.htaccess', 'a');
                     if ($f !== false) {
-                        fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(.*)			' . $link . "&foo=\$1&%{QUERY_STRING}");
+                        fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(?!-)(.*)			' . $link . "&foo=\$1&%{QUERY_STRING}");
                         fclose($f);
 
                         $sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')");

admin/survey/classes/class.AppSettings.php

@@ -178,24 +178,28 @@ class AppSettings {
     // Display app settings
     public function displaySettingsGroup($group){
 
-        echo '<br>';
-
         $setting_variables = $this->variables[$group];
+        
 
         foreach($setting_variables as $what){
             $this->displaySetting($what);
-        }   
+        }
+        
     }
 
     // Display app single setting
     public function displaySetting($what){
         global $lang;
-        
-        echo '<span class="nastavitveSpan6"><label>'.$lang['as_'.$what].': </label></span>';
-            
-        echo '<input type="text" size="40" name="as_'.$what.'" value="'.strip_tags($this->settings[$what]).'">';
 
-        echo '<br>';
+        echo '<div class="osnovne_nastavitve_single">';
+        
+        echo '<label>'.$lang['as_'.$what].': </label>';
+            
+        echo '<input type="text" name="as_'.$what.'" value="'.strip_tags($this->settings[$what]).'">';
+        
+        echo '</div>';
+
+
     }
 }
 

admin/survey/classes/class.Cache.php

@@ -207,32 +207,95 @@ class Cache
                     $result['tip'] = $lang['srv_sklop_posebna_short'] . ' - ' . $lang['srv_vprasanje_tip_' . $spremenljivka['tip']];
                     break;
             }
+
+            //$result['izrazanje'] = $spremenljivka['tip']; - preverjanje manjkajočih tipov za switch spodaj. Če je vse ok, se lahko odstrani @TG
+
             switch ($spremenljivka['tip']) {
                 case 1 : // radio
+                    $result['izrazanje'] = $lang['srv_vprasanje_radio'];
+                    break;
                 case 2 : // check
+                    $result['izrazanje'] = $lang['srv_vprasanje_checkbox'];
+                    break;
                 case 3 : // drop
-                case 6 : // mradio
+                    $result['izrazanje'] = $lang['srv_vprasanje_dropdown'];
-                case 16 : // mcheck
-                case 17 : // razvrščanje
-                    $result['izrazanje'] = $lang['srv_analiza_vrsta_kate'];
                     break;
                 case 4 : // text
-                case 19 : // mtext
+                    $result['izrazanje'] = $lang['srv_vprasanje_text'];
-                case 21 : // text*
-                    $result['izrazanje'] = $lang['srv_analiza_vrsta_bese'];
-                    break;
-                case 7 : // number
-                case 18 : // vsota
-                case 20 : // mnumber
-                case 22 : // kalkulacija
-                case 25 : // kvota
-                    $result['izrazanje'] = $lang['srv_analiza_vrsta_stev'];
-                    break;
-                case 8 : // datum
-                    $result['izrazanje'] = $lang['srv_analiza_vrsta_stev'];
                     break;
                 case 5 : // nagovor
-                    $result['izrazanje'] = $lang['srv_analiza_vrsta_nago'];
+                    $result['izrazanje'] = $lang['srv_vprasanje_label'];
+                    break;
+                case 6 : // mradio
+                    $result['izrazanje'] = $lang['srv_vprasanje_multigrid'];
+                    break;
+                case 7 : // number
+                    $result['izrazanje'] = $lang['srv_vprasanje_number'];
+                    break;
+                case 8 : // datum
+                    $result['izrazanje'] = $lang['srv_vprasanje_datum'];
+                    break;
+
+                
+                //SOCIAL NETWORK VPRAŠANJA
+                case 9 :
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_9'];
+                    break;
+                case 10 :
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_10'];
+                    break; 
+                case 11 :
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_11'];
+                    break;
+                case 12 :
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_12'];
+                    break; 
+                case 13 :
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_13'];
+                    break;
+
+
+                //AW
+                case 14 :
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_14'];
+                    break; 
+                case 15 :
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_15'];
+                    break;
+
+
+                case 16 : // mcheck
+                    $result['izrazanje'] = $lang['srv_vprasanje_multicheckbox'];
+                    break;
+                case 17 : // razvrščanje
+                    $result['izrazanje'] = $lang['srv_vprasanje_ranking'];
+                    break;
+                case 18 : // vsota
+                    $result['izrazanje'] = $lang['srv_vprasanje_vsota'];
+                    break;
+                case 19 : // mtext
+                    $result['izrazanje'] = $lang['srv_vprasanje_multitext'];
+                    break;
+                case 20 : // mnumber
+                    $result['izrazanje'] = $lang['srv_vprasanje_multinumber'];
+                    break;
+                case 21 : // text*
+                    $result['izrazanje'] = $lang['srv_vprasanje_text'];
+                    break;
+                case 22 : // kalkulacija
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_22'];
+                    break;
+                case 24 : // kombinirana tabela
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_24'];
+                    break;
+                case 25 : // kvota
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_25'];
+                    break;
+                case 26 : // lokacija
+                    $result['izrazanje'] = $lang['srv_vprasanje_tip_26'];
+                    break;
+                case 27 : // heatmap
+                    $result['izrazanje'] = $lang['srv_vprasanje_heatmap'];
                     break;
             }
 

admin/survey/classes/class.Common.php

@@ -1112,7 +1112,7 @@ class Common {
 			while (!feof($f)) {
 				$r = fgets($f);
 
-				if (strpos($r, "^".$nice_url.'\b(.*)	') !== false && strpos($r, "?anketa=".$ank_id."") !== false) {
+				if (strpos($r, "^".$nice_url.'\b') !== false && strpos($r, "?anketa=".$ank_id."") !== false) {
 					// kao pobrisemo vrstico
 				} else {
 					$output[] = $r;
@@ -1152,7 +1152,7 @@ class Common {
 
 							while($rowS = mysqli_fetch_array($sqlS)){
 
-								if (strpos($r, "^".$rowS['link'].'\b(.*)	') !== false && strpos($r, "?anketa=".$ank_id."&skupina=".$rowS['vre_id']."") !== false) {
+								if (strpos($r, "^".$rowS['link'].'\b') !== false && strpos($r, "?anketa=".$ank_id."&skupina=".$rowS['vre_id']."") !== false) {
 
 									// pobrisemo vrstico in vnos v bazi
 									$sqlD = sisplet_query("DELETE FROM srv_nice_links_skupine WHERE ank_id='$ank_id' AND nice_link_id='$row[id]' AND vre_id='$rowS[vre_id]'");
@@ -2129,11 +2129,56 @@ class Common {
     }
     
     // Izpise obvestilo, da ni podatkov
-    static function noDataAlert() {
+    static function noDataAlert($location='') {
         global $lang;
+		global $anketa;
         
         echo '<div class="no_data_alert">';
-        echo $lang['srv_data_no_data'];
+
+        if($lang['id'] == '1')
+		    echo '<img src="/public/img/images/no_data.svg" />';
+        else
+		    echo '<img src="/public/img/images/no_data_eng.svg" />';
+
+        if($location == 'status') {
+			echo '<h2>'.$lang['srv_dashboard_no_data'].'</h2>';
+		}
+		else {
+			echo '<h2>'.$lang['srv_data_no_data'].'</h2>';
+		}
+
+        echo '<div id="note">';
+		if($location == 'status') {
+			echo '<p>'.$lang['srv_data_no_data3'].'</p>';
+		}
+		else {
+			echo '<p>'.$lang['srv_data_no_data2'].'</p>';
+		}
+        echo '</div>';
+
+		if($location == 'status') {
+			$buttonA = 'index.php?anketa='.$anketa.'&a=branching'; //urejanje
+			$buttonB = 'index.php?anketa='.$anketa.'&a=testiranje'; //testiranje
+			$textA = $lang['edit2'];
+			$textB = $lang['srv_testiranje'];
+			$textC = $lang['srv_vabila'];
+		}
+		else {
+			$buttonA = 'index.php?anketa='.$anketa.'&a=testiranje&m=testnipodatki'; //avtomatski testni vnos
+			$buttonB = SurveyInfo::getSurveyLink() . '?preview=on&testdata=on'; //ročni testni vnos
+			$textA = $lang['srv_testiranje_vnosi2'];
+			$textB = $lang['srv_archive_test_data_text2a'];
+			$textC = $lang['srv_anketa_share'];
+		}
+
+		$buttonC = 'index.php?anketa='.$anketa.'&amp;a=vabila'; //objava
+
+		echo '<div id="buttons">';
+		echo '  <a href="'.$buttonA.'"><button class="medium white-blue buttonA" onClick="window.location.href='.$buttonA.';return false;">'.$textA.'</button></a>';              
+		echo '  <a href="'.$buttonB.'"><button class="medium white-blue buttonB" onClick="window.open('.$buttonB.', \'_blank\');return false;">'.$textB.'</button></a>';              
+        echo '  <a href="'.$buttonC.'"><button class="medium blue buttonC">'.$textC.'</button></a>';
+        echo '</div>';
+
         echo '</div>';
     }
 

admin/survey/classes/class.Dostop.php

@@ -501,7 +501,8 @@ class Dostop {
 
         echo '<div class="popup_close"><a href="#" onClick="anketa_user_dostop_close(); return false;">✕</a></div>';
 
-		echo '<h3><span class="bold">';
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title semi-bold">';
 
         if ($r['type'] == 2 || $r['type'] == 3) {
 			echo $lang['admin_narocnik'];
@@ -515,7 +516,7 @@ class Dostop {
 
 		$r['email'] = iconv("iso-8859-2", "utf-8", $r['email']);
 
-		echo ': ' . $r['name'] . ' ' . $r['surname'] . ' (' . $r['email'] . ')</span></h3>';
+		echo ': ' . $r['name'] . ' ' . $r['surname'] . ' (' . $r['email'] . ')</span>';
 
 		if ($r['type'] >= 2) {
 
@@ -524,49 +525,77 @@ class Dostop {
 			$dostop = explode(',', $row['dostop']);
 			echo '<form id="dostop">';
 			echo '<input type="hidden" name="uid" value="' . $uid . '">';
-
 			echo '<input type="hidden" name="aktiven" value="1" id="aktiven_1">';
 
-			echo '<p><input type="checkbox" name="dostop[dashboard]" value="dashboard" id="dashboard" ' . (in_array('dashboard', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '> <label for="dashboard">' . $lang['srv_dostop_dashboard'] . '</label></p>';
+			echo '<div class="setting_item">';
-			echo '<p><input type="checkbox" name="dostop[edit]" value="edit" id="edit" ' . (in_array('edit', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . ' onchange="dostop_language(this);"> <label for="edit">' . $lang['srv_dostop_edit'] . '</label></p>';
+			echo '<input type="checkbox" name="dostop[dashboard]" value="dashboard" id="dashboard" ' . (in_array('dashboard', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '>';
-			echo '<p><input type="checkbox" name="dostop[test]" value="test" id="test" ' . (in_array('test', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . ' onchange="dostop_language(this);"> <label for="test">' . $lang['srv_dostop_test'] . '</label></p>';
+			echo '<label for="dashboard">' . $lang['srv_dostop_dashboard'] . '</label>';
-			echo '<p><input type="checkbox" name="dostop[publish]" value="publish" id="publish" ' . (in_array('publish', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . ' onchange="dostop_language(this);"> <label for="publish">' . $lang['srv_dostop_publish'] . '</label></p>';
+			echo '</div>';
-			echo '<p><input type="checkbox" name="dostop[data]" value="data" id="data" ' . (in_array('data', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '> <label for="data">' . $lang['srv_dostop_data'] . '</label></p>';
+			echo '<div class="setting_item">';
-			echo '<p><input type="checkbox" name="dostop[analyse]" value="analyse" id="analyse" ' . (in_array('analyse', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '> <label for="analyse">' . $lang['srv_dostop_analyse'] . '</label></p>';
+			echo '<input type="checkbox" name="dostop[edit]" value="edit" id="edit" ' . (in_array('edit', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . ' onchange="dostop_language(this);">';
-
+			echo '<label for="edit">' . $lang['srv_dostop_edit'] . '</label>';
-			echo '<p><input type="checkbox" name="dostop[export]" value="export" id="export" ' . (in_array('export', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '> <label for="export">' . $lang['srv_dostop_export'] . '</label></p>';
+			echo '</div>';
-
+			echo '<div class="setting_item">';
+			echo '<input type="checkbox" name="dostop[test]" value="test" id="test" ' . (in_array('test', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . ' onchange="dostop_language(this);">';
+			echo '<label for="test">' . $lang['srv_dostop_test'] . '</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="checkbox" name="dostop[publish]" value="publish" id="publish" ' . (in_array('publish', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . ' onchange="dostop_language(this);">';
+			echo '<label for="publish">' . $lang['srv_dostop_publish'] . '</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="checkbox" name="dostop[data]" value="data" id="data" ' . (in_array('data', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '>';
+			echo '<label for="data">' . $lang['srv_dostop_data'] . '</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="checkbox" name="dostop[analyse]" value="analyse" id="analyse" ' . (in_array('analyse', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '>';
+			echo '<label for="analyse">' . $lang['srv_dostop_analyse'] . '</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="checkbox" name="dostop[export]" value="export" id="export" ' . (in_array('export', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '>';
+			echo '<label for="export">' . $lang['srv_dostop_export'] . '</label>';
+			echo '</div>';
 			// Nastavitev, da ne more odklenit ankete
-			echo '<p><input type="checkbox" name="dostop[lock]" value="lock" id="lock" ' . (in_array('lock', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '> <label for="lock">' . $lang['srv_dostop_lock'] . '</label></p>';
+			echo '<div class="setting_item">';
-
+			echo '<input type="checkbox" name="dostop[lock]" value="lock" id="lock" ' . (in_array('lock', $dostop) ? 'checked' : '') . ' ' . (in_array('phone', $dostop) ? ' disabled="disabled"' : '') . '>';
+			echo '<label for="lock">' . $lang['srv_dostop_lock'] . '</label>';
+			echo '</div>';
 			// Je anketar - ne more poceti nicesar razen izvajati telefonsko anketo (ob kliku se ostale avtomatsko ugasnejo in disablajo)
-			echo '<p><input type="checkbox" name="dostop[phone]" value="phone" id="phone" ' . (in_array('phone', $dostop) ? 'checked' : '') . ' onchange="dostop_anketar(this);"> <label for="phone">' . $lang['srv_dostop_phone'] . '</label></p>';
+			echo '<div class="setting_item">';
+			echo '<input type="checkbox" name="dostop[phone]" value="phone" id="phone" ' . (in_array('phone', $dostop) ? 'checked' : '') . ' onchange="dostop_anketar(this);">';
+			echo '<label for="phone">' . $lang['srv_dostop_phone'] . '</label>';
+			echo '</div>';
+						
+			echo '</div>';
 
 			// Če gre za Hierarhijo
 			if (SurveyInfo::checkSurveyModule('hierarhija', $this->anketa)) {
 				$tip = sisplet_query("SELECT type FROM srv_hierarhija_users WHERE user_id='" . $uid . "' AND anketa_id='" . $this->anketa . "'", "obj");
 
 				if (!empty($tip) && !empty($tip->type)) {
-					echo '<p><label>Uporabnik hierarhije s pravicami: </label>';
+					echo '<div class="setting_holder">';
-					echo '<select name="hierarchy_type" id="hierarchy-type-change" onchange="hierarhijaPravice()">
+					echo '<span class="setting_title">Uporabnik hierarhije s pravicami:</span>';
-                            <option value="10" ' . ($tip->type == 10 ? 'selected' : NULL) . '> Učitelj </option>
+					echo '<select class="dropdown large" name="hierarchy_type" id="hierarchy-type-change" onchange="hierarhijaPravice()">
-                            <option value="2" ' . ($tip->type == 2 ? 'selected' : NULL) . '> Administrator </option>
+						<option value="10" ' . ($tip->type == 10 ? 'selected' : NULL) . '> Učitelj </option>
-                        </select ></p>';
+						<option value="2" ' . ($tip->type == 2 ? 'selected' : NULL) . '> Administrator </option>
+						</select >';
+					echo '</div>';
 				}
 			}
 
-
-			echo '<div style="position: absolute; right: 10px; top: 50px; width: 200px;">';
-
 			// Ce je katerikoli od treh checkboxou ugasnjen imamo enablano editiranje samo posameznega jezik
 			$enable_lang = (!in_array('edit', $dostop) || !in_array('test', $dostop) || !in_array('publish', $dostop)) ? TRUE : FALSE;
 
 			$sqll = sisplet_query("SELECT * FROM srv_language WHERE ank_id = '$this->anketa'");
-			if (mysqli_num_rows($sqll) > 0) {
-				echo '<p><b>' . $lang['srv_passive_multilang'] . '</b></p>';
 
+			echo '<div class="setting_holder">';
+
+			if (mysqli_num_rows($sqll) > 0) {
+				echo '<span class="setting_title">' . $lang['srv_passive_multilang'] . ':</span>';
+				
 				echo '<input type="hidden" name="dostop_language_edit" id="dostop_language_edit" value="' . ($enable_lang ? '1' : '0') . '">';
 			}
+
 			while ($rowl = mysqli_fetch_array($sqll)) {
 
 				$sqldl = sisplet_query("SELECT * FROM srv_dostop_language WHERE ank_id = '$this->anketa' AND uid = '$uid' AND lang_id='$rowl[lang_id]'");
@@ -579,16 +608,18 @@ class Dostop {
 					$checked = '';
 				}
 
-				echo '<label><input class="dostop_language" type="checkbox" name="dostop_language[]" value="' . $uid . '-' . $rowl['lang_id'] . '" ' . $checked . ' ' . ($enable_lang ? '' : ' disabled="disabled"') . ' > ' . $rowl['language'] . '</label> <br>';
+				echo '<div class="setting_item">';
+				echo '<input class="dostop_language" type="checkbox" name="dostop_language[]" id="' . $uid . '-' . $rowl['lang_id'] . '" value="' . $uid . '-' . $rowl['lang_id'] . '" ' . $checked . ' ' . ($enable_lang ? '' : ' disabled') . ' >';
+				echo '<label ' . ($enable_lang ? '' : ' disabled') . ' for="' . $uid . '-' . $rowl['lang_id'] . '">' . $rowl['language'] . '</label>';
+				echo '</div>';
 			}
 
 			echo '</div>';
 
 			echo '</form>';
-
-			echo '<div class="buttonwrapper floatLeft spaceRight"><a class="ovalbutton ovalbutton_orange" onclick="anketa_user_dostop_save(\'' . $this->anketa . '\'); return false;" href="#"><span>' . $lang['edit1337'] . '</span></a></div>';
         } 
-        // Manager - brez moznosti uporabe 1ka streznika
+        
+		// Manager - brez moznosti uporabe 1ka streznika
 		elseif ($r['type'] == 1) {
 
 			$sql = sisplet_query("SELECT dostop FROM srv_dostop WHERE ank_id='$this->anketa' AND uid='$uid'");
@@ -633,8 +664,6 @@ class Dostop {
 				echo '</form>';
 
 				echo '<p>(' . $lang['srv_dostop_edit'] . ', ' . $lang['srv_dostop_data'] . ', ' . $lang['srv_dostop_export'] . ')</p>';
-
-				echo '<div class="buttonwrapper floatLeft spaceRight"><a class="ovalbutton ovalbutton_orange" onclick="anketa_user_dostop_save(\'' . $this->anketa . '\'); return false;" href="#"><span>' . $lang['edit1337'] . '</span></a></div>';
             } 
             // Ostali ne morejo managerju nicesar spreminjati
 			else {
@@ -646,7 +675,10 @@ class Dostop {
 			echo '<p>(' . $lang['srv_dostop_edit'] . ', ' . $lang['srv_dostop_data'] . ', ' . $lang['srv_dostop_export'] . ')</p>';
 		}
 
-		echo '<div class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_gray" onclick="anketa_user_dostop_close(); return false;" href="#"><span>' . $lang['srv_zapri'] . '</span></a></div>';
+		echo '<div class="button_holder">';
+		echo '<button class="medium white-blue" onClick="anketa_user_dostop_close(); return false;">'.$lang['edit1338'].'</button>';              
+		echo '<button class="medium blue" onclick="anketa_user_dostop_save(\'' . $this->anketa . '\'); return false;">'.$lang['edit1337'].'</button>';
+		echo '</div>';
 	}
 
 	function ajax_anketa_user_dostop_save()	{
@@ -697,7 +729,8 @@ class Dostop {
         
 		echo '<form class="manager_add_user" name="manager_edit_user" action="ajax.php?t=dostop&a=edit_user_save&uid=' . $uid . '" method="post">';
 
-		echo '<h2><strong>' . $lang['edit_user'] . '</strong></h2>';
+		echo '<h2>' . $lang['edit_user'] . '</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="edit_user_close();">✕</a></div>';
 
         // Segment tip uporabnika
         echo '<div class="segment user_type">';
@@ -706,35 +739,65 @@ class Dostop {
 
 		// Emaila ne more vec editirat, ker je prevec problemov (izgubi ankete...)
 		echo '<input type="hidden" id="email" name="email" value="' . $row['email'] . '" />';
-        echo '<p><label for="email">' . $lang['user2'] . ':</label>'.$row['name'].' '.$row['surname'].' ('.$row['email'].')</p>';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">' . $lang['user2'] . ': '.$row['name'].' '.$row['surname'].' ('.$row['email'].')</span>';
+		echo '</div>';
 
 		// Admin lahko spreminja tip vseh userjev
 		if ($admin_type == 0) {
-			echo '<p><label for="type">' . $lang['admin_type'] . '</label><select id="type" name="type">';
+
+			echo '<div class="setting_holder horizontal">';
+			echo '<span class="setting_title">' . $lang['admin_type'] . ':</span>';
+			echo '<select class="dropdown medium" id="type" name="type">';
 			echo '<option value="0" ' . ($row['type'] == '0' ? 'selected' : '') . '>' . $lang['admin_admin'] . '</option>';
 			echo '<option value="1" ' . ($row['type'] == '1' ? 'selected' : '') . '>' . $lang['admin_manager'] . '</option>';
 			echo '<option value="3" ' . ($row['type'] == '3' ? 'selected' : '') . '>' . $lang['admin_narocnik'] . '</option>';
-			echo '</select></p>';
+			echo '</select>';
+			echo '</div>';
         } 
         else {
 			echo '<input type="hidden" id="type" name="type" value="' . $row['type'] . '" />';
 		}
 
-		echo '<p><label for="status">' . $lang['status'] . '</label><select name="status" id="status"><option value="1" ' . ($row['status'] == 1 ? 'selected' : '') . '>' . $lang['srv_user_notbanned'] . '</option><option value="0" ' . ($row['status'] == 0 ? 'selected' : '') . '>' . $lang['srv_user_banned'] . '</option></select></p>';
+		echo '<div class="setting_holder horizontal">';
-        
+		echo '<span class="setting_title">' . $lang['status'] . '</span>';
+		echo '<select class="dropdown medium" name="status" id="status"><option value="1" ' . ($row['status'] == 1 ? 'selected' : '') . '>' . $lang['srv_user_notbanned'] . '</option><option value="0" ' . ($row['status'] == 0 ? 'selected' : '') . '>' . $lang['srv_user_banned'] . '</option></select>';
+		echo '</div>';
+
         echo '</div>';
 
         // Segment osnovni podatki
         echo '<div class="segment user_info">';
 
-		echo '<p><label for="name">' . $lang['name'] . ':</label><input type="text" id="name" name="name" value="' . (!empty($row['name']) ? $row['name'] : '') . '" autocomplete="off" size="50"></p>';
+		echo '<div class="setting_holder horizontal">';
-		echo '<p><label for="surname">' . $lang['surname'] . ':</label><input type="text" id="surname" name="surname" value="' . (!empty($row['surname']) ? $row['surname'] : '') . '" size="50" readonly onfocus="this.removeAttribute(\'readonly\');"></p>';
+		echo '<span class="setting_title">' . $lang['name'] . ':</span>';
-		echo '<p><label for="password">' . $lang['password'] . ':</label><input type="password" id="password" name="password" readonly onfocus="this.removeAttribute(\'readonly\');"></p>';
+		echo '<input type="text" class="text medium" id="name" name="name" value="' . (!empty($row['name']) ? $row['name'] : '') . '" autocomplete="off" size="50">';
-		echo '<p><label for="password2">' . $lang['cms_register_user_repeat_password'] . ':</label><input type="password" id="password2" name="password2" readonly onfocus="this.removeAttribute(\'readonly\');"></p>';
+		echo '</div>';
-        echo '<p><label for="subscription">'.$lang['srv_subscribe'].':</label> 
+
-               <input type="radio" id="subscriptionDa" name="gdpr_agree" value="1" '.($row['gdpr_agree'] == 1 ? 'checked="checked"' : '').'><label for="subscriptionDa" style="width: auto;">'.$lang['yes'].'</label>'.
+		echo '<div class="setting_holder horizontal">';
-                ' <input type="radio" id="subscriptionNe" class="spaceLeft" name="gdpr_agree" value="0" '.($row['gdpr_agree'] == 0 ? 'checked="checked"' : '').'><label for="subscriptionNe" style="width: auto;">'.$lang['no'].'</label>'.
+		echo '<span class="setting_title">' . $lang['surname'] . ':</span>';
-            '</p>';
+		echo '<input type="text" class="text medium" id="surname" name="surname" value="' . (!empty($row['surname']) ? $row['surname'] : '') . '" size="50" readonly onfocus="this.removeAttribute(\'readonly\');">';
+		echo '</div>';
+
+
+		echo '<div class="setting_holder horizontal">';
+		echo '<span class="setting_title">' . $lang['password'] . ':</span>';
+		echo '<input type="password" class="text medium" id="password" name="password" readonly onfocus="this.removeAttribute(\'readonly\');">';
+		echo '</div>';
+
+
+		echo '<div class="setting_holder horizontal">';
+		echo '<span class="setting_title">' . $lang['cms_register_user_repeat_password'] . ':</span>';
+		echo '<input type="password" class="text medium" id="password2" name="password2" readonly onfocus="this.removeAttribute(\'readonly\');">';
+		echo '</div>';
+
+
+		echo '<div class="setting_holder horizontal">';
+		echo '<span class="setting_title">'.$lang['srv_subscribe'].':</span>';
+		echo '<input type="radio" id="subscriptionDa" name="gdpr_agree" value="1" '.($row['gdpr_agree'] == 1 ? 'checked="checked"' : '').'><label for="subscriptionDa" style="width: auto;">'.$lang['yes'].'</label>'.
+		' <input type="radio" id="subscriptionNe" class="spaceLeft" name="gdpr_agree" value="0" '.($row['gdpr_agree'] == 0 ? 'checked="checked"' : '').'><label for="subscriptionNe" style="width: auto;">'.$lang['no'].'</label>';
+		echo '</div>';
 
         $user_2fa_validate = User::option($uid, 'google-2fa-validation');
         if($admin_type == 0 && !empty($user_2fa_validate) && $user_2fa_validate != 'NOT') {
@@ -809,7 +872,7 @@ class Dostop {
 
         // SEZNAM ANKET
 		echo '<div class="survey_list">';
-		echo '  <h3><strong>' . $lang['srv_ankete'] . '</strong></h3>';
+		echo '  <p class="semi-bold">' . $lang['srv_ankete'] . '</p>';
 
 		echo '  <ul>';
 		$sql = sisplet_query("SELECT srv_anketa.id, srv_anketa.naslov FROM srv_dostop, srv_anketa WHERE srv_dostop.uid='". $uid ."' AND srv_dostop.ank_id=srv_anketa.id ORDER BY srv_anketa.edit_time DESC");
@@ -824,10 +887,11 @@ class Dostop {
 
         
         // GUMBI NA DNU
-		echo '<p>';
+
-        echo '  <div class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_gray" href="#" onclick="edit_user_close();"><span>'.$lang['srv_zapri'].'</span></a></div>';
+		echo '<div class="button_holder">';
-        echo '  <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="document.manager_edit_user.submit();"><span>'.$lang['edit1337'].'</span></a></div>';
+        echo '<button class="medium white-blue" onClick="edit_user_close();">'.$lang['srv_zapri'].'</button>';              
-        echo '</p>';
+        echo '<button class="medium blue" onclick="document.manager_edit_user.submit();">'.$lang['edit1337'].'</button>';
+        echo '</div>';
 	}
 
 	function ajax_edit_user_save(){
@@ -1186,6 +1250,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 +1264,7 @@ class Dostop {
                     (!empty($uporabnik->st_managerjev) ? $uporabnik->st_managerjev : 0),
                     $lang["users_gdpr".$uporabnik->gdpr_agree],
                     $uporabnik->registriran,
-                    $uporabnik->last_login,
+                    $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>'
                 ];
             }
         }
@@ -1311,6 +1375,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>'.
+                    ' | <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>',
                     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),
@@ -1320,30 +1387,26 @@ class Dostop {
                     (!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
                     $lang["users_gdpr".$uporabnik->gdpr_agree],
                     $uporabnik->registriran,
-                    $uporabnik->last_login,
+                    $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>'
                 ];
 
             }
         }
         
         // Število vseh zadetkov, ki jih imamo v bazi
-        $recordsTotal = 0;
+        $recordsTotal = (is_countable($vsi)) ? sizeof($vsi) : 0;
-        $recordsTotal = sizeof($vsi);
 
         // Število filtriranih zadetkov
         $recordFiltered = $recordsTotal;
         if(!empty($_POST['search']['value']))
-            $recordFiltered = sizeof($vsi);
+            $recordFiltered = $recordsTotal;
 
 		echo json_encode([
-                       "draw" => (!empty($_POST['draw']) ? $_POST['draw'] : 1),
+            "draw"              => (!empty($_POST['draw']) ? $_POST['draw'] : 1),
-			                 "recordsTotal" => $recordsTotal,
+            "recordsTotal"      => $recordsTotal,
-			                 "recordsFiltered" => $recordFiltered,
+            "recordsFiltered"   => $recordFiltered,
-			                 "data" => $seznam   // polje z vsebino
+            "data"              => $seznam   // polje z vsebino
-		                 ]);
+        ]);
 	}
 
 	/**
@@ -1523,9 +1586,14 @@ class Dostop {
 			$r = mysqli_fetch_assoc($result);
 			$g = base64_encode((hash('SHA256', base64_decode($r['pass']) . $pass_salt)));
 
-			sisplet_query("INSERT INTO users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved) 
+			$sqlCopy = sisplet_query("INSERT INTO users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved) 
                       VALUES ('" . $r['type'] . "', '" . $r['email'] . "', '" . $r['name'] . "', '" . $r['surname'] . "', '" . $g . "','" . $r['status'] . "', '" . $r['gdpr_agree'] . "','" . $r['when_reg'] . "', '" . $r['came_from'] . "', '" . $r['lang'] . "',  'Y')");
-			sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'");
+            if (!$sqlCopy) {
+				echo mysqli_error($GLOBALS['connect_db']);
+                return;
+			}
+            
+            sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'");
            
 
             // Uporabniku posljemo email da je bil njegov racun aktiviran
@@ -1594,13 +1662,13 @@ class Dostop {
 			$seznam = [];
 			foreach ($nepotrjeni as $uporabnik) {
 				$seznam[] = [
+					'<span onclick="potrdiNepotrjenegaUporabnika(' . $uporabnik->id . ')" title="' . $lang['confirm_user_in_db'] . '" class="faicon fa-check pointer blue"></span> | ' .
+					'<span onclick="izbrisiNepotrjenegaUporabnika(' . $uporabnik->id . ')" title="'.$lang['delete_user_in_db'].'" class="faicon fa-times pointer blue"></span>',
 					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),
 					iconv(mb_detect_encoding(  $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email),
 					$this->userTypeToText($uporabnik->type),
 					$admin_languages[$uporabnik->lang],
 					$uporabnik->registriran,
-					'<a href="#" onclick="potrdiNepotrjenegaUporabnika(' . $uporabnik->id . ')" title="' . $lang['confirm_user_in_db'] . '"><i class="fa fa-check link-sv-moder"></i> <span class="no-print"> | </span>' .
-					'<a href="#" onclick="izbrisiNepotrjenegaUporabnika(' . $uporabnik->id . ')" title="'.$lang['delete_user_in_db'].'"><i class="fa fa-times link-sv-moder"></a>',
 				];
 			}
 		}

admin/survey/classes/class.Library.php

@@ -5,8 +5,6 @@ class Library {
     var $Branching;
 	
     var $tab = 2;           // tab pove kater tab je odprt (od 4ih)
-    var $tip = 1;          	// tip pove v bazi srv_library_folder za kater tip gre (0-vpra<72>anja, 1-ankete)
-    var $prva = 0;      	// prva pove, ce je to library na prvi strani (1) ali v urejanju ankete (0)
 	
     // v odvisnosti od mode prilagajamu UI. (Mode je odvisen od tipa ankete - survey_type)
     var $mode = -1; 		// mode: -1 -> library pri datotekah, 0 -> glasovanje, 1 -> forma, 2 -> ankata na več straneh, 3 -> ifi
@@ -32,28 +30,12 @@ class Library {
 
         if (isset($_options['tab'])) {
 			$this->tab = $_options['tab'];
-            if ($this->tab <= 1)
-                $this->tip = 0;
-            else
-                $this->tip = 1;
         } 
         else if (isset($_POST['tab'])) {
             $this->tab = ($_POST['tab'] == 0 || $_POST['tab'] == 'undefined') ? 0 : $_POST['tab'];
-            if ($this->tab <= 1)
-                $this->tip = 0;
-            else
-                $this->tip = 1;
         } 
         else {
             $this->tab = 0;
-            $this->tip = 0;
-        }
-
-        if (isset($_options['prva'])) {
-        	$this->prva = $_options['prva'];
-        } 
-        else {
-        	$this->prva = 0;
         }
 
         if (isset($_GET['tab'])) $this->tab = (int)$_GET['tab'];
@@ -78,93 +60,28 @@ class Library {
 		}
 	}
 	
-
+    
-    /**
-    * @desc prikaze knjiznico znotraj ankete na desni
-    */
-    function display () {
-        global $admin_type;
-		global $global_user_id;
-		global $lang;
-
-		echo '<div id="library_title">';
-		echo '<span class="faicon library"></span> '.$lang['srv_library'];
-		echo '<a href="#" title="'.$lang['srv_zapri'].'" onclick="change_mode(\'toolboxback\', \'1\'); return false;"><span class="faicon close" style="float:right;"></span></a>';
-		echo '</div>';
-
-        $this->display_tabs();
-
-        echo '<div id="library">';
-
-        echo '<div id="libraryInner">';
-        $this->display_folders();
-        echo '</div><!-- id="libraryInner" -->';
-
-        echo '</div><!-- id="library" -->';
-    }
-
-    /**
-    * @desc prikaze tabe za izbiro
-    */
-    function display_tabs () {
-        global $lang;
-
-		echo '<p class="display_tabs">';
-	    echo '<span' . ($this->tab==0 || $this->tab==1 ? ' class="highlightTabBlackLeft"' : ' class="nohighlight"') . ' >';
-		echo '<a href="/" onclick="display_knjiznica(\'0\'); return false;" title="'.$lang['srv_vprasanja'].'"><span>' . $lang['srv_vprasanja'] . '</span></a></span>';
-		echo '<span' . ($this->tab==2 || $this->tab==3 ? ' class="highlightTabBlackRight"' : ' class="nohighlight"') . ' >';
-		echo '<a href="/" onclick="display_knjiznica(\'2\'); return false;" title="'.$lang['srv_ankete'].'"><span>' . $lang['srv_ankete'] . '</span></a></span>';
-		echo '</p>';
-    }
-
     function display_folders () {
 		global $global_user_id;
 		global $lang;
 
-		// Knjiznica znotraj posamezne ankete
+        echo '<div class="advanced_search">';
-		if ($this->prva == 0) {
+        echo '  <div id="searchLibrarySettings">';
-			$this->display_contentfolders(0, 0);
+        $this->displaySearchSettings();
-	        $this->display_contentfolders(0, $global_user_id);
+        echo '  </div>';
-
+        echo '</div>';
-	        if ($this->tip == 1) {
+        
-	        	echo '<p class="bold"><a href="index.php?a=knjiznica">'.$lang['srv_library_edit'].'</a><br>';
+        // Na prvi strani imamo search	
-
+        if($this->isSearch == 1){
-	        	$sql = sisplet_query("SELECT * FROM srv_library_anketa WHERE uid='".$global_user_id."' AND ank_id='".$this->SurveyAdmin->anketa."'");
+            echo '<div class="library_title">'.($this->tab == '3' ? $lang['srv_library_title_search_my'] : $lang['srv_library_title_search_public']).'</div>';
-	        	if (mysqli_num_rows($sql) == 0) {
+            $this->display_contentfolders_searchList();
-		        	echo '<div class="buttonwrapper" style="float:left;">
+        }				
-					<a class="ovalbutton ovalbutton_orange btn_savesettings" onclick="add_to_my_library(); return false;" href="#"><span>'.$lang['srv_library_edit_add'].'</span></a>
+        else{
-					</div></p>';
+            echo '<div class="library_title">'.($this->tab == '3' ? $lang['srv_library_title_my'] : $lang['srv_library_title_public']).'</div>';
-	    		}
+            $this->display_contentfolders();
-
+        }
-	    	} else {
-				echo '<p>'.$lang['srv_library_q_txt'].'</p>';
-			}
-
-			//echo '<a style="padding:5px; background-color: white; bottom: 1px; position: absolute; right: 18px;" onclick="change_mode(\'toolboxback\', \'1\'); return false;" href="#">'.$lang['srv_zapri'].'</a>';
-		} 
-		// Knjiznica na prvi strani zraven mojih anket
-		else {
-			// Na prvi strani imamo search	
-			if($this->isSearch == 1){
-				echo '<div id="searchLibrarySettings">';
-				$this->displaySearchSettings();
-				echo '</div>';
-				
-				echo '<div class="clr"></div>';
-				
-				$this->display_contentfolders_searchList();
-			}				
-			else{
-				echo '<div id="searchLibrarySurveys">';
-				$this->displaySearch();
-				echo '</div>';
-				
-				echo '<div class="clr"></div>';
-				
-				$this->display_contentfolders();
-			}
-		}
     }
+    
 
     /**
     * @desc prikaze folderje v knjiznici
@@ -194,200 +111,173 @@ class Library {
 		if (isset($_GET['libfolder'])) $cookie .= '-'.$_GET['libfolder'].'-';
 
         if ($parent == 0) {
-	        // v skrite html elemente shranimo tab, in prva
+	        // v skrite html elemente shranimo tab
 			echo '<input type="hidden" name="lib_tab" id="lib_tab" value="'.($this->tab == 0 || $this->tab == "" ? "0" : "$this->tab").'">';
-			echo '<input type="hidden" name="lib_tip" id="lib_tip" value="'.($this->tip == 0 || $this->tip== "" ? "0" : "$this->tip").'">';
-			echo '<input type="hidden" name="lib_prva" id="lib_prva" value="'.($this->prva == 0 || $this->prva== "" ? "0" : "$this->prva").'">';
 
 			echo '<ul title="'.($uid==0?$lang['srv_library_left']:$lang['srv_library_left_right']).'" style="padding-left:0;" class="'.($admin_type==0 || $uid == $global_user_id?'can_edit':'').'">'."\n";
         }
 
-        $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='$this->tip' $language ORDER BY naslov");
+        $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='1' $language ORDER BY naslov");
         if (!$sql) 
             echo mysqli_error($GLOBALS['connect_db']);
 
         if (mysqli_num_rows($sql) == 0 && $uid > 0 && $parent == 0) {
             
             // za prvic ko pride user, da mu dodamo folder
-            if ($this->tip == 0)
+            $naslov = $lang['srv_moje_ankete'];
-            	$naslov = $lang['srv_moja_vprasanja'];
-            else
-            	$naslov = $lang['srv_moje_ankete'];
             
-            sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent, lang) VALUES ('$uid', '$this->tip', '$naslov', '0', '$lang[id]')");
+            sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent, lang) VALUES ('$uid', '1', '$naslov', '0', '$lang[id]')");
             
-            $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='$this->tip' ORDER BY naslov");
+            $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='1' ORDER BY naslov");
             if (!$sql) 
                 echo mysqli_error($GLOBALS['connect_db']);
         }
 
         while ($row = mysqli_fetch_array($sql)) {
+
             if (strpos($cookie, '-'.$row['id'].'-')=== false && $parent!=0)
                 $hidden = true;
             else
                 $hidden = false;
 
 
-            echo '  <li id="li'.$row['id'].'" eid="'.$row['id'].'" class="folder" name="folder">';
+            echo '  <li id="li'.$row['id'].'" eid="'.$row['id'].'" class="folder '.($parent != 0 ? 'can_drag' : '').'" name="folder">';
 
-            if ($parent != 0)
-                echo '  <a href="/" onclick="javascript:library_folders_plusminus(\''.$row['id'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" id="f_pm_'.$row['id'].'"><span class="faicon icon-blue '.($hidden?'plus':'minus').'"></span></a>';
-            else
-                echo '  <span class="sprites spacer12"></span>';
 
-            echo '  <span class="'.($parent!=0 || $uid>0 || $admin_type==0 ? ' folderdrop' : '').'" id="sp'.$row['id'].'" eid="'.$row['id'].'"><span class="faicon folder icon-blue'.($parent!=0?' movable':'').'"></span>'.
+            echo '<div class="folder_box_holder">';
-                 '  <span '.($admin_type==0||$uid>0? 'title="'.$lang['srv_rename_profile'].'" onclick="folder_rename(\''.$row['id'].'\'); return false;"':'').'>'.$row['naslov'].'</span>';
+            
+            // Drag handle
+            /*if($parent != 0)
+                echo '<span class="faicon move_updown folder_handle"></span>';*/
+
+            // Okvircek folderja
+            echo '<div eid="'.$row['id'].'" class="folder_box '.($hidden ? '' : 'open').' '.($parent!=0 || $uid>0 || $admin_type==0 ? ' folderdrop' : '').'">';
+
+            if ($parent != 0){
+                echo '<span onclick="library_folders_plusminus(\''.$row['id'].'\',\''.$this->tab.'\'); return false;" class="faicon folder_arrow_icon"></span>';
+            }
+
+            echo '<div id="sp'.$row['id'].'" eid="'.$row['id'].'"><span class="faicon folder"></span>';
+            echo '<span '.($admin_type==0||$uid>0? 'title="'.$lang['srv_rename_profile'].'" onclick="folder_rename(\''.$row['id'].'\'); return false;"':'').'>'.$row['naslov'].'</span>';
             if ($admin_type==0 || $uid>0)
-            	echo '  <a href="/" onclick="javascript:library_new_folder(\''.$row['id'].'\',\''.$uid.'\'); return false;"><span class="faicon add icon-blue-hover-orange small new_folder" id="new_folder_'.$row['id'].'" title="'.$lang['srv_newfolder'].'"></span></a>';
+            	echo '<span class="faicon add new_folder" id="new_folder_'.$row['id'].'" title="'.$lang['srv_newfolder'].'" onclick="javascript:library_new_folder(\''.$row['id'].'\',\''.$uid.'\'); return false;"></span>';
-
             if ($parent != 0 && ($admin_type==0||$uid>0) )
-                echo '  <a href="/" onclick="javascript:library_delete_folder(\''.$row['id'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;"><span class="faicon remove icon-orange small delete_folder" id="delete_folder_'.$row['id'].'" title="'.$lang['srv_deletefolder'].'"></span></a>';
+                echo '<span class="faicon remove delete_folder" id="delete_folder_'.$row['id'].'" title="'.$lang['srv_deletefolder'].'" onclick="javascript:library_delete_folder(\''.$row['id'].'\',\''.$this->tab.'\'); return false;"></span>';
+            echo '</div>';
 
-            echo '  </span>'."\n";
+            echo '<div class="folder_clickable" onclick="library_folders_plusminus(\''.$row['id'].'\',\''.$this->tab.'\'); return false;"></div>';
 
-            echo '<ul id="folder_'.$row['id'].'"'.($hidden?' style="display:none"':'').'>'."\n";
+            echo '</div>';
 
+            echo '</div>';
+
+
+            // Vsebina folderja
+            echo '      <ul id="folder_'.$row['id'].'"'.($hidden?' style="display:none"':'').'>'."\n";
             $this->display_contentfolders($row['id'], $uid);
 
-            $this->display_ifs($row['id']);
+            // Izpis anket v folderju
+            $sql1 = sisplet_query("SELECT * FROM srv_anketa a, srv_library_anketa l WHERE a.id=l.ank_id AND l.folder='$row[id]' AND l.uid='$uid' ORDER BY naslov ASC");
+            if (!$sql1) echo mysqli_error($GLOBALS['connect_db']);
 
-			// Izpis spremenljivk v folderju - v root folderju ne izpisujemo vprasanj (ker jih itak ne sme bit)
+            if (mysqli_num_rows($sql1) > 0) {
-			if(!($this->tip == 0 && $parent == 0 && $uid == 0)){
 
-				if ($this->tip == 0)
+                while ($row1 = mysqli_fetch_array($sql1)) {
-					$sql1 = sisplet_query("SELECT * FROM srv_spremenljivka WHERE folder = '$row[id]' AND gru_id='-1' ORDER BY naslov ASC");
-				else
-					$sql1 = sisplet_query("SELECT * FROM srv_anketa a, srv_library_anketa l WHERE a.id=l.ank_id AND l.folder='$row[id]' AND l.uid='$uid' ORDER BY naslov ASC");
-				if (!$sql1) echo mysqli_error($GLOBALS['connect_db']);
 
-				if (mysqli_num_rows($sql1) > 0) {
+                    echo '<li eid="'.$row1['id'].'" class="anketa tip1 '.($admin_type==0 || $uid>0 ? 'can_drag' : '').'" name="library">';
 
-					while ($row1 = mysqli_fetch_array($sql1)) {
+                    // Okvircek ankete
+                    echo '  <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container">';
 
-                        echo '<li class="anketa tip'.$this->tip.'">';
-                        echo '        <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container '.($this->tip==0?'new_spr':'').'" name="library">';
 
-                        echo '          <div class="folder_right">';
+                    // Levo ime
+                    echo '<div class="folder_left">';
 
-                        if ($this->tip == 0) {
+                    echo '<span class="faicon clipboard"></span> ';
-                            //echo '<a href="/" onclick="javascript:copy_spremenljivka(\''.$row1['id'].'\'); return false;"><img src="img_'.$this->skin.'/copy.png" title="'.$lang['srv_copy_spr'].'" /></a>';
+                    echo skrajsaj(strip_tags($row1['naslov']), 40);
-                            if ($admin_type==0 or $uid==$global_user_id)
+
-                                echo ' <a href="/" onclick="library_brisi_spremenljivko(\''.$row1['id'].'\', \''.$lang['srv_brisispremenljivkoconfirm'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;"><span class="faicon delete_circle icon-orange" title="'.$lang['srv_brisispremenljivko'].'"></span></a>';
+                    echo '</div>';
+
+
+                    // Desne nastavitve
+                    echo '<div class="folder_right">';
+
+                    SurveyInfo::getInstance()->SurveyInit($row1['id']);
+                        
+                    // Dodaj anketo v javno knjiznico
+                    if ($admin_type == 0 && $this->tab == 3) {
+
+                        $sqlPublic = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='".$row1['id']."' AND uid='0'");
+                        if (!$sqlPublic) echo mysqli_error($GLOBALS['connect_db']);
+
+                        // Anketa ze obstaja v javni knjiznici - jo pobrisemo
+                        if (mysqli_num_rows($sqlPublic) > 0) {
+                            echo '<button class="medium-rounded white-gray" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
+                            echo '  <span class="faicon anketa_delete"></span>'.$lang['srv_ank_lib_off'];
+                            echo '</button>';
                         }
-                        else {
+                        // Anketo dodamo v javno knjiznico
-                            SurveyInfo::getInstance()->SurveyInit($row1['id']);
+                        else{
-
+                            echo '<button class="medium-rounded white-gray" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_on'].'">';
-                            if ($this->prva == "1") {
+                            echo '  <span class="faicon library"></span>'.$lang['srv_ank_lib_on'];
-                                
+                            echo '</button>';
-                                // Dodaj anketo v javno knjiznico
-                                if ($admin_type == 0 && $this->tab == 3) {
-
-                                    $sqlPublic = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='".$row1['id']."' AND uid='0'");
-                                    if (!$sqlPublic) echo mysqli_error($GLOBALS['connect_db']);
-
-                                    // Anketa ze obstaja v javni knjiznici - jo pobrisemo
-                                    if (mysqli_num_rows($sqlPublic) > 0) {
-                                        echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
-                                        echo '      <span class="sprites faicon remove icon-orange small"></span> <span class="library_item_setting_text">'.$lang['srv_ank_lib_off'].'</span>';
-                                        echo '  </a>';
-                                    }
-                                    // Anketo dodamo v javno knjiznico
-                                    else{
-                                        echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_on'].'">';
-                                        echo '      <span class="sprites faicon library"></span> <span class="library_item_setting_text">'.$lang['srv_ank_lib_on'].'</span>';
-                                        echo '  </a>';
-                                    }
-                                }
-
-                                // nova anketa kot template iz knjiznice
-                                echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> <span class="library_item_setting_text">'.$lang['srv_anketacopy'].'</span></a> ';
-                                if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))                                
-                                    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
-                                else
-                                    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
-                                
-                                // brisi iz knjiznice
-                                if ($admin_type == 0) {
-                                    echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'"><span class="faicon edit"></span> <span class="library_item_setting_text">'.$lang['edit3'].'</span></a>';
-                                }
-                                
-                                if ($admin_type==0 && $this->tab==2) {// sistemska
-                                    echo ' <a href="/" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'"><span class="sprites faicon remove icon-orange small"></span> <span class="library_item_setting_text">'.$lang['hour_remove'].'</span></a>';
-                                }
-                                
-                                if($this->tab==3){// moja knjiznica
-                                    echo ' <a href="/" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'"><span class="faicon remove icon-orange small"></span> <span class="library_item_setting_text">'.$lang['hour_remove'].'</span></a>';
-                                }
-                            }
-                            else {
-                                if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))                                
-                                    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
-                                else
-                                    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
-                                
-                                // moznost da povozi anketo z anketo iz knjiznice
-                                //TEGA NE DOVOLIMO KER NI OK DA SE KAR PREPISE OBSTOJECO ANKETO - anketo iz knjiznice se lahko po novem dodaja samo iz mojih anket oz. pri ustvarjanju
-                                echo ' <a href="/" onclick="alert_copy_anketa(\''.$row1['id'].'\'); return false;"><span class="sprites copy_small" title="'.$lang['srv_copy_srv'].'"></span></a>';
-                            }
                         }
-                        echo '</div>';
+                    }
 
-                        echo '          <div class="folder_left'.($this->tip==1?' indent"':'" onclick="library_spremenljivka_new(\''.$row1['id'].'\'); return false;"').'>';
+                    // Predogled
-                        if ($this->tip == 1 && $this->prva == "0") {
+                    if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost')){
-                            echo '<a href="/" onclick="javascript:library_anketa_plusminus(\''.$row1['id'].'\', this); return false;"><span class="faicon icon-blue plus" style="opacity: 0.3"></span></a> ';
+                        echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" class="noline" title="'.$lang['srv_poglejanketo'].'">';
-                        } else {
+                        echo '  <button class="medium-rounded white-gray">';
-                            if ($this->tip != 0)
+                        echo '      <span class="faicon monitor"></span>'.$lang['srv_poglejanketo2'];
-                                echo '  <span class="sprites spacer12"></span>';
+                        echo '  </button>';
-                        }
+                        echo '</a>';
+                    }
+                    else{
+                        echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" class="noline" title="'.$lang['srv_poglejanketo'].'">';
+                        echo '  <button class="medium-rounded white-gray">';
+                        echo '      <span class="faicon monitor"></span>'.$lang['srv_poglejanketo2'];
+                        echo '  </button>';
+                        echo '</a>';
+                    }
 
+                    // nova anketa kot template iz knjiznice
+                    echo '<button class="medium-rounded white-gray" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'">';
+                    echo '  <span class="faicon copy"></span>'.$lang['srv_copy'];
+                    echo '</button>';  
+                    
+                    // Uredi anketo
+                    if ($admin_type == 0 || $this->tab==3) {
+                        echo '<a href="index.php?anketa='.$row1['id'].'" class="noline" title="'.$lang['srv_editirajanketo'].'">';
+                        echo '  <button class="medium-rounded white-gray">';
+                        echo '      <span class="faicon edit"></span>'.$lang['edit3'];
+                        echo '  </button>';
+                        echo '</a>';
+                    }
+                    
+                    // sistemska
+                    if ($admin_type==0 && $this->tab==2) {
+                        echo '<button class="medium-rounded white-gray" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
+                        echo '  <span class="sprites faicon anketa_delete"></span>'.$lang['hour_remove'];
+                        echo '</button>';
+                    }
+                    
+                    // moja knjiznica
+                    if($this->tab==3){
+                        echo '<button class="medium-rounded white-gray" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'">';
+                        echo '  <span class="faicon anketa_delete"></span>'.$lang['hour_remove'];
+                        echo '</button>';
+                    }
 
-                        if ($this->tip == 0) {
+                    echo '</div>';
-                            if ($row1['tip']==1 || $row1['tip']==2 || $row1['tip']==3 || $row1['tip']==21 || $row1['tip']==7)
+                    
-                                $ikonca = 'osnovna_vprasanja';
-                            elseif ($row1['tip']==6 || $row1['tip']==16 || $row1['tip']==19 || $row1['tip']==20)
-                                $ikonca = 'table';
-                            else
-                                $ikonca = 'other_vprasanja';
-                        } else {
-                            $ikonca = 'anketa';
-                        }
 
-                        echo '<span class="faicon '.$ikonca.' mapca icon-blue" style="display:inline-block"></span> ';
+                    echo '  </div>';
-                        echo skrajsaj(strip_tags($row1['naslov']), 40).'</a>'."\n";
 
-                        echo '          </div>';
+                    echo '</li>';
+                }
+            }
 
-
+            echo '      </ul>'."\n";
-                        if ($this->prva == "0") {
-
-                            echo '<div id="anketa_vprasanja_'.$row1['id'].'" class="anketa_vprasanja">';
-                            if ($this->tip == 1) {
-                                $sql2 = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$row1[id]'");
-                                while ($row2 = mysqli_fetch_array($sql2)) {
-
-                                    if ($row2['tip']==1 || $row2['tip']==2 || $row2['tip']==3 || $row2['tip']==21 || $row2['tip']==7)
-                                        $ikonca = 'osnovna_vprasanja';
-                                    elseif ($row2['tip']==6 || $row2['tip']==16 || $row2['tip']==19 || $row2['tip']==20)
-                                        $ikonca = 'table';
-                                    else
-                                        $ikonca = 'other_vprasanja';
-
-                                    echo '<span class="new_spr" copy="'.$row2['id'].'" onclick="library_spremenljivka_new(\''.$row2['id'].'\'); return false;"><span class="faicon '.$ikonca.' icon-blue" title="'.$lang['srv_copy_spr'].'" style="display:inline-block"></span>';
-                                    echo ' '.skrajsaj(strip_tags($row2['naslov']), 40).'</span>';
-
-                                }
-                            }
-
-                            echo '</div>';
-                        }
-
-                        echo '</div></li>';
-					}
-
-				}
-			}
-
-            echo '    </ul>'."\n";
 
             echo '  </li>'."\n";
         }
@@ -406,36 +296,6 @@ class Library {
             <?php
         }
     }
-
-    /**
-    * @desc prikaze ife / bloke v knjiznici
-    */
-    function display_ifs ($folder) {
-        global $lang, $admin_type;
-
-        $sql = sisplet_query("SELECT * FROM srv_if WHERE folder = '$folder' ORDER BY label ASC, id ASC");
-        while ($row = mysqli_fetch_array($sql)) {
-
-            echo '<li class="anketa tip0">';
-            echo '        <div eid="'.$row['id'].'" copy="'.$row['id'].'" class="folder_container new_if" name="library_if">';
-
-            echo '          <div class="folder_right">';
-            if ($admin_type==0 or $this->tab==1)
-        		echo ' <a href="/" onclick="library_if_remove(\''.$row['id'].'\', \''.$lang['srv_brisispremenljivkoconfirm'].'\'); return false;"><span class="faicon delete_circle icon-orange" title="'.($row['tip']==0?$lang['srv_if_rem']:$lang['srv_block_rem']).'"></span></a>';
-            echo '          </div>';
-
-            echo '          <div class="folder_left'.($this->tip==1?' indent':'').'" onclick="library_if_new(\''.$row['id'].'\'); return false;">';
-
-            echo '<span class="faicon '.($row['tip']==0?'if':'b').' mapca icon-blue"></span> ';
-
-            echo skrajsaj(strip_tags(($row['label']!=''?$row['label']:($row['tip']==0?$lang['srv_pogoj']:$lang['srv_blok']))), 40).'</a>'."\n";
-
-            echo '          </div>';
-
-            echo '</div></li>';
-        }
-
-    }
   
   
 	/**
@@ -457,12 +317,10 @@ class Library {
   		if ($uid == 0)
   			$language = " AND lang='$lang[id]' ";
 
-		// v skrite html elemente shranimo tab, in prva
+		// v skrite html elemente shranimo tab
 		echo '<input type="hidden" name="lib_tab" id="lib_tab" value="'.$this->tab.'">';
-		echo '<input type="hidden" name="lib_tip" id="lib_tip" value="1">';
-		echo '<input type="hidden" name="lib_prva" id="lib_prva" value="1">';
 
-		echo '<ul title="'.($uid == 0 ? $lang['srv_library_left'] : $lang['srv_library_left_right']).'" style="padding-left:0; margin-left:-12px; margin-top:10px;" class="'.($admin_type == 0 || $uid == $global_user_id ? 'can_edit' : '').'">'."\n";
+		echo '<ul title="'.($uid == 0 ? $lang['srv_library_left'] : $lang['srv_library_left_right']).'" class="'.($admin_type == 0 || $uid == $global_user_id ? 'can_edit' : '').'">'."\n";
 
 
 		// Sestavimo query za search po knjiznici
@@ -481,43 +339,13 @@ class Library {
 			while ($row1 = mysqli_fetch_array($sql1)) {
 				
 				echo '<li class="anketa tip1">';
-				echo '        <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container" name="library">';
+				echo '  <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container" name="library">';
-
-				echo '          <div class="folder_right">';
-				
-				SurveyInfo::getInstance()->SurveyInit($row1['id']);
-				
-				// nova anketa kot template iz knjiznice
-				echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> '.$lang['srv_anketacopy'].'</a> ';
-				
-				// Preview
-                
-                if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
-				    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
-                else
-				    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
-				
-				// Urejanje - admin
-				if ($admin_type == 0)
-					echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'"><span class="faicon edit"></span> '.$lang['edit3'].'</a>';
-				
-				// Brisanje - admin iz javne knjiznice
-				if ($admin_type == 0 && $this->tab == 2)
-					echo ' <a href="/" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'"><span class="faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
-				
-				// Brisanje - uporabnik iz moje knjiznice
-				if($this->tab == 3)
-					echo ' <a href="/" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'"><span class="faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
-				
-				echo '</div>';
 
 
-				echo '          <div class="folder_left'.($this->tip==1?' indent"':'" onclick="library_spremenljivka_new(\''.$row1['id'].'\'); return false;"').'>';	
+                // Leva stran - ime
-				echo '  <span class="sprites spacer12"></span>';
+                echo '<div class="folder_left">';	
 
-				$ikonca = 'anketa';
+				echo '<span class="faicon clipboard"></span>';
-
-				echo '<span class="faicon '.$ikonca.' mapca icon-blue" style="display:inline-block"></span> ';
 				
 				// Ce gre za search moramo ustrezno pobarvati najden del besede
 				$text_searched = $row1['naslov'];
@@ -527,17 +355,74 @@ class Library {
 						// Pobarvamo najden niz v naslovu ankete
 						preg_match_all("/$search_word+/i", $text_searched, $matches);
 						if (is_array($matches[0]) && count($matches[0]) >= 1) {
-							foreach ($matches[0] as $match) {
+
-								$text_searched = str_replace($match, '<span class="red">'.$match.'</span>', $text_searched);
+                            // Drugace vcasih pobrise presledek, ne vem kako drugace resit:)
-							}
+                            $text_searched = str_replace(' ', '&nbsp;', $text_searched);
+                            
+							$text_searched = str_replace($matches[0][0], '<span class="red">'.$matches[0][0].'</span>', $text_searched);
 						}
 					}					
 				}
 				
-				echo skrajsaj($text_searched, 40).'</a>'."\n";
+				echo skrajsaj($text_searched, 100);
 
-				echo '          </div>';
+				echo '</div>';
-				echo '</div></li>';
+
+
+                // Desne nastavitve
+				echo '<div class="folder_right">';
+				
+				SurveyInfo::getInstance()->SurveyInit($row1['id']);
+				
+                // Preview
+                if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost')){
+				    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" class="noline" target="_blank" title="'.$lang['srv_poglejanketo'].'">';
+                    echo '  <button class="medium-rounded white-gray">';
+                    echo '      <span class="faicon monitor"></span>'.$lang['srv_poglejanketo2'];
+                    echo '  </button>';
+                    echo '</a>';
+                }
+                else{
+				    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" class="noline" target="_blank" title="'.$lang['srv_poglejanketo'].'">';
+                    echo '  <button class="medium-rounded white-gray">';
+				    echo '      <span class="faicon monitor"></span>'.$lang['srv_poglejanketo2'];
+                    echo '  </button>';
+                    echo '</a>';
+                }
+
+				// nova anketa kot template iz knjiznice
+                echo '<button class="medium-rounded white-gray" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'">';
+				echo '  <span class="faicon copy"></span>'.$lang['srv_copy'];
+                echo '</button>';			
+				
+				// Urejanje - v moji knjiznici vsi, v javni samo admin
+				if ($admin_type == 0 || $this->tab == 3){
+					echo ' <a href="index.php?anketa='.$row1['id'].'" class="noline" title="'.$lang['srv_editirajanketo'].'">';
+                    echo '  <button class="medium-rounded white-gray">';
+					echo '      <span class="faicon edit"></span>'.$lang['edit3'];
+                    echo '  </button>';
+                    echo '</a>';
+                }
+				
+				// Brisanje - admin iz javne knjiznice
+				if ($admin_type == 0 && $this->tab == 2){
+                    echo '<button class="medium-rounded white-gray" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
+					echo '  <span class="faicon anketa_delete"></span>'.$lang['hour_remove'];
+                    echo '</button>';
+                }
+				
+				// Brisanje - uporabnik iz moje knjiznice
+				if($this->tab == 3){
+                    echo '<button class="medium-rounded white-gray" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'">';
+					echo '  <span class="faicon anketa_delete"></span>'.$lang['hour_remove'];
+                    echo '</button>';
+                }
+				
+				echo '</div>';
+
+
+				echo '  </div>';
+                echo '</li>';
 			}
 		}
 
@@ -565,68 +450,51 @@ class Library {
 		global $lang;
 		global $site_url;
 
-		echo '<span class="title">'.$lang['s_search_settings_lib'].'</span>';
-
 		echo '<form method="GET" id="1kasf2" action="'.$site_url.'admin/survey/index.php?a=knjiznica">';
 
-		// Hidden polja za knjiznico
+        // Hidden polja za knjiznico
 		echo '<input type="hidden" name="a" value="knjiznica">';
 		if($this->tab == '3')
 			echo '<input type="hidden" name="t" value="moje_ankete">';
 
+        // Zgornja vrstica z geslom in gumbom za iskanje
+        echo '<div class="search_settings_top">';
+
 		// Iskano geslo
-		echo '<p>';
+		echo '<div class="search_text">';
-        echo '	<span class="bold">'.$lang['s_search2'].':</span> <input type="text" name="search" id="searchMySurveyText" value="'.htmlentities($this->searchString).'" placeholder="' . $lang['s_search'] . '" />';
+        echo '	<input type="text" name="search" id="searchMySurveyText" value="'.htmlentities($this->searchString).'" placeholder="'.($this->tab == '3' ? $lang['s_search_Library_my'] : $lang['s_search_Library_public']).'" />';
-		echo '</p>';
+		echo '</div>';
 		
 		// Iskanje po naslovu ali avtorju ali besedilu
-		echo '<p>';
+		echo '<div class="search_type">';
-		echo '	<span>'.$lang['s_thru'].': </span>';
+		echo '	<select name="stype" id="stype">';
-		echo '	<label for="stype_0"><input type="radio" name="stype" id="stype_0" value="0" '.($this->searchSettings['stype'] == '0' ? ' checked="checked"' : '').' />'.$lang['s_title'].'</label>';
+		echo '	    <option value="0" '.($this->searchSettings['stype'] == '0' ? ' selected="selected"' : '').'>'.$lang['s_title'].'</option>';
-		echo '	<label for="stype_1"><input type="radio" name="stype" id="stype_1" value="1" '.($this->searchSettings['stype'] == '1' ? ' checked="checked"' : '').' />'.$lang['s_text'].'</label>';
+		echo '	    <option value="1" '.($this->searchSettings['stype'] == '1' ? ' selected="selected"' : '').'>'.$lang['s_text'].'</option>';
-		echo '</p>';
+		echo '  </select>';
-				
+		echo '</div>';
-		// Gumba isci in zapri
+        
-		echo '<span style="margin-top: 10px;" class="floatRight spaceRight">';
+        // Gumb isci
-		echo '	<div class="buttonwrapper floatLeft spaceRight">';
+		echo '<div class="search_button">';
-		echo '		<a class="ovalbutton ovalbutton_gray" href="'.$site_url.'admin/survey/index.php?a=knjiznica'.($this->tab == '3' ? '&t=moje_ankete' : '').'"><span>'.$lang['srv_zapri'].'</span></a>';
+		echo '	<a href="#" onclick="$(\'#1kasf2\').submit(); return false;"><button class="medium blue">'.$lang['s_search'].'</button></a>';
-		echo '	</div>';
+		echo '</div>';
-		echo '	<div class="buttonwrapper floatRight">';
+
-		echo '		<a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#1kasf2\').submit(); return false;"><span>'.$lang['s_search'].'</span></a>';
+		echo '</div>';
-		echo '	</div>';
-		echo '</span>';
 		
-		// Link na isci po mojih anketah
+        // Gumba za napredne nastavitve
-		echo '<span class="link"><a href="'.$site_url.'admin/survey/index.php?search='.$this->searchString.'">'.$lang['s_search_mySurvey'].'</a></span>';
+        echo '<div class="search_settings_advanced_buttons">';		
-		
+        
-		echo '<input style="display: none;" value="Išči" type="submit">';
+        // Gumb nazaj na moje ankete
+        echo '  <a href="'.$site_url.'admin/survey/index.php?a=pregledovanje&search='.htmlentities($this->searchString).'"><button type="button" class="white-black small">';
+        echo '      <span class="faicon clipboard_notes"></span>'.$lang['s_search_mySurvey'];
+        echo '  </button></a>';
+
+        echo '</div>';
+          
+        echo '<input style="display: none;" value="Išči" type="submit">';
 		
         echo '</form>';		
 	}
-	
-	// Prikazemo search okno za iskanje po anketah znotraj knjiznice
-	private function displaySearch(){
-		global $lang;
-		global $site_url;
 		
-		echo '<form method="GET" id="1kasmysurvey" action="'.$site_url.'admin/survey/index.php">';      
-	    
-		// Hidden polja za knjiznico
-		echo '<input type="hidden" name="a" value="knjiznica">';
-		if($this->tab == '3')
-			echo '<input type="hidden" name="t" value="moje_ankete">';
-		
-		//echo '<span class="sprites search"></span> ';
-        echo '<input id="searchMySurvey" class="floatLeft" type="text" value="" placeholder="' . $lang['s_search_Library'] . '" name="search" />';
-		
-		//echo '<input type="submit" value="' . $lang['s_search'] . '" />'; 
-		echo '	<div class="buttonwrapper floatLeft">';
-		echo '		<a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#1kasmysurvey\').submit(); return false;"><span>'.$lang['s_search2'].'</span></a>';
-		echo '	</div>';
-          		
-		echo '</form>';
-	}
-	
 	// vrne sql string za search po anketah glede na nastavitve searcha
 	private function getSearchString(){
 		
@@ -677,17 +545,6 @@ class Library {
     		$this->tab = (int)$_GET['tab'];
     	if ($this->tab == 'undefined')
     		$this->tab = 0;
-    	if (isset($_POST['prva']))
-    		$this->prva = $_POST['prva'];
-    	else if (isset($_GET['prva']))
-    		$this->prva = $_GET['prva'];
-    	if ($this->prva == 'undefined')
-    		$this->prva = 0;
-
-    	if ($this->tab <= 1)
-            $this->tip = 0;
-        else
-            $this->tip = 1;
 
     	if ($_GET['a'] == 'display_knjiznica') {
             $this->ajax_display_knjiznica();
@@ -757,36 +614,11 @@ class Library {
 
         $data = array();
 
-        if ($this->tip == 0) {
-            $spremenljivka = substr($_POST['spremenljivka'], 10);	// odrezemo branching_
-            $folder = $_POST['folder'];
-
-            // v knjiznico dodamo spremenljivko
-            if ($spremenljivka > 0) {
-                $id = $this->Branching->nova_spremenljivka(-1, 0, 0, $spremenljivka);
-                sisplet_query("UPDATE srv_spremenljivka SET folder = '$folder' WHERE id = '$id'");
-
-            	$data['response'] = $lang['srv_library_q_added'];
-
-            // v knjiznico dodamo if/blok
-            } else {
-                $if = substr($_POST['spremenljivka'], 12);			// odrezemo branching_if
-
-                if ($if > 0) {
-	                $id = $this->Branching->if_copy(0, $if, true);
-	                sisplet_query("UPDATE srv_if SET folder = '$folder' WHERE id = '$id'");
-
-	                $data['response'] = $lang['srv_library_b_added'];
-				}
-            }
-        }
-
         ob_start();
 		$this->display_folders();
 		$data['folders'] = ob_get_clean();
 
 		echo json_encode($data);
-
     }
 
 
@@ -801,12 +633,8 @@ class Library {
         elseif ($this->tab == 1 or $this->tab == 3)
             $uid = $global_user_id;
 
-        if ($this->tip == 0) {
+        sisplet_query("UPDATE srv_library_anketa SET folder='$folder' WHERE ank_id='$spremenljivka' AND uid='$uid'");
-            sisplet_query("UPDATE srv_spremenljivka SET folder = '$folder' WHERE id = '$spremenljivka'");
+
-        } else {
-            sisplet_query("UPDATE srv_library_anketa SET folder = '$folder' WHERE ank_id = '$spremenljivka' AND uid='$uid'");
-        }
-        //$this->display();
         $this->display_folders();
     }
 
@@ -828,9 +656,8 @@ class Library {
         $folder = $_POST['folder'];
 
         if ($drop != $folder)
-            sisplet_query("UPDATE srv_library_folder SET parent = '$folder' WHERE id = '$drop' AND tip='$this->tip'");
+            sisplet_query("UPDATE srv_library_folder SET parent = '$folder' WHERE id = '$drop' AND tip='1'");
 
-        //$this->display();
         $this->display_folders();
     }
 
@@ -841,9 +668,9 @@ class Library {
        $sql = sisplet_query("SELECT naslov FROM srv_library_folder WHERE id = '$folder'");
        $row = mysqli_fetch_array($sql);
 
-       echo '<form method="post" onsubmit="javascript:library_folder_newname(\''.$folder.'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" style="display:inline">';
+       echo '<form method="post" onsubmit="javascript:library_folder_newname(\''.$folder.'\',\''.$this->tab.'\'); return false;" style="display:inline">';
        echo '<span class="faicon folder icon-blue"></span> '.
-            '<input type="text" name="naslov" id="naslov_'.$folder.'" value="'.$row['naslov'].'" onblur="javascript:library_folder_newname(\''.$folder.'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" />';
+            '<input type="text" name="naslov" id="naslov_'.$folder.'" value="'.$row['naslov'].'" onblur="javascript:library_folder_newname(\''.$folder.'\',\''.$this->tab.'\'); return false;" />';
        echo '</form>';
 
     }
@@ -870,16 +697,14 @@ class Library {
 
         $uid = $_POST['uid'];
 
-        $s = sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent) VALUES ('$uid', '$this->tip', '$lang[srv_newfolder]', '$folder')");
+        $s = sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent) VALUES ('$uid', '1', '$lang[srv_newfolder]', '$folder')");
         if (!$s) echo mysqli_error($GLOBALS['connect_db']);
         $insert_id = mysqli_insert_id($GLOBALS['connect_db']);
 
         $_COOKIE['library_folders'] .= '-'.$insert_id.'-';  // $_COOKIE popravimo, da bo sprememba vidna tudi v display_folders()
         setcookie('library_folders', $_COOKIE['library_folders'], time()+2500000);
 
-		//        $this->display();
 		$this->display_folders();
-
     }
 
     function ajax_delete_folder () {
@@ -890,12 +715,7 @@ class Library {
         $sql = sisplet_query("SELECT parent FROM srv_library_folder WHERE id = '$folder'");
         $row = mysqli_fetch_array($sql);
 
-        if ($this->tip == 0) {
+        sisplet_query("UPDATE srv_library_anketa SET folder = '$row[parent]' WHERE folder = '$folder'");
-            sisplet_query("UPDATE srv_spremenljivka SET folder = '$row[parent]' WHERE folder = '$folder'");
-            sisplet_query("UPDATE srv_if SET folder = '$row[parent]' WHERE folder = '$folder'");
-        } else {
-            sisplet_query("UPDATE srv_library_anketa SET folder = '$row[parent]' WHERE folder = '$folder'");
-        }
 
         sisplet_query("UPDATE srv_library_folder SET parent = '$row[parent]' WHERE parent = '$folder'");
 
@@ -913,13 +733,12 @@ class Library {
 
         if ($collapsed == 0) {
             $cookie .= '-'.$folder.'-';
-        } else {
+        } 
+        else {
             $cookie = str_replace('-'.$folder.'-', '', $cookie);
         }
 
         setcookie('library_folders', $cookie, time()+2500000);
-
-        echo '<span class="faicon icon-blue '.($collapsed==1?'plus':'minus').'"></span>';
     }
 
     function ajax_library_del_anketa () {
@@ -959,16 +778,17 @@ class Library {
     	global $global_user_id;
     	global $lang;
     	global $site_url;
+
         $anketa = $_POST['anketa'];     // nasa anketa (jo povozimo)
         $ank_id = $_POST['ank_id'];     // anketa, ki jo uporabimo za predlogo
 
         $hierarhija = (empty($_POST['hierarhija']) ? false : true);
 
         if($hierarhija && $ank_id == 'privzeta'){
-
             $ank_id = AppSettings::getInstance()->getSetting('hierarhija-default_id');
         }
 
+
         if ($anketa > 0) {
 
 			// preberemo osnovne podatke obstojece ankete (naslov.....)
@@ -978,11 +798,11 @@ class Library {
 	        $sql2 = sisplet_query("SELECT naslov FROM srv_anketa WHERE id = '$ank_id'");
 	        $row2 = mysqli_fetch_array($sql2);
 
-             $sqls = sisplet_query("SELECT ank_id, uid FROM srv_dostop WHERE ank_id='$anketa'");
+            $sqls = sisplet_query("SELECT ank_id, uid FROM srv_dostop WHERE ank_id='$anketa'");
 
             $this->SurveyAdmin->anketa_delete($anketa);
-
+        } 
-        } else {
+        else {
 
             $sql = sisplet_query("SELECT naslov, dostop FROM srv_anketa WHERE id = '$ank_id'");
             $row = mysqli_fetch_array($sql);
@@ -993,14 +813,13 @@ class Library {
         $naslov = " naslov='".(isset($_POST['naslov']) ? $_POST['naslov'] : $row['naslov'])."',";
         $intro_opomba = " intro_opomba='".(addslashes($lang['srv_library_copy_of_note'].'<a href="'.$site_url.'admin/survey/index.php?anketa='.$ank_id.'">'.$row2['naslov'].'</a>'))."',";
 
-
-        //$new_id = $this->SurveyAdmin->anketa_copy($ank_id);
         $sas = new SurveyAdminSettings();
 		$new_id = $sas->anketa_copy($ank_id);
 
         // popravimo naslov, opombo, dostop, in novega avtorja
         sisplet_query("UPDATE srv_anketa SET $naslov $intro_opomba dostop='$row[dostop]', insert_uid='$global_user_id', edit_uid='$global_user_id' WHERE id='$new_id'");
-		// vsilimo refresh podatkov
+		
+        // vsilimo refresh podatkov
 		SurveyInfo :: getInstance()->resetSurveyData();
 
         // dostop uporabimo od stare ankete in ne od skopirane (trnutno ne kopira pravic od prej, če ustvarjamo novo anketo)
@@ -1021,7 +840,8 @@ class Library {
             (new \Hierarhija\Hierarhija($new_id))->izrisisSistemskoVprsanjeVloga();
 
             echo $new_id;
-        }else{
+        }
+        else{
             echo 'index.php?anketa='.$new_id.'&a=branching';
         }
     }
@@ -1223,16 +1043,12 @@ class Library {
     }
 
 	function repareTabs() {
-        if ($this->tab >= 2)
-            $this->tip = 1;
-        else
-            $this->tip = 0;
 
         // popravimo tabe če smo v glasovanju ali formi
         if ($this->mode < 2) {
-           	// uredimo tabe
+           	
+            // uredimo tabe
         	if ($this->tab==0 || $this->tab==1) {
-        		$this->tip = 1;
         		$this->tab=2;
         	}
         }

admin/survey/classes/class.NewSurvey.php

@@ -31,14 +31,17 @@ class NewSurvey{
         global $site_path;
 				
 		// Leva stran - meni
-		echo '<div id="left_menu">';
+		echo '<div class="layout_left_item">';
 		$this->displayLeftMenu();
 		echo '</div>';
 			
 		// Desna stran - vsebina
-		echo '<div id="right_content">';
+		echo '<div class="layout_right_item">';
+		echo '<div class="layout_right_centering">';
+		echo '<span class="faicon fa-times ultra_dark_gray pointer" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;"></span>';
 		$this->displayRightContent();
 		echo '</div>';
+		echo '</div>';
 	}
 	
 	// Izris levega menija
@@ -48,39 +51,37 @@ class NewSurvey{
         global $site_path;
         global $admin_type;
 		
-		echo '<div class="title">'.$lang['srv_newSurvey_title'].':</div>';
-		
 		// Nova anketa
-		echo '<a href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=new" title="'.$lang['srv_newSurvey_survey_new2'].'"><span class="item '.($this->subpage == 'new' ? ' active' : '').'" onClick="">'.$lang['srv_newSurvey_survey_new'].'</span></a>';
+		echo '<a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=new" title="'.$lang['srv_newSurvey_survey_new2'].'"><span class="item '.($this->subpage == 'new' ? ' active' : '').'" onClick=""><span class="faicon fa-clipboard-list new_survey_menu_icon"></span>'.$lang['srv_newSurvey_survey_new'].'</span></a>';
 		
 		// Anketa iz predloga (knjiznice) - samo na www.1ka.si, testu in arnesu
-		if((strpos($site_url, 'www.1ka.si') !== false && !isVirtual()) 
+		if/**((strpos($site_url, 'www.1ka.si') !== false && !isVirtual()) 
 				|| strpos($site_url, 'test.1ka.si')
 				|| strpos($site_url, '1ka.arnes.si')
-				|| isDebug()){
+				|| isDebug())**/(1){
 			
-			echo '<a href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template" title="'.$lang['srv_newSurvey_survey_template2'].'"><span class="item '.($this->subpage == 'template' ? ' active' : '').'">'.$lang['srv_newSurvey_survey_template'].'</span></a>';
+			echo '<a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template" title="'.$lang['srv_newSurvey_survey_template2'].'"><span class="item '.($this->subpage == 'template' ? ' active' : '').'"><span class="faicon fa-file-image new_survey_menu_icon"></span>'.$lang['srv_newSurvey_survey_template'].'</span></a>';
 			
 			if($this->subpage == 'template'){
 				echo '<ul class="template_type_menu">';		
 				for($i=0; $i<=10; $i++){
-					echo '<li><a href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template&c='.$i.'" title="'.$lang['srv_newSurvey_survey_template_cat'.$i].'"><span class="subitem '.($this->subpage == 'template' && $this->template_category == $i ? ' active' : '').'">'.$lang['srv_newSurvey_survey_template_cat'.$i].'</span></a></li>';
+					echo '<li><a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template&c='.$i.'" title="'.$lang['srv_newSurvey_survey_template_cat'.$i].'"><span class="subitem '.($this->subpage == 'template' && $this->template_category == $i ? ' active' : '').'">'.$lang['srv_newSurvey_survey_template_cat'.$i].'</a></li>';
 				}
 				echo '</ul>';
 			}
 		}
 		
 		// Kopiraj mojo anketo
-		echo '<a href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=copy" title="'.$lang['srv_newSurvey_survey_copy'].'"><span class="item '.($this->subpage == 'copy' ? ' active' : '').'">'.$lang['srv_newSurvey_survey_copy'].'</span></a>';
+		echo '<a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=copy" title="'.$lang['srv_newSurvey_survey_copy'].'"><span class="item '.($this->subpage == 'copy' ? ' active' : '').'"><span class="faicon copy new_survey_menu_icon"></span>'.$lang['srv_newSurvey_survey_copy'].'</span></a>';
 		
-		// Uvoz ankete
+		// Uvoz ankete - 1ka format
-		echo '<a href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=archive" title="'.$lang['srv_newSurvey_survey_archive2'].'"><span class="item '.($this->subpage == 'archive' ? ' active' : '').'">'.$lang['srv_newSurvey_survey_archive'].'</span></a>';
+		echo '<a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=archive" title="'.$lang['srv_newSurvey_survey_archive2'].'"><span class="item '.($this->subpage == 'archive' ? ' active' : '').'"><span class="faicon fa-file-upload new_survey_menu_icon"></span>'.$lang['srv_newSurvey_survey_archive'].'</span></a>';
 
 		// Anketa iz besedila
-		echo '<a href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=from_text" title="'.$lang['srv_newSurvey_survey_from_text'].'"><span class="item '.($this->subpage == 'from_text' ? ' active' : '').'">'.$lang['srv_newSurvey_survey_from_text'].'</span></a>';
+		echo '<a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=from_text" title="'.$lang['srv_newSurvey_survey_from_text'].'"><span class="item '.($this->subpage == 'from_text' ? ' active' : '').'"><span class="faicon fa-file-word empty new_survey_menu_icon"></span>'.$lang['srv_newSurvey_survey_from_text'].'</span></a>';
 
 		if(HierarhijaHelper::aliImaDostopDoIzdelovanjaHierarhije()) {
-            echo '<a href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=hierarhija" title="'.$lang['srv_hierarchy'].'"><span class="item hierarhija-button '.($this->subpage == 'hierarhija' ? ' active' : '').'">'.$lang['srv_hierarchy'].'</span></a>';
+            echo '<a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=hierarhija" title="'.$lang['srv_hierarchy'].'"><span class="item hierarhija-button '.($this->subpage == 'hierarhija' ? ' active' : '').'"><span class="faicon fa-school new_survey_menu_icon"></span>'.$lang['srv_hierarchy'].'</span></a>';
         }
 	}
 	
@@ -128,22 +129,23 @@ class NewSurvey{
 		echo '<div class="fieldset">';	
 
 		// Naslov
+		echo '<div class="pre-title">' . $lang['srv_newSurvey_survey_new'] . '</div>';
 		echo '<div class="title">' . $lang['srv_noSurvey_settings'] . '</div>';
 
-		echo '<div class="survey_title_text_holder">';
+		echo '<div class="setting_horizontal_wrapper">';
 		
         // Interno ime
-        echo '<div class="setting survey_title_text">';
+        echo '<div class="setting_holder">';
-        echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_list_no_data_create'] . ':</span>';
+        echo '<label for="novaanketa_naslov_1">' . $lang['srv_list_no_data_create'] . ':</label>';
-        echo '<input type="text" id="novaanketa_naslov_1" name="novaanketa_naslov_1" placeholder="' . $lang['srv_novaanketa_polnoime'] . '" value="' . $lang['srv_novaanketa_polnoime'] . '" size="40" maxlength="' . ANKETA_NASLOV_MAXLENGTH . '"  onfocus="if(this.value==\'' . $lang['srv_novaanketa_polnoime'] . '\') {this.value=\'\';}" />';
+        echo '<input type="text" class="large" id="novaanketa_naslov_1" name="novaanketa_naslov_1" placeholder="' . $lang['srv_novaanketa_polnoime'] . '" value="' . $lang['srv_novaanketa_polnoime'] . '" maxlength="' . ANKETA_NASLOV_MAXLENGTH . '"  onfocus="if(this.value==\'' . $lang['srv_novaanketa_polnoime'] . '\') {this.value=\'\';}" />';
-        echo '<span id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
+        echo '<span class="charalimit" id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
         echo '</div>';
 
         // Objavljeno ime
-        echo '<div class="setting survey_title_text">';
+        echo '<div class="setting_holder">';
-        echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_novaanketa_kratkoime'] . ':</span>';
+        echo '<label for="novaanketa_akronim_1"">' . $lang['srv_novaanketa_kratkoime'] . ':</label>';
-        echo '<input type="text" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="' . $lang['srv_novaanketa_ime_respondenti'] . '" placeholder="' . $lang['srv_novaanketa_ime_respondenti'] . '" size="40" maxlength="' . ANKETA_AKRONIM_MAXLENGTH . '"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\'' . $lang['srv_novaanketa_ime_respondenti'] . '\') {this.value=\'\';}" changed="0" />';
+        echo '<input type="text" class="large" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="' . $lang['srv_novaanketa_ime_respondenti'] . '" placeholder="' . $lang['srv_novaanketa_ime_respondenti'] . '" maxlength="' . ANKETA_AKRONIM_MAXLENGTH . '"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\'' . $lang['srv_novaanketa_ime_respondenti'] . '\') {this.value=\'\';}" changed="0" />';
-        echo '<span id="novaanketa_akronim_1_chars">0 / ' . ANKETA_AKRONIM_MAXLENGTH . '</span>';
+        echo '<span class="charalimit" id="novaanketa_akronim_1_chars">0 / ' . ANKETA_AKRONIM_MAXLENGTH . '</span>';
         echo '</div>';
 		
 		// Ce ima uporabnik mape, lahko izbere v katero mapo se anketa uvrsti
@@ -151,10 +153,10 @@ class NewSurvey{
 		$show_folders = UserSetting::getInstance()->getUserSetting('survey_list_folders');
 		$sql = sisplet_query("SELECT * FROM srv_mysurvey_folder WHERE usr_id='$global_user_id' ORDER BY naslov ASC");
 		if($show_folders == 1 && mysqli_num_rows($sql) > 0){
-			echo '<div class="setting survey_title_text">';
+			echo '<div class="setting_holder">';
-			echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_newSurvey_survey_new_folder'] . ':</span>';
+			echo '<label for="novaanketa_folder">' . $lang['srv_newSurvey_survey_new_folder'] . Help::display('srv_nova_shrani').':</label>';
 			
-			echo '<select name="novaanketa_folder" id="novaanketa_folder">';
+			echo '<select class="dropdown large" name="novaanketa_folder" id="novaanketa_folder">';
 			echo '<option value="0">'.$lang['srv_newSurvey_survey_new_folder_def'].'</option>';
 			while($row = mysqli_fetch_array($sql)){
 				echo '<option value="'.$row['id'].'">'.$row['naslov'].'</option>';
@@ -179,8 +181,7 @@ class NewSurvey{
 		echo '<label for="newAnketaBlank_2"><div class="setting survey_type active">';
         echo '<input type="radio" name="newAnketaBlank" id="newAnketaBlank_2" value="2" checked="checked" onClick="$(\'.survey_type\').removeClass(\'active\'); $(this).parent().parent().find(\'.survey_type\').addClass(\'active\');" />';
         echo '<span class="radioSetting_type">';
-		echo '	<div class="survey_type_title">' . $lang['srv_vrsta_survey_type_2']  . Help::display('srv_create_survey'). '</div>';
+		echo '<div class="survey_type_title"><span class="faicon fa-clipboard-list"></span>' . $lang['srv_vrsta_survey_type_2']  . '</div>';
-		echo '	<div class="survey_type_text">' . $lang['srv_noSurvey_type_2'] . '</div>';
 		echo '</span>';
         echo '</div></label>';
 
@@ -188,8 +189,7 @@ class NewSurvey{
 		echo '<label for="newAnketaBlank_1"><div class="setting survey_type">';
         echo '<input type="radio" name="newAnketaBlank" id="newAnketaBlank_1" value="1" onClick="$(\'.survey_type\').removeClass(\'active\'); $(this).parent().parent().find(\'.survey_type\').addClass(\'active\');" />';
 		echo '<span class="radioSetting_type">';
-		echo '	<div class="survey_type_title">' . $lang['srv_vrsta_survey_type_1']  . Help::display('srv_create_form'). '</div>';
+		echo '<div class="survey_type_title"><span class="faicon list-alt empty"></span>' . $lang['srv_vrsta_survey_type_1']  . '</div>';
-		echo '	<div class="survey_type_text">' . $lang['srv_noSurvey_type_1'] . '</div>';
 		echo '</span>';
 		echo '</div></label>';
 
@@ -197,8 +197,7 @@ class NewSurvey{
 		echo '<label for="newAnketaBlank_0"><div class="setting survey_type">';
         echo '<input type="radio" name="newAnketaBlank" id="newAnketaBlank_0" value="0" onClick="$(\'.survey_type\').removeClass(\'active\'); $(this).parent().parent().find(\'.survey_type\').addClass(\'active\');" />';
 		echo '<span class="radioSetting_type">';
-		echo '	<div class="survey_type_title">' . $lang['srv_vrsta_survey_type_0']  . Help::display('srv_create_poll'). '</div>';
+		echo '	<div class="survey_type_title"> <span class="faicon vote-yes"></span>' . $lang['srv_vrsta_survey_type_0']  . '</div>';
-		echo '	<div class="survey_type_text">' . $lang['srv_noSurvey_type_0'] . '</div>';
 		echo '</span>';
 		echo '</div></label>';
 
@@ -270,12 +269,10 @@ class NewSurvey{
 
 
         // Gumba naprej in preklici
-        echo '<div class="noSurvey_buttons">';
+		echo '<div class="button_holder">';
-
+		echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';				
-        echo '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
+		echo '<button class="medium blue" onclick="newAnketaBlank();" id="noSurvey_create">'.$lang['next1'].'</button>';
-        echo '<a href="#" onclick="newAnketaBlank();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
+		echo '</div>';
-
-        echo '</div>';
 	}
 	
 	
@@ -288,27 +285,27 @@ class NewSurvey{
 		
 		$this->setTemplates();
 				
-		
 		// 1. sklop - ime ankete
 		echo '<div class="fieldset">';	
 
 		// Naslov
+		echo '<div class="pre-title">' . $lang['srv_newSurvey_survey_template'] . '</div>';
 		echo '<div class="title">' . $lang['srv_noSurvey_settings'] . '</div>';
 
-		echo '<div class="survey_title_text_holder">';
+		echo '<div class="setting_horizontal_wrapper">';
 		
         // Interno ime
-        echo '<div class="setting survey_title_text">';
+        echo '<div class="setting_holder">';
-        echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_list_no_data_create'] . ':</span>';
+        echo '<label for="novaanketa_naslov_1">' . $lang['srv_list_no_data_create'] . ':</label>';
-        echo '<input type="text" id="novaanketa_naslov_1" name="novaanketa_naslov_1" placeholder="' . $lang['srv_novaanketa_polnoime'] . '" value="' . $lang['srv_novaanketa_polnoime'] . '" size="40" maxlength="' . ANKETA_NASLOV_MAXLENGTH . '"  onfocus="if(this.value==\'' . $lang['srv_novaanketa_polnoime'] . '\') {this.value=\'\';}" />';
+        echo '<input type="text" class="large" id="novaanketa_naslov_1" name="novaanketa_naslov_1" placeholder="' . $lang['srv_novaanketa_polnoime'] . '" value="' . $lang['srv_novaanketa_polnoime'] . '" maxlength="' . ANKETA_NASLOV_MAXLENGTH . '"  onfocus="if(this.value==\'' . $lang['srv_novaanketa_polnoime'] . '\') {this.value=\'\';}" />';
-        echo '<span id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
+        echo '<span class="charalimit" id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
         echo '</div>';
 
         // Objavljeno ime
-        echo '<div class="setting survey_title_text">';
+        echo '<div class="setting_holder">';
-        echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_novaanketa_kratkoime'] . ':</span>';
+        echo '<label for="novaanketa_akronim_1"">' . $lang['srv_novaanketa_kratkoime'] . ':</label>';
-        echo '<input type="text" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="' . $lang['srv_novaanketa_ime_respondenti'] . '" placeholder="' . $lang['srv_novaanketa_ime_respondenti'] . '" size="40" maxlength="' . ANKETA_AKRONIM_MAXLENGTH . '"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\'' . $lang['srv_novaanketa_ime_respondenti'] . '\') {this.value=\'\';}" changed="0" />';
+        echo '<input type="text" class="large" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="' . $lang['srv_novaanketa_ime_respondenti'] . '" placeholder="' . $lang['srv_novaanketa_ime_respondenti'] . '" maxlength="' . ANKETA_AKRONIM_MAXLENGTH . '"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\'' . $lang['srv_novaanketa_ime_respondenti'] . '\') {this.value=\'\';}" changed="0" />';
-        echo '<span id="novaanketa_akronim_1_chars">0 / ' . ANKETA_AKRONIM_MAXLENGTH . '</span>';
+        echo '<span class="charalimit" id="novaanketa_akronim_1_chars">0 / ' . ANKETA_AKRONIM_MAXLENGTH . '</span>';
         echo '</div>';
 		
 		// Ce ima uporabnik mape, lahko izbere v katero mapo se anketa uvrsti
@@ -316,10 +313,10 @@ class NewSurvey{
 		$show_folders = UserSetting::getInstance()->getUserSetting('survey_list_folders');
 		$sql = sisplet_query("SELECT * FROM srv_mysurvey_folder WHERE usr_id='$global_user_id' ORDER BY naslov ASC");
 		if($show_folders == 1 && mysqli_num_rows($sql) > 0){
-			echo '<div class="setting survey_title_text">';
+			echo '<div class="setting_holder">';
-			echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_newSurvey_survey_new_folder'] . ':</span>';
+			echo '<label for="novaanketa_folder">' . $lang['srv_newSurvey_survey_new_folder'] .Help::display('srv_nova_shrani'). ':</label>';
 			
-			echo '<select name="novaanketa_folder" id="novaanketa_folder">';
+			echo '<select class="dropdown large" name="novaanketa_folder" id="novaanketa_folder">';
 			echo '<option value="0">'.$lang['srv_newSurvey_survey_new_folder_def'].'</option>';
 			while($row = mysqli_fetch_array($sql)){
 				echo '<option value="'.$row['id'].'">'.$row['naslov'].'</option>';
@@ -336,7 +333,7 @@ class NewSurvey{
 		// 2. sklop - izbira predloge
         echo '<div class="fieldset noSurvey_template">';
 
-        echo '<div class="title">' . $lang['srv_newSurvey_survey_template_cat'.$this->template_category] . '</div>';
+        echo '<div class="title">' . $lang['srv_newSurvey_survey_template_choose'] . '</div>';
 		
 		echo '<input type="hidden" name="noSurvey_template_id" id="noSurvey_template_id" value="">';
 
@@ -346,22 +343,24 @@ class NewSurvey{
             echo '<option value="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template&c='.$i.'" '.($this->subpage == 'template' && $this->template_category == $i ? ' selected="selected"' : '').'>'.$lang['srv_newSurvey_survey_template_cat'.$i].'</option>';
         }
         echo '</select>';
-			
+        
+		echo '<div class="noSurvey_template_wrap">';
+		echo '<div class="noSurvey_template_holder">';
 		// Prikaz predlog
 		foreach($this->templates as $template_id => $template_name){				
 			$this->displayRightContentTemplate($template_id);
 		}
+        echo '</div>';
+        echo '</div>';
 		
         echo '</div>';
 
 		
 		// Gumba naprej in preklici
-        echo '<div class="noSurvey_buttons">';
+		echo '<div class="button_holder">';
-
+		echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';				
-        echo '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
+		echo '<button class="medium blue" onclick="newAnketaTemplate();" id="noSurvey_create" title="' . $lang['srv_create_survey']. '">'.$lang['next1'].'</button>';
-        echo '<a href="#" onclick="newAnketaTemplate();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
+		echo '</div>';
-
-        echo '</div>';
 	}
 	
 	// Pripravimo podatke o vseh predlogah na trenutni strani
@@ -409,43 +408,44 @@ class NewSurvey{
 		
 
 		// Vsebina
+		echo '<div class="template_title">'.$template_data['naslov'].'</div>';
 		echo '<div class="template_content">';
-		echo '<div class="template_content_white">';
-		echo $lang['srv_newSurvey_survey_template_type'].': <span class="bold">'.$template_data['tip'].'</span>';
-		echo '<br /><br /><br />';
 		if($template_data['opis'] != '')
-			echo (strlen($template_data['opis']) > 155) ? substr($template_data['opis'], 0, 152).'...' : $template_data['opis'];
+			echo (strlen($template_data['opis']) > 140) ? substr($template_data['opis'], 0, 137).'...' : $template_data['opis'];
 		else
 			echo $template_data['naslov'];
-
+			echo '</div>';
-		echo '</div>';
-		
-		echo '<span class="template_title">'.$template_data['naslov'].'</span>';
-		
-		echo '</div>';
 
 		// Predogled
-		echo '<a href="'.$site_url.'a/'.$template_id.'?preview=on&no_preview=1&size=full" target="_blank" class="template_preview"><span class="faicon preview"></span> '.$lang['srv_newSurvey_survey_template_preview'].'</a>';
+		echo '<div class="template_preview">';
-
+		echo '<a class="noline" href="'.$site_url.'a/'.$template_id.'?preview=on&no_preview=1&size=full" target="_blank"><span class="faicon preview"></span> '.$lang['srv_newSurvey_survey_template_preview'].'</a>';
+		echo '</div>';
+		
 		echo '</div>';
 	}
 	
 	
-	// Vsebina za ustvarjanje ankete iz predloge
+	// Vsebina za kopiranje obstoječe ankete
 	private function displayRightContentCopy(){
 		global $lang;
         global $site_url;
         global $site_path;
         global $global_user_id;
 		
-		 // 1. sklop - tip ankete (navadna, forma, glasovanje)
+		//1. sklop ime ankete, mapa - se doda v 2. fazi redizajna @TG
+		
+		// 2. sklop - seznam obstoječih anket
         echo '<div class="fieldset">';
 
+		echo '<div class="pre-title">' . $lang['srv_newSurvey_survey_copy'] . '</div>';
         echo '<div class="title">'.$lang['srv_newSurvey_survey_copy_title'].'</div>';
 		
 		//echo '<input placeholder="'.$lang['srv_newSurvey_survey_copy_text'].'" list="my_surveys" data-list-focus="true" style="width:300px;">';
 		//echo '<datalist id="my_surveys">';
-		echo '<select name="my_surveys" id="my_surveys">';
+        echo '<p class="bottom32">'.$lang['srv_newSurvey_survey_copy_paragraph'].'</p>';
+		echo '<div class="setting_holder">';
+		echo '<select class="dropdown large" name="my_surveys" id="my_surveys">';
+		echo '<option value="0">'.$lang['srv_newSurvey_survey_copy_dropdown'].'</option>';
 		// Pridobimo seznam obstoječih anket
 		$sql = sisplet_query("SELECT id, naslov, akronim FROM srv_anketa WHERE insert_uid='".$global_user_id."' ORDER BY naslov ASC");
 		while($row = mysqli_fetch_array($sql)){
@@ -453,17 +453,17 @@ class NewSurvey{
 		}
 		//echo '</datalist>';
 		echo '</select>';
+		echo '</div>';
 
         echo '</div>';
 
 		
 		// Gumba naprej in preklici
-        echo '<div class="noSurvey_buttons">';
 
-        echo '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
+		echo '<div class="button_holder">';
-        echo '<a href="#" onclick="newAnketaCopy();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
+		echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';				
-
+		echo '<button class="medium blue" onclick="newAnketaCopy();" id="noSurvey_create">'.$lang['next1'].'</button>';
-        echo '</div>';
+		echo '</div>';
 	}
 	
 	// Vsebina za uvažanje ankete iz arhiva
@@ -476,42 +476,40 @@ class NewSurvey{
 		echo '<div class="fieldset">';	
 
 		// Naslov
+		echo '<div class="pre-title">' . $lang['srv_newSurvey_survey_archive'] . '</div>';
 		echo '<div class="title">' . $lang['srv_newSurvey_survey_archive_title'] . '</div>';
 
-		echo $lang['srv_newSurvey_survey_archive_text2'];
+		echo '<p class="bottom32">'.$lang['srv_newSurvey_survey_archive_text2'].'</p>';
+		echo '<p class="bottom32">'.$lang['srv_newSurvey_survey_archive_text'].'</p>';
 		
 		echo '<div class="setting archive">';		 
 		echo '<form id="restore" action="ajax.php?a=archive_restore" method="post" name="restorefrm" enctype="multipart/form-data" >';
 		
 		echo '<input type="hidden" name="has_data" value="0" />';
 		//echo '<input type="file" name="restore" onchange="document.restorefrm.submit();" />';
-		echo '<input type="file" name="restore" class="pointer" />';
+		echo '<input type="file" name="restore" id="restore" /></label>';
 
 		echo $lang['srv_arhiv_datoteka_save_txt2'].'.';
 		
-		echo '<br /><br />'.$lang['srv_newSurvey_survey_archive_text'].'.';
-			  
 		echo '</form>';
 		echo '</div>';
 		
 		// Izpis napake pri uvozu
 		if(isset($_GET['error'])){
 			if($_GET['error'] == '2')
-				echo '<p><span class="red">'.$lang['srv_newSurvey_survey_archive_error2'].'</span></p>';
+				echo '<p class="top32 red">'.$lang['srv_newSurvey_survey_archive_error2'].'</p>';
 			else
-				echo '<p><span class="red">'.$lang['srv_newSurvey_survey_archive_error1'].'</span></p>';
+				echo '<p class="top32 red">'.$lang['srv_newSurvey_survey_archive_error1'].'</p>';
 		}
 		
 		echo '</div>';
 		
 		
 		// Gumba naprej in preklici
-        echo '<div class="noSurvey_buttons">';
+		echo '<div class="button_holder">';
-
+		echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';				
-        echo '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
+		echo '<button class="medium blue" onclick="document.restorefrm.submit();" id="noSurvey_create">'.$lang['next1'].'</button>';
-        echo '<a href="#" onclick="document.restorefrm.submit();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
+		echo '</div>';
-
-        echo '</div>';
 	}
 
 
@@ -602,25 +600,28 @@ class NewSurvey{
 		
 		
 		// 1. sklop - ime ankete
+		echo '<div class="fieldset">';
+		
 		echo '<div class="fieldset">';	
 
 		// Naslov
+		echo '<div class="pre-title">' . $lang['srv_newSurvey_survey_from_text'] . '</div>';
 		echo '<div class="title">' . $lang['srv_noSurvey_settings'] . '</div>';
 
-		echo '<div class="survey_title_text_holder">';
+		echo '<div class="setting_horizontal_wrapper">';
-
+		
         // Interno ime
-        echo '<div class="setting survey_title_text">';
+        echo '<div class="setting_holder">';
-        echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_list_no_data_create'] . ':</span>';
+        echo '<label for="novaanketa_naslov_1">' . $lang['srv_list_no_data_create'] . ':</label>';
-        echo '<input type="text" id="novaanketa_naslov_1" name="novaanketa_naslov_1" placeholder="' . $lang['srv_novaanketa_polnoime'] . '" value="' . $lang['srv_novaanketa_polnoime'] . '" size="40" maxlength="' . ANKETA_NASLOV_MAXLENGTH . '"  onfocus="if(this.value==\'' . $lang['srv_novaanketa_polnoime'] . '\') {this.value=\'\';}" />';
+        echo '<input type="text" class="large" id="novaanketa_naslov_1" name="novaanketa_naslov_1" placeholder="' . $lang['srv_novaanketa_polnoime'] . '" value="' . $lang['srv_novaanketa_polnoime'] . '" maxlength="' . ANKETA_NASLOV_MAXLENGTH . '"  onfocus="if(this.value==\'' . $lang['srv_novaanketa_polnoime'] . '\') {this.value=\'\';}" />';
-        echo '<span id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
+        echo '<span class="charalimit" id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
         echo '</div>';
 
         // Objavljeno ime
-        echo '<div class="setting survey_title_text">';
+        echo '<div class="setting_holder">';
-        echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_novaanketa_kratkoime'] . ':</span>';
+        echo '<label for="novaanketa_akronim_1"">' . $lang['srv_novaanketa_kratkoime'] . ':</label>';
-        echo '<input type="text" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="' . $lang['srv_novaanketa_ime_respondenti'] . '" placeholder="' . $lang['srv_novaanketa_ime_respondenti'] . '" size="40" maxlength="' . ANKETA_AKRONIM_MAXLENGTH . '"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\'' . $lang['srv_novaanketa_ime_respondenti'] . '\') {this.value=\'\';}" changed="0" />';
+        echo '<input type="text" class="large" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="' . $lang['srv_novaanketa_ime_respondenti'] . '" placeholder="' . $lang['srv_novaanketa_ime_respondenti'] . '" maxlength="' . ANKETA_AKRONIM_MAXLENGTH . '"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\'' . $lang['srv_novaanketa_ime_respondenti'] . '\') {this.value=\'\';}" changed="0" />';
-        echo '<span id="novaanketa_akronim_1_chars">0 / ' . ANKETA_AKRONIM_MAXLENGTH . '</span>';
+        echo '<span class="charalimit" id="novaanketa_akronim_1_chars">0 / ' . ANKETA_AKRONIM_MAXLENGTH . '</span>';
         echo '</div>';
 		
 		// Ce ima uporabnik mape, lahko izbere v katero mapo se anketa uvrsti
@@ -628,10 +629,10 @@ class NewSurvey{
 		$show_folders = UserSetting::getInstance()->getUserSetting('survey_list_folders');
 		$sql = sisplet_query("SELECT * FROM srv_mysurvey_folder WHERE usr_id='$global_user_id' ORDER BY naslov ASC");
 		if($show_folders == 1 && mysqli_num_rows($sql) > 0){
-			echo '<div class="setting survey_title_text">';
+			echo '<div class="setting_holder">';
-			echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_newSurvey_survey_new_folder'] . ':</span>';
+			echo '<label for="novaanketa_folder">' . $lang['srv_newSurvey_survey_new_folder'] . Help::display('srv_nova_shrani').':</label>';
 			
-			echo '<select name="novaanketa_folder" id="novaanketa_folder">';
+			echo '<select class="dropdown large" name="novaanketa_folder" id="novaanketa_folder">';
 			echo '<option value="0">'.$lang['srv_newSurvey_survey_new_folder_def'].'</option>';
 			while($row = mysqli_fetch_array($sql)){
 				echo '<option value="'.$row['id'].'">'.$row['naslov'].'</option>';
@@ -644,13 +645,16 @@ class NewSurvey{
 		echo '</div>';
 		echo '</div>';
 		
-		
 		// 2. sklop - uvoz iz besedila
 		echo '<div class="fieldset anketa_from_text">';	
 
 		// Naslov
-		echo '<div class="title">' . $lang['srv_newSurvey_survey_from_text_title'] . ' '.Help::display('srv_create_survey_from_text').'</div>';
+		echo '<div class="title">' . $lang['srv_newSurvey_survey_from_text_title'] . ' '.Help::display('srv_create_survey_from_text', "title").'</div>';
-		echo '<div class="from_text_instructions">' . $lang['srv_newSurvey_survey_from_text_text'] . '</div>';
+		echo '<p>' . $lang['srv_newSurvey_survey_from_text_text1'] . '</p>';
+		echo '<p>' . $lang['srv_newSurvey_survey_from_text_text2'] . '</p>';
+		echo '<p class="bottom32">' . $lang['srv_newSurvey_survey_from_text_text3'] . '</p>';
+
+		echo '<div class="from_text_sidebyside_holder">';
 		
 		// Input okno za text
 		echo '<div id="input_field_holder"><div id="input_field">';
@@ -660,19 +664,20 @@ class NewSurvey{
 		
 		// Preview okno
 		echo '<div id="preview_field_holder"><div id="preview_field">';
-		echo '<span class="italic">'.$lang['srv_poglejanketo2'].'</span>';
+		echo '<span class="caps bold">'.$lang['srv_poglejanketo2'].'</span>';
 		echo '</div></div>';	
 		
-		echo '</div>';		
+		echo '</div>';	
+		
+		echo '</div>';
+		
 
 
         // Gumba naprej in preklici
-        echo '<div class="noSurvey_buttons">';
+		echo '<div class="button_holder">';
-
+		echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';				
-        echo '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
+		echo '<button class="medium blue" onclick="newAnketaFromText();" id="noSurvey_create">'.$lang['next1'].'</button>';
-        echo '<a href="#" onclick="newAnketaFromText();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
+		echo '</div>';
-
-        echo '</div>';
 	}
 	
 	
@@ -684,113 +689,157 @@ class NewSurvey{
         global $lang;
         global $site_url;
         global $site_path;
+		global $global_user_id;
 
         echo '<div class="noSurvey_sequence">';
 
-		// Video
-        if ($_GET['b'] == 'video') {
-
-            echo '<div class="main_holder video">';
-
-            echo '<span class="title">' . $lang['noSurvey_sequence_title'] . '</span>';
-
-            echo '<p style="text-align:center;"><iframe width="700" height="500" style="border:1px #8a9fbf solid;" src="//www.youtube.com/embed/1OeaQErrPrc" frameborder="0" allowfullscreen></iframe></p>';
-            
-            echo '</div>';
-        } 
-        // Spisek funkcionalnosti
-        elseif ($_GET['b'] == 'features') {
-
-            echo '<div class="main_holder features">';
-
-            echo '<span class="title">' . $lang['noSurvey_sequence_title'] . '</span>';
-
-            echo $lang['noSurvey_sequence_features'];
-
-            echo '<h2>' . $lang['noSurvey_sequence_features_h1'] . '</h2>';
-            echo '<ul class="features">';
-            echo '<li>' . $lang['noSurvey_sequence_features_li1'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li2'] . '</li>';
-            echo '</ul>';
-
-            echo '<h2>' . $lang['noSurvey_sequence_features_h2'] . '</h2>';
-            echo '<ul class="features">';
-            echo '<li>' . $lang['noSurvey_sequence_features_li3'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li4'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li5'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li6'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li7'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li8'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li9'] . '</li>';
-            echo '</ul>';
-
-            echo '<h2>' . $lang['noSurvey_sequence_features_h3'] . '</h2>';
-            echo '<ul class="features">';
-            echo '<li>' . $lang['noSurvey_sequence_features_li10'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li11'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li12'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li13'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li14'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li15'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li16'] . '</li>';
-            echo '<li>' . $lang['noSurvey_sequence_features_li17'] . '</li>';
-            echo '</ul>';
-
-            echo '</div>';
-        } 
-        // Prva stran
-        else {
-
-            echo '<div class="main_holder main">';
-            
-            // Leva stran
-            echo '<div class="left_holder">';
-            echo '<span class="title">' . $lang['noSurvey_sequence_title'] . '</span>';
-            echo $lang['noSurvey_sequence_main'];
-            echo '</div>';
-
-            // Desna stran
-            echo '<div class="right_holder">';
-            echo '<img src="/public/img/images/first_survey.jpg">';
-            echo '</div>';
-
-            echo '</div>';
-        }
-
-
-        // Gumbi na dnu
-        echo '<div class="buttons_holder">';
-
-        // Gumb ustvari anketo
-        echo '<a href="'.$site_url.'/admin/survey/index.php?b=new_survey">';
-        echo '  <div class="button">'.$lang['noSurvey_sequence_button_create'].'</div>';
-        echo '</a>';
         
-        // Gumb videovodic
+        // Prva stran
-        if($_GET['b'] != 'video'){
-            echo '<a href="'.$site_url.'/admin/survey/index.php?b=video">';
-            echo '  <div class="button button_gray">'.$lang['noSurvey_sequence_button_video'].'</div>';
-            echo '</a>';
-        }
 
-        // Gumb ogled funkcionalnosti
+		echo '<div class="main_holder main">';
-        if($_GET['b'] != 'features'){
+            echo '<div id="no_survey">';
-            echo '<a href="'.$site_url.'/admin/survey/index.php?b=features">';
-            echo '  <div class="button button_gray">'.$lang['noSurvey_sequence_button_advanced'].'</div>';
-            echo '</a>';
-        }
 
-        // Gumb ogled cenika
+			$sql = sisplet_query("SELECT * FROM users WHERE id='$global_user_id'");
-        if($_GET['b'] == 'features'){
+			$row = mysqli_fetch_array($sql);
-            $cenik_link = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/cenik' : 'https://www.1ka.si/d/en/services/';
 
-            echo '<a href="'.$cenik_link.'" target="_blank">';
+			$text = $row['name'] . ' ' . $row['surname'];
-            echo '  <div class="button button_gray">'.$lang['noSurvey_sequence_button_cenik'].'</div>';
+			$text = (strlen($text) > 25) ? substr($text, 0, 25) . '...' : $text;
-            echo '</a>';
+			$text = trim($text);
-        }
 
-        echo '</div>';
+            echo '<div class="no_survey_title">';
+		    echo '<img src="/public/img/images/hand_icon.svg" />';
+			echo $lang['noSurvey_sequence_1'] . $text .'!';
+            echo '</div>';
 
+			// Video
+			if ($_GET['b'] == 'video') {
+
+				echo '<div id="no_survey_video" class="main_holder video">';
+	
+				echo '<p style="text-align:center;"><iframe width="800" height="450" src="//www.youtube.com/embed/1OeaQErrPrc" frameborder="0" allowfullscreen></iframe></p>';
+				
+				echo '</div>';
+			}
+
+			// Spisek funkcionalnosti
+			if ($_GET['b'] == 'features') {
+
+				echo '<div id="no_survey_features" class="main_holder features">';
+
+				echo '<p id="intro">'.$lang['noSurvey_sequence_features'].'</p>';
+
+				echo '<h2>' . $lang['noSurvey_sequence_features_h1'] . '</h2>';
+				echo '<ul class="features">';
+				echo '<li>' . $lang['noSurvey_sequence_features_li1'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li2'] . '</li>';
+				echo '</ul>';
+
+				echo '<h2>' . $lang['noSurvey_sequence_features_h2'] . '</h2>';
+				echo '<ul class="features">';
+				echo '<li>' . $lang['noSurvey_sequence_features_li3'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li4'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li5'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li6'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li7'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li8'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li9'] . '</li>';
+				echo '</ul>';
+
+				echo '<h2>' . $lang['noSurvey_sequence_features_h3'] . '</h2>';
+				echo '<ul class="features">';
+				echo '<li>' . $lang['noSurvey_sequence_features_li10'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li11'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li12'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li13'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li14'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li15'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li16'] . '</li>';
+				echo '<li>' . $lang['noSurvey_sequence_features_li17'] . '</li>';
+				echo '</ul>';
+
+				$cenik_link = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/cenik' : 'https://www.1ka.si/d/en/services/';
+
+				echo '<p class="top16">'.$lang['noSurvey_sequence_button_cenik_text'].'<a target="_blank" href="'.$cenik_link.'">'.$lang['noSurvey_sequence_button_cenik'].'</a>.</p>';
+
+				echo '</div>';
+			}
+
+			// Ustvari anketo
+			echo '<div class="no_survey_box">';
+			
+			echo '<div class="feature">';
+			echo '<div class="icon">';
+			echo '<span class="faicon fa-newspaper empty"></span>';
+            echo '</div>';
+			echo '<div class="name">';
+			echo $lang['noSurvey_sequence_button_create'];
+            echo '</div>';
+            echo '</div>';
+
+			echo $lang['noSurvey_sequence_2'];
+
+			$anketa_url = "'".$site_url.'/admin/survey/index.php?b=new_survey'."'";
+
+			echo '<div class="button_holder">';
+       		echo '<button class="medium blue" onClick="window.location='.$anketa_url.';return false;">'.$lang['noSurvey_sequence_button_create'].'</button>';              
+        	echo '</div>';
+            
+			echo '</div>';
+
+
+			// Videovodic box
+			if($_GET['b'] != 'video'){
+
+				echo '<div class="no_survey_box">';
+			
+				echo '<div class="feature">';
+				echo '<div class="icon">';
+				echo '<span class="faicon fa-film"></span>';
+				echo '</div>';
+				echo '<div class="name">';
+				echo $lang['noSurvey_sequence_3'];
+				echo '</div>';
+				echo '</div>';
+
+				echo $lang['noSurvey_sequence_4'];
+
+				$video_url = "'".$site_url.'/admin/survey/index.php?b=video'."'";
+
+				echo '<div class="button_holder">';
+				echo '<button class="medium white-blue" onClick="window.location='.$video_url.';return false;">'.$lang['noSurvey_sequence_button_video'].'</button>';              
+				echo '</div>';
+				
+				echo '</div>';
+			}
+
+			// Ogled funkcionalnosti box
+			if($_GET['b'] != 'features'){
+
+				echo '<div class="no_survey_box">';
+			
+				echo '<div class="feature">';
+				echo '<div class="icon">';
+				echo '<span class="faicon fa-toolbox"></span>';
+				echo '</div>';
+				echo '<div class="name">';
+				echo $lang['noSurvey_sequence_5'];
+				echo '</div>';
+				echo '</div>';
+
+				echo $lang['noSurvey_sequence_6'];
+
+				$features_url = "'".$site_url.'/admin/survey/index.php?b=features'."'";
+
+				echo '<div class="button_holder">';
+				echo '<button class="medium white-blue" onClick="window.location='.$features_url.';return false;">'.$lang['noSurvey_sequence_button_advanced'].'</button>';              
+				echo '</div>';
+				
+				echo '</div>';
+			}
+			
+
+            echo '</div>';
+            echo '</div>';
 
         echo '</div>';
     }
@@ -806,7 +855,7 @@ class NewSurvey{
 
 			// Ce imamo prazno
 			if($text == ''){
-				$text = '<span class="italic">'.$lang['srv_poglejanketo2'].'</span>';
+				$text = '<span class="caps bold">'.$lang['srv_poglejanketo2'].'</span>';
 			}
 			else{
 				// Pobrisemo vmesne odvecne presledke
@@ -819,7 +868,7 @@ class NewSurvey{
 				// Wrapamo naslove (prazna vrstica spredaj)
 				$text = preg_replace(
 					'/<br \/><br \/>([^<>]+)/', 
-	        		'<br /><br /><span class="title">$1</span>',
+	        		'<br /><br /><span class="variable_title">$1</span>',
 					$text
 				);		
 				// Wrapamo variable (vsaka v novi vrstici)
@@ -830,27 +879,27 @@ class NewSurvey{
 				);				
 				// Dodamo se textbox ce je samo vprasanje
 				$text = preg_replace(
-					'/(<span class="title">[^<>]+<\/span>)<br \/><br \/>/', 
+					'/(<span class="variable_title">[^<>]+<\/span>)<br \/><br \/>/', 
-	        		'$1<br /><input type="text" /><br /><br />',
+	        		'$1<br /><input type="text" class="large" /><br /><br />',
 					$text
 				);
 				
 				// Wrapamo se prvo vrstico kot naslov
 				$text = preg_replace(
 					'/([^<>]+)<br \/>/', 
-					'<span class="title">$1</span><br />',
+					'<span class="variable_title">$1</span><br />',
 					$text, 1
 				);
 				// Dodamo se textbox na zadnjo vrstico ce je potrebno
 				$text = preg_replace(
-					'/(<span class="title">[^<>]+<\/span>)\Z/', 
+					'/(<span class="variable_title">[^<>]+<\/span>)\Z/', 
-					'$1<br /><input type="text" />',
+					'$1<br /><input type="text" class="large" />',
 					$text
 				);
-				// Dodamo se textbox na prvo vrstico ce je potrebno
+				// Dodamo se textbox na prvo vrstico, ce je potrebno
 				$text = preg_replace(
-					'/(<span class="title">[^<>]+<\/span>)<br \/><br \/>/', 
+					'/(<span class="variable_title">[^<>]+<\/span>)<br \/><br \/>/', 
-					'$1<br /><input type="text" /><br /><br />',
+					'$1<br /><input type="text" class="large" /><br /><br />',
 					$text, 1
 				);				
 			}

admin/survey/classes/class.Notifications.php

@@ -18,46 +18,77 @@ class Notifications {
 	
 	public function display($tab=0){
 		global $admin_type, $global_user_id, $lang;
-		
+
 		// Prikazemo poslana sporocila
 		if((isset($_GET['t']) && $_GET['t']=='sent') || $tab == 1){
-			
+
+			echo '<div class="notifications_content">';
+
 			// Izpis vseh poslanih sporocil
 			if($admin_type == 0){
-				echo '<div class="sent_list">';
+				echo '<div class="notifications_content_left">';
+				
+				echo '<div class="title">';
+				echo '<div class="title_icon"><span class="faicon inv_sent_1"></span></div>';
+				echo '<h2>'.$lang['srv_notifications_sent'].'</h2>';
+				echo '</div>';
+				
 				$this->displaySentMessages();
 				echo '</div>';
 				
 				// obrazec za posiljanje sporocil
+				echo '<div class="notifications_content_right">';
+				
+				echo '<div class="title">';
+				echo '<div class="title_icon"><span class="faicon inv_sent_0"></span></div>';
+				echo '<h2>'.$lang['srv_inv_message_draft_new'].'</h2>';
+				echo '</div>';
+
 				$this->sendMessageForm();
+				echo '</div>';
+
 			}
 			else
-				echo $lang['srv_notifications_admin_alert'];			
+				echo $lang['srv_notifications_admin_alert'];
+			
+			echo '</div>';
 		}
 		// Prikazemo prejeta sporocila
 		else{
+
+			echo '<div class="title">';
+			echo '<div class="title_icon"><span class="faicon fa-inbox"></span></div>';
+			echo '<h2>'.$lang['srv_notifications_recieved'].'</h2>';
+			echo '</div>';
+
+			echo '<div class="notifications_content">';
+
+			echo '<div class="notifications_content_left">';
 			echo '<div class="recieved_list">';
 			$this->displayRecievedMessages();
 			echo '</div>';
+			echo '</div>';
 			
+			echo '<div class="notifications_content_right">';
 			echo '<div id="message" style="display:none;"></div>';
+			echo '</div>';
+
+
+			echo '</div>';
+
 		}
-		
-		echo '<div class="clr"></div>';
 	}
 	
 	private function displayRecievedMessages($active=0){
 		global $admin_type, $global_user_id, $lang;
 		
-		echo '<span class="bold">'.$lang['srv_notifications_recieved'].':</span>';
-		
 		// Napolnimo array prejetih sporocil
 		$recievedMessages = array();
 		
-		$sql = sisplet_query("SELECT n.id AS id, n.recipient AS recipient, n.viewed AS viewed, m.id AS message_id, m.date AS date, m.title AS title, m.text AS text
+		$sql = sisplet_query("SELECT n.id AS id, n.recipient AS recipient, n.viewed AS viewed, m.id AS message_id, m.send_time AS send_time, m.title AS title, m.text AS text
 								FROM srv_notifications n, srv_notifications_messages m 
 								WHERE n.recipient='".$global_user_id."' AND n.message_id=m.id
-								ORDER BY m.date DESC");
+								ORDER BY m.send_time DESC");
 		while($row = mysqli_fetch_array($sql)){
 			$recievedMessages[$row['id']] = $row;
 		}	
@@ -67,16 +98,25 @@ class Notifications {
 		
 		if(count($recievedMessages) > 0){
 			foreach($recievedMessages as $message){
-				echo '<a href="#" onclick="viewMessage(\''.$message['id'].'\'); return false;">';
+				echo '<li class="'.($active > 0 && $message['id'] == $active ? ' active':'').'" onclick="viewMessage(\''.$message['id'].'\'); return false;">';
-				echo '<li class="'.($message['viewed'] == 0 ? ' unread':'').' '.($active > 0 && $message['id'] == $active ? ' active':'').'">';
+
+				echo '<span class="faicon fa-circle '.($message['viewed'] == 0 ? ' unread':'').'"></span>';
+
+				echo '<div class="title_row">'; //sem noter pride še oznaka, če je obvestilo ali sporočilo
+				echo '<div class="subject">';
+				echo $message['title'];
+				echo '</div>';
+				echo '<div class="date">';
+				echo date('Y-m-d H:i:s', strtotime($message['send_time']));
+				echo '</div>';
+				echo '</div>';
 				
-				echo '<span class="bold">'.$message['title'].' <span class="italic">('.$message['date'].')</span></span>';
+				$text = strip_tags($message['text']);
-				
+				echo '<div class="content">';
-				$text = strip_tags((strlen($message['text']) > 70) ? substr($message['text'], 0, 70).'...' : $message['text']);
+				echo $text;
-				echo '<br />'.$text;
+				echo '</div>';
 				
 				echo '</li>';
-				echo '</a>';
 			}
 		}
 		
@@ -85,43 +125,54 @@ class Notifications {
 	
 	private function displaySentMessages(){
 		global $admin_type, $global_user_id, $lang;
-		
+
-		echo '<span class="bold">'.$lang['srv_notifications_sent'].':</span>';
-		
 		// Napolnimo array poslanih sporocil
 		$sentMessages = array();
 		
-		$sql = sisplet_query("SELECT * FROM srv_notifications_messages WHERE author='".$global_user_id."' ORDER BY date DESC");
+		$sql = sisplet_query("SELECT * FROM srv_notifications_messages WHERE author='".$global_user_id."' ORDER BY send_time DESC");
 		while($row = mysqli_fetch_array($sql)){
 			$sentMessages[$row['id']] = $row;
 		}
 		
-		
-		echo '<ul>';
-		
 		if(count($sentMessages) > 0){
+
+			echo '<div class="sent_list">';
+			echo '<ul>';
+
 			foreach($sentMessages as $message_id => $message){
-				//echo '<li '.($message['viewed'] == 0 ? ' class="unread"':'').'>';
 				echo '<li>';
+
+				echo '<div class="title_row">'; //sem noter pride še oznaka, če je obvestilo ali sporočilo
+				echo '<div class="subject">';
+				echo $message['title'];
+				echo '</div>';
+				echo '<div class="date">';
+				echo date('Y-m-d H:i:s', strtotime($message['send_time']));
+				echo '</div>';
+				echo '</div>';
 				
-				echo '<span class="bold">'.$message['title'].' <span class="italic">('.$message['date'].')</span></span>';
+				$text = strip_tags($message['text']);
-				
+				echo '<div class="content">';
-				$text = strip_tags((strlen($message['text']) > 70) ? substr($message['text'], 0, 70).'...' : $message['text']);
+				echo $text;
-				echo '<br />'.$text;
+				echo '</div>';
 				
 				// Gumb da se sporocilo razresi vsem  (kot da so ga pregledali)
 				$sqlN = sisplet_query("SELECT message_id FROM srv_notifications WHERE message_id='".$message_id."' AND viewed='0'");
 				$count = mysqli_num_rows($sqlN);
 				if($count > 0){
-					echo '<br />';
+					echo '<div class="resolve" onclick="resolveMessages(\''.$message_id.'\'); return false;">';
-					echo '<a href="#" onclick="resolveMessages(\''.$message_id.'\'); return false;"><span class="link">'.$lang['srv_notifications_sent_resolve'].' ('.$count.')'.'</span></a>';
+					echo '<span class="faicon fa-check"></span>';
+					echo $lang['srv_notifications_sent_resolve'].' ('.$count.')';
+					echo '</div>';
 				}
 				
 				echo '</li>';
-			}	
+			}
+			echo '</ul>';
+			echo '</div>';
 		}
-		
+		else //Ni poslanih sporočil
-		echo '</ul>';
+			echo '<p>'.$lang['srv_notifications_sent_none'].'.</p>';		
 	}
 	
 	// Obrazec za posiljanje sporocila
@@ -129,29 +180,54 @@ class Notifications {
 		global $admin_type, $global_user_id, $lang;
 		
 		echo '<div class="send_form">';
-		echo '<span class="clr bold">'.$lang['srv_notifications_send_reciever'].': </span><input type="text" name="recipient" id="recipient">';
+
-		
+		//Prejemniki
-		// Checkboxa za posiljenje vsem uporabnikoom (slo in ang)
+		echo '<div class="setting_holder">';
-		echo '<div style="padding-top:5px;"><input type="checkbox" value="1" name="recipient_all_slo" id="recipient_all_slo" onClick="recipient_all_disable_email();"> <label for="recipient_all_slo"><span class="clr bold">'.$lang['srv_notifications_send_all_slo'].'</span></label></div>';
+		echo '<span class="setting_title">'.$lang['srv_notifications_send_reciever2'].':</span>';
-		echo '<div style="padding-top:5px;"><input type="checkbox" value="1" name="recipient_all_ang" id="recipient_all_ang" onClick="recipient_all_disable_email();"> <label for="recipient_all_ang"><span class="clr bold">'.$lang['srv_notifications_send_all_ang'].'</span></label></div><br />';
+
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" name="recipient_all_slo" id="recipient_all_slo" onChange="recipient_toggle(\'slo\');">';
+		echo '<label for="recipient_all_slo">'.$lang['srv_notifications_send_all_slo'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" name="recipient_all_ang" id="recipient_all_ang" onChange="recipient_toggle(\'ang\');">';
+		echo '<label for="recipient_all_ang">'.$lang['srv_notifications_send_all_ang'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" name="recipient_custom" id="recipient_custom" onChange="recipient_toggle(\'custom\');">';
+		echo '<label for="recipient_custom">'.$lang['srv_notifications_send_custom'].'</label>';
+		echo '<input type="text" class="text large disabled" name="recipient" id="recipient">';
+		echo '</div>';
+					
+		echo '</div>';
 
         // Naslov sporocila
-		echo '<span class="clr bold">'.$lang['srv_notifications_send_title'].': </span><input type="text" name="title"><br /><br />';
+		echo '<div class="setting_holder">';
+		echo $lang['srv_notifications_send_title'].':';
+		echo '<input type="text" class="text large" name="title">';
+		echo '</div>';
 
         // Besedilo sporocila (editor)
-		echo '<span class="clr bold">'.$lang['srv_notifications_send_text'].': </span><textarea id="notification" name="notification" autocomplete="off"></textarea><br />';
+		echo $lang['srv_notifications_send_text'].':';
+		echo '<div class="label">';
+		echo '<textarea id="notification" name="notification" autocomplete="off"></textarea>';
+		echo '</div>';
 		
 		// Avtomatsko prikaži obvestilo po prijavi
-		echo '<div style="padding-top:5px;"><input type="checkbox" value="1" name="force_show" id="force_show"> <label for="force_show"><span class="clr bold">'.$lang['srv_notifications_force_show'].'</span></label></div><br />';
+		echo '<div class="auto_checkbox">';
-		
+		echo '<input type="checkbox" value="1" name="force_show" id="force_show">';
-		echo '<span class="buttonwrapper floatLeft spaceRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="sendNotification(); return false;">';
+		echo '<label for="force_show">'.$lang['srv_notifications_force_show'].'</label>';
-		echo '<span>'.$lang['srv_notifications_send'].'</span>';
+		echo '</div>';
-		echo '</a></span>';
+
-		
+		//Error notes
 		if($note != ''){
-			echo '<br /><br />';
+			echo '<p class="top16">'.$note.'</p>';
-			echo '<span class="bold red">'.$note.'</span>';
 		}
+
+		// Gumb pošlji
+		echo '<div class="button_holder '.($note != '' ? 'top16' : '').'">';
+		echo '<button class="medium blue" onclick="sendNotification(); return false;">'.$lang['srv_notifications_send'].'</button>';
+		echo '</div>';
 		
 		echo '</div>';
 
@@ -251,7 +327,7 @@ class Notifications {
 		if($recipient_all_slo == 1 || $recipient_all_ang == 1){
 			
 			// Dodamo novo sporocilo v bazo
-			$sql = sisplet_query("INSERT INTO srv_notifications_messages (author, date, title, text, force_show) VALUES ('".$global_user_id."', NOW(), '".$title."', '".$notification."', '".$force_show."')");
+			$sql = sisplet_query("INSERT INTO srv_notifications_messages (author, send_time, title, text, force_show) VALUES ('".$global_user_id."', NOW(), '".$title."', '".$notification."', '".$force_show."')");
 			$message_id = mysqli_insert_id($GLOBALS['connect_db']);
 			
 			$note = '';
@@ -267,7 +343,7 @@ class Notifications {
 	
 				$sql = sisplet_query("INSERT INTO srv_notifications (message_id, recipient, viewed) VALUES ('".$message_id."', '".$rowU['id']."', '0')");
 				if(!$sql) 
-					$note .= mysqli_error($GLOBALS['connect_db']).'<br />';	
+					$note .= '<span class="red">'.mysqli_error($GLOBALS['connect_db']).'</span>';	
 			}		
 		}
 		// Posiljamo na specificen mail
@@ -278,30 +354,46 @@ class Notifications {
 				$rowU = mysqli_fetch_array($sqlU);
 				
 				// Dodamo novo sporocilo v bazo
-				$sql = sisplet_query("INSERT INTO srv_notifications_messages (author, date, title, text, force_show) VALUES ('".$global_user_id."', NOW(), '".$title."', '".$notification."', '".$force_show."')");
+				$sql = sisplet_query("INSERT INTO srv_notifications_messages (author, send_time, title, text, force_show) VALUES ('".$global_user_id."', NOW(), '".$title."', '".$notification."', '".$force_show."')");
 				$message_id = mysqli_insert_id($GLOBALS['connect_db']);
 				
 				// Dodamo novo sporocilo v bazo
 				$sql = sisplet_query("INSERT INTO srv_notifications (message_id, recipient, viewed) VALUES ('".$message_id."', '".$rowU['id']."', '0')");
 				if(!$sql) 
-					$note = mysqli_error($GLOBALS['connect_db']);
+					$note = '<span class="red">'.mysqli_error($GLOBALS['connect_db']).'</span>';
 				else
-					$note = 'Sporočilo je bilo uspešno poslano uporabniku '.$recipient.' ('.$rowU['name'].' '.$rowU['surname'].').';		
+					$note = '<span class="faicon success blue link-right"></span>'.$lang['srv_notifications_sent_success'].' '.$recipient.' ('.$rowU['name'].' '.$rowU['surname'].').';		
 			}
 			else{
-				$note = 'Vnešeni email ('.$recipient.') ne pripada nobenemu uporabniku!';
+				$note = '<span class="red">'.$lang['srv_notifications_sent_nouser1'].$recipient.$lang['srv_notifications_sent_nouser1'].'</span>';
 			}
 		}
 		
+		echo '<div class="notifications_content">';
+
 		// Refresh vseh poslanih sporocil
-		echo '<div class="sent_list">';
+		echo '<div class="notifications_content_left">';
+				
+		echo '<div class="title">';
+		echo '<div class="title_icon"><span class="faicon inv_sent_1"></span></div>';
+		echo '<h2>'.$lang['srv_notifications_sent'].'</h2>';
+		echo '</div>';
+
 		$this->displaySentMessages();
 		echo '</div>';
 		
 		// Refresh obrazca za posiljanje sporocil
+		echo '<div class="notifications_content_right">';
+				
+		echo '<div class="title">';
+		echo '<div class="title_icon"><span class="faicon inv_sent_0"></span></div>';
+		echo '<h2>'.$lang['srv_inv_message_draft_new'].'</h2>';
+		echo '</div>';
+
 		$this->sendMessageForm($note);
-		
+		echo '</div>';
-		echo '<div class="clr"></div>';
+
+		echo '</div>';
 	}
 	
 	public function ajax_resolveMessages(){
@@ -326,28 +418,48 @@ class Notifications {
 		$sql = sisplet_query("UPDATE srv_notifications SET viewed='1' WHERE id='$id'");
 		
 		// Dobimo sporocilo
-		$sql = sisplet_query("SELECT n.id AS id, m.title AS title, m.text AS text, m.date AS date 
+		$sql = sisplet_query("SELECT n.id AS id, m.title AS title, m.text AS text, m.send_time AS send_time 
 								FROM srv_notifications n, srv_notifications_messages m 
 								WHERE n.id='$id' AND m.id=n.message_id");
 		$row = mysqli_fetch_array($sql);
 		
 		// Refresh vseh prejetih sporocil
+		echo '<div class="title">';
+		echo '<div class="title_icon"><span class="faicon fa-inbox"></span></div>';
+		echo '<h2>'.$lang['srv_notifications_recieved'].'</h2>';
+		echo '</div>';
+
+		echo '<div class="notifications_content">';
+
+		echo '<div class="notifications_content_left">';
 		echo '<div class="recieved_list">';
 		$this->displayRecievedMessages($active=$id);
 		echo '</div>';
-		
+		echo '</div>';
+
 		// Prikaz izbranega sporocila
+		echo '<div class="notifications_content_right">';
 		echo '<div id="message">';
 
-		echo '<span class="bold">'.$row['title'].' <span class="italic">('.$row['date'].')</span></span>';
+		echo '<div class="subject">';
-
+		echo $row['title'];
+		echo '</div>';
+		
+		echo '<div class="date">';
+		echo '('.date('Y-m-d H:i:s', strtotime($row['send_time'])).')';
+		echo '</div>';
+		
         // Stara sporocila so brez editorja
-        $text = (strtotime($row['date']) < strtotime('2021-08-26')) ? nl2br($row['text']) : $row['text'];
+        $text = (strtotime($row['send_time']) < strtotime('2021-08-26')) ? nl2br($row['text']) : $row['text'];
-		echo '<p>'.$text.'</p>';
+		echo '<div class="content">';
+		echo $text;
+		echo '</div>';
 
 		echo '</div>';
 		
 		echo '<div class="clr"></div>';
+		
+		echo '</div>'; //div.notifications_content
 	}
 	
 	public function ajax_viewUnreadMessages(){
@@ -358,17 +470,17 @@ class Notifications {
 		echo '<ul>';
 		
 		// Loop cez vsa neprebrana sporocila
-		$sql = sisplet_query("SELECT n.id AS id, m.title AS title, m.text AS text, m.date AS date, n.viewed AS viewed 
+		$sql = sisplet_query("SELECT n.id AS id, m.title AS title, m.text AS text, m.send_time AS send_time, n.viewed AS viewed 
 								FROM srv_notifications n, srv_notifications_messages m 
 								WHERE n.recipient='".$global_user_id."' AND n.viewed='0' AND m.id=n.message_id 
-								ORDER BY m.date DESC");
+								ORDER BY m.send_time DESC");
 		while($row = mysqli_fetch_array($sql)){
 			echo '<li class="'.($row['viewed'] == 0 ? ' unread':'').' '.($active > 0 && $row['id'] == $active ? ' active':'').'">';
 			
-			echo '<span class="bold">'.$row['title'].' <span class="italic">('.$row['date'].')</span></span>';
+			echo '<span class="bold">'.$row['title'].' <span class="italic">('.date('Y-m-d H:i:s', strtotime($row['send_time'])).')</span></span>';
 			
             // Stara sporocila so brez editorja
-            $text = (strtotime($row['date']) < strtotime('2021-08-26')) ? nl2br($row['text']) : $row['text'];
+            $text = (strtotime($row['send_time']) < strtotime('2021-08-26')) ? nl2br($row['text']) : $row['text'];
 			echo '<br />'.$text;
 			
 			echo '</li>';

admin/survey/classes/class.Prevajanje.php

@@ -131,22 +131,27 @@ class Prevajanje {
 		}
 		
 		
+        echo '<div class="prevajanje_holder">';
+
+
+        // Segment z zgornjimi nastavitvami
+        echo '<div class="section jezik_top_settings">';
 		$this->top_settings();
+        echo '</div>';
 		
+
 		$sql = sisplet_query("SELECT * FROM srv_language WHERE ank_id = '$this->anketa'");
-		if (mysqli_num_rows($sql) == 0) {
+		if (mysqli_num_rows($sql) == 0) {	
-		
 			//$this->dodaj_jezik(1);
-		
+		} 
-		} else {
+        elseif ($rowa['multilang'] == 1) {
 			
-			if ($rowa['multilang'] == 1) {
+            $this->urejanje();
-				
+
-				$this->urejanje();
+            ?><script> var srv_meta_lang_id = <?=$this->lang_id?>; </script><?
-				
-				?><script> var srv_meta_lang_id = <?=$this->lang_id?>; </script><?
-			}
 		}
+
+        echo '</div>';
 	}
 	
 	/**
@@ -166,6 +171,7 @@ class Prevajanje {
 		$lang_admin = $row['lang_admin'];
 		$lang_resp = $row['lang_resp'];
 		$lang_array = array();
+
 		// Preberemo razpoložljive jezikovne datoteke
 		if ($dir = opendir($site_path . 'lang')) {
 			while (($file = readdir($dir)) !== false) {
@@ -189,11 +195,10 @@ class Prevajanje {
 		}
 		
 		
-		/**
+        echo '<div class="jezik_row">';
-		* Leva stran nastavitev 
+
-		*/
+		// Leva stran nastavitev 
-		
+		echo '<fieldset class="jezik_left settings">';
-		echo '<fieldset class="wide prevajanje" style="position:relative">';
 		
 		if ($this->user_dostop_edit == 1) {
 			
@@ -207,42 +212,59 @@ class Prevajanje {
 			
 			
 			asort($lang_array);
-			
+
-			echo '<p><span class="nastavitveSpan1">'.$lang['srv_language_respons_1'].': </span><select name="lang_resp" onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;">';
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_language_respons_1'].':</span>';
+			echo '<select class="dropdown large" name="lang_resp" onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;">';
 			foreach ($lang_array AS $key => $val) {
 				echo '<option value="'.$key.'" '.($key==$lang_resp?' selected':'').'>'.$val.'</option>'; 
 			}
-			echo '</select> <a href="index.php?anketa='.$this->anketa.'&a=jezik">'.$lang['srv_extra_translations'].'</a></p>' . "\n\r";
+			echo '</select>';
+			echo '</div>';
 			
 			$resp_change_lang = SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang');		
 			
 			if ($this->lang_id != 0) {
-				
+
-				echo '<p><span class="nastavitveSpan1"><label for="">'.$lang['srv_resp_change_lang'].':</label> </span>
+				echo '<div class="setting_holder">';
-					<label for="resp_change_lang_0"><input type="radio" name="resp_change_lang" id="resp_change_lang_0" value="0" '.($resp_change_lang==0?' checked':'').' onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;" />'.$lang['no'].'</label> 
+				echo '<span class="setting_title">'.$lang['srv_resp_change_lang'].':</span>';
-					<label for="resp_change_lang_1"><input type="radio" name="resp_change_lang" id="resp_change_lang_1" value="1" '.($resp_change_lang==1?' checked':'').' onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;" />'.$lang['yes'].'</label></p>';
+
-					
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="resp_change_lang" id="resp_change_lang_0" value="0" '.($resp_change_lang==0?' checked':'').' onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;" />';
+				echo '<label for="resp_change_lang_0">'.$lang['no'].'</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="resp_change_lang" id="resp_change_lang_1" value="1" '.($resp_change_lang==1?' checked':'').' onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;" />';
+				echo '<label for="resp_change_lang_1">'.$lang['yes'].'</label>';
+				echo '</div>';
+							
+				echo '</div>';
+
 				if($resp_change_lang==1){
-					$resp_change_lang_type = SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang_type');		
+					$resp_change_lang_type = SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang_type');
 					
-					echo '<p>';
+					echo '<div class="setting_holder">';
-					
+					echo '<span class="setting_title">'.$lang['srv_resp_change_lang_type'].':</span>';
-					echo '<span class="nastavitveSpan1"><label for="">'.$lang['srv_resp_change_lang_type'].':</label> </span>
+
-					<label for="resp_change_lang_type_0"><input type="radio" name="resp_change_lang_type" id="resp_change_lang_type_0" value="0" '.($resp_change_lang_type==0?' checked':'').' onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;" />'.$lang['srv_resp_change_lang_type_0'].'</label>
+					echo '<div class="setting_item">';
-					<label for="resp_change_lang_type_1"><input type="radio" name="resp_change_lang_type" id="resp_change_lang_type_1" value="1" '.($resp_change_lang_type==1?' checked':'').' onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;" />'.$lang['srv_resp_change_lang_type_1'].'</label>';
+					echo '<input type="radio" name="resp_change_lang_type" id="resp_change_lang_type_0" value="0" '.($resp_change_lang_type==0?' checked':'').' onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;" />';
-					
+					echo '<label for="resp_change_lang_type_0">'.$lang['srv_resp_change_lang_type_0'].'</label>';
-					echo '</p>';
+					echo '</div>';
+					echo '<div class="setting_item">';
+					echo '<input type="radio" name="resp_change_lang_type" id="resp_change_lang_type_1" value="1" '.($resp_change_lang_type==1?' checked':'').' onchange="document.settingsanketa_' . $row['id'] . '.submit(); return false;" />';
+					echo '<label for="resp_change_lang_type_1">'.$lang['srv_resp_change_lang_type_1'].'</label>';
+					echo '</div>';
+								
+					echo '</div>';
 				}		
 			} 
 			else {
 				echo '<a href="index.php?anketa='.$this->anketa.'" style="position:absolute; top:0px; right:10px">'.$lang['srv_back_edit'].'</a>';
 			}
+
+			//Standardne besede
+			echo '<p class="top16">'.$lang['srv_language_std_bes1'].'<a href="index.php?anketa='.$this->anketa.'&a=jezik">'.$lang['srv_language_std_bes2'].'</a>.</p>';
 			
-			// Jezik administrativnega vmesnika
-			echo '<div style="position:absolute; right:20px; bottom:10px;"><span class="bold">';
-			//printf ($lang['srv_language_admin_survey2'], 'index.php?anketa='.$this->anketa.'&a=nastavitve');
-			echo '<a href="index.php?anketa='.$this->anketa.'&a=nastavitve">'.$lang['srv_language_admin_survey'].'</a>';
-			echo '</span></div>';
 			
 			echo '</form>';
 		}
@@ -250,36 +272,48 @@ class Prevajanje {
 		echo '</fieldset>';
 		
 		
-		/**
+		// Desna stran	
-		* 	Desna stran
+		echo '<fieldset class="jezik_right"><legend>'.$lang['srv_multilang'].'</legend>';
-		*/		
-		echo '<fieldset class="wide prevajanje" style="position:relative; float:right;"><legend>'.$lang['srv_multilang'].'</legend>';
 
 		if ($this->lang_id != 0) {
 			$lang_array = $this->get_all_translation_langs();
 			
 			foreach ($lang_array AS $key => $l) {
-				echo '<p>';
-				
-				echo '<a href="index.php?anketa='.$this->anketa.'&a=prevajanje&lang_id='.$key.'" style="font-size: 1.2em; display:inline-block; min-width: 150px; '.($this->lang_id==$key?' font-weight:bold':'').'">'.$l.'</a> ';
-				
-				echo '<span class="prevajanje_settings '.($key!=$this->lang_id?'transparent':'').'">';
-				
-				echo '<a href="'.SurveyInfo::getSurveyLink().'?language='.$key.'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].': '.$lang['srv_preview_text'].'"><span class="faicon preview large"></span> '.$lang['srv_poglejanketo2'].'</a>&nbsp;&nbsp;-&nbsp;&nbsp;';
-				echo '<a href="'.SurveyInfo::getSurveyLink().'?language='.$key.'&preview=on&testdata=on" target="_blank" title="'.$lang['srv_survey_testdata2'].': '.$lang['srv_testdata_text'].'"><span class="faicon edit_square large"></span> '.$lang['srv_test'].'</a>&nbsp;&nbsp;-&nbsp;&nbsp;';
-				echo '<a href="'.SurveyInfo::getSurveyLink().'?language='.$key.'" target="_blank" title="'.$lang['url'].': '.SurveyInfo::getSurveyLink().'?language='.$key.'"><span class="faicon data_link_small large"></span> '.$lang['url'].'</a>&nbsp;&nbsp;-&nbsp;&nbsp;';
 
-				// Pdf in rtf izvoz vprasalnika v tujem jeziku
+				$bold = '';
-				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=vprasalnik_pdf&anketa='.$this->anketa.'&type=1&language='.$key).'" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf large"></span> '.$lang['srv_export_hover_pdf'].'</a>&nbsp;&nbsp;-&nbsp;&nbsp;';
+				$display = 'displayNone';
-				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=vprasalnik_rtf&anketa='.$this->anketa.'&type=1&language='.$key).'" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf large"></span> '.$lang['srv_export_hover_rtf'].'</a>';		
+				$active_urejanje = '';
-								
+
+				if ($this->lang_id == $key) {
+					$bold = 'semi-bold';
+					$display = '';
+					$active_urejanje = '<div class="active_urejanje">'.$lang['edit2'].'</div>';
+				}
+
+				echo '<p>';
+
+				echo '<div class="lang_name '.$bold.'">';
+				echo '<a href="index.php?anketa='.$this->anketa.'&a=prevajanje&lang_id='.$key.'">'.$l.'</a> ';
+				echo $active_urejanje;
+				echo '</div>';
+
+				echo '<div class="lang_content '.$display.'">';
+
+				echo '<div class="lang_column">';
+				echo '<div class="lang_item">';
+				echo '<a href="'.SurveyInfo::getSurveyLink().'?language='.$key.'" target="_blank" title="'.$lang['url'].': '.SurveyInfo::getSurveyLink().'?language='.$key.'"><span class="faicon data_link"></span>'.$lang['srv_multilang_link'].'</a>';
+				echo '</div>';
+				echo '<div class="lang_item">';
+				echo '<a href="'.SurveyInfo::getSurveyLink().'?language='.$key.'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].': '.$lang['srv_preview_text'].'"><span class="faicon monitor"></span> '.$lang['srv_poglejanketo2'].'</a>';
+				echo '</div>';
+				echo '<div class="lang_item">';
+				echo '<a href="'.SurveyInfo::getSurveyLink().'?language='.$key.'&preview=on&testdata=on" target="_blank" title="'.$lang['srv_survey_testdata2'].': '.$lang['srv_testdata_text'].'"><span class="faicon edit_square"></span> '.$lang['srv_survey_testdata'].'</a>';
+				echo '</div>';
+				echo '</div>';
+
 				$d = new Dostop();
 				if ($d->checkDostopSub('edit')) {
-					
+
-					echo '<span class="prevajanje_settings_sub">';
-					
-					echo '<a href="index.php?anketa='.$this->anketa.'&a=jezik&lang_id='.$key.'"><span class="faicon compress"></span> '.$lang['srv_extra_translations'].'</a>';
-				
 					$title = '';
 					$sqlu = sisplet_query("SELECT uid FROM srv_dostop_language WHERE ank_id='$this->anketa' AND lang_id='$key'");
 					while ($rowu = mysqli_fetch_array($sqlu)) {
@@ -288,18 +322,33 @@ class Prevajanje {
 						if ($title != '') $title .= ', ';
 						$title .= $row1['name'].' '.$row1['surname'].' ('.$row1['email'].')';
 					}
-					
+
-					echo '&nbsp;&nbsp;-&nbsp;&nbsp;<a href="index.php?anketa='.$this->anketa.'&a=dostop" title="'.$lang['srv_passive_multilang_1'].': '.$title.'"><span class="faicon users_small"></span> '.$lang['srv_users'].'</a>';
+					echo '<div class="lang_column">';
-					
+					echo '<div class="lang_item">';
-					if ($this->user_dostop_edit == 1)
+					echo '<a href="index.php?anketa='.$this->anketa.'&a=jezik&lang_id='.$key.'"><span class="faicon paragraph"></span> '.$lang['srv_extra_translations'].'</a>';
-						echo '&nbsp;&nbsp;-&nbsp;&nbsp;<a href="ajax.php?anketa='.$this->anketa.'&t=prevajanje&a=brisi_jezik&lang_id='.$key.'" onclick="if (!confirm(\''.$lang['srv_lang_rem_confirm'].'\')) return false"><span class="faicon delete_circle icon-orange"></span> '.$lang['srv_lang_rem'].'</a></span>';
+					echo '</div>';
-				
+					echo '<div class="lang_item">';
-					echo '</span>';
+					echo '<a href="index.php?anketa='.$this->anketa.'&a=dostop" title="'.$lang['srv_passive_multilang_1'].': '.$title.'"><span class="faicon users"></span> '.$lang['srv_multilang_users'].'</a>';
+					echo '</div>';
+					echo '</div>';
 				}
-				
+
-				echo '</span>';
+				echo '<div class="lang_column">';
-					
+				echo '<div class="lang_item">';
-				echo '</p>';	
+				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=vprasalnik_pdf&anketa='.$this->anketa.'&type=1&language='.$key).'" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf"></span> '.$lang['srv_lang_pdf'].'</a>';
+				echo '</div>';
+				echo '<div class="lang_item">';
+				echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=vprasalnik_rtf&anketa='.$this->anketa.'&type=1&language='.$key).'" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf"></span> '.$lang['srv_lang_rtf'].'</a>';		
+				echo '</div>';
+				if ($this->user_dostop_edit == 1) {
+					echo '<div class="lang_item">';
+					echo '<a href="ajax.php?anketa='.$this->anketa.'&t=prevajanje&a=brisi_jezik&lang_id='.$key.'" onclick="if (!confirm(\''.$lang['srv_lang_rem_confirm'].'\')) return false"><span class="faicon trash empty"></span> '.$lang['srv_lang_rem'].'</a></span>';
+					echo '</div>';
+				}
+				echo '</div>';
+
+				echo '</div>';
+
 			}
 		}	
 		
@@ -307,9 +356,8 @@ class Prevajanje {
 		$this->dodaj_jezik();
 			
 		echo '</fieldset>';
-			
+
-	
+        echo '</div>';
-		echo '<div class="clr"></div><p></p>';	
 	}
 	
 	/**
@@ -332,17 +380,27 @@ class Prevajanje {
 		
 		//echo '<form action="ajax.php?anketa='.$this->anketa.'&t=prevajanje&a=dodaj_jezik" method="post" name="dodaj_jezik" style="position:absolute; right:10px; top:0">';
 		echo '<form action="ajax.php?anketa='.$this->anketa.'&t=prevajanje&a=dodaj_jezik" method="post" name="dodaj_jezik" >';
-		echo '<p><span class="bold">'.$lang['srv_prevajanje_dodaj'].': </span> ';
+
-		echo '<select name="lang_id">';
+		echo '<div class="dodaj_prevod">';
+		echo '<div class="button_holder">';
+		
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_prevajanje_dodaj'].':</span>';
+
+		echo '<select class="dropdown large" name="lang_id">';
 		echo '<option value="0"></option>';
 		foreach ($lang_array AS $key => $l) {
 			echo '<option value="'.$key.'">'.$l.'</option>';
 		}
 		echo '</select> ';
 		
-		echo '<input type="submit" value="'.$lang['srv_add_new_language'].'" />';
+		echo '</div>';
+
+		echo '<button class="medium blue" type="submit">'.$lang['srv_add_new_language'].'</button>';
+		echo '</div>'; //button_holder
 		
-		echo '</p>';
+		echo '</div>'; //dodaj_prevod
+
 		echo '</form>';
 	}
 	
@@ -365,49 +423,49 @@ class Prevajanje {
 	function urejanje () {
 		global $lang;
 		global $lang1;
-		
+				
-		/*echo '<div style="float:right">';
+
-		$this->dodaj_jezik();
+        // Segment z zgornjimi nastavitvami
-		echo '</div>';*/
+        echo '<div class="section jezik_additional_settings">';
-		
+
-		echo '<fieldset style="margin-top:40px; min-width:1100px;" class="locked">';
+        echo '<div class="jezik_row">';
-		
+
-		/**
+		// Leva stran
-		* Leva stran
+		echo '<div class="jezik_left">';
-		*/
+		echo '<span class="title">'.$lang['srv_base_lang'].': <span class="title semi-bold">'.$lang1['language'];
-		echo '<div class="jezik_left noborder" style="opacity:1; margin-bottom:30px;">';
-		echo '<span class="red" style="font-weight:bold; font-size:1.2em;">'.$lang['srv_base_lang'].': <span style="font-size:1em">'.$lang1['language'];
 		echo '</span></span>';
 		$d = new Dostop();
 		if ($d->checkDostopSub('edit'))
-			echo ' - '.$lang['srv_edit_in_edit'].' <a href="index.php?anketa='.$this->anketa.'">'.$lang['srv_urejanje'].'</a>';
+			echo ' - '.$lang['srv_edit_in_edit'].' <a href="index.php?anketa='.$this->anketa.'" style="pointer-events:auto;">'.$lang['srv_social_settings_text6'].'</a>';
 		echo '</div>';
 		
-		/**
+		// Desna stran
-		* Desna stran
+		echo '<div class="jezik_right">';
-		*/
+		echo '  <span class="title">'.$lang['srv_trans_lang'].': ';
-		echo '<div class="jezik_right noborder">';
-		
-		echo '<span class="red" style="font-weight:bold; font-size:1.2em;">'.$lang['srv_trans_lang'].': ';
 		
 		$lang_array = $this->get_all_translation_langs();
-		echo '<span style="font-size:1em">'.$lang_array[$this->lang_id].'</span>';
+		echo '      <span class="title semi-bold">'.$lang_array[$this->lang_id].'</span>';
-		
-		echo '</span>';
 		
+		echo '  </span>';
 		echo '</div>';
-		
+
-		
+        echo '</div>';
+
+        echo '</div>';
+
+
 		// Prevajanje imena ankete
+        echo '<div class="section jezik_texti">';
 		$this->urejanje_texti();
-		
+		echo '</div>';
+
+
 		// Prevajanje vprasanj
+        echo '<div class="section jezik_vprasanja">';
 		$this->urejanje_vprasanja();
+        echo '</div>';
 		
-		echo '</fieldset>';
+
-		
-		echo '<div class="clr"></div>';
-		
 		?><script>
 			prevajanje_bind_click();
 		</script><?
@@ -420,15 +478,28 @@ class Prevajanje {
 	function urejanje_texti () {
 		global $lang;
 		
-		echo '<div class="clr"></div>';
+        echo '<div class="jezik_row">';
-		echo '<div class="jezik_left noborder"><h2 class="jezik_page">'.$lang['srv_novaanketa_kratkoime'].'</h2></div>';
+		echo '  <div class="jezik_left"><p class="caps semi-bold bottom16">'.$lang['srv_survey_info'].'</p></div>';
-		echo '<div class="jezik_right noborder"><h2 class="jezik_page">'.$lang['srv_novaanketa_kratkoime'].'</h2></div>';
+		echo '  <div class="jezik_right"><p class="caps semi-bold bottom16">'.$lang['srv_survey_info'].'</p></div>';
-		
+        echo '</div>';
-		echo '<strong>';
+
+        echo '<div class="jezik_row">';
+		echo '  <div class="jezik_left semi-bold">'.$lang['srv_novaanketa_kratkoime'].':</div>';
+		echo '  <div class="jezik_right semi-bold">'.$lang['srv_novaanketa_kratkoime'].':</div>';
+        echo '</div>';
+
+		echo '<div class="jezik_row">';
 		$this->extra_translation('srv_novaanketa_kratkoime');
-		echo '</strong>';
+        echo '</div>';
+
+		echo '<div class="jezik_row">';
+		echo '  <div class="jezik_left semi-bold top16">'.$lang['note'].' ('.$lang['srv_internal'].'):</div>';
+		echo '  <div class="jezik_right semi-bold top16">'.$lang['note'].' ('.$lang['srv_internal'].'):</div>';
+        echo '</div>';
 		
+        echo '<div class="jezik_row">';
 		$this->extra_translation('srv_anketa_opomba');	
+        echo '</div>';
 	}
 	
 	/**
@@ -441,7 +512,7 @@ class Prevajanje {
 		global $lang2;
 		
 		$row = SurveyInfo::getInstance()->getSurveyRow();
-		
+
 		if ($text == 'srv_novaanketa_kratkoime') {	// akronim pri default jeziku je pac v srv_anketa
 			$value = (($row['akronim'] == null || $row['akronim'] == '') ? $row['naslov'] : $row['akronim'] );
 		} elseif ($text == 'srv_question_comment_text') {	// "Vaš komentar k vprašanju" ni v lang, ampak je v settingsih
@@ -453,8 +524,8 @@ class Prevajanje {
 			if ($value == '') $value = $lang1[$text];
 		}
 		
-		echo '<div class="jezik_left">';
+		echo '<div class="jezik_left vert_middle">';
-		echo '<p style="margin-left:10px">'.$value.'</p>';
+		echo '<span>'.$value.'</span>';
 		echo '</div>';
 		 
 		echo '<div class="jezik_right srvlang" id="srvlang_'.$text.'">';
@@ -472,15 +543,11 @@ class Prevajanje {
 		$value1 = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_'.$text.'_'.$this->lang_id);
 		
 		if ($value1 == '' && $text != 'srv_anketa_opomba') $value1 = $def;
+
+		//if ($text == 'srv_novaanketa_kratkoime')
+		//	echo $lang['srv_naslov'].': ';
 		
-		echo '<span style="margin-left: 10px; margin:10px; display:block; width:120px; float:left;">';
+		echo '<p class="editable" id="srvlang_'.$text.'_'.$this->lang_id.'" contenteditable="true" onblur="extra_translation_save(\''.$text.'\');">'.$value1.'</p>';
-		if ($text == 'srv_novaanketa_kratkoime')
-			echo $lang['srv_naslov'].': ';
-		if ($text == 'srv_anketa_opomba')
-			echo $lang['note'].' ('.$lang['srv_internal'].'): ';
-		echo '</span>';
-		
-		echo '<p style="margin-left:10px; min-height:15px; min-width:200px; float:left; outline:1px dashed gray; cursor: text" class="editable" id="srvlang_'.$text.'_'.$this->lang_id.'" contenteditable="true" onblur="extra_translation_save(\''.$text.'\');">'.$value1.'</p>';
 	}
 	
 	/**
@@ -491,34 +558,43 @@ class Prevajanje {
 		global $lang;
 		
 		Cache::cache_all_srv_spremenljivka($this->anketa);
+        
+        // Naslov prve strani (ime strani)
+        echo '<div class="jezik_row page">';
+		echo '  <div class="jezik_left">'.$lang['srv_intro_label'].'</div>';
+		echo '  <div class="jezik_right">'.$lang['srv_intro_label'].'</div>';
+        echo '</div>';
 		
-		echo '<div class="clr"></div>';
+        // Urejanje texta uvoda
-		echo '<div class="jezik_left noborder"><h2 class=" jezik_page">'.$lang['srv_intro_label'].'</h2></div>';
+		$this->urejanje_vprasanje(-1, -1);
-		echo '<div class="jezik_right noborder"><h2 class=" jezik_page">'.$lang['srv_intro_label'].'</h2></div>';
-		
-		$this->urejanje_vprasanje(-1);
 		
 		$gru_id = 0;
 		
-		$sql = sisplet_query("SELECT s.id, g.naslov, g.id AS gru_id, g.vrstni_red FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$this->anketa' AND s.visible='1' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
+		$sql = sisplet_query("SELECT s.id, s.tip, g.naslov, g.id AS gru_id, g.vrstni_red FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$this->anketa' AND s.visible='1' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
 		while ($row = mysqli_fetch_array($sql)) {
 			
 			if ($gru_id != $row['gru_id']) {
-				echo '<div class="clr"></div>';
+
-				echo '<div class="jezik_left noborder"><h2 class=" jezik_page">'.$lang['srv_stran'].' '.$row['vrstni_red'].'</h2></div>';
+                // Naslov vmesne strani (ime strani)
-				echo '<div class="jezik_right noborder"><h2 class=" jezik_page">'.$lang['srv_stran'].' '.$row['vrstni_red'].'</h2></div>';
+                echo '<div class="jezik_row page">';
-				
+				echo '  <div class="jezik_left">'.$lang['srv_stran'].' '.$row['vrstni_red'].'</div>';
+				echo '  <div class="jezik_right">'.$lang['srv_stran'].' '.$row['vrstni_red'].'</div>';
+                echo '</div>';
+
 				$gru_id = $row['gru_id'];
 			}
 			
-			$this->urejanje_vprasanje($row['id']);
+			$this->urejanje_vprasanje($row['id'], $row['tip']);
 		}
 		
-		echo '<div class="clr"></div>';
+        // Naslov zadnje strani (ime strani)
-		echo '<div class="jezik_left noborder"><h2 class=" jezik_page">'.$lang['srv_end_label'].'</h2></div>';
+        echo '<div class="jezik_row page">';
-		echo '<div class="jezik_right noborder"><h2 class=" jezik_page">'.$lang['srv_end_label'].'</h2></div>';
+		echo '  <div class="jezik_left">'.$lang['srv_end_label'].'</div>';
+		echo '  <div class="jezik_right">'.$lang['srv_end_label'].'</div>';
+        echo '</div>';
 		
-		$this->urejanje_vprasanje(-2);
+        // Urejanje texta uvoda
+		$this->urejanje_vprasanje(-2, -2);
 	}
 	
 	/**
@@ -526,7 +602,7 @@ class Prevajanje {
 	* 
 	* @param mixed $spremenljivka
 	*/
-	function urejanje_vprasanje ($spremenljivka) {
+	function urejanje_vprasanje ($spremenljivka, $tip) {
 		global $lang;
 		global $lang1;
 		global $lang2;
@@ -550,6 +626,9 @@ class Prevajanje {
 		}
         
 
+        echo '<div class="jezik_row question tip_'.$tip.'">';
+        
+
         // LEVA STRAN PREVAJANJA
 		echo '<div class="jezik_left">';
    
@@ -567,7 +646,7 @@ class Prevajanje {
 		
 		echo '</div>';
 			
-        
+
         // DESNA STRAN PREVAJANJA
 		echo '<div class="jezik_right vprlang" id="vprlang_'.$spremenljivka.'">';
 		
@@ -584,6 +663,9 @@ class Prevajanje {
 			$this->Branching->vprasanje($spremenljivka, true);	//poklici izris vprasanja za prevajanje (za enkrat je drugi argument pomemben le za slider)
 		
         echo '</div>';		
+        
+
+        echo '</div>';		
     
 
         // Nastavimo nazaj originalen jezik vmesnika

admin/survey/classes/class.RecodeValues.php

@@ -444,7 +444,7 @@ class RecodeValues {
 			echo '<li>';
 			echo '<span class="faicon move_updown moveY"></span>';
 			printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']);
-			echo '&nbsp;<select name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
+			echo '&nbsp;<select class="dropdown medium" name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
 			foreach (self::$_operators AS $value => $operator) {
 				$selected = ($value == '0') ? ' selected="selected"' : ''; 
 				echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>';
@@ -462,7 +462,7 @@ class RecodeValues {
 			
 			echo '&nbsp;'.$lang['srv_recode_number_to'];
 							
-			echo '<select name="recode_number_type[]" onChange="recode_number_type_changed(this);">';
+			echo '<select class="dropdown medium" name="recode_number_type[]" onChange="recode_number_type_changed(this);">';
 			foreach (self::$options AS $oKey => $option) {
 				if ($option['variable'] == null && $oKey != '_0_') {
 					echo '<option disabled="disabled">'.$option['naslov'].'</option>';
@@ -494,7 +494,7 @@ class RecodeValues {
 			echo '<li>';
 			echo '<span class="faicon move_updown moveY"></span>';
 			printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']);
-			echo '&nbsp;<select name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
+			echo '&nbsp;<select class="dropdown medium" name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
 			foreach (self::$_operators AS $value => $operator) {
 				$selected = ($value == '0') ? ' selected="selected"' : '';
 				echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>';
@@ -514,7 +514,7 @@ class RecodeValues {
 			# imamo rekodiranje v  novo spremenljivko
 			$recode['vred_id'] = '-1';
 				
-			echo '<select name="recode_number_vrednost[]">';
+			echo '<select class="dropdown medium" name="recode_number_vrednost[]">';
 			if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) {
 				foreach ($new_spr_vrednosti AS $oKey => $option) {
 					if ($option['variable'] == null) {
@@ -667,48 +667,57 @@ class RecodeValues {
 			}
 			$sugestedName = strip_tags(self::$cacheSpremenljivka['naslov'].' - recoded');
 			echo'<div id="divRecodeSprOption">';
-			echo '<label>'.$lang['srv_recode_to_spr'].'</label>';
+			echo '<label>'.$lang['srv_recode_to_spr'].': ';
 			if ( $_GET['t'] == 'charts' || $_POST['recIsCharts'] == 1 ) {
-				echo $lang['srv_recode_to_spr_same'];
+				echo $lang['srv_recode_to_spr_same'].'</label>';
 			} else {
-				echo '<label><input type="radio" name="recode_type" value="0" '.((int)$recode_type == 0 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;">'.$lang['srv_recode_to_spr_same'].'</label>';
+				echo '</label><input type="radio" name="recode_type" id="recode_type0" value="0" '.((int)$recode_type == 0 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;"><label for="recode_type0">'.$lang['srv_recode_to_spr_same'].'</label>';
-				echo '<label><input type="radio" name="recode_type" value="1" '.((int)$recode_type == 1 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;">'.$lang['srv_recode_to_spr_new'].'</label>';
+				echo '<input type="radio" name="recode_type" id="recode_type1" value="1" '.((int)$recode_type == 1 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;"><label for="recode_type1">'.$lang['srv_recode_to_spr_new'].'</label>';
 			}
 			echo '</div>';
 			if ((int)$recode_type == 1) {
 				
-                echo'<span id="divRecodeSprNew" class="floatRecodeSpremenljivka">';
+                echo'<div id="divRecodeSprNew" class="top16 bottom16">';
                 
 				if ((int)$to_spr_id == 0) {
-					echo '<div class="new-spr" style="text-align: right">';
+					echo '<div class="new-spr">';
-					echo $lang['srv_recode_to_spr_add_spr'].'<br/>';
+					//echo $lang['srv_recode_to_spr_add_spr'].'<br/>';
 					echo '<div id="coding_spr_new" >';
-					echo '<p>'.$lang['srv_recode_to_spr_name'].' <input type="text" id="rec_spremenljivka_naslov" name="spremenljivka_naslov" default="1" contenteditable="true" value="'.$sugestedName.'" style="width: 123px" />';
+					echo '<p class="top16">'.$lang['srv_recode_to_spr_name'].' <input type="text" class="text medium" id="rec_spremenljivka_naslov" name="spremenljivka_naslov" default="1" contenteditable="true" value="'.$sugestedName.'"/>';
 					#echo '<a href="#" onclick="recodeSpremenljivkaNew(); return false;">'.$lang['add'].'</a>';
-					echo '<a href="#" onclick="recodeSpremenljivkaNew(); return false;""><span class="faicon add small" title="'.$lang['add'].'"></span></a>';
+					echo '<button class="small blue" onclick="recodeSpremenljivkaNew(); return false;"">'.$lang['add'].'</button>';
 					echo '</p>';
 					echo '</div>';
 					echo '</div>';
 				} else {
-					echo '<strong>'.$rowSpremenljivka['variable'].' - '.skrajsaj(strip_tags($rowSpremenljivka['naslov']), 40).'</strong><br/><br/>';
+					echo '<span class="semi-bold">'.$rowSpremenljivka['variable'].' - '.skrajsaj(strip_tags($rowSpremenljivka['naslov']), 40).'</span>';
 					$sql1 = sisplet_query("SELECT naslov FROM srv_vrednost WHERE spr_id='$to_spr_id' ORDER BY vrstni_red ASC");
+					$count = 0;
+					echo '<p class="top16 bottom16">'.$lang['srv_recode_valueset'];
 					while ($row1 = mysqli_fetch_array($sql1)) {
 						if ($rowSpremenljivka['tip'] == 1) {
-							echo '<input type="radio" onclick="return false;" /><label> '.$row1['naslov'].'</label>';
+							if ($count == 0) {
-							echo '<br/>';
+								$count = 1;
+							}
+							else {
+								echo ', ';
+							}
+							echo $row1['naslov'];
 						}
 					}
+					echo '</p>';
+					echo '<div class="setting_holder">';
 					if (mysqli_num_rows($sql1) == 0) {
 						echo '&nbsp;'.$lang['srv_novavrednost'].': '; $margin='0';
-					} else { $margin = '23px';
+					} else { $margin = 'none-left';
 					}
-					echo '<input type="text" name="vrednost_new" value="" '.(mysqli_num_rows($sql1)>0?' placeholder="'.$lang['srv_novavrednost'].'" ':'').' style="margin-left:'.$margin.'; width: 80px" /> ';
+					echo '<input class="text medium '.$margin.'" type="text" name="vrednost_new" value="" '.(mysqli_num_rows($sql1)>0?' placeholder="'.$lang['srv_novavrednost'].'" ':'').' /> ';
-					echo '<a href="#" onclick="recodeVrednostNew(); return false;"><span class="faicon add small icon-as_link" title="'.$lang['add'].'"></span></a>';
+					echo '<button class="small blue" onclick="recodeVrednostNew(); return false;">'.$lang['add'].'</button>';
-					echo '<br>Napredne spremembe:'.Help::display('srv_recode_advanced_edit');
+					echo '<p class="recode_end">Napredne spremembe:'.Help::display('srv_recode_advanced_edit').'</p>';
+					echo '</div>';
 				}
-				echo '</span>';
+				echo '</div>';
 			}
-			echo'<br class="clr" />';
 		}
 		if ( $displayType == 1 ) {
 			if (count(self::$variables)> 0) {
@@ -721,39 +730,37 @@ class RecodeValues {
 				//echo '<table style="width:65% !important;">';
 				echo '<table class="question_recode_table">';
 				echo '<tr>';
-				echo '<th class="halfWidth" colspan="2">';
+				echo '<th class="main_head center" colspan="2">';
 				echo $lang['srv_recode_original'];
 				echo '</th>';
-				echo '<td rowspan="2" style="vertical-align:top;">&nbsp;<span class="sprites arrow_switch"></span>&nbsp;</td>';
+				echo '<th class="main_head center" style="vertical-align:top;">';
-				echo '<th class="halfWidth" rowspan="2" style="vertical-align:top;">';
 				echo $lang['srv_recode_to'];
 				echo '</th>';
 				echo '</tr>';
 
 				echo '<tr>';
-				echo '<td class="halfWidth anl_ac gray">';
+				echo '<th class="dark">';
-				echo $lang['srv_recode_to_label'];
+				echo $lang['srv_label'];
-				echo '</td>';
+				echo '</th>';
-				echo '<td class="halfWidth anl_ac gray">';
+				echo '<th class="dark center">';
-				echo $lang['srv_recode_to_value'];
+				echo $lang['srv_vrednost'];
-				echo '</td>';
+				echo '</th>';
+				echo '<th>';
+				echo '</th>';
 				echo '</tr>';
 					
 				foreach (self::$variables AS $vKey => $variable) {
 					echo '<tr>';
-					echo '<td class="anl_ac">';
+					echo '<td class="labela">';
 					echo $variable['naslov'];
 					echo '</td>';
-					echo '<td class="anl_ac">';
+					echo '<td class="center">';
 					echo '&nbsp;&nbsp;['.$variable['variable'].']';
 					echo '</td>';
-					# spacer
-					echo '<td>&nbsp</td>';
-					#
 					echo '<td>';
 					if ((int)$recode_type == 0) {
 						# imamo klasično rekodiranje
-						echo '<select name="MVFQ_'.$variable['variable'].'">';
+						echo '<select class="dropdown medium" name="MVFQ_'.$variable['variable'].'">';
 						foreach (self::$options AS $oKey => $option) {
 								
 							if ($option['variable'] == null) {
@@ -774,7 +781,7 @@ class RecodeValues {
 						if (!isset($recodedFrom[$vKey])) {
 								$recodedFrom[$vKey] = '-1';
 						}
-						echo '<select name="MVSNFQ_'.$vKey.'">';
+						echo '<select class="dropdown medium" name="MVSNFQ_'.$vKey.'">';
 						if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) {
 							foreach ($new_spr_vrednosti AS $oKey => $option) {
 								if ($option['variable'] == null) {
@@ -816,7 +823,7 @@ class RecodeValues {
 						echo '<li>';
 						echo '<span class="faicon move_updown moveY"></span>';
 						printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']);
-						echo '&nbsp;<select name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
+						echo '&nbsp;<select class="dropdown medium" name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
 						foreach (self::$_operators AS $value => $operator) {
 							$selected = ($value == $recode['operator']) ? ' selected="selected"' : '';
 							echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>';
@@ -834,7 +841,7 @@ class RecodeValues {
 	
 						echo '&nbsp;'.$lang['srv_recode_number_to'];
 						$is_missing_value = false;
-						echo '<select name="recode_number_type" onChange="recode_number_type_changed(this);">';
+						echo '<select class="dropdown medium" name="recode_number_type" onChange="recode_number_type_changed(this);">';
 						foreach (self::$options AS $oKey => $option) {
 							if ($oKey == '_0_' || $oKey == '_1_' || $oKey == '_2_') {
 								# privzeto izberemo prvi odgovor - veljavni, nato spodaj popravimo
@@ -875,7 +882,7 @@ class RecodeValues {
 						echo '<li>';
 						echo '<span class="faicon move_updown moveY"></span>';
 						printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']);
-						echo '&nbsp;<select name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
+						echo '&nbsp;<select class="dropdown medium" name="recode_number_operator[]" onChange="recode_operator_changed(this);">';
 						foreach (self::$_operators AS $value => $operator) {
 							$selected = ($value == $recode['operator']) ? ' selected="selected"' : '';
 							echo '<option value="'.$value.'"'.$selected.'>'.$operator.'</option>';
@@ -896,7 +903,7 @@ class RecodeValues {
 							$recodedFrom[$rKey] = '-1';
 						}
 						# imamo rekodiranje v  novo spremenljivko
-						echo '<select name="recode_number_vrednost[]">';
+						echo '<select class="dropdown medium" name="recode_number_vrednost[]">';
 						if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) {
 							foreach ($new_spr_vrednosti AS $oKey => $option) {
 								if ($option['variable'] == null) {

admin/survey/classes/class.SurveyAktivnost.php

@@ -2,7 +2,6 @@
 
 class SurveyAktivnost{
 
-
 	public function __construct(){
 		global $lang;
 		
@@ -53,56 +52,134 @@ class SurveyAktivnost{
 		
 		$language = (isset($_GET['language'])) ? $_GET['language'] : 0;
     
-        if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
+		// n, število anket
+        //echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total'].'</label><label class="srv_diagnostic_total_sub_label">'.$sum.'</label>';
+        //echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total_survey'].'</label><label class="srv_diagnostic_total_survey_label">'.$sum_survey.'</label>';
+		
+		// Nastavitve nad tabelo
+		echo '<div class="data_table_top_holder">';
 
-            $package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
+		//Osnova
-            $package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
+		echo '<div class="osnova">';
-            $package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
+		echo $lang['srv_diagnostics_basis'];
-            
-            echo '<span>'.$lang['srv_narocilo_paket'].':</span>';
 
-            echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
+		echo '<select class="dropdown" name="type" onchange="this.form.submit();">';
-            echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
-            echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
-            echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label></span>';
-            echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
-            echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label></span>';
-            
-            echo '<span class="spaceLeft spaceRight bold">|</span>';
-        }
-
-		echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
-		echo '<span class="spaceLeft"><input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label></span>';
-		echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
-		echo '<span class="spaceLeft"><input type="checkbox" id="uvoz" '.($uvoz == 1 ? ' checked="checked"' : '').' onchange="$(\'#uvoz_hidden\').val('.($uvoz==1 ? '0' : '1').');"><label for="uvoz">'.$lang['srv_diagnostics_filter_import'].'</label></span>';
-		
-		echo '<input type="hidden" name="ustrezni" id="ustrezni_hidden" value="'.$ustrezni.'" />';
-		echo '<span class="spaceLeft bold">|</span><span class="spaceLeft"></span><input type="checkbox" id="ustrezni" '.($ustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#ustrezni_hidden\').val('.($ustrezni==1 ? '0' : '1').');"><label for="ustrezni">'.$lang['srv_diagnostics_filter_6'].'</label>';
-		echo '<input type="hidden" name="delnoustrezni" id="delnoustrezni_hidden" value="'.$delnoustrezni.'" />';
-		echo '<span class="spaceLeft"><input type="checkbox" id="delnoustrezni" '.($delnoustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#delnoustrezni_hidden\').val('.($delnoustrezni==1 ? '0' : '1').');"><label for="delnoustrezni">'.$lang['srv_diagnostics_filter_5'].'</label></span>';
-		echo '<input type="hidden" name="neustrezni" id="neustrezni_hidden" value="'.$neustrezni.'" />';
-		echo '<span class="spaceLeft"><input type="checkbox" value="1" id="neustrezni" '.($neustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#neustrezni_hidden\').val('.($neustrezni==1 ? '0' : '1').');"><label for="neustrezni">'.$lang['srv_diagnostics_filter_34'].'</label></span>';
-		echo '<span class="spaceLeft"><input type="checkbox" value="1" id="mailsent" name="mailsent" '.($mailsent == 1 ? ' checked="checked"' : '').'><label for="mailsent">'.$lang['srv_diagnostics_filter_012'].'</label></span>';
-		
-		echo '<span class="spaceLeft bold">|</span><span class="spaceLeft"></span>'.$lang['lang'].': <select id="language" name="language">';
-		echo '<option value="0" '.($language=='0' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_all'].'</option>';
-		echo '<option value="1" '.($language=='1' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_slo'].'</option>';
-		echo '<option value="2" '.($language=='2' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_ang'].'</option>';
-		
-		echo '<input type="button" class="spaceLeft" value="'.$lang['srv_coding_filter'].'" onClick="this.form.submit();">';
-		
-		echo '<br /><br />';
-		
-		echo ''.$lang['srv_diagnostics_total'].' <select name="type" onchange="this.form.submit();">';
 		echo '<option value="users"' . ($type == 'users' ? ' selected' : '') . '>'.$lang['srv_diagnostics_respondentov'].'</option>';
-		echo '<option value="emails"' . ($type == 'emails' ? ' selected' : '') . '>'.$lang['srv_email-vabila'].'</option>';
+		echo '<option value="emails"' . ($type == 'emails' ? ' selected' : '') . '>'.$lang['srv_diagnostics_emails'].'</option>';
 		echo '<option value="pages"' . ($type == 'pages' ? ' selected' : '') . '>'.$lang['srv_diagnostics_strani'].'</option>';
 		echo '<option value="analiza"' . ($type == 'analiza' ? ' selected' : '') . '>'.$lang['srv_diagnostics_analiza'].'</option>';
 		echo '<option value="graph"' . ($type == 'graph' ? ' selected' : '') . '>'.$lang['srv_diagnostics_graph'].'</option>';
 		echo '<option value="editing"' . ($type == 'editing' ? ' selected' : '') . '>'.$lang['srv_diagnostics_editing'].'</option>';
-		echo '</select> '.$lang['srv_diagnostics_in'].' ';
+		echo '</select>';
+		echo '</div>';
+
+		//Upoštevane enote
+		echo '<div class="dataSettingsBasic">';    
+		echo '  <button id="toggleDataCheckboxes" class="small white-blue" onClick="toggleAktivnostCheckboxes(\'units\'); return false;"><span class="faicon plus"></span>'.$lang['srv_diagnostics_upostevane'].'</button>';
+		echo '</div>';
+
+		// Dodatne nastavitve, ki se razprejo
+		echo '<div id="dataSettingsCheckboxes" class="displayNone">';
+		echo '  <div class="dataSettingsCheckboxes_holder">';
+			
+		// Upoštevaj enote
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_diagnostics_upostevaj'].'</span>';
 		
-		echo '<select id="diagnostics_date_selected" name="time" onchange="diagnosticsChooseDate()">';
+		echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="uvoz" '.($uvoz == 1 ? ' checked="checked"' : '').' onchange="$(\'#uvoz_hidden\').val('.($uvoz==1 ? '0' : '1').');"><label for="uvoz">'.$lang['srv_diagnostics_filter_import'].'</label>';
+		echo '</div>';
+		
+		echo '<input type="hidden" name="ustrezni" id="ustrezni_hidden" value="'.$ustrezni.'" />';
+		echo '<div class="setting_item">';
+		echo '</span><input type="checkbox" id="ustrezni" '.($ustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#ustrezni_hidden\').val('.($ustrezni==1 ? '0' : '1').');"><label for="ustrezni">'.$lang['srv_diagnostics_filter_6'].'</label>';
+		echo '</div>';
+		echo '<input type="hidden" name="delnoustrezni" id="delnoustrezni_hidden" value="'.$delnoustrezni.'" />';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="delnoustrezni" '.($delnoustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#delnoustrezni_hidden\').val('.($delnoustrezni==1 ? '0' : '1').');"><label for="delnoustrezni">'.$lang['srv_diagnostics_filter_5'].'</label>';
+		echo '</div>';
+		echo '<input type="hidden" name="neustrezni" id="neustrezni_hidden" value="'.$neustrezni.'" />';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="neustrezni" '.($neustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#neustrezni_hidden\').val('.($neustrezni==1 ? '0' : '1').');"><label for="neustrezni">'.$lang['srv_diagnostics_filter_34'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="mailsent" name="mailsent" '.($mailsent == 1 ? ' checked="checked"' : '').'><label for="mailsent">'.$lang['srv_diagnostics_filter_012'].'</label>';
+		echo '</div>';
+
+		echo '</div>';
+
+		echo '<div id="jezikpaket">';
+
+		//Jezik
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_diagnostics_jezik'].'</span>';
+
+		echo '<select class="dropdown w130" id="language" name="language">';
+		echo '<option value="0" '.($language=='0' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_all'].'</option>';
+		echo '<option value="1" '.($language=='1' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_slo'].'</option>';
+		echo '<option value="2" '.($language=='2' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_ang'].'</option>';
+		echo '</select>';
+					
+		echo '</div>';
+
+		//Paketi
+		if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
+
+            $package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
+            $package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
+            $package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
+
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_narocilo_paket'].'</span>';
+
+            echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
+			echo '<div class="setting_item">';
+            echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
+			echo '</div>';
+            echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
+			echo '<div class="setting_item">';
+            echo '<input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label>';
+			echo '</div>';
+            echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
+			echo '<div class="setting_item">';
+            echo '<input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label>';
+			echo '</div>';		
+			
+			echo '</div>';
+        }
+
+		echo '</div>'; //div#jezikpaket
+
+
+		// Gumb filtriraj
+		echo '<div class="button_holder">';
+		echo '  <button class="small blue" onClick="this.form.submit();">'.$lang['srv_diagnostics_filter'].'</button>';
+		echo '</div>';
+		
+		echo '  </div>';
+		echo '</div>'; //div#dataSettingsCheckboxes
+
+		// Datum
+		echo '<div id="end">';    
+		echo '<div class="dataSettingsBasic">';    
+		echo '  <button id="toggleDataCheckboxes_Date" class="small white-blue" onClick="toggleAktivnostCheckboxes(\'date\'); return false;"><span class="faicon calendar_icon"></span>'.$lang['srv_diagnostics_date'].'</button>';
+		echo '</div>';
+		echo '</div>';
+
+		// Dodatne nastavitve, ki se razprejo
+		echo '<div id="dataSettingsCheckboxes_Date" class="displayNone">';
+		echo '  <div class="dataSettingsCheckboxes_holder">';
+
+		echo '<div class="setting_holder">';
+		echo $lang['srv_diagnostics_date2'];
+		echo '<select class="dropdown w130" id="diagnostics_date_selected" name="time" onChange="this.form.submit();">';
 		echo '<option value="1 minute"' . ($time == '1 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 minute'].'</option>';
 		echo '<option value="5 minute"' . ($time == '5 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_5 minute'].'</option>';
 		echo '<option value="10 minute"' . ($time == '10 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_10 minute'].'</option>';
@@ -119,21 +196,57 @@ class SurveyAktivnost{
 		echo '<option value="3 month"' . ($time == '3 month' ? ' selected' : '') . '>'.$lang['srv_diagnostics_3 month'].'</option>';
 		echo '<option value="6 month"' . ($time == '6 month' ? ' selected' : '') . '>'.$lang['srv_diagnostics_6 month'].'</option>';
 		echo '<option id="option_99date" value="99date"' . ($time == '99date' ? ' selected' : '') . '>'.$lang['srv_diagnostics_choose_date'].'</option>';
-		echo '</select> ';
+		echo '</select>';
-		
+		echo '</div>';
+
 		// Datum - od
-		echo ''.$lang['srv_diagnostics_orfrom'].' <input type="text" id="from" name="from" value="' . $from . '" '. ($time != '99date' ? ' disabled' : '') .' />';
+		echo '<div class="setting_holder">';
-		echo ' <span class="faicon calendar_icon icon-as_link" onclick="changeSelectOption()" id="from_img"></span>';
+		echo $lang['srv_diagnostics_orfrom'];
+		echo '<div class="date_holder">';
+		echo '<input type="text" class="text '.($time != '99date'? 'disabled' : '').'" id="from" name="from" value="' . $from . '"/>';
+		echo '<span class="faicon calendar_icon blue" onclick="changeSelectOption()" id="from_img"></span>';
+		echo '</div>';
+		echo '</div>';
 
 		// Datum - do
-		echo ' '.$lang['srv_diagnostics_to'].' <input type="text" id="to" name="to" value="' . $to . '" '. ($time != '99date' ? ' disabled' : '') .'/>';
+		echo '<div class="setting_holder">';
-		echo ' <span class="faicon calendar_icon icon-as_link" onclick="changeSelectOption()" id="to_img"></span>';
+		echo $lang['srv_diagnostics_to'];
+		echo '<div class="date_holder">';
+		echo '<input type="text" class="text '. ($time != '99date'? 'disabled' : '') .'" id="to" name="to" value="' . $to . '"/>';
+		echo '<span class="faicon calendar_icon blue" onclick="changeSelectOption()" id="from_img"></span>';
+		echo '</div>';
+		echo '</div>';
 
-		echo '<input type="submit" class="spaceLeft pointer" value="'.$lang['hour_show'].'" />';
+		// Gumb filtriraj
-        echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total'].'</label><label class="srv_diagnostic_total_sub_label">'.$sum.'</label>';
+		echo '<div class="button_holder">';
-        echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total_survey'].'</label><label class="srv_diagnostic_total_survey_label">'.$sum_survey.'</label>';
+		echo '  <button class="small blue" onClick="this.form.submit();">'.$lang['srv_diagnostics_filter'].'</button>';
-		
+		echo '</div>';
-		echo '</form><br />';
+
+		echo '</div>';
+		echo '</div>'; //div#dataSettingsCheckboxes_Date
+
+		// Klik izven razprith nastavitev - zapremo okno
+        echo '<script>
+            $(document).mouseup(function(e){
+                var container1 = $("#dataSettingsCheckboxes");
+                var container2 = $("#dataSettingsCheckboxes_Date");
+            
+                if (!container1.is(e.target) && container1.has(e.target).length === 0){
+                    $("#dataSettingsCheckboxes").addClass("displayNone");
+					$("#toggleDataCheckboxes").removeClass("border_blue");
+                }
+				if (!container2.is(e.target) && container2.has(e.target).length === 0){
+                    $("#dataSettingsCheckboxes_Date").addClass("displayNone");
+					$("#toggleDataCheckboxes_Date").removeClass("border_blue");
+                }
+            });
+        </script>';
+
+
+		echo '</div>'; // div.data_table_top_holder
+
+
+		echo '</form>';
 
 		if ($type == 'pages')
 			$time_edit = 'srv_user_grupa_active.time_edit';
@@ -266,21 +379,32 @@ class SurveyAktivnost{
 			echo mysqli_error($GLOBALS['connect_db']);
 		}
 
+		// Tabela
 		global $site_url;
-		
+
-		echo '<table style="width:70%">';
+		echo '<table id="aktivnost_ankete_table">';
 		$max = -1;
+		echo '<tr>';
+		echo '<th>'.$lang['srv_ime'].'</th>';
+		echo '<th>'.$lang['email'].'</th>';
+		echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
+		echo '</tr>';
 		
 		while ($row = mysqli_fetch_array($sql)) {
 			if ($max == -1)
 			    $max = max($row['responses'], $max)*1.3;
 
+            SurveyInfo::getInstance()->SurveyInit($row['ank_id']);
+
 			echo '<tr>';
-			echo '<td><a href="'.SurveyInfo::getSurveyLink($row['ank_id']).'?preview=on&pages=all" target="_blank">' . $row['naslov'] . '</a></td>';
+			echo '<td><a href="'.SurveyInfo::getSurveyLink().'?preview=on&pages=all" target="_blank">' . $row['naslov'] . '</a></td>';
-			echo '<td>'.$row['email'].'</td>';
+			echo '<td class="gray">'.$row['email'].'</td>';
             $sum = $sum + $row['responses'];
             $sum_survey = $sum_survey + 1;
-			echo '<td style="width:60%"><div class="graph_lb" style="float: left; width:' . (round($row['responses'] / $max * 100, 0)) . '%">&nbsp;</div><div style="float:left">&nbsp;'.$row['responses'].'</div></td>';
+			echo '<td class="graph_cell">';
+			echo '<div class="graph_cell">';
+			echo '<div class="graph_full" style="width:' . (round($row['responses'] / $max * 100, 0)) . '%">&nbsp;</div><div>&nbsp;'.$row['responses'].'</div';
+			echo '</div></td>';
 			echo '</tr>';
 		}
 		
@@ -490,23 +614,71 @@ class SurveyAktivnost{
 		
 		echo '<input type="hidden" name="a" value="diagnostics">';
 		echo '<input type="hidden" name="t" value="paradata">';
-		
-		// Vseh random enot
-		echo '<span>'.$lang['srv_inv_dashboard_tbl_all'].'</span> <input type="text" name="limit" value="'.$limit.'" style="padding:1px 3px; font-size:12px; width:70px; margin-right:20px;" />';	
-		
-		// Datum
-		echo $lang['s_from'].' <input type="text" id="from" name="from" value="' . $date_from . '" />';
-		echo ' <span class="faicon calendar_icon icon-as_link" onclick="diagnosticsParadataChooseDate();" id="from_img"></span> ';
 
-		echo $lang['s_to'].' <input type="text" id="to" name="to" value="' . $date_to . '" />';
+		// Nastavitve nad tabelo
-		echo ' <span class="faicon calendar_icon icon-as_link" onclick="diagnosticsParadataChooseDate();" id="to_img"></span>';
+		echo '<div class="data_table_top_holder">';
-		
+
+		//Vseh random enot
+		echo '<div class="osnova no_border">';
+		echo $lang['srv_inv_dashboard_tbl_all'];
+
+		echo '<input class="text" type="text" name="limit" value="'.$limit.'" />';
+		echo '</div>';
+
+		// Datum
+		echo '<div id="end">';    
+		echo '<div class="dataSettingsBasic">';    
+		echo '  <button id="toggleDataCheckboxes_Date" class="small white-blue" onClick="toggleAktivnostCheckboxes(\'date\'); return false;"><span class="faicon calendar_icon"></span>'.$lang['srv_diagnostics_date'].'</button>';
+		echo '</div>';
+		echo '</div>';
+
+		// Dodatne nastavitve, ki se razprejo
+		echo '<div id="dataSettingsCheckboxes_Date" class="displayNone">';
+		echo '  <div class="dataSettingsCheckboxes_holder">';
+
+		// Datum - od
+		echo '<div class="setting_holder">';
+		echo $lang['srv_diagnostics_orfrom'];
+		echo '<div class="date_holder">';
+		echo '<input class="text" type="text" id="from" name="from" value="' . $date_from . '" />';
+		echo '<span class="faicon calendar_icon blue" onclick="diagnosticsParadataChooseDate();" id="from_img"></span>';
+		echo '</div>';
+		echo '</div>';
+
+		// Datum - do
+		echo '<div class="setting_holder">';
+		echo $lang['srv_diagnostics_to'];
+		echo '<div class="date_holder">';
+		echo '<input class="text" type="text" id="to" name="to" value="' . $date_to . '" />';
+		echo '<span class="faicon calendar_icon blue" onclick="diagnosticsParadataChooseDate();" id="from_img"></span>';
+		echo '</div>';
+		echo '</div>';
+
 		echo '<script>diagnosticsParadataChooseDate();</script>';
+
+		// Gumb filtriraj
+		echo '<div class="button_holder">';
+		echo '  <button class="small blue" onClick="this.form.submit();">'.$lang['srv_diagnostics_filter'].'</button>';
+		echo '</div>';
+
+		echo '</div>';
+		echo '</div>'; //div#dataSettingsCheckboxes_Date
+
+		// Klik izven razprith nastavitev - zapremo okno
+        echo '<script>
+            $(document).mouseup(function(e){
+                var container1 = $("#dataSettingsCheckboxes_Date");
+            
+                if (!container1.is(e.target) && container1.has(e.target).length === 0){
+                    $("#dataSettingsCheckboxes_Date").addClass("displayNone");
+					$("#toggleDataCheckboxes_Date").removeClass("border_blue");
+                }
+            });
+        </script>';
+
+		echo '</div>'; // div.data_table_top_holder
 		
-		// Gumb prikazi
+		echo '</form>';
-		echo '<input type="button" class="pointer" value="'.$lang['hour_show'].'" onClick="this.form.submit();" style="margin-left:20px;">';
-		
-		echo '</form><br />';
 	
 			
 		// Gledamo vse veljavne respondente iz leta 2016
@@ -557,13 +729,17 @@ class SurveyAktivnost{
 
 		foreach($statistics as $key => $vals){
 	
-			echo '<fieldset style="width:60%;"><legend>'.$vals['title'].'</legend>';
+			echo '<fieldset><legend>'.$vals['title'].'</legend>';
 	
 			// Sortiramo vrednosti po velikosti (od najvecje do najmanjse)
 			//ksort($vals);
 			arsort($vals);
 
-			echo '<table style="width:100%;">';
+			echo '<table class="aktivnost_paradata_table">';
+			echo '<tr>';
+			echo '<th>'.$vals['title'].'</th>';
+			echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
+			echo '</tr>';
 				
 			$max = -1;
 			foreach($vals as $key2 => $val){
@@ -579,7 +755,11 @@ class SurveyAktivnost{
 					echo '<td>'.$key2.'</td>';
 				
 					$max = max($val, $max) * 1.2;
-					echo '<td style="width:80%"><div class="graph_lb" style="float: left; width:' . (round($val / $max * 100, 0)) . '%">&nbsp;</div><div style="float:left">&nbsp;'.$val.'</div></td>';
+
+					echo '<td class="graph_cell">';
+					echo '<div class="graph_cell">';
+					echo '<div class="graph_full" style="width:' . (round($val / $max * 100, 0)) . '%">&nbsp;</div><div>&nbsp;'.$val.'</div>';
+					echo '</div></td>';
 
 					echo '</tr>';
 				}
@@ -587,7 +767,7 @@ class SurveyAktivnost{
 			
 			echo '</table>';
 			
-			echo '</fieldset><br />';
+			echo '</fieldset>';
 		}
 	}
 	
@@ -688,9 +868,9 @@ class SurveyAktivnost{
 				if ($color == 'month') $label = date('M Y', strtotime($row['date']));
 				if ($color == 'day') $label = date('j.n.Y', strtotime($row['date']));
 				
-				echo '<span style="position: absolute; bottom: -15px; width: 90px;">'.$label;
+				/*echo '<span style="position: absolute; bottom: -15px; width: 90px;">'.$label;
 				if ( !$sumarium ) echo ' <span style="color:darkgray; font-size:70%" title="x̄ = '.$avg[$row['color']].'">('.$avg[$row['color']].')</span>';
-				echo '</span>';
+				echo '</span>';*/
 				$prev_color = $row['color'];
 			}
 			
@@ -711,11 +891,11 @@ class SurveyAktivnost{
 
 	private function diagnostics_show_interval ($t) {
 		global $lang;
-		
+
 		echo '<form name="intr" action="index.php" method="get">';
 		echo '<input type="hidden" name="a" value="diagnostics">';
 		echo '<input type="hidden" name="t" value="'.$t.'">';
-		
+
 		$testdata = (isset($_GET['testdata']) && $_GET['testdata']=='1') ? 1 : 0;
 		$testdataauto = (isset($_GET['testdataauto']) && $_GET['testdataauto']=='1') ? 1 : 0;
 		$uvoz = (isset($_GET['uvoz']) && $_GET['uvoz']=='1') ? 1 : 0;
@@ -726,48 +906,15 @@ class SurveyAktivnost{
 		$mailsent = (isset($_GET['mailsent']) && $_GET['mailsent']=='1') ? 1 : 0;
 		
 		$language = (isset($_GET['language'])) ? $_GET['language'] : 0;
-        
-        if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
 
-            $package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
+		// Nastavitve nad tabelo
-            $package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
+		echo '<div class="data_table_top_holder graphs">';
-            $package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
-            
-            echo '<span>'.$lang['srv_narocilo_paket'].':</span>';
 
-            echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
+		//Interval
-            echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
+		echo '<div class="osnova">';
-            echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
+		echo 'Interval:';
-            echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label></span>';
-            echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
-            echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label></span>';
-            
-            echo '<span class="spaceLeft spaceRight bold">|</span>';
-        }
 
-		echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
+		echo '<select class="dropdown" name="interval" onchange="document.intr.submit();">';
-		echo '<span class="spaceLeft"><input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label></span>';
-		echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
-		echo '<span class="spaceLeft"><input type="checkbox" id="uvoz" '.($uvoz == 1 ? ' checked="checked"' : '').' onchange="$(\'#uvoz_hidden\').val('.($uvoz==1 ? '0' : '1').');"><label for="uvoz">'.$lang['srv_diagnostics_filter_import'].'</label></span>';
-		
-		echo '<input type="hidden" name="ustrezni" id="ustrezni_hidden" value="'.$ustrezni.'" />';
-		echo '<span class="spaceLeft bold">|</span><span class="spaceLeft"></span><input type="checkbox" id="ustrezni" '.($ustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#ustrezni_hidden\').val('.($ustrezni==1 ? '0' : '1').');"><label for="ustrezni">'.$lang['srv_diagnostics_filter_6'].'</label>';
-		echo '<input type="hidden" name="delnoustrezni" id="delnoustrezni_hidden" value="'.$delnoustrezni.'" />';
-		echo '<span class="spaceLeft"><input type="checkbox" id="delnoustrezni" '.($delnoustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#delnoustrezni_hidden\').val('.($delnoustrezni==1 ? '0' : '1').');"><label for="delnoustrezni">'.$lang['srv_diagnostics_filter_5'].'</label></span>';
-		echo '<input type="hidden" name="neustrezni" id="neustrezni_hidden" value="'.$neustrezni.'" />';
-		echo '<span class="spaceLeft"><input type="checkbox" value="1" id="neustrezni" '.($neustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#neustrezni_hidden\').val('.($neustrezni==1 ? '0' : '1').');"><label for="neustrezni">'.$lang['srv_diagnostics_filter_34'].'</label></span>';
-		echo '<span class="spaceLeft"><input type="checkbox" value="1" id="mailsent" name="mailsent" '.($mailsent == 1 ? ' checked="checked"' : '').'><label for="mailsent">'.$lang['srv_diagnostics_filter_012'].'</label></span>';
-
-		echo '<span class="spaceLeft bold">|</span><span class="spaceLeft"></span>'.$lang['lang'].': <select id="language" name="language">';
-		echo '<option value="0" '.($language=='0' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_all'].'</option>';
-		echo '<option value="1" '.($language=='1' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_slo'].'</option>';
-		echo '<option value="2" '.($language=='2' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_ang'].'</option>';
-		
-		echo '<input type="button" class="spaceLeft" value="'.$lang['srv_coding_filter'].'" onClick="this.form.submit();">';
-		
-		echo '<br /><br />';
-	
-		echo 'Interval: <select name="interval" onchange="document.intr.submit();">';
 		if ( ! in_array($t, array('time_span_yearly', 'time_span')) ) {
 			echo '<option value="hour" '.($_GET['interval']=='hour'?'selected':'').'>'.$lang['srv_diagnostics_interval_hour'].'</option>';
 		}
@@ -775,9 +922,117 @@ class SurveyAktivnost{
 		echo '<option value="week" '.($_GET['interval']=='week'?'selected':'').'>'.$lang['srv_diagnostics_interval_week'].'</option>';
 		echo '<option value="month" '.($_GET['interval']=='month'?'selected':'').'>'.$lang['srv_diagnostics_interval_month'].'</option>';
 		echo '<option value="year" '.($_GET['interval']=='year'?'selected':'').'>'.$lang['srv_diagnostics_interval_year'].'</option>';
-		echo '</select>';		
+		echo '</select>';
+		echo '</div>';
+
+		//Upoštevane enote
+		echo '<div class="dataSettingsBasic">';    
+		echo '  <button id="toggleDataCheckboxes" class="small white-blue" onClick="toggleAktivnostCheckboxes(\'units\'); return false;"><span class="faicon plus"></span>'.$lang['srv_diagnostics_upostevane'].'</button>';
+		echo '</div>';
+
+		// Dodatne nastavitve, ki se razprejo
+		echo '<div id="dataSettingsCheckboxes" class="displayNone">';
+		echo '  <div class="dataSettingsCheckboxes_holder">';
+			
+		// Upoštevaj enote
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_diagnostics_upostevaj'].'</span>';
 		
-		echo '</form><br />';		
+		echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="uvoz" '.($uvoz == 1 ? ' checked="checked"' : '').' onchange="$(\'#uvoz_hidden\').val('.($uvoz==1 ? '0' : '1').');"><label for="uvoz">'.$lang['srv_diagnostics_filter_import'].'</label>';
+		echo '</div>';
+		
+		echo '<input type="hidden" name="ustrezni" id="ustrezni_hidden" value="'.$ustrezni.'" />';
+		echo '<div class="setting_item">';
+		echo '</span><input type="checkbox" id="ustrezni" '.($ustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#ustrezni_hidden\').val('.($ustrezni==1 ? '0' : '1').');"><label for="ustrezni">'.$lang['srv_diagnostics_filter_6'].'</label>';
+		echo '</div>';
+		echo '<input type="hidden" name="delnoustrezni" id="delnoustrezni_hidden" value="'.$delnoustrezni.'" />';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="delnoustrezni" '.($delnoustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#delnoustrezni_hidden\').val('.($delnoustrezni==1 ? '0' : '1').');"><label for="delnoustrezni">'.$lang['srv_diagnostics_filter_5'].'</label>';
+		echo '</div>';
+		echo '<input type="hidden" name="neustrezni" id="neustrezni_hidden" value="'.$neustrezni.'" />';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="neustrezni" '.($neustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#neustrezni_hidden\').val('.($neustrezni==1 ? '0' : '1').');"><label for="neustrezni">'.$lang['srv_diagnostics_filter_34'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="mailsent" name="mailsent" '.($mailsent == 1 ? ' checked="checked"' : '').'><label for="mailsent">'.$lang['srv_diagnostics_filter_012'].'</label>';
+		echo '</div>';
+
+		echo '</div>';
+
+		echo '<div id="jezikpaket">';
+
+		//Jezik
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_diagnostics_jezik'].'</span>';
+
+		echo '<select class="dropdown w130" id="language" name="language">';
+		echo '<option value="0" '.($language=='0' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_all'].'</option>';
+		echo '<option value="1" '.($language=='1' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_slo'].'</option>';
+		echo '<option value="2" '.($language=='2' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_ang'].'</option>';
+		echo '</select>';
+					
+		echo '</div>';
+
+		//Paketi
+		if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
+
+            $package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
+            $package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
+            $package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
+
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_narocilo_paket'].'</span>';
+
+            echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
+			echo '<div class="setting_item">';
+            echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
+			echo '</div>';
+            echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
+			echo '<div class="setting_item">';
+            echo '<input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label>';
+			echo '</div>';
+            echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
+			echo '<div class="setting_item">';
+            echo '<input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label>';
+			echo '</div>';		
+			
+			echo '</div>';
+        }
+
+		echo '</div>'; //div#jezikpaket
+
+
+		// Gumb filtriraj
+		echo '<div class="button_holder">';
+		echo '  <button class="small blue" onClick="this.form.submit();">'.$lang['srv_diagnostics_filter'].'</button>';
+		echo '</div>';
+		
+		echo '  </div>';
+		echo '</div>'; //div#dataSettingsCheckboxes
+
+		// Klik izven razprith nastavitev - zapremo okno
+        echo '<script>
+            $(document).mouseup(function(e){
+                var container1 = $("#dataSettingsCheckboxes");
+            
+                if (!container1.is(e.target) && container1.has(e.target).length === 0){
+                    $("#dataSettingsCheckboxes").addClass("displayNone");
+					$("#toggleDataCheckboxes").removeClass("border_blue");
+                }
+            });
+        </script>';
+
+		echo '</div>'; // div.data_table_top_holder
+
+		echo '</form>';		
 	}
 	
 	private function diagnostics_get_interval ($def = '') {

admin/survey/classes/class.SurveyAppendMerge.php

@@ -67,15 +67,19 @@ class SurveyAppendMerge {
 			echo '<input type="hidden" name="do" value="0">';
 			echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">';
 			
-			# sporočilo za personalizirana e-vabila in respondente iz baze
+			// Opis združevanja podatkov
-			echo $lang['srv_append_note'];
+			echo '<p class="bottom16">'.$lang['srv_append_note'].'</p>';
 			
 			// Korak 1
-			echo $lang['srv_append_step1'];
+			echo '<p class="bold">'.$lang['srv_append_step1'].'</p>';
-			echo '<div class="append_step">';
+			echo '<div class="appendmerge_indent">';
+
+			echo '<ul>';
+			echo '<li>'.$lang['srv_append_step1_notea'].'</li>';
+			echo '<li>'.$lang['srv_append_step1_noteb'].'</li>';
+			echo '<li>'.$lang['srv_append_step1_notec'].'</li>';
+			echo '</ul>';
 
-			echo $lang['srv_append_step1_note'];
-			
 			echo '<div id="inv_field_container">';
 
 			echo '<ul class="connectedSortable">';
@@ -102,23 +106,34 @@ class SurveyAppendMerge {
 					}
 				}
 			}
-			echo '</ul><br />';
+			echo '</ul>';
 			echo '</div>';
+
+			echo '<p>'.$lang['srv_append_step1_noted'].'</p>';
+
 			echo '</div>';
 			
 			
 			// Korak 2
-			echo $lang['srv_append_step2'];
+			echo '<p class="bold">'.$lang['srv_append_step2'].'</p>';
-			echo '<div class="append_step">';
+
+			echo '<div class="appendmerge_indent">';
 			
             echo '<script type="text/javascript">initAppendMergeConnectedSortable();</script>';
-			
+
-			echo '<span><label><input name="inv_import_type" id="inv_import_type0" type="radio" value="0" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m='.$_GET['m'].'\');" checked="checked">';
+			echo '<div class="setting_holder">';
-			echo ''.$lang['srv_iz_seznama'].'</label></span>';
+			echo '<span class="setting_title">'.$lang['srv_appendmerge_source'].'</span>';
-			echo '<span><label><input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m=upload_xls\');">';
+
-			echo ''.$lang['srv_iz_excela'].'</label></span>';
+			echo '<div class="setting_item">';
-			echo '<br class="clr"/>';		
+			echo '<input name="inv_import_type" id="inv_import_type0" type="radio" value="0" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m='.$_GET['m'].'\');" checked="checked">';
-			echo '<br class="clr"/>';		
+			echo '<label for="inv_import_type0">'.$lang['srv_iz_seznama'].'</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m=upload_xls\');">';
+			echo '<label for="inv_import_type1">'.$lang['srv_iz_excela'].'</label>';
+			echo '</div>';
+						
+			echo '</div>';
 
 			echo '<input type="hidden" name="do_merge" value="0" id="do_merge">';
 			
@@ -129,21 +144,32 @@ class SurveyAppendMerge {
 			echo '<div id="inv_import_list"'.($import_type != 1 ? '' : ' style="display:none"').'>' ;
 			
 			// Korak 3
-			echo $lang['srv_append_step3'];
+			echo '<p class="bold">'.$lang['srv_append_step3'].'</p>';
-			echo '<div class="append_step">';
+			echo '<div class="appendmerge_indent">';
 			
 			echo $lang['srv_append_step3_note'];
+
+			echo '<ul>';
+			echo '<li>'.$lang['srv_append_step3_note1'].'</li>';
+			echo '<li>'.$lang['srv_append_step3_note2'].'</li>';
+			echo '<li>'.$lang['srv_append_step3_note3'].'</li>';
+			echo '</ul>';
+
+			echo '<p class="top16 bottom16">'.$lang['srv_append_step3_note4'].'</p>';
+
+			echo '<ul>';
+			echo '<li>'.$lang['srv_append_step3_note5'].'</li>';
+			echo '<li>'.$lang['srv_append_step3_note6'].'</li>';
+			echo '</ul>';
+
+			echo '<p class="top16 bottom16">'.$lang['srv_append_step3_note7'].'</p>';
+			echo '<p>'.$lang['srv_append_step3_note8'].'</p>';
+			echo '<p>'.$lang['srv_append_step3_note9'].'</p>';
 			
-			echo '<span class="inv_sample" >';
+			echo '<p class="top16">'.$lang['srv_append_step3_note10'].' <span id="inv_field_list" class="inv_type_0 bold">';
-			echo $lang['srv_inv_recipiens_sample'].'&nbsp;</span><span class="inv_sample">';
+			echo implode(', ',$field_lang);
-			echo $lang['srv_inv_recipiens_sample1'];
+			echo '</span></p>';
-			echo '</span>';
+			echo '<textarea id="inv_recipients_list" name="inv_recipients_list"">';
-			echo '<br class="clr" />';
-			echo '</span>';
-			echo '<br class="clr" />'.$lang['srv_inv_recipiens_fields'].' <span id="inv_field_list" class="inv_type_0">';
-			echo implode(',',$field_lang);
-			echo '</span>';
-			echo '<br class="clr" /><textarea id="inv_recipients_list" cols="50" rows="9" name="inv_recipients_list" style="margin-bottom: 7px;">';
 			if (is_array($recipients_list) && count($recipients_list) > 0 ) {
 				echo implode("\n",$recipients_list);
 			}
@@ -157,32 +183,28 @@ class SurveyAppendMerge {
 			echo '<div id="inv_import_file"'.($import_type == 1 ? '' : ' style="display:none"').'>' ;
 						
 			// Korak 3
-			echo $lang['srv_append_step3_xls'];
+			echo '<p class="bold">'.$lang['srv_append_step3_xls'].'</p>';
-			echo '<div class="append_step">';
+
+			echo '<div class="appendmerge_indent">';
 						
-			echo $lang['srv_mailing_upload_list'];
+			echo '<p class="top16 bottom16"><input type="file" name="recipientsFile" id="recipientsFile" /></p>';
-			echo ' <input type="file" name="recipientsFile" id="recipientsFile" />';
+
-			
-			echo '<br /><br />';
-			
-			echo $lang['srv_excel_upload_note'];
-			
 			echo '</div>';
 			echo '</div>'; # id=inv_import_file
 
-			echo '<br class="clr" />';
+			echo '<div class="button_holder bottom16">';
-			echo '<span id="inv_upload_recipients_nosbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" onclick="append_submit(); return false;">'.$lang['srv_inv_btn_add_recipients_add'].'</a></span>';
+			echo '<button class="medium blue" onclick="append_submit(); return false;">'.$lang['srv_append_add'].'</button>';
-			
+			echo '</div>';
+
 			$d = new Dostop();
 			if ($d->checkDostopSub('edit')){
-				echo '<span style="margin: 5px 20px; line-height:24px">';
+				echo '<span class="red">';
 				printf($lang['src_coding_alert'], $this->anketa);
 				echo '</span>';
 			}
 						
 			echo '</form>';
 			
-			echo '<br class="clr"/>';	
 			
 			//echo '</div>'; # id=inv_import_list_container
 			
@@ -199,15 +221,19 @@ class SurveyAppendMerge {
 			echo '<input type="hidden" name="do" value="0">';
 			echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">';
 			
-			# sporočilo za personalizirana e-vabila in respondente iz baze
+			//Opis združevanja podatkov
-			echo $lang['srv_merge_note'];		
+			echo '<p class="bottom16">'.$lang['srv_merge_note'].'</p>';
-			
+
-			// Korak 1
+			// Korak 1
-			echo $lang['srv_merge_step1'];
+			echo '<p class="bold">'.$lang['srv_merge_step1'].'</p>';
-			echo '<div class="append_step">';
+			echo '<div class="appendmerge_indent">';
+
+			echo '<ul>';
+			echo '<li>'.$lang['srv_merge_step1_notea'].'</li>';
+			echo '<li>'.$lang['srv_merge_step1_noteb'].'</li>';
+			echo '<li>'.$lang['srv_merge_step1_notec'].'</li>';
+			echo '</ul>';
 
-			echo $lang['srv_merge_step1_note'];
-			
 			echo '<div id="inv_field_container">';
 
 			echo '<ul class="connectedSortable">';
@@ -234,31 +260,40 @@ class SurveyAppendMerge {
 					}
 				}
 			}
-			echo '</ul><br />';
+			echo '</ul>';
-			echo '</div>';
 			echo '</div>';
 			
-			
+			echo '<p>'.$lang['srv_merge_step1_noted'].'</p>';
+
+			echo '</div>';
+
 			// Korak 2
-			echo $lang['srv_merge_step2'];
+			echo '<p class="bold">'.$lang['srv_merge_step2'].'</p>';
-			echo '<div class="append_step">';
+
-			
+			echo '<div class="appendmerge_indent">';
-			echo '<script type="text/javascript">initAppendMergeConnectedSortable();</script>';
-			
-			echo '<span><label><input name="inv_import_type" id="inv_import_type0" type="radio" value="0" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m='.$_GET['m'].'\');" checked="checked">';
-			echo ''.$lang['srv_iz_seznama'].'</label></span>';
-			echo '<span><label><input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m=upload_xls\');">';
-			echo ''.$lang['srv_iz_excela'].'</label></span>';
-			
-			echo '<br class="clr"/>';	
-			echo '<br class="clr"/>';	
-			
-			echo '</div>';		
 			
+            echo '<script type="text/javascript">initAppendMergeConnectedSortable();</script>';
+
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_appendmerge_source'].'</span>';
+
+			echo '<div class="setting_item">';
+			echo '<input name="inv_import_type" id="inv_import_type0" type="radio" value="0" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m='.$_GET['m'].'\');" checked="checked">';
+			echo '<label for="inv_import_type0">'.$lang['srv_iz_seznama'].'</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m=upload_xls\');">';
+			echo '<label for="inv_import_type1">'.$lang['srv_iz_excela'].'</label>';
+			echo '</div>';
+						
+			echo '</div>';
+
+			echo '</div>';
 
 			// Korak 3
-			echo $lang['srv_merge_step3'];
+			echo '<p class="bold">'.$lang['srv_merge_step3'].'</p>';
-			echo '<div class="append_step">';
+
+			echo '<div class="appendmerge_indent">';
 
 			echo '<input type="hidden" name="do_merge" value="1" id="do_merge">';
 			echo '<p>'.$lang['srv_izberite_identifikator'].'</p>';
@@ -271,25 +306,35 @@ class SurveyAppendMerge {
 			echo '<div id="inv_import_list"'.($import_type != 1 ? '' : ' style="display:none"').'>' ;
 			
 			// Korak 4
-			echo $lang['srv_merge_step4'];
+			echo '<p class="bold">'.$lang['srv_merge_step4'].'</p>';
-			echo '<div class="append_step">';
-			
-			echo $lang['srv_merge_step4_note'];
 
-			echo $lang['srv_inv_recipiens_sample'].'&nbsp;</span><span class="inv_sample">';
+			echo '<div class="appendmerge_indent">';
-			echo $lang['srv_inv_recipiens_sample1'];
+			
-			echo '</span>';
+			echo '<ul>';
-			echo '<br class="clr" />';
+			echo '<li>'.$lang['srv_append_step3_note1'].'</li>';
-			echo '</span>';
+			echo '<li>'.$lang['srv_append_step3_note2'].'</li>';
-			echo '<br class="clr" />'.$lang['srv_inv_recipiens_fields'].' <span id="inv_field_list" class="inv_type_0">';
+			echo '<li>'.$lang['srv_append_step3_note3'].'</li>';
+			echo '</ul>';
+
+			echo '<p class="top16 bottom16">'.$lang['srv_append_step3_note4'].'</p>';
+
+			echo '<ul>';
+			echo '<li>'.$lang['srv_append_step3_note5'].'</li>';
+			echo '<li>'.$lang['srv_append_step3_note6'].'</li>';
+			echo '</ul>';
+
+			echo '<p class="top16 bottom16">'.$lang['srv_append_step3_note7'].'</p>';
+			echo '<p>'.$lang['srv_append_step3_note8'].'</p>';
+			echo '<p>'.$lang['srv_append_step3_note9'].'</p>';
+			
+			echo '<p class="top16">'.$lang['srv_append_step3_note10'].' <span id="inv_field_list" class="inv_type_0 bold">';
 			echo implode(',',$field_lang);
 			echo '</span>';
-			echo '<br class="clr" /><textarea id="inv_recipients_list" cols="50" rows="9" name="inv_recipients_list" style="margin-bottom: 7px;">';
+			echo '<textarea id="inv_recipients_list" name="inv_recipients_list">';
 			if (is_array($recipients_list) && count($recipients_list) > 0 ) {
 				echo implode("\n",$recipients_list);
 			}
 			echo '</textarea>';
-			echo '<br class="clr"/>';
 			
 			echo '</div>';
 			echo '</div>';	# id=inv_import_list
@@ -298,34 +343,27 @@ class SurveyAppendMerge {
 			echo '<div id="inv_import_file"'.($import_type == 1 ? '' : ' style="display:none"').'>' ;
 			
 			// Korak 4
-			echo $lang['srv_merge_step4'];
+			echo '<p class="bold">'.$lang['srv_merge_step4_xls'].'</p>';
-			echo '<div class="append_step">';
+			echo '<div class="appendmerge_indent">';
 			
-			echo $lang['srv_mailing_upload_list'];
 			echo ' <input type="file" name="recipientsFile" id="recipientsFile" />';
 			
-			echo '<br class="clr" /><br />';
-			
-			echo $lang['srv_excel_upload_note'];
-			
 			echo '</div>';
 			echo '</div>'; # id=inv_import_file
 
-			
+			echo '<div class="button_holder bottom16">';
-			echo '<br class="clr" />';
+			echo '<button class="medium blue" onclick="append_submit(); return false;">'.$lang['srv_merge_add'].'</button>';
-			echo '<span id="inv_upload_recipients_nosbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" onclick="append_submit(); return false;">'.$lang['srv_inv_btn_add_recipients_add'].'</a></span>';
+			echo '</div>';
-			
+
 			$d = new Dostop();
 			if ($d->checkDostopSub('edit')){
-				echo '<span style="margin: 5px 20px; line-height:24px">';
+				echo '<span class="red">';
 				printf($lang['src_coding_alert'], $this->anketa);
 				echo '</span>';
 			}
 			
 			echo '</form>';
 			
-			echo '<br class="clr"/>';	
-
 			echo '</fieldset>';
 		}
 	}
@@ -342,8 +380,7 @@ class SurveyAppendMerge {
 		$do_merge = (int)$_POST['do_merge'];
 		$import_type = (int)$_POST['inv_import_type'];
 		if ($_POST['do']=='1') $do = true; else $do = false;
-		
+
-		
 		// ce uploadamo datoteko
 		if ($import_type == 1) {
 			
@@ -406,26 +443,31 @@ class SurveyAppendMerge {
 			// napaka
 			if ($result <= 0) {
 				echo '<h2>'.$lang['error'].'</h2>';
+				echo '<div class="popup_close"><a href="#" onClick="append_submit_close(); return false;"">✕</a></div>';
 				
 				if ($result < 0)
 					echo '<p>'.$output.'</p>';
 				else 
 					echo '<p>'.$lang['srv_append-merge_error_value'].'</p>';
 				
-				echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_gray" onclick="append_submit_close(); return false;"><span>'.$lang['back'].'</span></a></span>';
+				echo '<div class="button_holder">';
+				echo '<button class="medium white-blue" onclick="append_submit_close(); return false;">'.$lang['back'].'</button>';
+				echo '</div>';
 				
 			} else {
 								
 				echo '<h2>'.$lang['srv_potrditev'].'</h2>';
+				echo '<div class="popup_close"><a href="#" onClick="append_submit_close(); return false;"">✕</a></div>';
 				
 				if ($do_merge == 0)
 					echo '<p>'.$lang['srv_append-merge_process_1'].' '.$result.' '.$lang['srv_append-merge_process_2'].'. '.'</p>';
 				else
 					echo '<p>'.$lang['srv_append-merge_process_o_1'].' '.$result.' '.$lang['srv_append-merge_process_o_2'].'</p>';
 				
-				
+				echo '<div class="button_holder">';
-				echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_gray" onclick="append_submit_close(); return false;"><span>'.$lang['srv_cancel'].'</span></a></span>';
+				echo '<button class="medium white-blue" onclick="append_submit_close(); return false;">'.$lang['srv_cancel'].'</button>';				
-				echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange" onclick="append_submit(1); return false;"><span>'.$lang['srv_potrdi'].'</span></a></span>';
+				echo '<button class="medium blue" onclick="append_submit(1); return false;">'.$lang['srv_potrdi'].'</button>';
+				echo '</div>';
 			}
 			
 		
@@ -433,16 +475,18 @@ class SurveyAppendMerge {
 		} else {
 			
 			echo '<h2>'.$lang['fin_import_ok'].'</h2>';
+			echo '<div class="popup_close"><a href="#" onClick="append_submit_close(); return false;"">✕</a></div>';
 			
 			echo '<p>'.$output.'</p>';
 			echo '<p>'.$lang['srv_append-merge_fin'].'</p>';
-			
+
-			echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" href="index.php?anketa='.$this->anketa.'&a=data'.(count($this->usr_ids) < 100?'&highlight_usr='.implode('-', $this->usr_ids).'':'').'"><span>'.$lang['data_show'].'</span></a></span>';
+			echo '<div class="button_holder">';
-			
+			echo '<button class="medium white-blue" onclick="append_submit_close(); return false;">'.$lang['srv_zapri'].'</button>';
+			echo '<button class="medium blue" onclick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=data'.(count($this->usr_ids) < 100?'&highlight_usr='.implode('-', $this->usr_ids).'':'').'\'">'.$lang['data_show'].'</button>';
+			echo '</div>';
 		}
 		
 		if ($import_type == 1){
-			echo '<br /><br />';
 			echo '</fieldset>';
 		}
 	}
@@ -807,12 +851,12 @@ class SurveyAppendMerge {
 					echo $lang['srv_append_xls_note'];
 										
 					echo '<div id="inv_field_container">';
-					echo '<div class="append_step">';
+					echo '<div class="appendmerge_indent">';
 					
 					echo '<ul class="connectedSortable">';
 					foreach ($_POST['fields'] AS $spr_id)
 					{
-						echo '<li class="inv_field_enabled"><label>'.$field_list[$spr_id].'</label></li>';
+						echo '<li class="inv_field_enabled nocursor"><label>'.$field_list[$spr_id].'</label></li>';
 					}
 					echo '</ul>';
 					echo '</div>';
@@ -820,27 +864,37 @@ class SurveyAppendMerge {
 						
 						
 					if (count($columns) > 0){
-						echo $lang['srv_append_xls_step1'];
+						echo '<p>'.$lang['srv_append_xls_step1'].'</p>';
 						
 						echo '<div id="inv_field_container">';
-						echo '<div class="append_step">';
+						echo '<div class="appendmerge_indent">';
 						echo '<ul class="connectedSortable">';
 						foreach ($columns AS $column){
-							echo '<li><label><input type="checkbox" name="xls_column[]" value="'.$column.'">'.$column.'</label></li>';
+							echo '<li><input type="checkbox" name="xls_column[]" id="'.$column.'" value="'.$column.'"><label for="'.$column.'">'.$column.'</label></li>';
 						}
 						echo '</ul>';
 						echo '</div>';
 						echo '</div>';
 					}
 					
+					echo $lang['srv_append_xls_step2'];
 					
-					echo $lang['srv_append_xls_step1'];
+					echo '<div class="appendmerge_indent">';
 					
-					echo '<div class="append_step">';
+					echo '<div class="setting_holder">';
-					echo '<p>'.$lang['srv_append_xls_step2_begin'].': <input name="start_row" type="number" min="1" max="'.(int)$highestRow.'" value="1"></p>';
+					echo '<label>'.$lang['srv_append_xls_step2_begin'].'</label>';
-					echo '<p>'.$lang['srv_append_xls_step2_end'].': <input name="end_row" type="number" min="1" max="'.(int)$highestRow.'" value="'.(int)$highestRow.'"></p>';
+					echo '<input name="start_row" type="number" min="1" max="'.(int)$highestRow.'" value="1">';
-					echo '<span id="inv_upload_recipients_nosbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" onclick="$(\'#append_xml\').submit();">'.$lang['srv_inv_btn_add_recipients_add'].'</a></span>';
+					echo '</div>';
-					echo '<br /><br />';
+
+					echo '<div class="setting_holder">';
+					echo '<label>'.$lang['srv_append_xls_step2_end'].'</label>';
+					echo '<input name="end_row" type="number" min="1" max="'.(int)$highestRow.'" value="'.(int)$highestRow.'">';
+					echo '</div>';
+
+					echo '<div class="button_holder top16 bottom0">';
+					echo '<button class="medium blue" onclick="$(\'#append_xml\').submit();">'.$lang['srv_append_add'].'</button>';
+					echo '</div>';
+
 					echo '</div>';
 					
 					
@@ -987,15 +1041,16 @@ class SurveyAppendMerge {
 			// shranjeno, prikazemo resultat
 		} else {
 
-			echo '<h2>'.$lang['fin_import_ok'].'</h2>';
+			echo '<p class="bold bottom16">'.$lang['fin_import_ok'].'</p>';
 				
 			echo '<p>'.$output.'</p>';
 			echo '<p>'.$lang['fin_import_ok_text'].'</p>';
-				
+
-			echo '<span id="inv_upload_recipients_no_sbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" href="index.php?anketa='.$this->anketa.'&a=data"><span>'.$lang['data_show'].'</span></a></span>';			
+			echo '<div class="button_holder top16 bottom0">';
+			echo '<button class="medium blue" onclick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=data\'">'.$lang['data_show'].'</button>';
+			echo '</div>';
 		}
 		
-		echo '<br /><br />';
 		echo '</fieldset>';
 	}
 	

admin/survey/classes/class.SurveyCheck.php

@@ -186,11 +186,12 @@ class SurveyCheck {
                 // Dosegli smo limit - posljemo mail adminu
                 if($click_count == AppSettings::getInstance()->getSetting('app_limits-clicks_per_minute_limit')){
 
+                    // TODO - da se poslje samo 1x, drugace konstantno letijo maili:D
                     // Includamo vse da lahko posljemo mail
-                    include_once('../../vendor/autoload.php');
+                    //include_once('../../vendor/autoload.php');
             
                     // Posljemo mail adminu
-                    $this->sendAlert($alert_type='limit_clicks', $click_count);
+                    //$this->sendAlert($alert_type='limit_clicks', $click_count);
                 }
                 
                 return true;

admin/survey/classes/class.SurveyCondition.php

@@ -71,40 +71,56 @@ class SurveyCondition
 		$popUp->setHeaderText($lang[''].'Filtriranje s pogoji');
 		
 		#vsebino shranimo v buffer
-
 		ob_start();
-		
+
+        echo '<div class="popup_main with_menu">';
+        
 		echo '<input type="hidden" id="chooseProfileJSAction" value="'.$this->_chooseProfileJSAction.'" />';
-		echo '<div class="condition_profile_holder">';
+
+
+		echo '<div class="popup_left condition_profile_holder">';
 		
-		echo '<div id="condition_profile" class="select">';
+		echo '<div id="condition_profile" class="list select">';
-		if (count($this->_conditions) > 0)
+		if (count($this->_conditions) > 0){
-		{
 			foreach ($this->_conditions as $key => $value) {
-				echo '<div class="option' . ( $pid == $value['id'] ? ' active' : '') . '" data-cid="' . $value['id'] . '" onclick="showSurveyCondition(\''.$value['id'].'\')">' . $value['name'] .'</div>';
+				echo '<div class="list_item option' . ( $pid == $value['id'] ? ' active' : '') . '" data-cid="' . $value['id'] . '" onclick="showSurveyCondition(\''.$value['id'].'\')">' . $value['name'] .'</div>';
 			}
 		}
 		echo '</div>';
+
 		echo '</div>';
+
+
 		# tukaj prikazemo vsebino ifa
-		echo '<div id="div_cp_preview">';
+		echo '<div id="div_cp_preview class="popup_right">';
+
 		echo '<div id="div_cp_preview_content">';
-		if ($pid > 0) 
+		if ($pid > 0){
-		{
 			$b = new Branching($this->_sid);
 			$b->condition_editing($pid, -2);
 		
-		} else {
+		} 
+        else {
 			echo 'Dodaj nov pogoj:';
 			echo '<input id="newSurveyConditionName" placeholder="Ime pogoja" >';
 			echo '<a href="#" onclick="newSurveyCondition(); return false;" class="faicon if_add" style="margin-left: 5px;" title="Dodaj nov pogoj"> Dodaj nov pogoj</a>';
 		}
 		echo '</div>';
+
 		echo '</div>';
+
+
+		echo '</div>';
+
+
+
 		echo '<div id="surveyConditionCover"></div>';
+
 		echo '<div id="renameProfileDiv"></div>';
+
 		$content = ob_get_clean();
 		
+
 		#dodamo vsebino
 		$popUp->setContent($content);
 		
@@ -113,8 +129,7 @@ class SurveyCondition
 		
 		#dodamo gumb izberi profil
 		$confirmAction = 'genericAlertPopup(\'alert_no_action_set\')';
-		if (isset($this->_chooseProfileJSAction) && !empty($this->_chooseProfileJSAction))
+		if (isset($this->_chooseProfileJSAction) && !empty($this->_chooseProfileJSAction)){
-		{
 			$confirmAction = $this->_chooseProfileJSAction;
 		}
 		$button = new PopUpButton($lang['srv_choose_profile']);
@@ -137,9 +152,7 @@ class SurveyCondition
 			$popUp->addButton($button);
 		}
 		
-		echo $popUp;
+		echo $popUp;				
-		
-						
 	}
 	
 	private function newCondition()

admin/survey/classes/class.SurveyConditionProfiles.php

@@ -130,14 +130,14 @@ class SurveyConditionProfiles
 	
 	static function DisplayLink($hideAdvanced = true) {
 		global $lang;
+
 		// profili statusov
         $allProfiles = self :: $profiles;
         $css = (self :: $currentProfileId == SCP_DEFAULT_PROFILE ? ' gray' : '');
         
 		if ($hideAdvanced == false || self :: $currentProfileId != SCP_DEFAULT_PROFILE) {
-			echo '<li class="space">&nbsp;</li>';
 			echo '<li>';
-			echo '<span class="as_link'.$css.'" id="link_condition_profile" title="' . $lang['srv_condition'] . '" onClick="conditionProfileAction(\'showProfiles\');">' . $lang['srv_condition'] . '</span>'."\n";
+			echo '  <span class="'.$css.'" id="link_condition_profile" title="' . $lang['srv_condition'] . '" onClick="conditionProfileAction(\'showProfiles\');">' . $lang['srv_condition'] . '</span>'."\n";
 			echo '</li>';
 		}
 	}
@@ -202,38 +202,48 @@ class SurveyConditionProfiles
         echo '<div class="popup_close"><a href="#" onClick="conditionProfileAction(\'cancle\'); return false;">✕</a></div>';
 		
         if ( self :: $currentProfileId != SCP_DEFAULT_PROFILE ) {
-	       	echo '<div id="not_default_setting">';
+	       	echo '<div id="not_default_setting" class="popup_note">';
 	        echo $lang['srv_not_default_setting'];
-	        echo '</div><br class="clr displayNone">';
+	        echo '</div>';
         }
         
-        echo '<div class="condition_profile_holder">';
+
+        echo '<div class="popup_main with_menu">';
+
+        echo '<div class="popup_left condition_profile_holder">';
         
-	        echo '<div id="condition_profile" class="select">';
+        echo '<div id="condition_profile" class="list select">';
-	        foreach (self :: $profiles as $key => $value) {
+        foreach (self :: $profiles as $key => $value) {
-	            
+            
-				echo '        <div class="option' . ( $_currMPID == $value['id'] ? ' active' : '') . '" id="condition_profile_' . $value['id'] . '" value="'.$value['id'].'">';
+            echo '<div class="list-item option' . ( $_currMPID == $value['id'] ? ' active' : '') . '" id="condition_profile_' . $value['id'] . '" value="'.$value['id'].'">';
-				
+            
-				echo $value['name'];
+            echo $value['name'];
-				
+            
-				if($_currMPID == $value['id']){
+            if($_currMPID == $value['id']){
-					if ( self :: $profiles[$_currMPID]['if_id'] != 0) {
+                echo '<div class="profile_icons">';
-						echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="conditionProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete floatRight"></span></a>';
+                
-					}
+                if ( self :: $profiles[$_currMPID]['if_id'] != 0) {
-					if ( self :: $profiles[$_currMPID]['if_id'] != 0) {
+                    echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="conditionProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete floatRight"></span></a>';
-						echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="conditionProfileAction(\'renameAsk\'); return false;"><span class="faicon edit floatRight spaceRight"></span></a>';
+                }
-					}
+                if ( self :: $profiles[$_currMPID]['if_id'] != 0) {
-				}
+                    echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="conditionProfileAction(\'renameAsk\'); return false;"><span class="faicon edit floatRight spaceRight"></span></a>';
-		
+                }
-				echo '</div>';
+
-			}
+                echo '</div>';
-	        echo '</div>';
+            }
-	        echo '<div class="clr"></div>';
+    
+            echo '</div>';
+        }
+        echo '</div>';
+
+        echo '<button class="small white-black" onclick="conditionProfileAction(\'newName\'); return false;"><span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'].'</button>';    
+
         echo '</div>';
 
 
         // tukaj prikazemo vsebino ifa
-        echo '<div id="div_cp_preview">';
+        echo '<div id="div_cp_preview" class="popup_right">';
+
         echo '  <div id="div_cp_preview_content">';
 
         if (self :: $profiles[$_currMPID]['if_id'] > 0) {
@@ -245,17 +255,17 @@ class SurveyConditionProfiles
         }
 
         echo '  </div>';
+
         echo '</div>';
         
 
         echo '</div>';
 
 		
-        echo '<div id="conditionProfileButtons">';
         // gumbi: preklici, ustvari nov, pozeni trenutni
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="conditionProfileAction(\'run\'); return false;"><span>'.$lang['srv_run_selected_profile'].'</span></a></span></span>';
+        echo '<div id="conditionProfileButtons" class="button_holder">';    
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'].'</span></a></span></span>';        
+        echo '  <button class="medium white-blue" onclick="conditionProfileAction(\'cancle\'); return false;">'.$lang['srv_close_profile'].'</button>';            
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'cancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';            
+        echo '  <button class="medium blue" onclick="conditionProfileAction(\'run\'); return false;">'.$lang['srv_run_selected_profile'].'</button>';
         echo '</div>';
 
 		
@@ -263,25 +273,50 @@ class SurveyConditionProfiles
         echo '<div id="conditionProfileCoverDiv"></div>';
         
         // div za shranjevanje novega profila
-        echo '<div id="newProfile">'.$lang['srv_missing_profile_name'].': ';
+        echo '<div id="newProfile">';
-        echo '<input id="newProfileName" name="newProfileName" type="text" size="45"  />';
+		
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'newCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
+		echo '<div class="setting_holder">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="conditionProfileAction(\'newCreate\'); return false;"><span>'.$lang['srv_save_profile'].'</span></a></span></span>';            
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="newProfileName" name="newProfileName" type="text" class="text large"  />';
+		echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="conditionProfileAction(\'newCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="conditionProfileAction(\'newCreate\'); return false;">'.$lang['srv_save_profile'].'</button>';
+        echo '</div>';
+
         echo '</div>';
 
         // div za preimenovanje
-        echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': ';
+        echo '<div id="renameProfileDiv">';
-        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self :: $profiles[$_currMPID]['name'] . '" size="45"  />';
+		
-        echo '<input id="renameProfileId" type="hidden" value="' . self :: $profiles[$_currMPID]['id'] . '"  />';
+		echo '<div class="setting_holder">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'renameCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
+        echo '<div class="setting_item">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="conditionProfileAction(\'renameConfirm\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>';            
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+		echo '<input id="renameProfileName" name="renameProfileName" type="text" class="text large" value="' . self :: $profiles[$_currMPID]['name'] . '"/>';
+        echo '<input id="renameProfileId" type="hidden" value="' . self :: $profiles[$_currMPID]['id'] . '"  />';echo '</div>';
         echo '</div>';
 
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="conditionProfileAction(\'renameCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="conditionProfileAction(\'renameConfirm\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
+		
         // div za brisanje
-        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . self :: $profiles[$_currMPID]['name'] . '</b>?';
+        echo '<div id="deleteProfileDiv">';
+		
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . self :: $profiles[$_currMPID]['name'] . '</span>?';
         echo '<input id="deleteProfileId" type="hidden" value="' . self :: $profiles[$_currMPID]['id'] . '"  />';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="conditionProfileAction(\'deleteCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
+        
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="conditionProfileAction(\'deleteConfirm\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>';            
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="conditionProfileAction(\'deleteCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="conditionProfileAction(\'deleteConfirm\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
+
         echo '</div>';
 	}
 	

admin/survey/classes/class.SurveyCopy.php

@@ -679,28 +679,6 @@ class SurveyCopy {
 					$pre_set = array('sid' => "'".$new_survey_id."'");
 					$new_missing_values_ids = self::preformCopyTable('srv_missing_values', null, $arr_src['srv_missing_values'], $pre_set);			
                     
-                    
-                    // vrednosti - prestavljeno pod srv_if da se ne porusijo notranji pogoji! Patrik - zakaj je bilo to prestavljeno višje??
-					/*$new_vrednosti_ids = array();
-					if ( count($new_spremenljivke_ids) > 0) {              
-                        foreach( $new_spremenljivke_ids AS $old_spremenljivka_id => $new_spremenljivka_id) {
-                            
-                            // vrednosti, tabela srv_vrednost
-							$src_srv_vrednost = self::arrayfilter($arr_src['srv_vrednost'], 'spr_id', $old_spremenljivka_id);
-							$pre_set = array('id' => "NULL",
-											'spr_id' => array('field'=>'spr_id', 'from'=>$new_spremenljivke_ids),
-											'vre_id' => array('field'=>'vre_id', 'from'=>$new_vrednosti_ids));
-							$tmp_vrednosti_ids = self :: preformCopyTable('srv_vrednost', 'id', $src_srv_vrednost, $pre_set);
-                            
-                            // shranimo stare in nove id-je spremenljivk
-							if ( count($tmp_vrednosti_ids) > 0 )
-                            
-                            foreach ($tmp_vrednosti_ids as $key => $value){
-								$new_vrednosti_ids[$key] = $value;
-							}							
-						}
-					}*/
-
 	
 					// splosne nastavitve ankete, tabela srv_survey_misc
 					$pre_set = array('sid' => "'".$new_survey_id."'");
@@ -1177,7 +1155,8 @@ class SurveyCopy {
 							$dest_value = "''";	
 			    		} 
                         // ce je polje NULL, ga moramo rocno nastavit na NULL
-                        elseif ( $row_src[$dest_field] === NULL && !isset($pre_set[$dest_field]) ) {
+                        //elseif ( $row_src[$dest_field] === NULL && !isset($pre_set[$dest_field]) ) {  // Ce potrebujemo kompatibilnost za nazaj se lahko to vklopi
+                        elseif ( $row_src[$dest_field] === NULL ) {
 							$dest_value = "NULL";	
 			    		} 
                         else {

admin/survey/classes/class.SurveyCustomReport.php

@@ -88,55 +88,90 @@ class SurveyCustomReport {
 			ob_start();
 		}
 				
-		if ($this->isArchive == false && $this->publicCReport == false) {			
+		if ($this->isArchive == false && $this->publicCReport == false) {		
 			
 			echo '<input type="hidden" value="'.$this->expanded.'" id="creport_expanded" />';
 			
 			$this->displayProfilePopups();
 
 			// Prva vrstica - seznam poročil
-			echo '<div>';
+			echo '<div id="custom_report_top">';
-			echo '<span class="pointer blue bold" style="font-size:14px;" onClick="showCReportProfiles();">'.$lang['srv_custom_report_list'].'</span>';
-			echo ' <span id="creport_profile_setting_plus" class="pointer faicon add icon-as_link spaceLeft" title="'.$lang['srv_custom_report_create'].'" style="padding-bottom:1px;"></span>';
-			echo '</div>';
-			
-			// Naslov
-			echo '<h2 style="display:inline-block; color:#333;">';
-			
-			// Profil			
-			if($this->creportProfile == 0){
 
-				$what = 'creport_default_profile_name';
-				$sql = sisplet_query("SELECT value FROM srv_user_setting_for_survey WHERE sid='$this->ank_id' AND uid='$this->creportAuthor' AND what='$what'");		
 
-				if(mysqli_num_rows($sql) == 0){
+            // Seznam porocil
-					$name = $lang['srv_custom_report_default'];
+            echo '  <div class="custom_report_list">';
-				}
+
-				else{
+            // Seznam avtorjevih porocil
-					$row = mysqli_fetch_array($sql);		
+
-					$name = $row['value'];
+            // Prvo default porocilo
-				}
+            $sql = sisplet_query("SELECT value FROM srv_user_setting_for_survey WHERE sid='$this->ank_id' AND uid='$global_user_id' AND what='creport_default_profile_name'");		
-			}
+            if(mysqli_num_rows($sql) == 0){
-			else{
+                echo '<div class="list_item '.($this->creportProfile == 0 && $this->creportAuthor == $global_user_id ? 'active' : '').'" onClick="change_creport_profile(\'0\', \''.$global_user_id.'\');">';
-				$profile = $this->getProfile($this->creportProfile);				
+                echo $lang['srv_custom_report_default'];
-				$name = $profile['name'];
+                echo '</div>';	
-			}
+            }
-			echo '<span style="font-weight: normal;">';
+            else{
-			echo $lang['srv_custom_report_profile'].': <span class="bold pointer blue" onClick="showCReportProfiles();">"'.$name.'"</span>';
+                $row = mysqli_fetch_array($sql);		
-			echo '</span>';
+
+                echo '<div class="list_item '.($this->creportProfile == 0 && $this->creportAuthor == $global_user_id ? 'active' : '').'" onClick="change_creport_profile(\'0\', \''.$global_user_id.'\');">';
+                echo $row['value'];
+                echo '</div>';	
+            }
+		
+            // Loop po ostalih lastnih porocilih
+            $sqlReports = sisplet_query("SELECT * FROM srv_custom_report_profiles WHERE ank_id='$this->ank_id' AND usr_id='$global_user_id'");
+            while($rowReports = mysqli_fetch_array($sqlReports)){
+                echo '<div class="list_item '.($this->creportProfile == $rowReports['id'] && $this->creportAuthor == $global_user_id ? 'active' : '').'" onClick="change_creport_profile(\''.$rowReports['id'].'\', \''.$global_user_id.'\');">';
+                echo $rowReports['name'];
+                echo '</div>';		
+            }
+
+            // Loop po deljenih porocilih
+            $sqlSharedReports = sisplet_query("SELECT s.*, u.email FROM srv_custom_report_share s, users u WHERE ank_id='$this->ank_id' AND share_usr_id='$global_user_id' AND u.id=s.author_usr_id");
+            while($rowSharedReports = mysqli_fetch_array($sqlSharedReports)){
+
+                // Ce gre za osnovno porocilo ki ga ne more pobrisati
+                if($rowSharedReports['profile_id'] == 0){
+                    
+                    // Dobimo ime osnovnega porocila
+                    $what = 'creport_default_profile_name';
+                    $sqlN = sisplet_query("SELECT value FROM srv_user_setting_for_survey WHERE sid='$this->ank_id' AND uid='".$rowSharedReports['author_usr_id']."' AND what='$what'");		
+                    if(mysqli_num_rows($sqlN) == '0'){
+                        $default_name = $lang['srv_custom_report_default'];
+                    }
+                    else{
+                        $rowN = mysqli_fetch_array($sqlN);
+                        $default_name = ($rowN['value'] == '') ? $lang['srv_custom_report_default'] : $rowN['value'];
+                    }
+            
+                    echo '<div class="list_item '.($this->creportProfile == 0 && $this->creportAuthor == $rowSharedReports['author_usr_id'] ? 'active' : '').'" onClick="change_creport_profile(\'0\', \''.$rowSharedReports['author_usr_id'].'\');" id="creport_profile_0_'.$rowSharedReports['author_usr_id'].'" author="'.$rowSharedReports['author_usr_id'].'" value="0">';
+                    echo $default_name . ' ('.$rowSharedReports['email'].')';
+                    echo '</div>';
+                }
+                // Ce gre za dodatno porocilo ga imamo normalno v bazi
+                else{
+                    $sql = sisplet_query("SELECT * FROM srv_custom_report_profiles WHERE ank_id='$this->ank_id' AND usr_id='".$rowSharedReports['author_usr_id']."'");
+                    while($row = mysqli_fetch_array($sql)){
+                        echo '<div class="list_item '.($this->creportProfile == $row['id'] && $this->creportAuthor == $rowSharedReports['author_usr_id'] ? 'active' : '').'" onClick="change_creport_profile(\''.$row['id'].'\', \''.$rowSharedReports['author_usr_id'].'\');">';
+                        echo $row['name'] . ' ('.$rowSharedReports['email'].')';
+                        echo '</div>';		
+                    }
+                }
+            }
+
+            echo '</div>';
 
-			echo '</h2>';
 			
 			// Edit in add porocilo
-			echo '<div  style="display:inline-block; line-height:10px;">';
+			echo ' <span id="creport_profile_setting_edit" class="faicon edit" title="'.$lang['srv_custom_report_edit'].'"></span>';
-			echo ' <span id="creport_profile_setting_edit" class="faicon edit icon-as_link spaceLeft" style="margin-bottom:1px;" title="'.$lang['srv_custom_report_edit'].'"></span>';
+			echo ' <span id="creport_profile_setting_plus" class="faicon add" title="'.$lang['srv_custom_report_create'].'"></span>';
 
 			// Osnova porocila (prazna, vsi grafi, vse frekvence...) - prikazemo samo ce je porocilo prazno
 			if($this->checkEmpty($this->ank_id)){
-				echo '<span style="font-size:14px; font-weight: normal; margin-left: 20px;">';
+				echo '<span class="custom_report_base">';
-				echo $lang['srv_custom_report_base'].': ';
+				echo $lang['srv_custom_report_base'].':';
 				
-				echo '<select name="custom_report_base" id="custom_report_base" onChange="addCustomReportAllElementsAlert(this.value);">';
+				echo '<select name="custom_report_base" id="custom_report_base" class="dropdown medium" onChange="addCustomReportAllElementsAlert(this.value);">';
 				echo '	<option value="0">'.$lang['srv_custom_report_base_0'].'</option>';
 				echo '	<option value="1">'.$lang['srv_sumarnik'].'</option>';
 				echo '	<option value="2">'.$lang['srv_frequency'].'</option>';
@@ -145,37 +180,27 @@ class SurveyCustomReport {
 				echo '</select>';
 				echo '</span>';
 			}
-			echo '</div>';
+
+            echo '</div>';
+						
 			
-			// Stevilo vseh porocil
+			// Preklop na skrcen/razsirjen pogled in predogled				
-			$sqlC = sisplet_query("SELECT id FROM srv_custom_report_profiles WHERE ank_id='$this->ank_id' AND usr_id='$global_user_id'");
+            echo '<div id="custom_report_view">';
-			$report_count = mysqli_num_rows($sqlC);
+                            
-			if($report_count > 0)
+            if($this->expanded == 0)
-				echo '<div style="margin:-12px 0 20px 0; color:#555555; font-size:10px;">'.$lang['srv_custom_report_count'].': '.($report_count + 1).'</div>';
+                echo '<a href="index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport&expanded=1" class="noline"><span class="faicon compress"></span> '.$lang['srv_custom_report_expanded_0'].'</a>';
-			
+            else
-			
+                echo '<a href="index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport&expanded=0" class="noline"><span class="faicon expand"></span> '.$lang['srv_custom_report_expanded_1'].'</a>';		
-			// Preklop na skrcen/razsirjen pogled in predogled
+            
-			if ($this->isArchive == false && $this->publicCReport == false) {
+            // Preview
-				
+            echo '<a title="'.$lang['srv_custom_report_preview'].'" class="noline" onClick="showCReportPreview(); return false;" href="#"><span class="faicon monitor"></span> '.$lang['srv_custom_report_preview_short'].'</a>';
-				echo '<div id="custom_report_view">';
+            
-								
+            echo '</div>';
-				if($this->expanded == 0)
+		}
-					echo '<a href="index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport&expanded=1"><span class="faicon compress"></span> '.$lang['srv_custom_report_expanded_0'].'</a>';
-				else
-					echo '<a href="index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport&expanded=0"><span class="faicon expand"></span> '.$lang['srv_custom_report_expanded_1'].'</a>';		
-				
-				// Preview
-				echo ' &nbsp;<a title="'.$lang['srv_custom_report_preview'].'" onClick="showCReportPreview(); return false;" href="#"><span class="faicon preview pointer"></span> '.$lang['srv_custom_report_preview_short'].'</a>';
-				
-				echo '</div>';
-			}
-			
-		}		
-		
-		echo '<div id="custom_report_elements">';		
 		
 
-		
+		echo '<div id="custom_report_elements" class="div_analiza_holder">';		
+				
 		// ce arhiviramo imamo razsirjene elemente
 		$this->expanded = ($this->isArchive == false && $this->publicCReport == false) ? $this->expanded : 1;
 		
@@ -190,52 +215,63 @@ class SurveyCustomReport {
 				
 			echo '<ul id="custom_report_sortable">';			
 			
-			if ($this->isArchive == false && $this->publicCReport == false) {	
+
-				echo '<div class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'">';			
+            if ($this->isArchive == false && $this->publicCReport == false) {	
+				echo '<li class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'">';			
 				echo '<div class="add_element">';
 				$this->addNewElement(-1);
 				echo '</div>';
-				echo '</div>';
+				echo '</li>';
 			}
-					
+            
+	
 			// Loop po vseh dodanih elementih porocila
 			while($row = mysqli_fetch_array($sql)){
-				echo '<li id="sortable_report_element_'.$row['id'].'">';
 				
+                // V arhivih nimamo pagebreakov
+                if( $row['type'] == '-1' && ($this->isArchive != false || $this->publicCReport != false) ){
+                    continue;
+                }
+
+
+                echo '<li id="sortable_report_element_'.$row['id'].'" class="'.($row['type'] == '-1' ? 'report_element_break' : 'report_element_standard').'">';
+
 				// Pagebreak
-				if($row['type'] == '-1'){
+				if($row['type'] == '-1'){       
-					if ($this->isArchive == false && $this->publicCReport == false){
+                    echo '<div class="report_element">';      
-						$this->displayBreak($row);
+                    $this->displayBreak($row);
-					}
+                    echo '</div>';
 				}
+                // Navaden element
 				else{
 					echo '<div class="report_element '.($this->expanded == 1 && $this->isArchive == false && $this->publicCReport == false ? ' active':'').'" id="report_element_'.$row['id'].'">';
 					$this->displayReportElement($row['id'], $this->expanded);
 					echo '</div>';
 				}
 				
+                // Separator za elementom 
 				if ($this->isArchive == false && $this->publicCReport == false) {
-					echo '<div class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'" id="report_element_separator_'.$row['id'].'">';			
+                    echo '<div id="report_element_separator_'.$row['id'].'" class="report_element_separator '.($row['vrstni_red'] == $counter ? 'last_separator' : '').'" >';			
-					if($row['vrstni_red'] < $counter){
+                    echo '<div class="add_element">';
-						echo '<div class="add_element">';
+                    $this->addNewElement($row['id']);
-						$this->addNewElement($row['id']);
+                    echo '</div>';
-						echo '</div>';
+                    echo '</div>';
-					}
-					echo '</div>';
 				}
-				
+
-				echo '</li>';
+                echo '</li>';
 			}
 			
+
 			echo '</ul>';
 		}
-		else
+        else{
-			echo '<br /><br />';
+            echo '<div class="first_element_text">'.$lang['srv_custom_report_begin'].'</div>';
+        }
+
 		
 		if ($this->isArchive == false && $this->publicCReport == false) {
 			// Dodajanje novega porocila		
-			echo '<br />';
+			echo '<div class="add_element bottom">';
-			echo '<div class="add_element">';
 			$this->addNewElement();
 			echo '</div>';
 		}
@@ -318,7 +354,7 @@ class SurveyCustomReport {
 			echo '<div class="report_element_settings" '.($expanded == 0 ? ' style="display:none;"' : '').'>';
 			
 			// Tip izpisa (sums, freq, opisne...)
-			echo '<select name="report_element_type_'.$reportElement['id'].'" id="report_element_type_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'type\', this.value)">';
+			echo '<select name="report_element_type_'.$reportElement['id'].'" id="report_element_type_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'type\', this.value)">';
 			
 			// Ce ni izbrana
 			if ( $reportElement['type'] == null || $reportElement['type'] == 0 ) {
@@ -328,11 +364,14 @@ class SurveyCustomReport {
 			echo	'<option value="2" '.($reportElement['type'] == 2 ? 'selected="selected"' : '').'>'.$lang['srv_frequency'].'</option>';
 			echo	'<option value="3" '.($reportElement['type'] == 3 ? 'selected="selected"' : '').'>'.$lang['srv_descriptor_short'].'</option>';
 			echo	'<option value="4" '.($reportElement['type'] == 4 ? 'selected="selected"' : '').'>'.$lang['srv_chart'].'</option>';
-			echo	'<option value="5" '.($reportElement['type'] == 5 ? 'selected="selected"' : '').'>'.$lang['srv_crosstabs'].'</option>';
+
-			echo	'<option value="10" '.($reportElement['type'] == 10 ? 'selected="selected"' : '').'>'.$lang['srv_multicrosstab'].'</option>';
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") != 0){
-			echo	'<option value="6" '.($reportElement['type'] == 6 ? 'selected="selected"' : '').'>'.$lang['srv_means_label'].'</option>';
+			    echo	'<option value="5" '.($reportElement['type'] == 5 ? 'selected="selected"' : '').'>'.$lang['srv_crosstabs'].'</option>';
-			echo	'<option value="7" '.($reportElement['type'] == 7 ? 'selected="selected"' : '').'>'.$lang['srv_ttest'].'</option>';
+			    //echo	'<option value="10" '.($reportElement['type'] == 10 ? 'selected="selected"' : '').'>'.$lang['srv_multicrosstab'].'</option>';
-			echo	'<option value="9" '.($reportElement['type'] == 9 ? 'selected="selected"' : '').'>'.$lang['srv_break'].'</option>';		
+			    echo	'<option value="6" '.($reportElement['type'] == 6 ? 'selected="selected"' : '').'>'.$lang['srv_means_label'].'</option>';
+			    echo	'<option value="7" '.($reportElement['type'] == 7 ? 'selected="selected"' : '').'>'.$lang['srv_ttest'].'</option>';
+			    echo	'<option value="9" '.($reportElement['type'] == 9 ? 'selected="selected"' : '').'>'.$lang['srv_break'].'</option>';		
+            }
 
 			echo '</select>';
 
@@ -341,7 +380,7 @@ class SurveyCustomReport {
 			if($reportElement['type'] > 0 && $reportElement['type'] < 5){
 			
 				// Izbira spremneljivke
-				echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';		
+				echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';		
 				
 				// Ce ni izbrana
 				if ( $reportElement['spr1'] == null || $reportElement['spr1'] == '' ) {
@@ -388,7 +427,7 @@ class SurveyCustomReport {
 				$crossData2 = explode("-", $reportElement['spr2']);
 				
 				// Izbira spremneljivke 1
-				echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
+				echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
 				
 				# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 				if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0 ) {
@@ -411,7 +450,7 @@ class SurveyCustomReport {
 				
 				
 				// Izbira spremneljivke 2
-				echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
+				echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
 				
 				# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 				if ( $reportElement['spr2'] == null || $reportElement['spr2'] == 0 ) {
@@ -433,8 +472,11 @@ class SurveyCustomReport {
 				echo '</select>';
 				
 				// Izbira podtipa (tabela / graf)
-				echo ' <input style="margin-left:20px;" type="radio" value="0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Tabela ';
+				echo '  <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
-				echo '<input type="radio" value="1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Graf';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
+
+				echo '  <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
 			}
 			
 			// Nastavitve za MULTICROSSTABE
@@ -447,7 +489,7 @@ class SurveyCustomReport {
 				}
 				else{
 					// Izbira ze ustvarjene tabele
-					echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
+					echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
 					
 					# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 					if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0 ) {
@@ -472,7 +514,7 @@ class SurveyCustomReport {
 				$meanData2 = explode("-", $reportElement['spr2']);
 				
 				// Izbira spremneljivke 1
-				echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
+				echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
 				
 				# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 				if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0 ) {
@@ -495,7 +537,7 @@ class SurveyCustomReport {
 				
 				
 				// Izbira spremneljivke 2
-				echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
+				echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
 				
 				# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 				if ( $reportElement['spr2'] == null || $reportElement['spr2'] == 0 ) {
@@ -518,8 +560,11 @@ class SurveyCustomReport {
 				
 				
 				// Izbira podtipa (tabela / graf)
-				echo ' <input style="margin-left:20px;" type="radio" value="0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Tabela ';
+				echo '  <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
-				echo '<input type="radio" value="1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Graf';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
+
+				echo '  <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
 			}
 			
 			// Nastavitve za TTEST
@@ -534,7 +579,7 @@ class SurveyCustomReport {
 				$ttestData2 = explode("-", $reportElement['spr2']);
 				
 				// Izbira spremneljivke 1
-				echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
+				echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
 				
 				# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 				if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0 ) {
@@ -557,7 +602,7 @@ class SurveyCustomReport {
 				
 				
 				// Izbira spremneljivke 2
-				echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
+				echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
 				
 				# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 				if ( $reportElement['spr2'] == null || $reportElement['spr2'] == 0 ) {
@@ -580,8 +625,11 @@ class SurveyCustomReport {
 				
 				
 				// Izbira podtipa (tabela / graf)
-				echo ' <input style="margin-left:20px;" type="radio" value="0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Tabela ';
+				echo '  <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
-				echo '<input type="radio" value="1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />Graf';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
+				
+                echo '  <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
 			
 				
 				// Izbira dveh podvariabel za prvo variablo
@@ -600,7 +648,7 @@ class SurveyCustomReport {
 				// Izbira spremneljivke 1
 				$variables = $this->classInstance->getVariableList(2);
 
-				echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
+				echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
 				
 				# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 				if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0){
@@ -629,7 +677,7 @@ class SurveyCustomReport {
 				// Izbira spremneljivke 2
 				$variables = $this->getBreakDependentVariableList();
 				
-				echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
+				echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
 				
 				# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 				if ( $reportElement['spr2'] == null || $reportElement['spr2'] == 0 ) {
@@ -655,8 +703,11 @@ class SurveyCustomReport {
 				echo '</select>';
 				
 				// Izbira podtipa (tabela / graf)
-				echo ' <input style="margin-left:20px;" type="radio" value="0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />'.$lang['srv_table'];
+				echo '  <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
-				echo ' <input type="radio" value="1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />'.$lang['srv_chart'];
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
+				
+                echo '  <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
 			}
 				
 			echo '</div>';
@@ -668,14 +719,14 @@ class SurveyCustomReport {
 		global $site_path;
 		global $lang;
 		
-		echo '<div class="creport_bottom_settings">';
+		echo '<div class="analysis_bottom_settings printHide">';
 		
-		echo '<a href="#" onclick="doArchiveCReport();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'"><span class="faicon arhiv black very_large"></span></a>';
+		echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=creport_rtf&anketa=' . $this->ank_id) . '" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf"></span></a>';	
-		echo '<a href="#" onclick="createArchiveCReportBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '"><span class="faicon arhiv_mail black very_large"></span></a>';			
+		echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=creport_pdf&anketa=' . $this->ank_id) . '" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf"></span></a>';
-		
+        
-		echo '<a href="#" onClick="printAnaliza(\'CReport\'); return false;" title="'.$lang['hour_print2'].'"><span class="faicon print icon-grey_dark_link"></span></a>';
+		echo '<a href="#" onclick="doArchiveCReport();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'"><span class="faicon arhiv"></span></a>';
-		echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=creport_pdf&anketa=' . $this->ank_id) . '" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf black very_large"></span></a>';
+		echo '<a href="#" onclick="createArchiveCReportBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '"><span class="faicon arhiv_mail"></span></a>';			
-		echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=creport_rtf&anketa=' . $this->ank_id) . '" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf black very_large"></span></a>';	
+		echo '<a href="#" onClick="printAnaliza(\'CReport\'); return false;" title="'.$lang['hour_print2'].'"><span class="faicon print"></span></a>';
 		
 		echo '</div>';
 	}
@@ -684,7 +735,7 @@ class SurveyCustomReport {
 	function displayTTestSubVar($reportElement){
 		global $lang;
 		
-		echo '<div id="ttestVariablesSpan" style="margin: 10px 0 10px 80px;">';
+		echo '<div id="ttestVariablesSpan" style="margin: 0 0 0 32px;">';
 		
 		$ttestData1 = explode("-", $reportElement['spr1']);
 		$spr = $ttestData1[1];
@@ -706,7 +757,8 @@ class SurveyCustomReport {
 					$checked = ($check1 == $spr.'_'.$sekvenca.'_'.$value || $check2 == $spr.'_'.$sekvenca.'_'.$value) ? true : false;
 					$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
 					
-					echo '<label '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />('.$value.') - '.$option.'</label><br/>';
+					echo '<input id="subTtest_'.$reportElement['id'].'_'.$value.'" name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />';
+                    echo '<label for="subTtest_'.$reportElement['id'].'_'.$value.'" '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'>('.$value.') - '.$option.'</label><br/>';
 				}
 				break;
 				
@@ -717,7 +769,8 @@ class SurveyCustomReport {
 					$checked = ($check1 == $spr.'_'.$variable['sequence'].'_'.$option || $check2 == $spr.'_'.$variable['sequence'].'_'.$option) ? true : false;
 					$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
 					
-					echo '<label '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
+					echo '<input id="subTtest_'.$reportElement['id'].'_'.$variable['variable'].'" name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />';
+                    echo '<label for="subTtest_'.$reportElement['id'].'_'.$variable['variable'].'" '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'>('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
 				}
 				break;
 				
@@ -729,20 +782,22 @@ class SurveyCustomReport {
 					$checked = ($check1 == $spr.'_'.$sekvenca.'_'.$value || $check2 == $spr.'_'.$sekvenca.'_'.$value) ? true : false;
 					$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
 					
-					echo '<label '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />('.$value.') - '.$option.'</label><br/>';
+					echo '<input id="subTtest_'.$reportElement['id'].'_'.$value.'" name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />';
+                    echo '<label for="subTtest_'.$reportElement['id'].'_'.$value.'" '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'>('.$value.') - '.$option.'</label><br/>';
 				}
 				break;
 				
 			case 16:	#mcheck
 				#nardimo inpute za vse opcije
-				# poi<EFBFBD><EFBFBD>emo pripadajo<6A>o sekvenco
+				# poiščemo pripadajočo sekvenco
 				#nardimo inpute za vse opcije
 				$option = '1';
 				foreach ($_spr_data['grids'][$grid]['variables'] as $vid => $variable) {
 					$checked = ($check1 == $spr.'_'.$variable['sequence'].'_'.$option || $check2 == $spr.'_'.$variable['sequence'].'_'.$option) ? true : false;
 					$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
 					
-					echo '<label '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
+					echo '<input id="subTtest_'.$reportElement['id'].'_'.$variable['variable'].'" name="subTtest" class="subTtest_'.$reportElement['id'].'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" '.($checked ? ' checked="checked"' : '').' onchange="editCustomReportTTestVar(\''.$reportElement['id'].'\');" '.$disabled.' />';
+                    echo '<label for="subTtest_'.$reportElement['id'].'_'.$variable['variable'].'" '.($disabled == ' disabled="disabled"' ? 'class="gray"' : '').'>('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
 				}
 				break;
 
@@ -788,14 +843,6 @@ class SurveyCustomReport {
 			echo ' <span class="faicon copy icon-grey_dark_link" style="margin-left: 10px;" title="'.$lang['srv_custom_report_copy'].'" onClick="copyCustomReportElement(\''.$reportElement['id'].'\');"></span>';
 			// Brisi element
 			echo ' <span class="faicon delete icon-grey_dark_link" style="margin-left: 10px;" title="'.$lang['srv_custom_report_delete'].'" onClick="deleteCustomReportElement(\''.$reportElement['id'].'\');"></span>';	
-
-			// Uredi element
-			/*if($reportElement['type'] != 8)
-			if($expanded == 1)
-				echo ' <span class="sprites pointer arrow_contract" style="margin-left: 10px;" title="'.$lang['srv_custom_report_contract'].'" onClick="expandCustomReportElement(\''.$reportElement['id'].'\');"></span>';
-			else
-				echo ' <span class="sprites pointer arrow_expand" style="margin-left: 10px;" title="'.$lang['srv_custom_report_expand'].'" onClick="expandCustomReportElement(\''.$reportElement['id'].'\');"></span>';
-			*/
 			
 			echo '</div>';	
 			
@@ -834,17 +881,13 @@ class SurveyCustomReport {
 	function displayReportElementText($reportElement, $expanded){
 		global $lang;
 		
-		echo '<div class="report_element_text report_element_comment" '.($expanded == 0 ? ' style="display:none;"' : '').'>';
+		echo '<div class="report_element_text report_element_comment" '.($expanded == 0 ? 'style="display:none;"' : '').'>';
 			
 		if($expanded == 1 && $this->isArchive == false && $this->publicCReport == false){
-			echo '<span class="bold">'.$lang['srv_inv_archive_comment'].':</span>';
+			echo '<span class="title">'.$lang['srv_inv_archive_comment'].':</span>';
-			
-			echo '<span class="faicon edit2" title="'.$lang['srv_editor_title'].'" style="cursor:pointer; float:right; margin:20px 18px 0 0;" onclick="creport_load_editor(this); return false;"></span>';
-	
-			/*echo '<textarea style="width:100%; height:80px;" class="creport_textarea" el_id="'.$reportElement['id'].'" id="report_element_text_'.$reportElement['id'].'" onBlur="editCustomReportElement(\''.$reportElement['id'].'\', \'text\', this.value)">';
-			echo $reportElement['text'];
-			echo '</textarea>';*/
 			
+			echo '<span class="faicon edit" title="'.$lang['srv_editor_title'].'" onclick="creport_load_editor(this); return false;"></span>';
+				
 			echo '<div class="creport_text_inline" contenteditable="true" el_id="'.$reportElement['id'].'">';
 			echo $reportElement['text'];	
 			echo '</div>';
@@ -1587,9 +1630,9 @@ class SurveyCustomReport {
 	function displayBreak($reportElement){
 		global $lang;
 		
-		echo '<span class="report_element_pb" title="'.$lang['srv_rem_pagebreak'].'" onClick="deleteCustomReportElement(\''.$reportElement['id'].'\');">';
+		echo '<div class="pb_text" title="'.$lang['srv_rem_pagebreak'].'" onClick="deleteCustomReportElement(\''.$reportElement['id'].'\');">'.$lang['srv_rem_pagebreak'].'</div>';
-				
+        
-		echo '</span>';
+        echo '<div class="pb_line"></div>';
 	}
 	
 	// Izrisemo element z besedilom
@@ -1599,25 +1642,15 @@ class SurveyCustomReport {
 		// Glava elementa (naslov, ikone...)		
 		$this->displayReportElementHead($reportElement, $expanded);
 				
-		echo '<div class="report_element_text" style="padding-top:15px; '.($expanded == 0 ? ' display:none;' : '').'">';
+		echo '<div class="report_element_text" '.($expanded == 0 ? 'style="display:none;"' : '').'">';
-			
+
-		/*if($expanded == 1){
-		
-			echo '<span class="faicon edit2" title="'.$lang['srv_editor_title'].'" style="cursor:pointer; display:block; float:right;" onclick="creport_load_editor(this); return false;"></span>';
-		
-			echo '<textarea style="width:100%; height:80px;" class="creport_textarea" el_id="'.$reportElement['id'].'" id="report_element_text_'.$reportElement['id'].'" onBlur="editCustomReportElement(\''.$reportElement['id'].'\', \'text\', this.value)">';
-			echo $reportElement['text'];
-			echo '</textarea>';
-		}*/
-		//else{
 		if ($this->isArchive == false && $this->publicCReport == false) {
-			echo '<span class="faicon edit2" title="'.$lang['srv_editor_title'].'" style="cursor:pointer; display:block; float:right; margin:20px 18px 0 0;" onclick="creport_load_editor(this); return false;"></span>';
+			echo '<span class="faicon edit" title="'.$lang['srv_editor_title'].'" onclick="creport_load_editor(this); return false;"></span>';
 		}
 	
-		echo '<br /><div class="creport_text_inline" '.($this->isArchive == false && $this->publicCReport == false ? ' contenteditable="true"':'').' el_id="'.$reportElement['id'].'">';
+		echo '<div class="creport_text_inline" '.($this->isArchive == false && $this->publicCReport == false ? ' contenteditable="true"':'').' el_id="'.$reportElement['id'].'">';
 		echo $reportElement['text'];	
 		echo '</div>';
-		//}		
 		
 		echo '</div>';
 	}
@@ -1629,19 +1662,18 @@ class SurveyCustomReport {
 		
 		// Dodajanje vmes in na zacetku
 		if($id != 0){
-			echo '<span class="pointer" title="'.$lang['srv_custom_report_add'].'" style="margin-left: 20px; " onClick="addEmptyCustomReportElement(\''.$id.'\');"><span class="faicon add small icon-blue_light"></span> '.$lang['srv_custom_report_add'].'</span>';
+			echo '<span title="'.$lang['srv_custom_report_add'].'" onClick="addEmptyCustomReportElement(\''.$id.'\');"><span class="faicon add"></span>'.$lang['srv_custom_report_add'].'</span>';
 		
-			echo '<span class="pointer" title="'.$lang['srv_custom_report_add_text'].'" style="margin-left: 20px;" onClick="addTextCustomReportElement(\''.$id.'\');"><span class="faicon add small icon-blue_dark"></span> '.$lang['srv_custom_report_add_text'].'</span>';		
+			echo '<span title="'.$lang['srv_custom_report_add_text'].'" onClick="addTextCustomReportElement(\''.$id.'\');"><span class="faicon add"></span>'.$lang['srv_custom_report_add_text'].'</span>';		
 
 			if($id > 0)
-				echo '<span class="pointer" title="'.$lang['srv_add_pagebreak'].'" style="margin-left: 20px;" onClick="addPBCustomReportElement(\''.$id.'\');"><span class="faicon paragraph icon-blue"></span> '.$lang['srv_add_pagebreak'].'</span>';
+				echo '<span title="'.$lang['srv_add_pagebreak'].'" onClick="addPBCustomReportElement(\''.$id.'\');"><span class="faicon paragraph"></span>'.$lang['srv_add_pagebreak'].'</span>';
 		}
 		
 		// Dodajanje na dnu (brez page breaka)
 		if($id == 0){
-			echo '<span class="pointer" style="margin:-10px 0 10px 20px;" onClick="addEmptyCustomReportElement(\''.$id.'\');"><span class="faicon add small icon-blue_light" title="'.$lang['srv_custom_report_add'].'"></span> '.$lang['srv_custom_report_add'].'</span>';
+			echo '<button class="medium white-blue" onClick="addTextCustomReportElement(\''.$id.'\');"  title="'.$lang['srv_custom_report_add_text'].'">'.$lang['srv_custom_report_add_text'].'</button>';		
-	
+			echo '<button class="medium blue" onClick="addEmptyCustomReportElement(\''.$id.'\');"  title="'.$lang['srv_custom_report_add'].'">'.$lang['srv_custom_report_add'].'</button>';
-			echo '<span class="pointer" style="margin:-10px 0 10px 20px;" onClick="addTextCustomReportElement(\''.$id.'\');"><span class="faicon add small icon-blue_dark" title="'.$lang['srv_custom_report_add_text'].'"></span> '.$lang['srv_custom_report_add_text'].'</span>';		
 		}
 	}
 	
@@ -1711,7 +1743,8 @@ class SurveyCustomReport {
 		$name = $profile['name'];
 		
 		
-		echo '<h2>'.$lang['srv_custom_report_profile_title'].'</h2>';		
+		echo '<h2>'.$lang['srv_custom_report_profile_title'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="close_creport_profile(); return false;">✕</a></div>';		
 						
 		echo '<div id="creport_settings_profiles_left">';	
 		
@@ -1773,19 +1806,18 @@ class SurveyCustomReport {
 		// Ce je izbran custom profil imamo na dnu gumba brisi in preimenuj, pri default pa samo preimenuj
 		// Preimenuje, brise in share lahko samo za lastna porocila
 		if($this->creportAuthor == $global_user_id){
-			echo '<div style="float:left; margin-bottom:10px;">';
+
-			echo '<a href="#" onclick="creport_profile_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</a>'."\n";
+			echo '<p class="blue pointer top16 bottom8" onClick="creport_profile_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</p>';              
 			
 			if($this->creportProfile > 0)
-				echo '<br /><a href="#" onclick="creport_profile_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</a>'."\n";
+				echo '<p class="blue pointer bottom8" onclick="creport_profile_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</p>';
+			
+			echo '<p class="blue pointer bottom16" onclick="creport_profile_action(\'show_share\'); return false;">'.$lang['srv_custom_report_share'].'</p>';
 			
-			// Deli poročilo z drugimi uredniki
-			echo '<br /><a href="#" onclick="creport_profile_action(\'show_share\'); return false;">'.$lang['srv_custom_report_share'].'</a>'."\n";
-			echo '</div>';
 		}
 
 				
-		// Preberemo najkasneje editiran element (cas spreminjanja)
+		/*/ Preberemo najkasneje editiran element (cas spreminjanja)
 		$sqlt = sisplet_query("SELECT MAX(time_edit) FROM srv_custom_report WHERE ank_id='$this->ank_id' AND usr_id='$this->creportAuthor' AND profile='$this->creportProfile'");		
 		if(mysqli_num_rows($sqlt) > 0){
 			$rowt = mysqli_fetch_array($sqlt);
@@ -1795,16 +1827,16 @@ class SurveyCustomReport {
 			$time_edit = $time_created;	
 		
 		// Cas kreirranja in urejanja profila
-		echo '<div style="float:right; text-align:right;">';
+		echo '<div class="top16 bottom16">';
 		
 		if($time_created != '' && $time_created != '0000-00-00 00:00:00'){
 			$time_created = strtotime($time_created);
-			echo $lang['srv_custom_report_time_created'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span><br />';
+			echo '<p>'.$lang['srv_custom_report_time_created'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span></p>';
 		}
 		if($time_edit != '' && $time_edit != '0000-00-00 00:00:00'){
 			$time_edit = strtotime($time_edit);
-			echo $lang['srv_custom_report_time_edited'].': <span class="bold">'.date("d.m.Y H:i", $time_edit).'</span>';
+			echo '<p>'.$lang['srv_custom_report_time_edited'].': <span class="bold">'.date("d.m.Y H:i", $time_edit).'</span></p>';
-		}
+		}*/
 		
 		echo '</div>';
 			
@@ -1824,10 +1856,10 @@ class SurveyCustomReport {
 			$comment = $row['value'];
 		}		 
 		
-		echo '<span class="bold clr">'.$lang['srv_inv_archive_comment'].':</span>';		
+		echo '<p>'.$lang['srv_inv_archive_comment'].':</p>';		
 		// Komentar lahko popravlja samo avtor porocila
 		if($this->creportAuthor == $global_user_id)
-			echo '<textarea onBlur="creport_profile_comment(this.value)">'.$comment.'</textarea>';
+			echo '<textarea class="textarea" onBlur="creport_profile_comment(this.value)">'.$comment.'</textarea>';
 		else
 			echo '<span>'.$comment.'</span>';
 				
@@ -1836,15 +1868,13 @@ class SurveyCustomReport {
 		
 		// cover Div
         echo '<div id="dsp_cover_div"></div>'."\n";	
-		
-		echo '<span class="clr"></span>';
 
-		echo '<div style="position:absolute; bottom:20px; right:20px;">';
+		echo '<div class="button_holder">';
-		echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="use_creport_profile(); return false;"><span>'.$lang['srv_save_and_run_profile'].'</span></a></div></span>';
+        echo '<button class="medium white-black" onClick="close_creport_profile(); return false;">'.$lang['srv_zapri'].'</button>';              
-		echo '<span class="floatRight spaceRight" title="'.$lang['srv_custom_report_create'].'"><div class="buttonwrapper"><a class="ovalbutton" href="#" onclick="creport_profile_action(\'show_new\'); return false;"><span>'.$lang['srv_custom_report_create'] . '</span></a></div></span>';
+        echo '<button class="medium white-blue" onclick="creport_profile_action(\'show_new\'); return false;">'.$lang['srv_custom_report_create'].'</button>';
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton" href="#" onclick="close_creport_profile(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
+        echo '<button class="medium blue" onClick="use_creport_profile(); return false;">'.$lang['srv_save_and_run_profile'].'</button>';              
+        echo '</div>';
 
-		echo '</div>';
 	}
 	
 	function displayProfilePopups(){
@@ -1856,28 +1886,52 @@ class SurveyCustomReport {
 		
 		// div za kreacijo novega
         echo '<div id="newCReportProfile">';
-		echo '<div style="float:left; width:410px; text-align:right;">'.$lang['srv_custom_report_name'].': '."\n";
+
-        echo '<input id="newCReportProfileName" name="newCReportProfileName" type="text" value="" size="50"  /></div>'."\n";
+		echo '<h2>'.$lang['srv_custom_report_create2'].'</h2>';
-		echo '<div style="float:left; width:410px; text-align:right; padding:5px 0px;">'.$lang['srv_inv_archive_comment'].': '."\n";
+		echo '<div class="popup_close"><a href="#" onClick="creport_profile_action(\'cancel_new\'); return false;">✕</a></div>';
-		echo '<input id="newCReportProfileComment" name="newCReportProfileComment" type="text" value="" size="50"  /></div>'."\n";
+
-        echo '<br /><br /><br /><br /><span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'new\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_save'].'</span></a></span></span>'."\n";            
+		echo '<p>'.$lang['srv_custom_report_name'].':</p>';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="creport_profile_action(\'cancel_new\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+        echo '<input id="newCReportProfileName" name="newCReportProfileName" type="text" value="" class="text large"  />';
-        echo '</div>'."\n";
+
-		
+		echo '<p class="top16">'.$lang['srv_inv_archive_comment'].':</p>';
+
+		echo '<input id="newCReportProfileComment" name="newCReportProfileComment" type="text" value="" class="text large"  />';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_new\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+        echo '<button class="medium blue" onclick="creport_profile_action(\'new\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
+
+
 		// div za preimenovanje
-        echo '<div id="renameCReportProfile">'.$lang['srv_custom_report_name'].': '."\n";
+        echo '<div id="renameCReportProfile">';
-        echo '<input id="renameCReportProfileName" name="renameCReportProfileName" type="text" size="45" />'."\n";
+		
-        echo '<input id="renameCReportProfileId" type="hidden" value="' . $this->creportProfile . '"  />'."\n";
+		echo '<p>'.$lang['srv_custom_report_name'].':</p>';
-        echo '<br /><br /><span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'rename\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>'."\n";            
+        echo '<input id="renameCReportProfileName" name="renameCReportProfileName" type="text" class="text large" />';
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="creport_profile_action(\'cancel_rename\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+
-        echo '</div>'."\n";
+        echo '<input id="renameCReportProfileId" type="hidden" value="' . $this->creportProfile . '"  />';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_rename\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+        echo '<button class="medium blue" onclick="creport_profile_action(\'rename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+        echo '</div>';
+		
+        echo '</div>';
 		
 		// div za brisanje
-        echo '<div id="deleteCReportProfile">'.$lang['srv_custom_report_delete_confirm'].': <span id="deleteCReportProfileName" style="font-weight:bold;"></span>?'."\n";
+        echo '<div id="deleteCReportProfile">';
+
+		echo '<p>'.$lang['srv_custom_report_delete_confirm'].':<span id="deleteCReportProfileName" class="semi-bold"></span>?</p>';
         echo '<input id="deleteCReportProfileId" type="hidden" value="' . $this->creportProfile . '"  />'."\n";
-        echo '<br /><br /><span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'delete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'."\n";
+
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="creport_profile_action(\'cancel_delete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";            
+		echo '<div class="button_holder">';
-        echo '</div>'."\n";
+        echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+        echo '<button class="medium blue" onclick="creport_profile_action(\'delete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
+
+		echo '</div>';
 		
 		// div za deljenje z drugimi uredniki
         echo '<div id="shareCReportProfile">';
@@ -2225,16 +2279,17 @@ class SurveyCustomReport {
 		// Alert pri dodajanju prvega
 		if($_GET['a'] == 'first_alert'){
 					
+			echo '<h2>'.$lang['srv_custom_report_insert'].'</h2>';
+			echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\'); $(\'#custom_report_alert\').fadeOut();">✕</a></div>';
+			
 			echo $lang['srv_custom_report_first'];
-			/*Ozna<6E>eni element (tabela/graf) se je prenesel v poro<72>ilo po meri, kjer lahko prilagajate prikaz in zaporedje elementov*/
-				
-			echo '<a href="#" onClick="window.location = \''.$site_url.'admin/survey/index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport\';"><span style="display: block; padding-top: 10px;">'.$lang['srv_custom_report_link'].'</span></a>';	
 
-			echo '<div class="buttons">';	
+
-			
+			echo '<div class="button_holder">';
-			//echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_blue" href="#" onClick="window.location = \''.$site_url.'admin/survey/index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport\';"><span>'.$lang['srv_custom_report'].'</span></a></div></span>';					
+
-			echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton" href="#" onClick="$(\'#fade\').fadeOut(\'slow\'); $(\'#custom_report_alert\').fadeOut();"><span>'.$lang['srv_zapri'].'</span></a></div></span>';			
+			echo '<button class="medium white-blue" onClick="$(\'#fade\').fadeOut(\'slow\'); $(\'#custom_report_alert\').fadeOut();">'.$lang['srv_zapri'].'</button>';              
-			
+			echo '<button class="medium blue" onclick="window.location = \''.$site_url.'admin/survey/index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport\';">'.$lang['srv_custom_report_link'].'</button>';
+	
 			echo '</div>';
 		}
 	
@@ -2334,7 +2389,7 @@ class SurveyCustomReport {
 		// prikaz previewja
 		if($_GET['a'] == 'report_preview'){
 
-			echo '<h1 style="text-align: center; margin-top: 20px;">'.$lang['export_analisys_creport'].': '.SurveyInfo::getInstance()->getSurveyTitle().'</h1>';
+			echo '<h1 style="text-align: center; margin: 32px 0;">'.$lang['export_analisys_creport'].': '.SurveyInfo::getInstance()->getSurveyTitle().'</h1>';
 		
 			$this->setUpReturnAsHtml(false);
 			$this->setUpIsForArchive(true);
@@ -2343,10 +2398,8 @@ class SurveyCustomReport {
 		
 			$this->displayReport();
 			
-			echo '<div id="navigationBottom" class="printHide">';
+			echo '<div id="navigationBottom" class="button_holder below float-right printHide">';
-			echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="window.close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
+			echo '  <button class="medium blue" onclick="window.close(); return false;">'.$lang['srv_zapri'].'</button>';
-			//echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="icons/icons/printer.png" alt="'.$lang['hour_print2'].'" vartical-align="middle" />'.$lang['hour_print2'].'</span></a></div></span>';
-			echo '<div class="clr"></div>';
 			echo '</div>';
 		}
 		
@@ -2354,14 +2407,15 @@ class SurveyCustomReport {
 		if($_GET['a'] == 'all_elements_alert'){
 					
 			$type = (isset($_POST['type'])) ? $_POST['type'] : 0;
+
+			echo '<h2>'.$lang['srv_custom_report_comments_add'].'</h2>';
+			echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\'); $(\'#custom_report_alert\').fadeOut();">✕</a></div>';
 	
-			echo '<div style="margin-bottom: 10px;">'.$lang['srv_custom_report_comments_alert'.$type].'</div>';
+			echo '<p class="bottom16">'.$lang['srv_custom_report_comments_alert'.$type].'</p>';
-				
+
-			echo '<div class="buttons">';	
+			echo '<div class="button_holder">';
-			
+			echo '<button class="medium white-blue" onClick="$(\'#fade\').fadeOut(\'slow\'); $(\'#custom_report_alert\').fadeOut();">'.$lang['srv_custom_report_alert_no'].'</button>';              
-			echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton" href="#" onClick="$(\'#fade\').fadeOut(\'slow\'); $(\'#custom_report_alert\').fadeOut();"><span>'.$lang['srv_custom_report_alert_no'].'</span></a></div></span>';					
+			echo '<button class="medium blue" onclick="addCustomReportAllElements(\''.$type.'\');">'.$lang['srv_custom_report_alert_yes'].'</button>';
-			echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onClick="addCustomReportAllElements(\''.$type.'\');"><span>'.$lang['srv_custom_report_alert_yes'].'</span></a></div></span>';					
-			
 			echo '</div>';
 		}
 		
@@ -2537,8 +2591,6 @@ class SurveyCustomReport {
 			
 			SurveyUserSetting :: getInstance()->saveSettings('default_creport_profile', $id);
 			SurveyUserSetting :: getInstance()->saveSettings('default_creport_author', $author);
-			
-			//$this->displayReport();
 		}
 		
 		// urejanje komentarja profila
@@ -2558,9 +2610,12 @@ class SurveyCustomReport {
 	
 		// prikazemo deljenje profila z drugimi uredniki
 		if($_GET['a'] == 'shareProfileShow') {
-			
+
-			echo '<span class="bold clr" style="display:block; margin-bottom:25px;">'.$lang['srv_custom_report_share_long'].':</span>'."\n";
+
-			
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_custom_report_share_long'].':</span>';
+
+
 			if (isset ($_POST['id'])){
 				$id = $_POST['id'];
 				
@@ -2572,16 +2627,25 @@ class SurveyCustomReport {
 					if($user['id'] != $global_user_id){
 						$sql = sisplet_query("SELECT * FROM srv_custom_report_share WHERE ank_id='".$this->ank_id."' AND profile_id='".$id."' AND author_usr_id='".$global_user_id."' AND share_usr_id='".$user['id']."' LIMIT 1");
 						$checked = (mysqli_num_rows($sql) > 0) ? ' checked="checked"' : '';
-						
+
+						echo '<div class="setting_item">';
 						echo '<input type="checkbox" '.$checked.' name="share_usr_id[]" id="share_usr_id'.$user['id'].'" value="'.$user['id'].'"> ';
-						echo '<label for="share_usr_id'.$user['id'].'">'.$user['email'].'</label><br />';
+						echo '<label for="share_usr_id'.$user['id'].'">'.$user['email'].'</label>';
+						echo '</div>';
+						
 					}
 				}	  
 			}
-			
+
-			echo '<input id="shareCReportProfileId" type="hidden" value="' . $id . '"  />'."\n";
+			echo '</div>';
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'share\'); return false;"><span>'.$lang['srv_custom_report_share'].'</span></a></span></span>'."\n";            
+
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="creport_profile_action(\'cancel_share\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+			echo '<input id="shareCReportProfileId" type="hidden" value="' . $id . '"  />';
+
+
+			echo '<div class="button_holder">';
+			echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_share\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+			echo '<button class="medium blue" onclick="creport_profile_action(\'share\'); return false;">'.$lang['srv_custom_report_share'].'</button>';
+			echo '</div>';
 		}
 	
 		// delimo profil z drugimi uredniki

admin/survey/classes/class.SurveyDataSettingProfiles.php

@@ -572,14 +572,9 @@ class SurveyDataSettingProfiles {
 		$css = (self::$currentProfileId == SDS_DEFAULT_PROFILE ? ' gray' : '');
 		
 		if ($hideAdvanced == false || self::$currentProfileId != SDS_DEFAULT_PROFILE) { 
-			if ($_GET['a'] != 'data') {
-				# v podatkih imamo nastavitve na prvem mestum zato ne rišemo spejsrja
-				echo '<li class="space">&nbsp;</li>';
-			}
 			echo '<li>';
-	        echo '<span class="as_link'.$css.'" id="dsp_link" title="' . $lang['srv_dsp_link_title'] . '">' . $lang['srv_dsp_link'] . '</span>'."\n";
+	        echo '  <span class="'.$css.'" id="dsp_link" title="' . $lang['srv_dsp_link_title'] . '">' . $lang['srv_dsp_link'] . '</span>'."\n";
 	        echo '</li>';
-	      
 		}
 	}
 	
@@ -616,47 +611,60 @@ class SurveyDataSettingProfiles {
         }
         $currentFilterProfile = $_all_profiles[$current_pid];
         if ( self::$currentProfileId != SDS_DEFAULT_PROFILE ) {
-	       	echo '<div id="not_default_setting">';
+	       	echo '<div id="not_default_setting" class="popup_note">';
 	        echo $lang['srv_not_default_setting'];
-	        echo '</div><br class="clr displayNone">';
+	        echo '</div>';
         }
         
-       	echo '<div id="dsp_profiles_left">';
+
-       	echo '<span id="dsp_profiles_holder">';
+        echo '<div class="popup_main with_menu">';
+        
+        echo '<div id="dsp_profiles_left" class="popup_left">';
+        echo '<div id="dsp_profiles_holder">';
+
 		# zlistamo vse profile
-       	echo '<span id="dsp_profiles" class="select">';
+        echo '<div id="dsp_profiles" class="list select">';
 		if (count($_all_profiles)) {
-			foreach ($_all_profiles as $id=>$profile) {
+            foreach ($_all_profiles as $id=>$profile) {
-				
+                
-				echo '<div class="option' . ($current_pid == $id ? ' active' : '') . '" id="dataSetting_profile_' . $id . '" value="'.$id.'">';			
+                echo '<div class="list-item option '.($current_pid == $id ? 'active' : '').'" id="dataSetting_profile_' . $id . '" value="'.$id.'">';			
 				
 				echo $profile['name'];
 				
 				if($current_pid == $id){
-					# sistemskega ne moremo izbrisati
+                    echo '<div class="profile_icons">';
+
+                    # sistemskega ne moremo izbrisati
 					if ($current_pid != 0) {
-						echo ' <a href="#" onclick="dataSettingProfileAction(\'show_delete\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
+                        echo ' <a href="#" onclick="dataSettingProfileAction(\'show_delete\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
 					}
 					# sistemskega in seje ne moremo preimenovati
 					if ($current_pid > 0) {
-						echo ' <a href="#" onclick="dataSettingProfileAction(\'show_rename\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
+                        echo ' <a href="#" onclick="dataSettingProfileAction(\'show_rename\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
 					}
+                    
+                    echo '</div>';	
 				}	
 				
 				echo '</div>';	
 			}
 		}
-		echo '</span>'; # dataSetting_profile
+		echo '</div>'; # dataSetting_profile
-		echo '</span>'; # dsp_profiles_holder
-				
-		echo '</div>'; # dsp_profiles_left
 
-		echo '<div id="dsp_profiles_right">'."\n";
+        // Gumb za dodajanje novega profila
+        echo '<button class="small white-black" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">';
+        echo '  <span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'];
+        echo '</button>';
+
+		echo '</div>'; # dsp_profiles_holder
+		echo '</div>'; # dsp_profiles_left
+        
+        
+		echo '<div id="dsp_profiles_right" class="popup_right">'."\n";
 		if ($current_pid == 0) {
-			echo '<div id="dsp_note">';
+			echo '<div id="dsp_note" class="popup_right_note">';
 			echo $lang['srv_change_default_profile'];
 			echo '</div>'; // dataSetting_profile_note
-			echo '<br class="clr" />'."\n";
 		}	
 		
 		echo '<div id="dsp_content">';
@@ -665,21 +673,25 @@ class SurveyDataSettingProfiles {
 		
 		echo '</div>'; // dataSetting_profile_right
 		
+        echo '</div>';
+
 		
-		echo '<div id="dsp_button_holder">'."\n";
+		echo '<div id="dsp_button_holder" class="button_holder">'."\n";
 		if ((int)$current_pid <= 0 ) {
-			if ((int)$current_pid == 0) {
+            
-				echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
+            echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
-				echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
+			
-			} else {
+            if ((int)$current_pid == 0) {
-				echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
+                echo '<button class="medium white-blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
+                echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="dataSettingProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
+			} 
+            else {
+                echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
 			}
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
+		} 
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
+        else  {
-		} else  {
+			echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';		
-			echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
+            echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="dataSettingProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';		
 		}
 		echo '</div>'."\n"; // dsp_button_holder
 		
@@ -688,26 +700,51 @@ class SurveyDataSettingProfiles {
         echo '<div id="dsp_cover_div"></div>'."\n";
 		
         // div za kreacijo novega
-        echo '<div id="newProfileDiv">'.$lang['srv_missing_profile_name'].': '."\n";
+        echo '<div id="newProfileDiv">';
-        echo '<input id="newProfileName" name="newProfileName" type="text" value="" size="45"  />'."\n";
+		
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'do_create\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_save'].'</span></a></span></span>'."\n";            
+		echo '<div class="setting_holder">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel_create\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+
-        echo '</div>'."\n";
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="dataSettingProfileAction(\'cancel_create\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="dataSettingProfileAction(\'do_create\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
         
         // div za preimenovanje
-        echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': '."\n";
+        echo '<div id="renameProfileDiv">';
-        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" size="45"  />'."\n";
+		
-        echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />'."\n";
+		echo '<div class="setting_item">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'do_rename\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>'."\n";            
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel_rename\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" class="text large"/>';
-        echo '</div>'."\n";
+        echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="dataSettingProfileAction(\'cancel_rename\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="dataSettingProfileAction(\'do_rename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+        echo '</div>';
+		
+        echo '</div>';
                 
         // div za brisanje
-        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . $currentFilterProfile['name'] . '</b>?'."\n";
+        echo '<div id="deleteProfileDiv">';
-        echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />'."\n";
+		
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'do_delete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'."\n";
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . $currentFilterProfile['name'] . '</span>?';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel_delete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";            
+        echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
-        echo '</div>'."\n";		
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="dataSettingProfileAction(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="dataSettingProfileAction(\'do_delete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
+        
+        echo '</div>';		
 	}
 	
 	/** Funkcija prikaze osnovnih informacije profila
@@ -725,64 +762,64 @@ class SurveyDataSettingProfiles {
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_results_filter_settings'].'</legend>';
 		
-		echo '<label><input id="showCategories" name="showCategories" type="checkbox" ' .
-		 (($cp['showCategories']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_analiza_kategorialneSpremenljivke'];
-        echo '</label>';
-        
-		echo '<label><input id="showOther" name="showOther" type="checkbox" ' .
-			  (($cp['showOther']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-			  #(($cp['showCategories']) ? '' : ' disabled="disabled" ')
-		echo  $lang['srv_analiza_ShowOthersText'] ;
-        echo '</label>';
-        
-		echo '<label><input id="showNumbers" name="showNumbers" type="checkbox" ' .
-		 (($cp['showNumbers']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_analiza_numericneSpremenljivke'];
-        echo '</label>';
-        
-		echo '<label><input id="showText" name="showText" type="checkbox" ' .
-		 (($cp['showText']) ? ' checked="checked" ' : ' ') . ' autocomplete="off"/>';
-        echo '</label>';
-        
-        echo $lang['srv_analiza_textovneSpremenljivke'];
-        
-		echo '<br />'.$lang['srv_analiza_link'].': ';
-		echo '<select id="analysisGoTo">';
-		echo '<option value="0"'.((int)$cp['analysisGoTo'] == 0 ? ' selected="selected"' : '').'>'.$lang['srv_analiza_charts'].'</option>';
-		echo '<option value="1"'.((int)$cp['analysisGoTo'] == 1 ? ' selected="selected"' : '').'>'.$lang['srv_sumarnik'].'</option>';
-        echo '</select>';
-        
-        echo '<br/>';
-        
-		echo '<label>';	
-		echo '<input id="analiza_legenda" name="analiza_legenda" type="checkbox" ' .(($cp['analiza_legenda'] == '1') ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_analiza_showLegend'];
-		echo '</label>';
 
-        echo '<br/>';
+        echo '<div class="setting_line">';
+
+        echo '  <input id="showCategories" name="showCategories" type="checkbox" '.(($cp['showCategories']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+		echo '  <label for="showCategories">'.$lang['srv_analiza_kategorialneSpremenljivke'].'</label>';
         
-		echo '<label>';
+        echo '  <input id="showOther" name="showOther" type="checkbox" '.(($cp['showOther']) ? ' checked="checked" ' : '').' autocomplete="off" />';
-		echo '<input id="hideEmpty" name="hideEmpty" type="checkbox" ' .
+		echo '  <label for="showOther">'.$lang['srv_analiza_ShowOthersText'].'</label>';
-			  (($cp['hideEmpty']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo  $lang['srv_analiza_hideEmpty'] ;
-        echo '</label>';
         
-        echo '<br/>';
+        echo '  <input id="showNumbers" name="showNumbers" type="checkbox" '.(($cp['showNumbers']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+		echo '  <label for="showNumbers">'.$lang['srv_analiza_numericneSpremenljivke'].'</label>';
         
-		echo '<label>';
+        echo '  <input id="showText" name="showText" type="checkbox" '.(($cp['showText']) ? ' checked="checked" ' : '').' autocomplete="off" />';
-		echo '<input id="hideAllSystem" name="hideAllSystem" type="checkbox" ' .
+		echo '  <label for="showText">'.$lang['srv_analiza_textovneSpremenljivke'].'</label>';
-			  (($cp['hideAllSystem']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo  $lang['srv_analiza_hideAllEmpty'] ;
-        echo '</label>';
         
-        echo '<br/>';
+        echo '</div>';
+ 
         
-		echo '<label>';
+        echo '<div class="setting_line">';
-		echo $lang['srv_analiza_defAnsCnt'].": ";
+
+		echo '  <label>'.$lang['srv_analiza_link'].':<label>';
+		echo '  <select id="analysisGoTo">';
+		echo '      <option value="0"'.((int)$cp['analysisGoTo'] == 0 ? ' selected="selected"' : '').'>'.$lang['srv_analiza_charts'].'</option>';
+		echo '      <option value="1"'.((int)$cp['analysisGoTo'] == 1 ? ' selected="selected"' : '').'>'.$lang['srv_sumarnik'].'</option>';
+        echo '  </select>';
+
+        echo '</div>';
+        
+
+        echo '<div class="setting_line">';
+
+		echo '  <input id="analiza_legenda" name="analiza_legenda" type="checkbox" ' .(($cp['analiza_legenda'] == '1') ? ' checked="checked" ' : '') . ' autocomplete="off" />';
+		echo '  <label for="analiza_legenda">'.$lang['srv_analiza_showLegend'].'</label>';
+
+        echo '</div>';
+
+        
+        echo '<div class="setting_line">';
+
+		echo '  <input id="hideEmpty" name="hideEmpty" type="checkbox" '.(($cp['hideEmpty']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+        echo '  <label for="hideEmpty">'.$lang['srv_analiza_hideEmpty'].'</label>';
+        
+        echo '</div>';
+
+        
+        echo '<div class="setting_line">';
+
+        echo '<input id="hideAllSystem" name="hideAllSystem" type="checkbox" '.(($cp['hideAllSystem']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+        echo '<label for="hideAllSystem">'.$lang['srv_analiza_hideAllEmpty'].'</label>';
+        
+        echo '</div>';
+
+        
+        echo '<div class="setting_line">';
+
+		echo '<label>'.$lang['srv_analiza_defAnsCnt'].":</label>";
 		echo '<select id="numOpenAnswers" name="numOpenAnswers" autocomplete="off">';
 		$lastElement = end(self::$textAnswersMore);
-		
 		foreach (self::$textAnswersMore AS $key => $values) {
 			echo '<option'.((int)$cp['numOpenAnswers'] == $values ? ' selected="selected"' : '').' value="'.$values.'">';
 			if ($values != $lastElement) {
@@ -793,80 +830,100 @@ class SurveyDataSettingProfiles {
 			echo '</option>';
 		}
 		echo '</select>';
-        echo '</label>';
+
+        echo '</div>';
         
 		echo '</fieldset>';
 		
 		
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_results_base_settings'].'</legend>';
-		echo '<span class="dsp_sett_label">'.$lang['srv_results_num_digits'].'</span>';
+
-		echo '&nbsp;&nbsp;<span clsss="dsp_sett_label">'.$lang['srv_results_for_percents'].':&nbsp;</span><input type="text" id="dsp_ndp" name="dsp_ndp" value="'.$cp['dsp_ndp'].'" size="2" autocomplete="off">';
+
-		echo '&nbsp;&nbsp;<span class="dsp_sett_label">'.$lang['srv_results_for_average'].':&nbsp;</span><input type="text" id="dsp_nda" name="dsp_nda" value="'.$cp['dsp_nda'].'" size="2" autocomplete="off">';
+        echo '<div class="setting_line">';
-		echo '&nbsp;&nbsp;<span class="dsp_sett_label">'.$lang['srv_results_for_deviation'].':&nbsp;</span><input type="text" id="dsp_ndd" name="dsp_ndd" value="'.$cp['dsp_ndd'].'" size="2" autocomplete="off">';
+		echo '  <label>'.$lang['srv_results_num_digits'].'</label>';
-		
+        echo '</div>';
-		echo '<br/>'.$lang['srv_results_decimal_sign'].': ';
+
+        echo '<div class="setting_line">';
+		echo '  <label for="dsp_ndp">'.$lang['srv_results_for_percents'].':</label>';
+        echo '  <input type="text" id="dsp_ndp" name="dsp_ndp" value="'.$cp['dsp_ndp'].'" size="2" autocomplete="off">';
+        echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <label for="dsp_nda">'.$lang['srv_results_for_average'].':</label>';
+        echo '  <input type="text" id="dsp_nda" name="dsp_nda" value="'.$cp['dsp_nda'].'" size="2" autocomplete="off">';
+        echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <label for="dsp_ndd">'.$lang['srv_results_for_deviation'].':</label>';
+        echo '  <input type="text" id="dsp_ndd" name="dsp_ndd" value="'.$cp['dsp_ndd'].'" size="2" autocomplete="off">';
+		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '<label>'.$lang['srv_results_decimal_sign'].':</label>';
 		foreach (self::$seperators AS $skey => $seperators) {
-			echo '<label>';
+            echo '<input type="radio" id="radio_dsp_sep_'.$skey.'" name="radio_dsp_sep" value="'.$skey.'"'.($cp['dsp_sep'] == $skey ? ' checked="checked"' : '').' autocomplete="off">';
-			echo '<input type="radio" id="radio_dsp_sep_'.$skey.'" name="radio_dsp_sep" value="'.$skey.'"'.($cp['dsp_sep'] == $skey ? ' checked="checked"' : '').' autocomplete="off">';
+			echo '<label for="radio_dsp_sep_'.$skey.'">'.self::formatNumber('1234.56', 2, $seperators).'</label>';
-			echo self::formatNumber('1234.56',2,$seperators);
-			echo '</label>';
 		}
+        echo '</div>';
+        
 		echo '</fieldset>';
 
 		
 		// Nastavitve za crosstabe - prikazemo samo v crosstabih
 		echo '<fieldset '.(isset($_POST['podstran']) && $_POST['podstran'] == 'crosstabs' ? '' : ' style="display:none;"').'>';
 		echo '<legend>'.$lang['srv_results_crostabs_settings'].'</legend>';
-		echo '<span class="dsp_sett_label">'.$lang['srv_results_num_digits'].'</span>';
+
-		echo '&nbsp;&nbsp;<span clsss="dsp_sett_label">'.$lang['srv_results_for_residual'].':&nbsp;</span><input type="text" id="dsp_res" name="dsp_res" value="'.$cp['dsp_res'].'" size="2" autocomplete="off">';
+        echo '<div class="setting_line">';
+		echo '  <label for="dsp_res">'.$lang['srv_results_num_digits'].' '.$lang['srv_results_for_residual'].':</label>';
+		echo '  <input type="text" id="dsp_res" name="dsp_res" value="'.$cp['dsp_res'].'" size="2" autocomplete="off">';
+		echo '</div>';
 		
-		echo '<div class="crossCheckHolder">' ;
+		echo '<div class="setting_line">';
-		echo '<div class="crossCheckHolder">' ;
+		echo '  <input id="crossCheck1" name="crossCheck1" type="checkbox" ' . ($cp['crossChk1'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-//		echo '<input id="crossCheck0" name="crossCheck0" type="checkbox" ' . ($cp['crossChk0'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span name="spn_residual" class="ctbChck_sp0">' . $lang['srv_analiza_crosstab_frekvence'] . '</span><br />';
+		echo '  <label for="crossCheck1">'.$lang['srv_analiza_crosstab_odstotek_vrstice'].'</label>';
-		echo '<label>';
-		echo '<input id="crossCheck1" name="crossCheck1" type="checkbox" ' . ($cp['crossChk1'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp1" class="ctbChck_sp1">' . $lang['srv_analiza_crosstab_odstotek_vrstice'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheck2" name="crossCheck2" type="checkbox" ' . ($cp['crossChk2'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp2" class="ctbChck_sp2">' . $lang['srv_analiza_crosstab_odstotek_stolpci'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheck3" name="crossCheck3" type="checkbox" ' . ($cp['crossChk3'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp3" class="ctbChck_sp3">' . $lang['srv_analiza_crosstab_odstotek_skupni'] . '</span><br />';
-		echo '</label>';
 		echo '</div>';
 
-		echo '<div class="crossCheckHolder">' ;
+        echo '<div class="setting_line">';
-		echo '<label>';
+		echo '  <input id="crossCheck2" name="crossCheck2" type="checkbox" ' . ($cp['crossChk2'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo '<input id="crossCheckEC" name="crossCheckEC" type="checkbox" ' . ($cp['crossChkEC'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_EC" class="crossCheck_EC">' . $lang['srv_analiza_crosstab_expected_count'] . '</span><br />';
+		echo '  <label for="crossCheck2">'.$lang['srv_analiza_crosstab_odstotek_stolpci'].'</label>';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheckRE" name="crossCheckRE" type="checkbox" ' . ($cp['crossChkRE'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_RE" class="crossCheck_RE">' . $lang['srv_analiza_crosstab_residual'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheckSR" name="crossCheckSR" type="checkbox" ' . ($cp['crossChkSR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_SR" class="crossCheck_SR">' . $lang['srv_analiza_crosstab_stnd_residual'] . '</span><br />';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheckAR" name="crossCheckAR" type="checkbox" ' . ($cp['crossChkAR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_AR" class="crossCheck_AR">' . $lang['srv_analiza_crosstab_adjs_residual'] . '</span><br />';
-		echo '</label>';
 		echo '</div>';
-		
+
-		echo '<div class="crossCheckHolder">' ;
+        echo '<div class="setting_line">';
-		echo '<label>';
+		echo '  <input id="crossCheck3" name="crossCheck3" type="checkbox" ' . ($cp['crossChk3'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo '<input id="crossCheckColor" name="crossCheckColor" type="checkbox" ' . ($cp['doColor'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span class="crossCheckColor">' . $lang['srv_analiza_crosstab_color_residual1'] . '</span><br />';
+		echo '  <label for="crossCheck3">'.$lang['srv_analiza_crosstab_odstotek_skupni'].'</label>';
-		echo '</label>';
-		echo '<label>';
-		echo '<input id="crossCheckValues" name="crossCheckValues" type="checkbox" ' . ($cp['doValues'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span class="crossCheckValues">' . $lang['srv_analiza_crosstab_doValues'] . '</span>';
-		echo '</label>';
-		/*
-		echo '<table id="tbl_color_ersidual" class="residual">';
-		echo '<tr><td>'.$lang['srv_analiza_crosstab_value'].'</td><th>+</th><th>-</th></tr>';
-		echo '<tr><td>1.1 - 2.0</td><td class="rsdl_bck1">&nbsp;</td><td class="rsdl_bck4">&nbsp;</td></tr>';
-		echo '<tr><td>2.1 - 3.0</td><td class="rsdl_bck2">&nbsp;</td><td class="rsdl_bck5">&nbsp;</td></tr>';
-		echo '<tr><td>3.1 '.$lang['srv_analiza_crosstab_and_more'].'</td><td class="rsdl_bck3">&nbsp;</td><td class="rsdl_bck6">&nbsp;</td></tr>';
-		echo '</table>';
-*/
 		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckEC" name="crossCheckEC" type="checkbox" ' . ($cp['crossChkEC'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckEC">'.$lang['srv_analiza_crosstab_expected_count'].'</label>';
 		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckRE" name="crossCheckRE" type="checkbox" ' . ($cp['crossChkRE'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckRE">'.$lang['srv_analiza_crosstab_residual'].'</label>';
+		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckSR" name="crossCheckSR" type="checkbox" ' . ($cp['crossChkSR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckSR">'.$lang['srv_analiza_crosstab_stnd_residual'].'</label>';
+		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckAR" name="crossCheckAR" type="checkbox" ' . ($cp['crossChkAR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckAR">'.$lang['srv_analiza_crosstab_adjs_residual'].'</label>';
+		echo '</div>';
+        
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckColor" name="crossCheckColor" type="checkbox" ' . ($cp['doColor'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckColor">'.$lang['srv_analiza_crosstab_color_residual1'].'</label>';
+		echo '</div>';
+
+        echo '<div class="setting_line">';
+		echo '  <input id="crossCheckValues" name="crossCheckValues" type="checkbox" ' . ($cp['doValues'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '  <label for="crossCheckValues">'.$lang['srv_analiza_crosstab_doValues'].'</label>';
+		echo '</div>';
+
 		echo '</fieldset>';
 		
 		
@@ -874,189 +931,91 @@ class SurveyDataSettingProfiles {
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_results_charts_settings'].'</legend>';
 
+
 		// default poravnava tabel
-		echo $lang['srv_chart_table_defAlign'].': ';
+        echo '<div class="setting_line">';
-		echo '<label>';
+
-		echo '<input type="radio" id="chartTableAlign_0" name="chartTableAlign" value="0"'.($cp['chartTableAlign'] == 0 ? ' checked="checked"' : '').' autocomplete="off">'.$lang['srv_chart_table_defAlign_0'];
+		echo '  <label>'.$lang['srv_chart_table_defAlign'].':</label>';
-		echo '</label>';
+
-		echo '<label>';
+		echo '  <input type="radio" id="chartTableAlign_0" name="chartTableAlign" value="0"'.($cp['chartTableAlign'] == 0 ? ' checked="checked"' : '').' autocomplete="off">';
-		echo '<input type="radio" id="chartTableAlign_1" name="chartTableAlign" value="1"'.($cp['chartTableAlign'] == 1 ? ' checked="checked"' : '').' autocomplete="off">'.$lang['srv_chart_table_defAlign_1'];
+		echo '  <label for="chartTableAlign_0">'.$lang['srv_chart_table_defAlign_0'].'</label>';
-		echo '</label>';
+		
+        echo '  <input type="radio" id="chartTableAlign_1" name="chartTableAlign" value="1"'.($cp['chartTableAlign'] == 1 ? ' checked="checked"' : '').' autocomplete="off">';
+		echo '  <label for="chartTableAlign_1">'.$lang['srv_chart_table_defAlign_1'].'</label>';
+        
+        echo '</div>';
+
+
 		// velikost pisave v grafih
-		echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
+        echo '<div class="setting_line">';
-		echo '<select name="chartFontSize" id="chartFontSize" >';
+
+		echo '<label for="chartFontSize">'.$lang['srv_export_font'].':</label>';
+		echo '<select name="chartFontSize" id="chartFontSize">';
 		echo '	<option value="8"'.((int)$cp['chartFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
 		echo '	<option value="9"'.((int)$cp['chartFontSize'] == 9 ? ' selected="selected"' : '').'>9</option>';
 		echo '	<option value="10"'.((int)$cp['chartFontSize'] == 10 ? ' selected="selected"' : '').'>10</option>';
 		echo '	<option value="11"'.((int)$cp['chartFontSize'] == 11 ? ' selected="selected"' : '').'>11</option>';
 		echo '	<option value="12"'.((int)$cp['chartFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
 		echo '</select>';
+
+        echo '</div>';
+
 		
 		// prikaz texta ob numerusu
-		echo '<br /><label>' . $lang['srv_chart_numerusText'] . ': </label>';
+        echo '<div class="setting_line">';
-		echo '<select name="chartNumerusText" id="chartNumerusText" >';
+
+		echo '<label for="chartNumerusText">' . $lang['srv_chart_numerusText'] . ':</label>';
+		echo '<select name="chartNumerusText" id="chartNumerusText">';
 		echo '	<option value="0"'.((int)$cp['chartNumerusText'] == 0 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_0'] . '</option>';
 		echo '	<option value="1"'.((int)$cp['chartNumerusText'] == 1 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_1'] . '</option>';
 		echo '	<option value="2"'.((int)$cp['chartNumerusText'] == 2 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_2'] . '</option>';
 		echo '	<option value="3"'.((int)$cp['chartNumerusText'] == 3 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_3'] . '</option>';
 		echo '	<option value="4"'.((int)$cp['chartNumerusText'] == 4 ? ' selected="selected"' : '').'>' . $lang['without'] . '</option>';	
 		echo '</select>';
+
+        echo '</div>';
+
 		
 		// prikaz povprecja
-		echo '<br /><label>' . $lang['srv_chart_showAvg_long'] . ': </label>';
+        echo '<div class="setting_line">';
-		echo '<select name="chartAvgText" id="chartAvgText" >';
+
+		echo '<label for="chartAvgText">' . $lang['srv_chart_showAvg_long'] . ':</label>';
+		echo '<select name="chartAvgText" id="chartAvgText">';
 		echo '	<option value="1"'.((int)$cp['chartAvgText'] == 1 ? ' selected="selected"' : '').'>' . $lang['yes'] . '</option>';
 		echo '	<option value="0"'.((int)$cp['chartAvgText'] == 0 ? ' selected="selected"' : '').'>' . $lang['no'] . '</option>';
 		echo '</select>';
+
+        echo '</div>';
+
 		
 		// stevilcenje vprasanj
-		echo '<br />';
+		echo '<div class="setting_line">';
-		echo '<label>';
+
-		echo '<input id="chartNumbering" name="chartNumbering" type="checkbox" ' .
+		echo '<input id="chartNumbering" name="chartNumbering" type="checkbox" '.(($cp['chartNumbering']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
-		 (($cp['chartNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '<label for="chartNumbering">' . $lang['srv_nastavitveStevilcenje'] . ':</label>';
-		echo $lang['srv_nastavitveStevilcenje'];
+
-		echo '</label>';
+        echo '</div>';
+
+
 		// uvodna stran v izvozu
-		echo '<br />';	
+		echo '<div class="setting_line">';
-		echo '<label>';
+
-		echo '<input id="chartFP" name="chartFP" type="checkbox" ' .
+		echo '<input id="chartFP" name="chartFP" type="checkbox" '.(($cp['chartFP']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
-			  (($cp['chartFP']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '<label for="chartFP">' . $lang['srv_chart_frontpage'] . ':</label>';
-		echo  $lang['srv_chart_frontpage'] ;	
+
-		echo '</label>';
+        echo '</div>';
-		// prikaz textovnih odgovorov (vec)
+
-		/*echo '<br />';
+
-		echo '<label>';
-		echo '<input id="chartTableMore" name="chartTableMore" type="checkbox" ' .
-			  (($cp['chartTableMore']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo  $lang['srv_chart_table_more'] ;
-		echo '</label>';*/
 		// prikaz nicelnih vrednosti v kroznih grafih
-		echo '<br />';
+        echo '<div class="setting_line">';
-		echo '<label>';
+
-		echo '<input id="chartPieZeros" name="chartPieZeros" type="checkbox" ' .
+		echo '<input id="chartPieZeros" name="chartPieZeros" type="checkbox" '.(($cp['chartPieZeros']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
-			  (($cp['chartPieZeros']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '<label for="chartPieZeros">' . $lang['srv_chart_pieZeros'] . ':</label>';
-		echo  $lang['srv_chart_pieZeros'] ;
+
-		echo '</label>';
+        echo '</div>';
+
+
 		echo '</fieldset>';
-		
-#		echo '<label>'.$lang['srv_displaydata_showIcon'].'</label>';
-#		echo '&nbsp;<input id="dataShowIcons0" name="dataShowIcons" type="radio" value="0"' .
-#		 (($cp['dataShowIcons'] != 1) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-#		echo '<label for="dataShowIcons0">'.$lang['no'].'</label>';
-#
-#		echo '&nbsp;<input id="dataShowIcons1" name="dataShowIcons" type="radio" value="1"' .
-#		 (($cp['dataShowIcons'] == 1) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-#		echo '<label for="dataShowIcons1">'.$lang['yes'].'</label>';		
-#		echo '<br/>';
-		
-		
-		#Nastavitve za izvoz podatkov - PRESTAVLJENO V SPLOSNE NASTAVITVE ANKETE
-		/*echo '<fieldset style="width: 43%; float: left;">';
-		echo '<legend>'.$lang['srv_export_results_settings'].'</legend>';
-		
-		echo '<label>' . $lang['srv_displaydata_type'] . ': </label>';
-		echo '<select name="dataPdfType" id="dataPdfType" >';
-		echo '	<option value="0"'.((int)$cp['dataPdfType'] == 0 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type0'] . '</option>';
-		echo '	<option value="1"'.((int)$cp['dataPdfType'] == 1 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type1'] . '</option>';
-		echo '	<option value="2"'.((int)$cp['dataPdfType'] == 2 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type2'] . '</option>';
-		echo '</select>';
-		echo Help :: display('displaydata_pdftype');
-		
-		// ostevilcevanje vprasanj pri izvozih
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="exportDataNumbering" name="exportDataNumbering" type="checkbox" ' .
-		 (($cp['exportDataNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_nastavitveStevilcenje'];
-		echo '</label>';
-		// prikaz recnumov respondentov pri izvozih
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="exportDataShowRecnum" name="exportDataShowRecnum" type="checkbox" ' .
-		 (($cp['exportDataShowRecnum']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_export_show_recnum'];	
-		echo '</label>';		
-		// page break med posameznimi respondenti
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="exportDataPB" name="exportDataPB" type="checkbox" ' .
-		 (($cp['exportDataPB']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_export_pagebreak'];
-		echo '</label>';
-		// izpusti vprasanja brez odgovora
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="exportDataSkipEmpty" name="exportDataSkipEmpty" type="checkbox" ' .
-		 (($cp['exportDataSkipEmpty']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_export_skip_empty'];
-		echo '</label>';
-		// izpusti podvprasanja brez odgovora
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="exportDataSkipEmptySub" name="exportDataSkipEmptySub" type="checkbox" ' .
-		 (($cp['exportDataSkipEmptySub']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_export_skip_empty_sub'];
-		echo '</label>';
-		// landscape postavitev izvoza - V DELU
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="exportDataLandscape" name="exportDataLandscape" type="checkbox" ' .
-		 (($cp['exportDataLandscape']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_export_landscape'];
-		echo '</label>';
-		// prikaz pogojev pri izvozih
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="exportDataShowIf" name="exportDataShowIf" type="checkbox" ' .
-		 (($cp['exportDataShowIf']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_export_if'];
-		echo '</label>';	
-		// velikost pisave v izvozih
-		echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
-		echo '<select name="exportDataFontSize" id="exportDataFontSize" >';
-		echo '	<option value="8"'.((int)$cp['exportDataFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
-		echo '	<option value="10"'.((int)$cp['exportDataFontSize'] == 10 ? ' selected="selected"' : '').'>10</option>';
-		echo '	<option value="12"'.((int)$cp['exportDataFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
-		echo '</select>';
-		
-		echo '</fieldset>';
-		
-		
-		#Nastavitve za izvoz vprasalnika - PRESTAVLJENO V SPLOSNE NASTAVITVE ANKETE
-		echo '<fieldset style="width: 43%; float: right; margin-bottom: 40px;">';
-		echo '<legend>'.$lang['srv_export_survey_settings'].'</legend>';
-		
-		// ostevilcevanje vprasanj pri izvozih
-		echo '<label>';
-		echo '<input id="exportNumbering" name="exportNumbering" type="checkbox" ' .
-		 (($cp['exportNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_nastavitveStevilcenje'];
-		echo '</label>';
-		// prikaz pogojev pri izvozih
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="exportShowIf" name="exportShowIf" type="checkbox" ' .
-		 (($cp['exportShowIf']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_export_if'];
-		echo '</label>';
-		// velikost pisave v izvozih
-		echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
-		echo '<select name="exportFontSize" id="exportFontSize" >';
-		echo '	<option value="8"'.((int)$cp['exportFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
-		echo '	<option value="10"'.((int)$cp['exportFontSize'] == 10 ? ' selected="selected"' : '').'>10</option>';
-		echo '	<option value="12"'.((int)$cp['exportFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
-		echo '</select>';
-		
-		// prikaz uvoda pri izvozih
-		echo '<br />';
-		echo '<label>';
-		echo '<input id="exportShowIntro" name="exportShowIntro" type="checkbox" ' .
-		 (($cp['exportShowIntro']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-		echo $lang['srv_export_intro'];
-		echo '</label>';
-		echo '</fieldset>';*/
-		
-		//echo '<span class="clr"></span>';
 	}
 	
 	public static function ajax() {
@@ -1093,17 +1052,7 @@ class SurveyDataSettingProfiles {
 			case 'refreshDropdown':
 				self::DisplayLinkDropdown();
 				break;
-/*
+				
-			case 'show_inspectListSpr':
-				self::showInspectListSpr();
-				break;
-			case 'saveInspectListVars':
-				self::saveInspectListVars();
-				break;
-			case 'displayInspectVars':
-				self::displayInspectVars();
-				break;
-*/
 			case 'removeKategoriesProfile':
 				self::removeKategoriesProfile();
 				break;
@@ -1113,6 +1062,9 @@ class SurveyDataSettingProfiles {
 			case 'changeDataIconsSettings':
 				self::changeDataIconsSettings();
 				break;
+            case 'changeDataFullscreen':
+                self::changeDataFullscreen();
+                break;
 			case 'changeUsabilityIconsSettings':
 				self::changeUsabilityIconsSettings();
 				break;
@@ -1329,6 +1281,19 @@ class SurveyDataSettingProfiles {
 			session_commit();
 		}
 	}
+
+    static function changeDataFullscreen(){
+		session_start();
+
+		if (isset($_POST['data_fullscreen'])){
+			if($_POST['data_fullscreen'] == '1') {
+				$_SESSION['sid_'.self::$surveyId]['data_fullscreen'] = true;
+			} else {
+				$_SESSION['sid_'.self::$surveyId]['data_fullscreen'] = false;
+			}
+			session_commit();
+		}
+	}
 	
 	static function changeUsabilityIconsSettings(){
 		session_start();

admin/survey/classes/class.SurveyDiagnostics.php

@@ -143,14 +143,8 @@ class SurveyDiagnostics
 				$_pripombe = true;	
 			}
 		
-			
-		echo '<span class="srv_diagnostic_note">';
-		echo $this->printNote();
-		#
-		echo '</span>';
 		
-		
+		SurveySetting::getInstance()->Init($this->sid);
-		SurveySetting::getInstance()->Init($this->anketa);
 		$preview_disableif = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disableif');
 		$preview_disablealert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disablealert');
 		$preview_displayifs = SurveySetting::getInstance()->getSurveyMiscSetting('preview_displayifs');
@@ -158,26 +152,39 @@ class SurveyDiagnostics
 		$preview_hidecomment = SurveySetting::getInstance()->getSurveyMiscSetting('preview_hidecomment');
 		$preview_options = ''.($preview_disableif==1?'&disableif=1':'').($preview_disablealert==1?'&disablealert=1':'').($preview_displayifs==1?'&displayifs=1':'').($preview_displayvariables==1?'&displayvariables=1':'').($preview_hidecomment==1?'&hidecomment=1':'').'';
 		
+		/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TG
 		echo '<br><div style="display:inline-block; margin: 0 0 10px 20px">';
 		
 		echo '<span class="tooltip">';
-		echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank" style="font-size:15px"><span class="faicon edit_square"></span> '.$lang['srv_survey_testdata'].'</a>';
-		echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') ';
 		echo '<span class="expanded-tooltip bottom light" style="left: -40px;">';
 		echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].'';
 		echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
 		echo '<span class="arrow"></span>';
 		echo '</span>';	// expanded-tooltip bottom
-		echo '</span>'; // tooltip
+		echo '</span>'; // tooltip */
-			
+
-		echo ' - <a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'"><span class="sprites settings"></span> '.$lang['srv_uredniske_nastavitve'].'</a>';
+		// TESTIRANJE
+		echo '<h2>'.$lang['srv_diagnostika_testiranje'].'</h2>';
+
+		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">';
+		echo '      <span class="faicon link-chain link-right blue"></span>';
+		echo '      <input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" readonly/>';
+		echo '  </div>';
+		echo '  <button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
 		echo '</div>';
+
+		//Nastavitve testnega vnosa - popup	
+		echo '<p class="top16"><a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'">'.$lang['srv_uredniske_nastavitve'].'</a></p>';
 		
 		if ( isset($_GET['popup']) && $_GET['popup'] == 'open' ) {
 			?><script> $(function() { $('#popup-open').click(); }); </script><?php
 		}
-		
+
-		echo '<br/>';
+		// DIAGNOSTIKA
+
 		# predviden čas ankete
 		list($total,$skupni_cas) = $this->time;
         
@@ -212,382 +219,336 @@ class SurveyDiagnostics
 		} else {
 			$kompleksnost = $lang['srv_diagnostic_complexity_5'];
 		}
-		 
+
-		#OPOZORILA
+		echo '<h2>'.$lang['srv_testiranje_diagnostika'].'</h2>';
-		echo '<div  class="floatLeft">';
+
-		echo '<div id="srv_diagnostic_results" >';
 		echo '<table class="srv_diagnostic_results">';
 		echo '<tr>';
 		echo '<th>'.$lang['srv_diagnostika_table_title1'].'</th>';
-		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
+		echo '<th class="center">'.$lang['srv_diagnostika_table_title'].'</th>';
+		echo '<th class="center">'.$lang['srv_diagnostika_table_title2'].'</th>';
 		echo '</tr>';
-		#Preveč ali premalo opomnikov (reminder). 
+
-		
 		#Napake - v IFih, Zankah
+
+		//Link - kako odkriti logične in tehnične napake
+		if($lang['id'] == '1')
+			    $link_status = 'href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank"';
+            else
+				$link_status = 'href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank"';
+
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_5_element_1'].'</td>';
-		echo '<td>';
 
 		if (in_array(DIAG_INVALID_CONDITIONS,$this->diagnostic_note)) {
-            echo '<span class="red">';
+			$color_status = 'notok';
-            if($lang['id'] == '1')
+			$msg_status = $lang['srv_diagnostic_neustreza'];
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-            echo '</span>';
         }	
         else {
-            echo '<span class="green">';
+			$color_status = 'ok';
-            if($lang['id'] == '1')
+			$msg_status = $lang['srv_diagnostic_ustreza'];
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-			echo '</span>';
 		}
-		echo '</td>';
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
+		echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 		
 		#Napake - v validacijah
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_5_element_3'].'</td>';
-		echo '<td>';
 
 		if (in_array(DIAG_INVALID_VALIDATIONS, $this->diagnostic_note)) {
-            echo '<span class="red">';
+            $color_status = 'notok';
-            if($lang['id'] == '1')
+			$msg_status = $lang['srv_diagnostic_neustreza'];
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-			echo '</span>';
         }	
         else {
-            echo '<span class="green">';
+			$color_status = 'ok';
-            if($lang['id'] == '1')
+			$msg_status = $lang['srv_diagnostic_ustreza'];
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-			echo '</span>';
 		}
-		echo '</td>';
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 		
-		#napake - Podovojenost imen varianel
+		#napake - Podovojenost imen variabel
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_5_element_2'].'</td>';
-		echo '<td>';
 		if (in_array(DIAG_INVALID_VARIABLENAMES,$this->diagnostic_note)) {
-            echo '<span class="red">';
+            $color_status = 'notok';
-            if($lang['id'] == '1')
+            $msg_status = '<a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&checkDuplicate=1" title="'.$lang['srv_check_pogoji'].'">'.$lang['srv_diagnostic_neustreza'].'</a>';
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
+			$link_status = 'href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&checkDuplicate=1"';
-            else
+		}	
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-			echo '</span>';
-			echo '<span>&nbsp;';
-			echo '<a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&checkDuplicate=1" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span></a> '."\n";
-			echo '</span>';
-        }	
         else {
-            echo '<span class="green">';
+			$color_status = 'ok';
-            if($lang['id'] == '1')
+			$msg_status = '<a class="noline" '.$link_status.' >'.$lang['srv_diagnostic_ustreza'].'<a/>';
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-			echo '</span>';
 		}
-		echo '</td>';
+		
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
-		
-		echo '</table>';
-		echo '</div>';
-		
-		echo '<br/><br/>';
 
-		echo '<div id="srv_diagnostic_results" >';
+		#OPOZORILA
-		echo '<table class="srv_diagnostic_results">';
-#		echo '<COLGROUP><COL width="50%"><COL><COL><COLGROUP>';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_diagnostika_table_title2'].'</th>';
-		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
-		echo '</tr>';
-	
 		# Preveč podvprašanj na eni strani.
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_1_element_1'].'</td>';
-        echo '<td>';
         
         if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-podvprasanj-bloku-prevec-vprasanj-na-eni-strani?from1ka=1" target="_blank">%s</a>';
+		    $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-podvprasanj-bloku-prevec-vprasanj-na-eni-strani?from1ka=1" target="_blank"';
         else    
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-subquestions-block-and-too-many-questions-on-one-page?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-subquestions-block-and-too-many-questions-on-one-page?from1ka=1" target="_blank"';
         
         if (in_array(DIAG_SPR_ON_PAGE,$this->diagnostic_note)) {
-			echo '<span class="red">';
+			$color_status = 'rec';
-			printf($link,$lang['srv_diagnostic_neustreza2']);
+			$msg_status = $lang['srv_diagnostic_rec'];
-			echo '</span>';
         }	
         else {
-			echo '<span class="green">';
+			$color_status = 'ok';
-			printf($link,$lang['srv_diagnostic_ustreza']);
+			$msg_status = $lang['srv_diagnostic_ustreza'];
-			echo '</span>';
 		}
-		echo '</td>';
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
+		echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 		
 		# Preveč vprašanj v bloku.
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_1_element_2'].'</td>';
-        echo '<td>';
         
         if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/premajhna-strukturiranost-vprasalnika?from1ka=1" target="_blank">%s</a>';
+			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/premajhna-strukturiranost-vprasalnika?from1ka=1" target="_blank"';
         else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/insufficiently-structured-questionnaire?from1ka=1" target="_blank">%s</a>';
+			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/insufficiently-structured-questionnaire?from1ka=1" target="_blank"';
         
         if (in_array(DIAG_SPR_IN_BLOCK,$this->diagnostic_note)) {
-			echo '<span class="red">';
+			$color_status = 'rec';
-			printf($link,$lang['srv_diagnostic_neustreza2']);
+			$msg_status = $lang['srv_diagnostic_rec'];
-			echo '</span>';
-		}	else {
-			echo '<span class="green">';
-			printf($link,$lang['srv_diagnostic_ustreza']);
-			echo '</span>';
 		}
-		echo '</td>';
+		else {
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
+		}
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
+		echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 
 		# Preveč podpvprašanj v multigridu
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_1_element_3'].'</td>';
-        echo '<td>';
 
         if($lang['id'] == '1')
-            $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-podvprasanj-bloku-prevec-vprasanj-na-eni-strani?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-podvprasanj-bloku-prevec-vprasanj-na-eni-strani?from1ka=1" target="_blank"';
         else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-subquestions-block-and-too-many-questions-on-one-page?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-subquestions-block-and-too-many-questions-on-one-page?from1ka=1" target="_blank"';
 
 		if (in_array(DIAG_SUB_Q_IN_GRID,$this->diagnostic_note)) {
-			echo '<span class="red">';
+			$color_status = 'rec';
-			printf($link,$lang['srv_diagnostic_neustreza2']);
+			$msg_status = $lang['srv_diagnostic_rec'];
-			echo '</span>';
-		}	else {
-			echo '<span class="green">';
-			printf($link,$lang['srv_diagnostic_ustreza']);
-			echo '</span>';
 		}
+		else {
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
+		}
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
+		echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
 		echo '</td>';
 		echo '</tr>';
 		
 		#Začetek ankete z neprimernimi vprašanji.
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_2_element_1'].'</td>';
-        echo '<td>';
         
         if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/zacetek-ankete-z-neprimernimi-vprasanji?from1ka=1" target="_blank">%s</a>';
+		    $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/zacetek-ankete-z-neprimernimi-vprasanji?from1ka=1" target="_blank"';
         else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/beginning-the-survey-with-inappropriate-questions?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/beginning-the-survey-with-inappropriate-questions?from1ka=1" target="_blank"';
         
         if (in_array(DIAG_UNAPROPRIATE_START,$this->diagnostic_note)) {
-			echo '<span class="red">';
+			$color_status = 'rec';
-			printf($link,$lang['srv_diagnostic_neustreza2']);
+			$msg_status = $lang['srv_diagnostic_rec'];
-			echo '</span>';
-		}	else {
-			echo '<span class="green">';
-			printf($link,$lang['srv_diagnostic_ustreza']);
-			echo '</span>';
 		}
-		echo '</td>';
+		else {
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
+		}
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
+		echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
+		
 		# predolga anketa - opozorilo
 		if (in_array(DIAG_TIME_HARD_LIMIT,$this->diagnostic_note)) {
 			echo '<tr>';
 			echo '<td>'.$lang['srv_diagnostic_2_element_2'].'</td>';
-			echo '<td>';
-            echo '<span class="red">';
             
-            if($lang['id'] == '1')
+			if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank">';
+		    	$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
-            else
+        	else
-                echo '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank">';
+            	$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
-            
+
-            echo $lang['srv_diagnostic_neustreza'];
+			$color_status = 'rec';
-			echo '</a>';
+			$msg_status = $lang['srv_diagnostic_rec'];
-			echo '</span>';
+			
-			echo '</td>';
+			echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
+			echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 			echo '</tr>';
 		}
-		echo '</table>';
+
-		echo '</div>';
-		
 		# PRIPOROČILA
-		echo '<br/><br/>';
+		#Preveč ali premalo opomnikov (reminder) - 2 vrstici 
-		echo '<div id="srv_diagnostic_results" >';
-		echo '<table class="srv_diagnostic_results">';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_diagnostika_table_title3'].'</th>';
-		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
-		echo '</tr>';
-		#Preveč ali premalo opomnikov (reminder). 
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_3_element_1'].'</td>';
-        echo '<td>';
 
         if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-ali-premalo-opomnikov?from1ka=1" target="_blank">%s</a>';
+		    $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-ali-premalo-opomnikov?from1ka=1" target="_blank"';
         else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-or-too-few-reminders?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-or-too-few-reminders?from1ka=1" target="_blank"';
         
             if (in_array(DIAG_REMINDER_ON_IF,$this->diagnostic_note)) {
-			echo '<span class="red">';
+				$color_status = 'rec';
-			printf($link,$lang['srv_diagnostic_neustreza']);
+				$msg_status = $lang['srv_diagnostic_rec'];
-			echo '</span>';
+			}
-		}	else {
+			else {
-			echo '<span class="green">';
+				$color_status = 'ok';
-			printf($link,$lang['srv_diagnostic_ustreza']);
+				$msg_status = $lang['srv_diagnostic_ustreza'];
-			echo '</span>';
+			}
-		}
+
-		echo '</td>';
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
+		echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 		
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_3_element_2'].'</td>';
-        echo '<td>';
-
-        if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-ali-premalo-opomnikov?from1ka=1" target="_blank">%s</a>';
-        else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-or-too-few-reminders?from1ka=1" target="_blank">%s</a>';
         
             if (in_array(DIAG_REMINDER_ON_MGRID,$this->diagnostic_note)) {
-			echo '<span class="red">';
+				$color_status = 'rec';
-			printf($link,$lang['srv_diagnostic_neustreza']);
+				$msg_status = $lang['srv_diagnostic_rec'];
-			echo '</span>';
+			}
-		}	else {
+			else {
-			echo '<span class="green">';
+				$color_status = 'ok';
-			printf($link,$lang['srv_diagnostic_ustreza']);
+				$msg_status = $lang['srv_diagnostic_ustreza'];
-			echo '</span>';
+			}
-		}
+
-		echo '</td>';
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
+		echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
+
 		# predolga naketa - priporočilo
 		if (in_array(DIAG_TIME_SOFT_LIMIT,$this->diagnostic_note)) {
 			echo '<tr>';
 			echo '<td>'.$lang['srv_diagnostic_2_element_2'].'</td>';
-			echo '<td>';
-            echo '<span class="red">';
             
-            if($lang['id'] == '1')
+           if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank">';
+				$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
-            else
+        	else
-                echo '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank">';
+				$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
             
-                echo $lang['srv_diagnostic_neustreza'];
+			$color_status = 'rec';
-			echo '</a>';
+			$msg_status = $lang['srv_diagnostic_rec'];
-			echo '</span>';
+
-			echo '</td>';
+			echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
+			echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 			echo '</tr>';
 		}
+		
+		echo '</table>';
+
+		// LASTNOSTI ANKETE
+		echo '<h2>'.$lang['srv_testiranje_diagnostika_lastnosti'].'</h2>';
+
+		echo '<div class="lastnosti_wrapper">';
+		
+		echo '<div class="lastnosti_left">';
+		echo '<table class="srv_diagnostic_results">';
+		echo '<tr>';
+		echo '<th>'.$lang['srv_diagnostika_table_title4'].'</th>';
+		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
+		echo '</tr>';
+		
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_1_element_5'].'</td>';
+        echo '<td>';
+		echo $time.'&nbsp&nbsp';
+        if($lang['id'] == '1')
+			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
+        else
+			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
+		echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_9'].'</td>';
+		echo '<td>'.(int)SurveyInfo::getSurveyGroupCount().'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_5'].'</td>';
+		echo '<td>'.(int)$this->cnt_spremenljivka.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_5a'].'</td>';
+		echo '<td>'.(int)$this->cnt_hidden.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_8'].'</td>';
+		echo '<td>'.(int)SurveyInfo::getSurveyVariableCount().'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_2'].'</td>';
+		echo '<td>'.(int)$this->cnt_conditions.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_3'].'</td>';
+		echo '<td>'.(int)$this->cnt_blocks.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_4'].'</td>';
+		echo '<td>'.(int)$this->globina.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_1_element_4'].'</td>';
+		echo '<td>';
+		echo $kompleksnost.'&nbsp&nbsp';
+        
+		if($lang['id'] == '1')
+			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank"';
+        else
+			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank"';
+        
+		echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
+		echo '</a>';
+		echo '</tr>';
+		
 		echo '</table>';
 		echo '</div>';
-		echo '</div>';
+
-		
 		
+		echo '<div class="lastnosti_right">';
 		# Trajanje - linki
-		echo '<div id="srv_diagnostic_results_right">';
 		echo '<table class="srv_diagnostic_results">';
 		echo '<tr>';
 		echo '<th>'.$lang['srv_info_duration'].'</th>';
 		echo '<th></th>';
-		echo '<th></th>';
+		echo '<th class="center">'.$lang['srv_diagnostika_table_title2'].'</th>';
 		echo '</tr>';
+
 		echo '<tr>';
 		echo '<td>'.$lang['srv_testiranje_predvidenicas'].'</td>';
 		echo '<td>'.$skupni_cas.'</td>';
-		echo '<td><a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas" title="'.$lang['srv_testiranje_predvidenicas'].'">'.$lang['details'].'</a></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas" title="'.$lang['srv_testiranje_predvidenicas'].'"></a></td>';
 		echo '</tr>';
+		
 		$sas = new SurveyAdminSettings();
 		$dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1);
 		echo '<tr>';
 		echo '<td>'.$lang['srv_testiranje_cas'].'</td>';
 		echo '<td>'.$dejanski_cas.'</td>';
-		echo '<td><a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'" title="'.$lang['srv_testiranje_cas'].'">'.$lang['details'].'</a></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'" title="'.$lang['srv_testiranje_cas'].'"></a></td>';
-		echo '</tr>';
-		echo '</table>';
-		echo '</div>';
-		echo '<br /><br />';
-		
-		
-		echo '<div id="srv_diagnostic_results_right">';
-		echo '<table class="srv_diagnostic_results">';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_diagnostika_table_title4'].'</th>';
-		echo '<th colspan="2">'.$lang['srv_diagnostika_table_title'].'</th>';
-		echo '</tr>';
-		/*echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_0'].'</td>';
-		echo '<td colspan="2">'.$skupni_cas.'</td>';
-		echo '</tr>';*/
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_5'].'</td>';
-
-        echo '<td colspan="2">';   
-
-        if($lang['id'] == '1')
-		    echo '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank">';
-        else
-            echo '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank">';
-
-		echo $time;
-		echo '</a>';
-#		echo Help::display('srv_diag_time').'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_9'].'</td>';
-		echo '<td colspan="2">'.(int)SurveyInfo::getSurveyGroupCount().'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_5'].'</td>';
-		echo '<td colspan="2">'.(int)$this->cnt_spremenljivka.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_5a'].'</td>';
-		echo '<td colspan="2">'.(int)$this->cnt_hidden.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_8'].'</td>';
-		echo '<td colspan="2">'.(int)SurveyInfo::getSurveyVariableCount().'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_2'].'</td>';
-		echo '<td colspan="2">'.(int)$this->cnt_conditions.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_3'].'</td>';
-		echo '<td colspan="2">'.(int)$this->cnt_blocks.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_4'].'</td>';
-		echo '<td colspan="2">'.(int)$this->globina.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_4'].'</td>';
-		echo '<td colspan="2">';
-        
-        if($lang['id'] == '1')
-            echo '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank">';
-        else
-            echo '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank">';
-        
-            echo $kompleksnost;
-		echo '</a>';
-		#echo Help::display('srv_diag_complexity').'</td>';
 		echo '</tr>';
 		
 		echo '</table>';
 		echo '</div>';
-		echo '<br /><br />';
+
-		
+		echo '</div>';
-		
+
+		// KOMENATRJI
 		# nerazrešeni komentarji uporabnikov $commentsUser,$commentsUserFinished		
 		$commentsUserUnresolved = $commentsUser - $commentsUserFinished;
 		if ((	(int)$commentsAll 
@@ -597,7 +558,8 @@ class SurveyDiagnostics
 				+(int)$commentsUser
 				+(int)$commentsUserFinished
 				) > 0 ) { 
-			echo '<div id="srv_diagnostic_results_right">';
+			
+			echo '<h2>'.$lang['srv_diagnostic_4_element_0'].'</h2>';
 			echo '<table class="srv_diagnostic_results">';
 			echo '<tr>';
 			echo '<th>'.$lang['srv_diagnostic_4_element_0'].'</th>';
@@ -625,11 +587,8 @@ class SurveyDiagnostics
 			echo '<td>'.(int)$commentsUser.'</td>';
 			echo '</tr>';
 			echo '</table>';
-			echo '</div>';
 		}
 		
-
-		echo '<br /><br />';
 		echo '</div>'; # id="srv_diagnostic"
 	}
 	

admin/survey/classes/class.SurveyInpect.php

@@ -516,9 +516,8 @@ class SurveyInspect {
 
 		$css = ($this->enableInspect == SI_DEFAULT_PROFILE ? ' gray' : '');
 		if ($hideAdvanced == false || $this->enableInspect != SI_DEFAULT_PROFILE) {
-			echo '<li class="space">&nbsp;</li>';
 			echo '<li>';
-			echo '<span class="as_link'.$css.'" id="link_inspect" title="' . $lang['srv_inspect_setting'] . '" onClick="show_inspect_settings();">' . $lang['srv_inspect_setting'] . '</span>'."\n";
+			echo '  <span class="'.$css.'" id="link_inspect" title="' . $lang['srv_inspect_setting'] . '" onClick="show_inspect_settings();">' . $lang['srv_inspect_setting'] . '</span>'."\n";
 			echo '</li>';
 			 
 		}
@@ -543,50 +542,78 @@ class SurveyInspect {
 		echo '<h2>'.$lang['srv_inspect_setting'].'</h2>';
 		
 		if ( $this->enableInspect != SI_DEFAULT_PROFILE ) {
-			echo '<div id="not_default_setting">';
+			echo '<div id="not_default_setting" class="popup_note">';
 			echo $lang['srv_not_default_setting'];
-			echo '</div><br class="clr displayNone">';
+			echo '</div>';
 		}
 
+
+        echo '<div class="popup_main">';
+        
+
 		# Nastavitve za Inspect
-		echo '<p>'.$lang['srv_inspect_setting_link'].'</p>';
+        echo '<p class="bottom16">';
-		echo '<p>';
+		echo    $lang['srv_inspect_setting_link'];
-		echo '<label>'.$lang['srv_inspect_setting_enabled'].'</label>';
+        echo '</p>';
-		echo '&nbsp;<input id="enableInspect0" name="enableInspect" type="radio" value="0"' .
+        
-				(($this->enableInspect == false) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+		echo '<div class="setting_holder">';
-		echo '<label for="enableInspect0">'.$lang['no'].'</label>';
+		echo '<p class="setting_title">'.$lang['srv_inspect_setting_enabled'].'</p>';
 
-		echo '&nbsp;<input id="enableInspect1" name="enableInspect" type="radio" value="1"' .
+		echo '<div class="horizontal">';
-				(($this->enableInspect == true) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+
-		echo '<label for="enableInspect1">'.$lang['yes'].'</label>';
+		echo '<div class="setting_item">';
-		echo Help :: display('srv_crosstab_inspect');
+		echo '  <input id="enableInspect0" name="enableInspect" type="radio" value="0" '.(($this->enableInspect == false) ? ' checked="checked" ' : '').' autocomplete="off">';
-		echo '</p>';
+		echo '  <label for="enableInspect0">'.$lang['no'].'</label>';
-		echo '<p>';
-		echo '<div>';
-		echo '<span class="floatLeft">'.$lang['srv_inspect_goto_note'].'</span>&nbsp;';
-		echo '<span class="floatLeft">';
-		echo '<label><input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_ANALIZE.'" value="'.SI_GOTO_ANALIZE.'"'.($this->inspect_goto == SI_GOTO_ANALIZE ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off"/>'.$lang['srv_inspect_goto_'.SI_GOTO_ANALIZE].'</label><br/>';
-		echo '<label><input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_VPOGLED.'" value="'.SI_GOTO_VPOGLED.'"'.($this->inspect_goto == SI_GOTO_VPOGLED ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off"/>'.$lang['srv_inspect_goto_'.SI_GOTO_VPOGLED].'</label> <br/>';
-		echo '<label><input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_PODATKI.'" value="'.SI_GOTO_PODATKI.'"'.($this->inspect_goto == SI_GOTO_PODATKI ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off"/>'.$lang['srv_inspect_goto_'.SI_GOTO_PODATKI].'</label>';
-		echo '</span>';
 		echo '</div>';
-		echo'</p>';
+		echo '<div class="setting_item">';
-		echo'<br class="clr">';
+		echo '  <input id="enableInspect1" name="enableInspect" type="radio" value="1" '.(($this->enableInspect == true) ? ' checked="checked" ' : '') . ' autocomplete="off">';
-		echo '<p>';
+		echo '  <label for="enableInspect1">'.$lang['yes'].' '.Help :: display('srv_crosstab_inspect').'</label>';
-		echo '<div id="inspectListDiv" '.($this->inspect_goto != SI_GOTO_PODATKI ? ' class="displayNone"' : '').'>';
+		echo '</div>';
-		echo '<span>'.$lang['srv_inspect_setting_show_variables'].'</span>';
+					
-		echo '<span id="inspectListSpr" class="as_link">';
+		echo '</div>';
+		echo '</div>';
+
+
+		echo '<div class="setting_holder">';
+		echo '<p class="setting_title">'.$lang['srv_inspect_goto_note'].'</p>';
+
+		echo '<div class="setting_item">';
+		echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_ANALIZE.'" value="'.SI_GOTO_ANALIZE.'"'.($this->inspect_goto == SI_GOTO_ANALIZE ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
+		echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_ANALIZE].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_VPOGLED.'" value="'.SI_GOTO_VPOGLED.'"'.($this->inspect_goto == SI_GOTO_VPOGLED ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
+		echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_VPOGLED].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_PODATKI.'" value="'.SI_GOTO_PODATKI.'"'.($this->inspect_goto == SI_GOTO_PODATKI ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
+        echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_PODATKI].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+        
+		echo '<div id="inspectListDiv" class="settings_block" '.($this->inspect_goto != SI_GOTO_PODATKI ? ' class="displayNone"' : '').'>';
+		echo '  <div class="setting_line">';
+		echo        $lang['srv_inspect_setting_show_variables'];
+		echo '      <span id="inspectListSpr" class="as_link">';
 		$this->displayInspectVars();
-		echo '</span>';
+		echo '      </span>';
+		echo '  </div>';
 		echo '</div>';
-		echo '</p>';
 
-		echo '<span class="floatRight" title="'.$lang['srv_save_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inspectSaveSettings(); return false;"><span>'.$lang['srv_save_profile'] . '</span></a></div></span>';
-		echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inspectCloseSettings(); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
 
 		// cover Div
 		echo '<div id="inspect_cover_div"></div>'."\n";
+        
 
+        echo '</div>';
+
+
+        // Gumbi
+        echo '<div class="button_holder">';
+		echo '  <button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="inspectCloseSettings(); return false;">'.$lang['srv_close_profile'] . '</button>';
+		echo '  <button class="medium blue" title="'.$lang['srv_save_profile'].'" onclick="inspectSaveSettings(); return false;">'.$lang['srv_save_profile'] . '</button>';
+        echo '</div>';
 	}
 
 	function displayInspectVars() {
@@ -608,31 +635,42 @@ class SurveyInspect {
 	}
 
 	function showInspectListSpr() {
-
 		global $lang, $site_url;
+
 		$all_spr = Cache::cache_all_srv_spremenljivka($this->sid);
 		$vars = $_SESSION['dataSetting_profile'][$this->sid]['InspectListVars'];
-		echo '<div id="dsp_inspect_cover">';
-		echo '<div id="dsp_inspect_spr_select">';
 
-		echo '<span>'.$lang['srv_inspect_choose'].'</span>';
+		echo '<div id="dsp_inspect_cover">';
+
+        
+        echo '<h2>'.$lang['srv_questions'].'</h2>';
+        echo '<div class="popup_close"><a href="#" onClick="$(\'#inspect_cover_div\').hide(); $(\'#fullscreen\').removeClass(\'z-index200\').fadeOut();">✕</a></div>';
+        
+
+		echo '<div id="dsp_inspect_spr_select" class="popup_main">';
+
+		echo '<div class="setting_line">'.$lang['srv_inspect_choose'].'</div>';
+
+        echo '<div class="settings_block">';
 		foreach ($all_spr AS $id => $spremenljivka) {
-			echo '<div class="dsp_inspect_var">';
+            echo '<div class="setting_line dsp_inspect_var">';
-			echo '<input name="dsp_inspect_vars" id="dsp_inspect_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox"'
+            
-			.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
+			echo '  <input name="dsp_inspect_vars" id="dsp_inspect_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox"'.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
-			echo '<label for="dsp_inspect_var_'.$spremenljivka['id'].'">'.$spremenljivka['variable'].' - '.strip_tags($spremenljivka['naslov']).'</label>';
+			echo '  <label for="dsp_inspect_var_'.$spremenljivka['id'].'">'.$spremenljivka['variable'].' - '.strip_tags($spremenljivka['naslov']).'</label>';
+            
 			echo '</div>';
 		}
+        echo '</div>';
 
 		echo '</div>';
-		echo '<div class="inv_FS_btm">';
+
-		echo '<div id="navigationBottom" class="printHide">';
+
-		echo '<span id="dsp_inspect_cancel" class="floatLeft spaceLeft buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#"><span>'.$lang['srv_cancel'].'</span></a></span>';
+		echo '<div class="button_holder">';
-		echo '<span id="dsp_inspect_save" class="floatRight spaceRight buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#"><span>'.$lang['srv_zapri'].'</span></a></span>';
+		echo '  <button id="dsp_inspect_cancel" class="medium white-blue">'.$lang['srv_cancel'].'</button>';
-		echo '<div class="clr" />';
+		echo '  <button id="dsp_inspect_save" class="medium blue">'.$lang['srv_zapri'].'</button>';
 		echo '</div>';
 
-		#echo '</div>';
+
 		echo '</div>';
 	}
 

admin/survey/classes/class.SurveyMissingProfiles.php

@@ -95,66 +95,96 @@ class SurveyMissingProfiles
 		}
 	
 		if ( self::$currentProfileId != SMP_DEFAULT_PROFILE ) {
-	       	echo '<div id="not_default_setting">';
+	       	echo '<div id="not_default_setting" class="popup_note">';
 	        echo $lang['srv_not_default_setting'];
-	        echo '</div><br class="clr displayNone">';
+	        echo '</div>';
         }
 		
 		
-		echo ' <div id="missing_profile_holder">';
+        echo '<div class="popup_main with_menu">';
+        
+		echo ' <div id="missing_profile_holder" class="popup_left">';
 		self :: DisplayProfileOptions($pid);
+		echo '<button class="small white-black" onclick="missingProfileAction(\'newName\'); return false;"><span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'].'</button>';
 		echo ' </div>';
 		
-		
+		echo ' <div id="missing_profile_data_holder" class="popup_right">';
-		echo ' <div id="missing_profile_data_holder">';
 		self :: DisplayProfileData($pid);		
 		echo ' </div>';
 
+        echo '</div>';
+
 		
 		// GUMBI
-		echo '<div style="margin: 15px 0 0 0; float:right;">';
+		echo '<div class="button_holder">';
-		# shrani kot seja
+		
+        # preklici - zapri
+		echo '<button class="medium white-blue" onclick="missingProfileAction(\'cancle\'); return false;">'.$lang['srv_close_profile'].'</button>';			
+		
+        # shrani kot seja
 		if (self::$profiles[$pid]['system'] == 1 || $pid == -1) {
 			$run_lbl = $lang['srv_run_as_session_profile'];
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="missingProfileAction(\'runSession\'); return false;"><span>'.$run_lbl.'</span></a></span></span>';
+			echo '<button class="medium blue" onclick="missingProfileAction(\'runSession\'); return false;">'.$run_lbl.'</</button>';
-		} else {
+		} 
+        else {
 			# shrani - pozeni
 			$run_lbl = $lang['srv_run_profile'];
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="missingProfileAction(\'run\'); return false;"><span>'.$run_lbl.'</span></a></span></span>';
+			echo '<button class="medium blue" onclick="missingProfileAction(\'run\'); return false;">'.$run_lbl.'</</button>';
 		}
-		# shrani kot nov profil
+
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="missingProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'].'</span></a></span></span>';		
+        echo '</div>';
-		# preklici - zapri
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="missingProfileAction(\'cancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';		
-		echo '</div>';
 		
 		
 		// cover Div
-        echo '<div id="missingProfileCoverDiv"></div>'."\n";
+        echo '<div id="missingProfileCoverDiv"></div>';
         
         // div za shranjevanje novega profila
-        echo '<div id="newProfile">'.$lang['srv_missing_profile_name'].': '."\n";
+        echo '<div id="newProfile">';
-        echo '<input id="newProfileName" name="newProfileName" type="text" size="45"  />'."\n";
+		
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="missingProfileAction(\'newSave\'); return false;"><span>'.$lang['srv_save_profile'].'</span></a></span></span>'."\n";            
+		echo '<div class="setting_holder">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="missingProfileAction(\'newCancle\');; return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+
-        echo '</div>'."\n";
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+		echo '<input id="newProfileName" name="newProfileName" type="text" class="text large"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="missingProfileAction(\'newCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="missingProfileAction(\'newSave\'); return false;">'.$lang['srv_save_profile'].'</button>';
+        echo '</div>';
+		
+        echo '</div>';
 
         // div za preimenovanje
-        echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': '."\n";
+        echo '<div id="renameProfileDiv">';
-        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" size="45"  />'."\n";
+		
-        echo '<input id="renameProfileId" type="hidden" value="' . $pid . '"  />'."\n";
+		echo '<div class="setting_holder">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="missingProfileAction(\'rename\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>'."\n";            
+
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="missingProfileAction(\'renameCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+        echo '<div class="setting_item">';
-        echo '</div>'."\n";
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="renameProfileName" class="text large" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" />';
+        echo '<input id="renameProfileId" type="hidden" value="' . $pid . '"  />';
+		echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="missingProfileAction(\'renameCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="missingProfileAction(\'rename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
 
         // div za brisanje
-        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . self::$profiles[$pid]['name'] . '</b>?'."\n";
+        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . self::$profiles[$pid]['name'] . '</span>?';
-        echo '<input id="deleteProfileId" type="hidden" value="' . $pid . '"  />'."\n";
+        echo '<input id="deleteProfileId" type="hidden" value="' . $pid . '"  />';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="missingProfileAction(\'deleteCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="missingProfileAction(\'deleteConfirm\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'."\n";            
-        echo '</div>'."\n";
 
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="missingProfileAction(\'deleteCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="missingProfileAction(\'deleteConfirm\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
 
+		echo '</div>';
 	}
 
 	static function DisplayProfileData($pid) {
@@ -164,103 +194,142 @@ class SurveyMissingProfiles
 		$_tpes_array = array(MISSING_TYPE_DESCRIPTOR=>$lang['srv_analiza_arhiviraj_type_'.MISSING_TYPE_DESCRIPTOR],MISSING_TYPE_FREQUENCY=>$lang['srv_analiza_arhiviraj_type_'.MISSING_TYPE_FREQUENCY],MISSING_TYPE_CROSSTAB=>$lang['srv_analiza_arhiviraj_type_'.MISSING_TYPE_CROSSTAB]);
 		$_sys_missings = self::$smv->GetMissingValuesForSurvey();
 		$_sys_unset = self::$smv->GetUnsetValuesForSurvey();
-		echo '<div id="infoMissingProfile">' . $lang['srv_missing_profile_title1'] . '</div >';
+
-		echo '<div id="missingProfileFieldsetHolder1">'.NEW_LINE;
+		echo '<div id="infoMissingProfile" class="profile_right_note">' . $lang['srv_missing_profile_title1'] . '</div>';
+
+		echo '<div id="missingProfileFieldsetHolder1">';
 		
-		echo '<fieldset id="missingProfileFieldset">'.NEW_LINE;
+		echo '<fieldset id="missingProfileFieldset">';
-		echo '<legend>' . $lang['srv_missing_profile_title2'] . '</legend>'.NEW_LINE;
+		echo '<legend>' . $lang['srv_missing_profile_title2'] . '</legend>';
+
+		echo '<form name="" id="" autocomplete="off">';
+
+		echo '<table id="missing_table_1">';
+		echo '<tr>';
 		foreach ($_tpes_array AS $tkey => $tlabel) {
-			echo '<div style="float:left; width:100px; text-align:center;">'. $tlabel .'</div>'.NEW_LINE;
+			echo '<th class="center">'. $tlabel .'</th>';
 		}
-		echo '<div class="clr"></div>'.NEW_LINE;
+		echo '<th></th>';
-		echo '<form name="" id="" autocomplete="off">'.NEW_LINE;
+		echo '</tr>';
+		
 		# loop sozi sistemske missinge
 		foreach ($_sys_unset  as $mkey => $mvalue) {
-			# loop skozi tipe
+			echo '<tr>';
-			foreach ($_tpes_array AS $tkey => $tlabel) {
-				echo '<div style="float:left; width:100px; text-align:center;">'.NEW_LINE;
-				echo '<input name="profile_value[]" type="checkbox" id="mv_'.$tkey.'_'.$mkey . '"' .
-				(isset($curentProfileData[$tkey][$mkey]) ? ' checked' : '').
-				'/>'.NEW_LINE;
-				echo '</div>'.NEW_LINE;
-			}
-			echo '<div style="float:left; width:150px;">'.NEW_LINE;
-			echo '(' . $mkey . ") " . $mvalue;
-			echo '</div>'.NEW_LINE;
-			echo '<div class="clr"></div>'.NEW_LINE;
-		}
-		echo '</form>'.NEW_LINE;
-		echo '</fieldset>'.NEW_LINE;
-		
-		echo '<fieldset id="missingProfileFieldset">'.NEW_LINE;
-		echo '<legend>' . $lang['srv_missing_profile_title3'] . '</legend>'.NEW_LINE;
-		foreach ($_tpes_array AS $tkey => $tlabel) {
-			echo '<div style="float:left; width:100px; text-align:center;">'. $tlabel .'</div>'.NEW_LINE;
-		}
-		echo '<div class="clr"></div>'.NEW_LINE;
-		echo '<form name="" id="" autocomplete="off">'.NEW_LINE;
-		# loop sozi sistemske missinge
-		foreach ($_sys_missings  as $mkey => $mvalue) {
-			# loop skozi tipe
-			foreach ($_tpes_array AS $tkey => $tlabel) {
-				echo '<div style="float:left; width:100px; text-align:center;">'.NEW_LINE;
-				echo '<input name="profile_value[]" type="checkbox" id="mv_'.$tkey.'_'.$mkey . '"' .
-				(isset($curentProfileData[$tkey][$mkey]) ? ' checked' : '').
-				'/>'.NEW_LINE;
-				echo '</div>'.NEW_LINE;
-			}
-			echo '<div style="float:left; width:150px;">'.NEW_LINE;
-			echo '(' . $mkey . ") " . $mvalue;
-			echo '</div>'.NEW_LINE;
-			echo '<div class="clr"></div>'.NEW_LINE;
-		}
-		echo '</form>'.NEW_LINE;
-		echo '</fieldset>'.NEW_LINE;
-		echo '</div>'.NEW_LINE;
 
-		echo '<div id="missingProfileFieldsetHolder1">'.NEW_LINE;
+			# loop skozi tipe
+			foreach ($_tpes_array AS $tkey => $tlabel) {
+				echo '<td class="center">';
+				echo '<input name="profile_value[]" type="checkbox" id="mv_'.$tkey.'_'.$mkey . '"' .
+				(isset($curentProfileData[$tkey][$mkey]) ? ' checked' : '').
+				'/>';
+				echo '<label class="empty"></label>';
+				echo '</td>';
+			}
+			echo '<td>';
+			echo '(' . $mkey . ") " . $mvalue;
+			echo '</td>';
+
+			echo '</tr>';
+		}
+
+
+		echo '</table>';
+		
+		echo '</form>';
+		echo '</fieldset>';
+		
+		echo '<fieldset id="missingProfileFieldset">';
+		echo '<legend>' . $lang['srv_missing_profile_title3'] . '</legend>';
+		
+		echo '<table id="missing_table_2">';
+		echo '<tr>';
+		foreach ($_tpes_array AS $tkey => $tlabel) {
+			echo '<th class="center">'. $tlabel .'</th>';
+		}
+		echo '<th></th>';
+		echo '</tr>';
+		
+		echo '<form name="" id="" autocomplete="off">';
+
+		# loop sozi sistemske missinge
+		foreach ($_sys_unset  as $mkey => $mvalue) {
+			echo '<tr>';
+
+			# loop skozi tipe
+			foreach ($_tpes_array AS $tkey => $tlabel) {
+				echo '<td class="center">';
+				echo '<input name="profile_value[]" type="checkbox" id="mv_'.$tkey.'_'.$mkey . '"' .
+				(isset($curentProfileData[$tkey][$mkey]) ? ' checked' : '').
+				'/>';
+				echo '<label class="empty"></label>';
+				echo '</td>';
+			}
+			echo '<td>';
+			echo '(' . $mkey . ") " . $mvalue;
+			echo '</td>';
+
+			echo '</tr>';
+		}
+
+
+		echo '</table>';
+		
+		echo '</form>';
+		echo '</fieldset>';
+
+		echo '</div>';
+
+		echo '<div id="missingProfileFieldsetHolder1">';
 		echo '<fieldset id="missingProfileFieldset">';
 		echo '<legend>'.$lang['srv_missing_profile_title5'].'</legend>';
 		# prikažemo še radio gumbe za način prikaza MV
 		
 		$radio_selected = self::$profiles[$pid]['display_mv_type'];
-		echo '<div style="margin-bottom:8px;">';
+
+		echo '<div class="mv_settings_other">';
 		echo '<input name="display_mv_type" id="display_mv_type_0" type="radio" value="0"'.($radio_selected == 0 ? ' checked' : '').'><label for="display_mv_type_0">'.$lang['srv_missing_profile_display_radio0'].'</label>';
 		echo '&nbsp;&nbsp;<input name="display_mv_type" id="display_mv_type_1" type="radio" value="1"'.($radio_selected == 1 ? ' checked' : '').'><label for="display_mv_type_1">'.$lang['srv_missing_profile_display_radio1'].'</label>';
 		echo '&nbsp;&nbsp;<input name="display_mv_type" id="display_mv_type_2" type="radio" value="2"'.($radio_selected == 2 ? ' checked' : '').'><label for="display_mv_type_2">'.$lang['srv_missing_profile_display_radio2'].'</label>';
 		echo '</div>';
-		echo '<div style=" width:auto; text-align:left;">'.NEW_LINE;
+
+		echo '<div class="setting_holder">';
 		echo '<input name="show_zerro" id="show_zerro" type="checkbox" ' .
 		 (self::$profiles[$pid]['show_zerro'] == 1 ? ' checked="checked"' : '') . ' autocomplete="off"/>'.NEW_LINE;
-		echo $lang['srv_missing_profile_other_show_zerro'];
+		echo '<label>'.$lang['srv_missing_profile_other_show_zerro'].'</label>';
-		echo '</div>'.NEW_LINE;
-		echo '<div style=" width:auto; text-align:left;">'.NEW_LINE;
-		echo '<input name="merge_missing" id="merge_missing" type="checkbox" ' .
-		 (self::$profiles[$pid]['merge_missing'] == 1 ?  ' checked="checked"' : '') . ' autocomplete="off"/>'.NEW_LINE;
-		echo $lang['srv_missing_profile_other_merge_missing'];
 		echo '</div>';
-		echo ' <div class="clr"></div>';
+	
+		echo '<div class="setting_holder">';
+		echo '<input name="merge_missing" id="merge_missing" type="checkbox" ' .
+		 (self::$profiles[$pid]['merge_missing'] == 1 ?  ' checked="checked"' : '') . ' autocomplete="off"/>';
+		echo '<label>'.$lang['srv_missing_profile_other_merge_missing'].'</label>';
+		echo '</div>';
+
 		echo '</fieldset>';
-		echo '</div>'.NEW_LINE;
+		echo '</div>';
 	}
 	
 	static function DisplayProfileOptions($pid) {
 		global $lang;
 		
-		echo '<div id="missing_profile" class="select">';	
+		echo '<div id="missing_profile" class="list select">';	
+
 		foreach ( self::$profiles as $key => $profile ) {
 			
-			echo '<div id="missing_profile_'.$profile['id'].'" class="option' . ($profile['id'] == $pid ? ' active' : '') . '" value="' . $profile['id'] . '">';
+			echo '<div id="missing_profile_'.$profile['id'].'" class="list-item option' . ($profile['id'] == $pid ? ' active' : '') . '" value="' . $profile['id'] . '">';
 
 			echo $profile['name'];
 
 			if($profile['id'] == $pid){
+                echo '<div class="profile_icons">';
+                
 				if (self::$profiles[$pid]['system'] != 1 ) {
-					echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="missingProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
+                    echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="missingProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
 				}
 				if (self::$profiles[$pid]['system'] != 1 && $pid != -1) {		
-					echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="missingProfileAction(\'renameAsk\'); return false;"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
+                    echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="missingProfileAction(\'renameAsk\'); return false;"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
 				}
+
+                echo '</div>';
 			}
 			
 			echo '</div>';	
@@ -268,11 +337,8 @@ class SurveyMissingProfiles
 		echo '</div>';
 
 		echo '<script>';
-		echo '$(function() {';
+		echo '  $( function(){scrollToProfile("#missing_profile_'.$pid.'");} );';
-		echo 'scrollToProfile("#missing_profile_'.$pid.'");';
-		echo '});';
 		echo '</script>';
-
 	}
 	
 	/** klici ajax funkcij
@@ -532,17 +598,16 @@ class SurveyMissingProfiles
 		
 	static function DisplayLink($hideAdvanced = true) {
 		global $lang;
+        
 		// profili missingov
         $missingProfiles = self :: getProfiles();
         $izbranMissingProfile = self :: getCurentProfileId();
         
         $css = ($izbranMissingProfile == SMP_DEFAULT_PROFILE ? ' gray' : '');
         if ($hideAdvanced == false || $izbranMissingProfile != SMP_DEFAULT_PROFILE ) {
-        	echo '<li class="space">&nbsp;</li>';
         	echo '<li>';
-        	echo '<span class="as_link'.$css.'" id="link_missing_profile" title="' . $lang['srv_analiza_setup_profile'] . '" onClick="show_missing_profiles();">' . $lang['srv_analiza_setup_profile'] . '</span>'."\n";
+        	echo '  <span class="'.$css.'" id="link_missing_profile" title="' . $lang['srv_analiza_setup_profile'] . '" onClick="show_missing_profiles();">' . $lang['srv_analiza_setup_profile'] . '</span>'."\n";
         	echo '</li>';
-        	
         }
 	}
 

admin/survey/classes/class.SurveyMissingValues.php

@@ -472,6 +472,10 @@ class SurveyMissingValues
 
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_survey_missing_title'].':</legend>';
+
+		echo '<p class="bottom16">'.$lang['srv_survey_missing_text'].':</p>';
+
+
 		$_survey_missing_values = self::GetSurveyMissingValues();
 		
 		if (self::$mySqlErrNo == '1062') {
@@ -479,26 +483,21 @@ class SurveyMissingValues
 		}
 		
 		if ( count($_survey_missing_values) > 0 ) {
-			echo '<table class="mv_tbl">';
-			echo '<tr>';
 			
-			echo '<th style="width:50px;">';
+			echo '<table id="missing_value_table">';
-			echo '  <i style="color:gray;text-align:right">'.$lang['srv_filter_vrednost'].'</i>';
+			//Table header
-			echo '</th>';
+			echo '<tr>';
-			echo '<th style="width:250px;">';
+			echo '<th class="vrednost">'.$lang['srv_filter_vrednost'].'</th>';
-			echo '  <i style="color:gray;">'.$lang['srv_label'].'</i>';
+			echo '<th>'.$lang['srv_label'].'</th>';
-			echo '</th>';
+			echo '<th></th>';
-			echo '<th style="width:20px;">';
-			echo '  <i style="color:gray;text-align:right">'.'</i>';
-			echo '</th>';
-			echo '<th>&nbsp;</th>';
 			echo '</tr>';
+			
 			foreach ( $_survey_missing_values as $type => $type_missing_values) {
 				foreach ($type_missing_values AS $type_missing_value) {
 					$key = $type_missing_value['value'];
 					$text = $type_missing_value['text'];
 					$sysValue = $type_missing_value['defSysVal'];
-					echo '<tr class="spr_sysFilter'.$type.'">';
+					echo '<tr>';
 					
 					echo '<td>';
 					echo '<input name="mv_value_input" id="mv_value_'.$type.'_'.$key.'" type="text" value="'.$key.'" class="mv_value_input">';
@@ -506,30 +505,22 @@ class SurveyMissingValues
 					echo '<td>';
 					echo '<input name="mv_text_input" id="mv_text_'.$type.'_'.$key.'" type="text" value="'.$text.'" class="mv_text_input">';
 					echo '</td>';
-					echo '<td class="anl_ac">';
-					if ($sysValue != null) {
-						echo '['.$sysValue.']';
-					}
-					echo '</td>';
 					echo '<td>';
-					echo '&nbsp;<span class="faicon remove smaller orange pointer" name="mv_delete_img" id="mv_img_'.$type.'_'.$key.'" title="'.$lang['srv_filtri_izbrisi_filter'].'"/>';
+					echo '<span class="faicon trash empty blue" name="mv_delete_img" id="mv_img_'.$type.'_'.$key.'" title="'.$lang['srv_filtri_izbrisi_filter'].'"/>';
 					echo '</td>';
 					echo '</tr>';
 				}
 			}
-			echo '<tr class="spr_sysFilter3">';
-			echo '<td>&nbsp;</td>';
-			echo '<td>&nbsp;</td>';
-			echo '<td>';
-			echo '&nbsp;<span name="mv_add_img" id="mv_add_img" class="faicon add icon-blue smaller pointer"></span>';
-			echo '</td>';
-			echo '</tr>';
 			echo '</table>';	
 		}		
 		if ($si_mv == '0') {
 			echo '<span class="mv_link_disabled">'.$lang['srv_survey_missing_default'].'</span><br/>';
 		} else {
-			echo '<span id="link_use_sistem_mv" onclick="useSystemMissingValues(); return false;" class="as_link">'.$lang['srv_survey_missing_default'].'</span><br/>';
+			echo '<span class="pointer blue" name="mv_add_img" id="mv_add_img"><span class="faicon plus_circle link-right"></span>'.$lang['srv_survey_missing_add'].'</span>';
+
+			echo '<div class="button_holder top16 bottom0">';
+			echo '<button id="link_use_sistem_mv" class="medium white-black" onClick="useSystemMissingValues(); return false;">'.$lang['srv_survey_missing_default'].'</button>';				
+			echo '</div>';
 		}
 		echo '</div>';
 		
@@ -657,7 +648,7 @@ class SurveyMissingValues
 		echo '<table class="mv_tbl">';
 		echo '<tr>';
 		echo '<th style="width:50px;">';
-		echo '  <i style="color:gray;text-align:right">'.$lang['srv_filter_vrednost'].'</i>';
+		echo '  <i style="color:gray;text-align:right">'.$lang['srv_filter_vrednost'].'test</i>';
 		echo '</th>';
 		echo '<th style="width:250px;">';
 		echo '  <i style="color:gray;">'.$lang['srv_filter_variabla'].'</i>';
@@ -708,21 +699,12 @@ class SurveyMissingValues
 		if ($_REQUEST['a'] != 'missing') {
 			if ($what == 'start') {
 				$sa=new SurveyAdmin(self::$anketa);
-				echo '<span class="floatLeft">';
+				echo '<div class="layout_left_item">';
-				echo '<div id="globalSetingsLinks" class="baseSettings">';
 				$sa->showGlobalSettingsLinks();
-				echo '</div>';
-				echo '<br class="clr"/><br/>';
-				echo '<div id="globalSetingsLinks" class="aditionalSettings">';
 				$sa->showAdditionalSettingsLinks();
 				echo '</div>';
-				echo '<br class="clr"/>';
-				echo '</span>';
-				echo '<div id="globalSetingsList" >';
-				
-			} else {
-				echo '</div>';
 			}
+		
 		}
 	}
 }

admin/survey/classes/class.SurveyParaAnalysis.php

@@ -310,100 +310,108 @@ class SurveyParaAnalysis{
 		}
 		
 		echo '<div id="dataSettingsCheckboxes" class="paraAnalysisGraph" '.($showSettings ? '' : ' style="display:none;"').'>';
-		echo '<div id="toggleDataCheckboxes2" onClick="toggleDataCheckboxes(\'paraAnalysisGraph\');"><span class="faicon close icon-orange" style="padding-bottom:2px;"></span> '.$lang['srv_para_close_settings'].'</div>';
+
-		
+		echo '<div class="wrap1360 page_'.$_GET['a'].' subpage_'.$_GET['m'].'">';
-		echo '<table id="para_settings"><tr><th>Spremenljivke</th><th rowspan="2" class="anl_bl spacer"></th><th>Prekinitve</th><th rowspan="2" class="anl_bl spacer"></th><th>Podrobno</th></tr>';
+
-		echo '<tr><td>';
+		//Spremenljivke
-		# spremenljivke
+		echo '<div class="section" id="one">';
-		echo '<div class="floatLeft">';
+
-		echo '<label>';
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_para_label_variables'].'</span>';
+
+		echo '<div class="setting_item">';
 		echo '<input type="checkbox" id="show_question_basic" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_question_basic == true ? ' checked="checked"' : '').' autocomplete="off">';
-		echo $lang['srv_para_show_question_basic'];
+		echo '<label for="show_question_basic">'.$lang['srv_para_show_question_basic'].'</label>';
-		echo '</label>';
-		echo '<br/>';
-		echo '<label>';
-		echo '<input type="checkbox" id="show_graph_basic" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_graph_basic == true ? ' checked="checked"' : '').' autocomplete="off" >';
-		echo $lang['srv_para_show_show_graph_basic'];
-		echo '</label>';
 		echo '</div>';
-		# end:spremenljivke
+		echo '<div class="setting_item">';
-		echo '</td><td>';
+		echo '<input type="checkbox" id="show_graph_basic" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_graph_basic == true ? ' checked="checked"' : '').' autocomplete="off" >';
-		# prekinitve
+		echo '<label for="show_graph_basic">'.$lang['srv_para_show_show_graph_basic'].'</label>';
-		echo '<div class="floatLeft">';
+		echo '</div>';
-		echo '<label>';
+		echo '</div>';
+
+		echo '</div>';
+
+		//Prekinitve
+		echo '<div class="section" id="two">';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_para_label_breaks'].'</span>';
+
+		echo '<div class="setting_item">';
 		echo '<input type="checkbox" id="show_question_breaks" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_question_breaks == true ? ' checked="checked"' : '').' autocomplete="off">';
-		echo $lang['srv_para_show_question_breaks'];
+		echo '<label for="show_question_breaks">'.$lang['srv_para_show_question_breaks'].'</label>';
-		echo '</label>';
+		echo '</div>';
-		echo '<br/>';
+		echo '<div class="setting_item">';
-		echo '<label>';
 		echo '<input type="checkbox" id="show_graph_breaks" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_graph_breaks == true ? ' checked="checked"' : '').' autocomplete="off" >';
-		echo $lang['srv_para_show_show_graph_breaks'];
+		echo '<label for="show_graph_breaks">'.$lang['srv_para_show_show_graph_breaks'].'</label>';
-		echo '</label>';
+		echo '</div>';
-		echo '<br/>';
+		echo '</div>';
-		echo '<label>'.$lang['srv_para_graph_type'].':';
+
+		/*echo '<label>'.$lang['srv_para_graph_type'].':';
 		echo '<select id="show_graph_breaks_type" onchange="changeParaAnalysisSelect(this);" autocomplete="off">';
 		echo '<option value="0"'.((int)$this->show_graph_breaks_type == 0 ? ' selected="selected"' : '').'>'.$lang['srv_para_graph_type0'].'</option>';
 		echo '<option value="1"'.((int)$this->show_graph_breaks_type == 1 ? ' selected="selected"' : '').'>'.$lang['srv_para_graph_type1'].'</option>';
 		echo '<option value="2"'.((int)$this->show_graph_breaks_type == 2 ? ' selected="selected"' : '').'>'.$lang['srv_para_graph_type2'].'</option>';
 		echo '</select>';
-		echo '</label>';
+		echo '</label>';*/
+
 		echo '</div>';
-		
+
-		# end: prekinitve
+		// Podrobno
-		echo '</td><td>';
+		echo '<div class="section" id="three">';
-		# podrobno
+		echo '<span class="setting_title">'.$lang['srv_para_label_details'].'</span>';
-		echo '<div class="floatLeft">';
+
-		echo '<label>';
+		echo '<div class="subsection">';
+
+		echo '<div class="setting_holder">';
+		echo '<div class="setting_item">';
 		echo '<input type="checkbox" id="show_with_zero" onclick="changeParaAnalysisCbx(this,true);" '.($this->show_with_zero == false ? ' checked="checked"' : '').' autocomplete="off">';
-		echo $lang['srv_para_only_valid'];
+		echo '<label for="show_with_zero">'.$lang['srv_para_only_valid'].'</label>';
-		echo '</label>';
+		echo '</div>';
-		echo '<br/>';
+		echo '<div class="setting_item">';
-		echo '<label>';
 		echo '<input type="checkbox" id="show_with_other" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_with_other == true ? ' checked="checked"' : '').' autocomplete="off" >';
-		echo $lang['srv_para_show_rows_other'];
+		echo '<label for="show_with_other">'.$lang['srv_para_show_rows_other'].'</label>';
-		echo '</label>';
 		echo '</div>';
-		echo '<div class="floatLeft spaceLeftBig anl_bl">';
+		echo '</div>';
-		echo '<label>';
+
+		echo '<div class="setting_holder">';
+		echo '<div class="setting_item">';
 		echo '<input type="checkbox" id="show_categories" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_categories == true ? ' checked="checked"' : '').' autocomplete="off">';
-		echo $lang['srv_analiza_kategorialneSpremenljivke'];
+		echo '<label for="show_categories">'.$lang['srv_analiza_kategorialneSpremenljivke'].'</label>';
-		echo '</label>';
+		echo '</div>';
-		echo '<br/>';
+		echo '<div class="setting_item">';
-		echo '<label>';
 		echo '<input type="checkbox" id="show_numbers" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_numbers == true ? ' checked="checked"' : '').' autocomplete="off">';
-		echo $lang['srv_analiza_numericneSpremenljivke'];
+		echo '<label for="show_numbers">'.$lang['srv_analiza_numericneSpremenljivke'].'</label>';
-		echo '</label>';
+		echo '</div>';
-		echo '<br/>';
+		echo '<div class="setting_item">';
-		echo '<label>';
 		echo '<input type="checkbox" id="show_text" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_text == true ? ' checked="checked"' : '').' autocomplete="off">';
-		echo $lang['srv_analiza_textovneSpremenljivke'];
+		echo '<label for="show_text">'.$lang['srv_analiza_textovneSpremenljivke'].'</label>';
-		echo '</label>';
 		echo '</div>';
-			
+		echo '</div>';
-		echo '<div class="floatLeft spaceLeftBig">';
+
-		echo '<label>';
+		echo '<div class="setting_holder">';
+		echo '<div class="setting_item">';
 		echo '<input type="checkbox" id="show_question_advanced" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_question_advanced == true ? ' checked="checked"' : '').' autocomplete="off">';
-		echo $lang['srv_para_show_question_advanced'];
+		echo '<label for="show_question_advanced">'.$lang['srv_para_show_question_advanced'].'</label>';
-		echo '</label>';
+		echo '</div>';
-		echo '<br/>';
+		echo '<div class="setting_item">';
-		echo '<label>';
+		echo '<input type="checkbox" id="show_graph_advanced" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_graph_advanced == true ? ' checked="checked"' : '').' autocomplete="off" >';
-		echo '<input type="checkbox" id="show_graph_advanced" onclick="changeParaAnalysisCbx(this,false);" '.($this->show_graph_advanced == true ? ' checked="checked"' : '').' autocomplete="off" >';
+		echo '<label for="show_graph_advanced">'.$lang['srv_para_show_show_graph_advanced'].'</label>';
-		echo $lang['srv_para_show_show_graph_advanced'];
+		echo '</div>';
-		echo '</label>';
+		echo '</div>';
+					
+		echo '</div>';
+
+		echo '</div>';
+
 		echo '</div>';
-		
-		# end:podrobno
-		echo '</td></tr></table>';
-		
-		if ($paraType == 'basic') {
-		}
-		if ($paraType == 'advanced') {
-		}
-		
-		echo '<div class="clr"></div>';
-		
 		echo '</div>'; // konec diva zapiranje nastavitev
-		
+
+		if ($showSettings) {
+			echo '<script type="text/javascript">
+			toggle_drop_settings_margin();
+        	</script>';
+		}
 
 		echo '<div id="div_para_data">';
 		
@@ -561,66 +569,24 @@ class SurveyParaAnalysis{
 		$rows = $data;
 
 		$baseColspan = 6;
+
+		echo '<h2>'.$lang['srv_para_label_breaks'].'</h2>';
 		
 		echo '<table id="tbl_para_analitics" class="graph'.($showGraph ? ' showGraph' : '').'">';
-		echo '<tr class="persist-header">';
-		echo '<th class="anl_w50 pointer" ';
-		if ($sort_field == 'variable') {
-			if ($sort_type == SORT_DESC) {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=v&sort_type=" . SORT_ASC . "')\"";
-			} else {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=v&sort_type=" . SORT_DESC . "')\"";
-			}
-		} else {
-			echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=v&sort_type=" . SORT_ASC . "')\"";
-		}
-		echo '>';
-		echo '<span class="floatLeft pointer">' . $lang['srv_para_variable'] . '</span>';
-		if ($sort_field == 'variable') {
-			echo '<span class="floatRight faicon '.$sort_type_sprite.'">&nbsp;</span>';
-		}
-		echo'</th>';
-		if ($showQuestion) {
-			echo '<th class="anl_w200" >'.$lang['srv_para_question'].'</th>';
-		}
-		echo '<th class="anl_w50" title="'.$lang['srv_para_breaks'].'">'.$lang['srv_para_breaks_short'].'</th>';
-		if ($show_delta) {
-			echo '<th class="anl_w50" title="'.$lang['srv_para_breaks_delta'].'">'.$lang['srv_para_breaks_delta_short'].'</th>';
-		}
-
-/*
- * 		echo '<th class="anl_w70" title="'.$lang['srv_para_breaks_value'].'"';
-		if ($sort_field == 'ns') {
-			if ($sort_type == SORT_DESC) {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_ASC . "')\"";
-			} else {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_DESC . "')\"";
-			}
-		} else {
-			echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_ASC . "')\"";
-		}
 		
-		echo '>';
+		echo '<tr>';
-		echo '<span>' . $lang['srv_para_breaks_short']. Help :: display('srv_item_nonresponse') . '</span>';
+		echo '<th>' . $lang['srv_para_variable'] . '</th>';
-		if ($sort_field == 'ns') {
+		if ($showQuestion) {
-			echo '<span class="floatRight faicon '.$sort_type_sprite.'">&nbsp;</span>';
+			echo '<th>'.$lang['srv_para_question'].'</th>';
 		}
-*/
+		echo '<th title="'.$lang['srv_para_breaks'].'">'.$lang['srv_para_breaks_short'].'</th>';
-		echo '<th class="anl_w50" title="'.$lang['srv_para_breaks_value'].'">';
+		
-		echo '<span>' . $lang['srv_para_breaks_value_short'].  '</span>';
+		if ($show_delta) {
-		echo '</th>';
+			echo '<th title="'.$lang['srv_para_breaks_delta'].'">'.$lang['srv_para_breaks_delta_short'].'</th>';
-		echo '<th class="anl_w50" title="'.$lang['srv_para_breaks_value_bruto'].'">';
+		}
-		echo '<span>' . $lang['srv_para_breaks_value_bruto_short'].'</span>';
+		echo '<th title="'.$lang['srv_para_breaks_value'].'">' . $lang['srv_para_breaks_value_short'] . '</th>';
-		echo '</th>';
+		echo '<th title="'.$lang['srv_para_breaks_value_bruto'].'">' . $lang['srv_para_breaks_value_bruto_short'] . '</th>';
-		echo '<th class="anl_w50" title="'.$lang['srv_para_breaks_value_neto'].'">';
+		echo '<th title="'.$lang['srv_para_breaks_value_neto'].'">' . $lang['srv_para_breaks_value_neto_short'] . '</th>';
-		echo '<span>' . $lang['srv_para_breaks_value_neto_short'].'</span>';
-		echo '</th>';
-#		echo '<th class="anl_w70 pointer" title="'.$lang['srv_para_breaks_value_bruto'].'">';
-#		echo '<span>' . $lang['srv_para_breaks_value_bruto_short'].  '</span>';
-#		echo '</th>';
-#		echo '<th class="anl_w75 pointer" title="'.$lang['srv_para_breaks_value_neto'].'">';
-#		echo '<span>' . $lang['srv_para_breaks_value_neto_short'].  '</span>';
-#		echo '</th>';
 		if ($showGraph) {
 			echo '<th class="anl_bb" title="' . $lang['srv_para_breaks_graph_title'] . '">' . $lang['srv_para_breaks_graph_title'] . '</th>';
 		}
@@ -630,9 +596,8 @@ class SurveyParaAnalysis{
 			$oldPage = reset($sprPage);
 			$newPage = $oldPage;
 			echo '<tr>';
-			echo '<td colspan="' . ($baseColspan + (int)$showQuestion + (int)$showGraph). '" class=" para_page_break">
+			echo '<td colspan="' . ($baseColspan + (int)$showQuestion + (int)$showGraph). '" class="para_page_break">
 			<span>' . $pages[$newPage] . '</span></td>';
-			//echo '<td class="empty_cell"></td>';
 			echo '</tr>';
 			
 		}		
@@ -642,37 +607,35 @@ class SurveyParaAnalysis{
 				if ($newPage != $oldPage) {
 					$oldPage = $newPage;
 					echo '<tr>';
-					echo '<td colspan="' . ($baseColspan + (int)$showQuestion + (int)$showGraph). '" class=" para_page_break">
+					echo '<td colspan="' . ($baseColspan + (int)$showQuestion + (int)$showGraph). '" class="para_page_break">
 					<span>' . $pages[$newPage] . '</span></td>';
-					//echo '<td class="empty_cell"></td>';
 					echo '</tr>';
 				}
 			}
 				
-			echo '<tr class="'.$css_sublcass.'">';
+			echo '<tr>';
-			echo '<td >';
+			echo '<td><a onclick="showspremenljivkaSingleVarPopup(\'' . $row['spid'] . '\'); return false;" href="#">' . $row['variable'] . '</a></td>';
-			echo '<span class="anl_variabla">';
+			
-			echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $row['spid'] . '\'); return false;" href="#">' . $row['variable'] . '</a>';
-			echo '</span>';
-			echo '</td>';
 			if ($showQuestion) {
 				echo '<td>';
 				echo (strlen($row['naslov']) > 40 ? substr($row['naslov'],0,40)."..." : $row['naslov']);
 				echo '</td>';
 			}
+			
 			$val = 0;
 			if (isset($row['values'][-3])) {
 				$val = $row['values'][-3];
 			}
 			echo '<td>'.$val.'</td>';
+			
 			if ($show_delta) {
 				echo '<td>'.$row['delta'].'</td>';
 			}
+			
 			echo '<td>'.common::formatNumber($row['sp']*100,1).'</td>';
 			echo '<td>'.common::formatNumber($row['sp_bruto']*100,1).'</td>';
 			echo '<td>'.common::formatNumber($row['sp_neto']*100,1).'</td>';
 
-			#echo '<td>'.common::formatNumber($value,2).'</td>';
 			if ($showGraph) {
 				$width = $row['sp'];
 				if ((int)$showGraphType == 1) {
@@ -681,22 +644,20 @@ class SurveyParaAnalysis{
 					$width = $row['sp_neto'];
 				} 
 				
-				echo '<td class="empty_cell">';
+				echo '<td class="graph_cell">';
 				if ($row['sp'] > 0) {
-					echo '<div class="para_analitics_bar" style="'.'width:'.($width*100).'%; text-align:right; padding-right:5px; color:green;"></div>';
+					echo '<div class="graph_full" style="'.'width:'.($width*100).'%;"></div>';
 				} else {
-					echo '<div class="para_analitics_bar null_value" style="'.'width:1px"></div>';
+					echo '/';
 				}
 				echo '</td>';
 			}
 			echo '</tr>';
-			
 		}
 		echo '</table>';
 		#SurveyAnalysisHelper::getInstance()->displayMissingLegend();
 
 		$this->displayLink();
-		echo '<br class="clr" />';
 	}
 	
 	
@@ -800,6 +761,8 @@ class SurveyParaAnalysis{
 			}
 		}
 		*/
+
+		/*SORTIRANJE
 		$sort_type = SORT_ASC;
 		if (isset($_REQUEST['sort_type']) 
 				&& ((int)$_REQUEST['sort_type'] == SORT_DESC || (int)$_REQUEST['sort_type'] == SORT_ASC)) {
@@ -839,78 +802,48 @@ class SurveyParaAnalysis{
 				$rows = array_reverse($rows);
 			}
 			
-		}
+		}*/
 		
 		$this->displayFormula();
+
+		echo '<h2>'.$lang['srv_para_label_variables'].'</h2>';
 		
 		echo '<table id="tbl_para_analitics" class="graph'.($showGraph ? ' showGraph' : '').'">';
-		echo '<tr class="persist-header">';
+		
-		echo '<th class="pointer" ';
+		echo '<tr>';
-		if ($sort_field == 'variable') {
+		echo '<th>' . $lang['srv_para_variable'] . '</th>';
-			if ($sort_type == SORT_DESC) {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=variable&sort_type=" . SORT_ASC . "')\"";
-			} else {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=variable&sort_type=" . SORT_DESC . "')\"";
-			}
-		} else {
-			echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=variable&sort_type=" . SORT_ASC . "')\"";
-		}
-		echo '>';
-		echo '<span class="floatLeft pointer">' . $lang['srv_para_variable'] . '</span>';
-		if ($sort_field == 'variable') {
-			echo '<span class="floatRight sprites '.$sort_type_sprite.'">&nbsp;</span>';
-		}
-		echo'</th>';
 		if ($showQuestion) {
 			echo '<th>'.$lang['srv_para_question'].'</th>';
 		}
 		if ($show_delta) {
-			echo '<th class="anl_w50" title="'.$lang[''].'">delta</th>';
+			echo '<th title="'.$lang[''].'">delta</th>';
 		}
-		echo '<th class="anl_w50 pointer" title="'.$lang['srv_para_unaswered'].'"';
+		echo '<th>' . $lang['srv_para_unaswered_short'] . ' %</th>';
-		if ($sort_field == 'ns') {
-			if ($sort_type == SORT_DESC) {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_ASC . "')\"";
-			} else {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_DESC . "')\"";
-			}
-		} else {
-			echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_ASC . "')\"";
-		}
-		echo '>';
-		echo '<span>' . $lang['srv_para_unaswered_short'] . ' %</span>'; // . Help :: display('srv_item_nonresponse')
-		if ($sort_field == 'ns') {
-			echo '<span class="floatRight sprites '.$sort_type_sprite.'">&nbsp;</span>';
-		}
-		echo '</th>';
 		if ($showGraph) {
-			echo '<th class="anl_bb" title="' . $lang['srv_para_unaswered_graph_title'] . '">' . $lang['srv_para_unaswered_graph_title'] . '</th>';
+			echo '<th title="' . $lang['srv_para_unaswered_graph_title'] . '">' . $lang['srv_para_unaswered_graph_title'] . '</th>';
 		}
 		echo '</tr>';
-		
+
 		foreach ($rows AS $row) {
-			echo '<tr class="'.$css_sublcass.'">';
+			echo '<tr>';
-			echo '<td >';
+			echo '<td>';
-			echo '<span class="anl_variabla">';
 			echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $row['spid'] . '\'); return false;" href="#">' . $row['variable'] . '</a>';
-			echo '</span>';
 			echo '</td>';
 			if ($showQuestion) {
 				echo '<td>';
-				echo (strlen($row['naslov']) > 40 ? substr($row['naslov'],0,40)."..." : $row['naslov']);
+				echo (strlen($row['naslov']) > 80 ? substr($row['naslov'],0,80)."..." : $row['naslov']);
 				echo '</td>';
 			}
 			if ($show_delta) {
 				echo '<td>'.$row['delta'].'</td>';
 			}
 			echo '<td>'.common::formatNumber($row['ns']*100,1).'</td>';
-			#echo '<td>'.common::formatNumber($value,2).'</td>';
 			if ($showGraph) {
-				echo '<td class="empty_cell">';
+				echo '<td class="graph_cell">';
 				if ($row['ns'] > 0) {
-					echo '<div class="para_analitics_bar" style="'.'width:'.($row['ns']*100).'%; text-align:right; padding-right:5px; color:green;"></div>';
+					echo '<div class="graph_full" style="'.'width:'.($row['ns']*100).'%;"></div>';
 				} else {
-					echo '<div class="para_analitics_bar null_value" style="'.'width:1px"></div>';
+					echo '/';
 				}
 				echo '</td>';
 			}
@@ -921,7 +854,6 @@ class SurveyParaAnalysis{
 		#SurveyAnalysisHelper::getInstance()->displayMissingLegend();
 
 		$this->displayLink();
-		echo '<br class="clr" />';
 	}
 	
 	function displayGraphDataAdvanced( ) {
@@ -964,47 +896,56 @@ class SurveyParaAnalysis{
  
 		
 		$this->displayFormula();
+
+		echo '<div id="scroll1">';
+		echo '<div id="scroll2">';
+
+		echo '<script>
+			check_para_wrap();
+        </script>';
+
+		echo '<table id="tbl_para_analitics" class="podrobno">';
 		
-		
+		echo '<tr>';
-		echo '<table id="tbl_para_analitics" class="persist-area">';
-		echo '<tr class="persist-header">';
 		
 		// Dodatna stolpca zaradi izvoza za Katjo Lozar
 		if($admin_type == '0'){
-			echo '<th style="width:30px;">ID VPRASANJA</th>';
+			echo '<th class="center">ID VPRAŠANJA</th>';
-			echo '<th style="width:30px;">ID VARIABLE</th>';
+			echo '<th class="center">ID VARIABLE</th>';
 		}
 		
-		echo '<th>'.$lang['srv_para_variable'].'</th>';
+		echo '<th class="left">'.$lang['srv_para_variable'].'</th>';
 		if ($showQuestion) {
-			echo '<th>'.$lang['srv_para_question'].'</th>';
+			echo '<th class="left">'.$lang['srv_para_question'].'</th>';
 		}
-		echo '<th >'.$lang['srv_para_valid'].'</th>';
+		//echo '<th >'.$lang['srv_para_valid'].'</th>';
 		foreach ($this->_missings AS $value => $text) {
 			$cnt_miss++;
-			echo "<th class=\"anl_w50\" title=\"".$lang['srv_mv_'.$text]."\" >{$value}<br/>(".$lang['srv_mv_'.$text].")</th>";
+			echo "<th class=\"left\" title=\"".$lang['srv_mv_'.$text]."\" >{$value}<br>(".$lang['srv_mv_'.$text].")</th>";
 		}
 		foreach ($this->_unsets AS $value => $text)
 		{
 			$cnt_undefined++;
-			echo "<th class=\"anl_w50\" title=\"".$lang['srv_mv_'.$text]."\">{$value}<br/>(".$lang['srv_mv_'.$text].")</th>";
+			echo "<th class=\"left\" title=\"".$lang['srv_mv_'.$text]."\">{$value} (".$lang['srv_mv_'.$text].")</th>";
 		}
 		if ($show_delta) {
-			echo "<th class=\"anl_w50\" title=\"".$lang['']."delta\">".$lang['']."&Delta;</th>";
+			echo "<th title=\"".$lang['']."delta\">".$lang['']."&Delta;</th>";
 		}
-		echo "<th class=\"anl_w50\" title=\"".$lang['srv_para_nonconceptual']."\">".$lang['srv_para_nonconceptual']."</th>";
+		echo "<th title=\"".$lang['srv_para_nonconceptual']."\">".$lang['srv_para_nonconceptual']."</th>";
-		echo "<th class=\"anl_w50\" title=\"".$lang['srv_para_approp']."\">".$lang['srv_para_approp']."</th>";
+		echo "<th title=\"".$lang['srv_para_approp']."\">".$lang['srv_para_approp']."</th>";
-		echo "<th class=\"anl_w50\" title=\"".$lang['srv_para_all_units']."\">".$lang['srv_para_all_units']."</th>";
+		echo "<th title=\"".$lang['srv_para_all_units']."\">".$lang['srv_para_all_units']."</th>";
 		if ($isNotStandardProfile)
 		{
-			echo "<th class=\"anl_w50\" title=\"".$lang['srv_para_status']."\">".$lang['srv_para_status']."</th>";
+			echo "<th title=\"".$lang['srv_para_status']."\">".$lang['srv_para_status']."</th>";
 		}
-		echo "<th class=\"anl_w50\" title=\"".$lang['srv_para_unaswered']."\">".$lang['srv_para_unaswered_short']. Help :: display('srv_item_nonresponse')."</th>";
+		echo "<th title=\"".$lang['srv_para_unaswered']."\">".$lang['srv_para_unaswered_short']. Help :: display('srv_item_nonresponse')."</th>";
 		if ($showGraph) {
-			echo '<th class="anl_bb">' . $lang['srv_para_unaswered_graph_title'] . '</th>';
+			echo '<th class="left">' . $lang['srv_para_unaswered_graph_title_br'] . '</th>';
 		}
 
 		echo '</tr>';
+
+
 		foreach ($headerVariablesId AS $key => $headerVariableId)
 		{
 			$spr = $this->_HEADERS[$headerVariableId];
@@ -1023,29 +964,24 @@ class SurveyParaAnalysis{
 					echo '<tr class="multiGroupHeader">';
 					
 					if($admin_type == '0'){
-						echo '<td>'.$spr['spr_id'].'</td>';	
+						echo '<td class="center">'.$spr['spr_id'].'</td>';	
-						echo '<td></td>';	
+						echo '<td class="center"></td>';	
 					}
+
+					$count_missing = count($this->_missings);
 					
 					if ($showQuestion) {
-						echo '<td class="showQuestion">';
+						echo '<td class="left semi-bold">';
-						echo '<span class="anl_variabla">';
 						echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>';
-						echo '</span>';
 						echo '</td>';
-						echo '<td colspan="'.(count($this->_missings)+count($this->_unsets)+$added_colspan).'">';
+						echo '<td class="left semi-bold" colspan="'.($count_missing+count($this->_unsets)+$added_colspan).'">';
 						echo $spr['naslov'];
 						echo '</td>';
 					} else {
-						echo '<td colspan="'.(count($this->_missings)+count($this->_unsets)+$added_colspan).'">';
+						echo '<td class="left semi-bold" colspan="'.($count_missing+count($this->_unsets)+$added_colspan).'">';
-						echo '<span class="anl_variabla">';
 						echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>';
-						echo '</span>';
 						echo '</td>';
 					}
-					if ($showGraph) {
-						echo '<td class="empty_cell30"></td>';
-					}
 					echo '</tr>';
 				}
 				else {
@@ -1067,72 +1003,56 @@ class SurveyParaAnalysis{
 								echo '<tr class="multiGroupHeader">';
 								
 								if($admin_type == '0'){
-									echo '<td>'.$spr['spr_id'].'</td>';	
+									echo '<td class="center">'.$spr['spr_id'].'</td>';	
-									echo '<td></td>';	
+									echo '<td class="center"></td>';	
 								}
 								
 								if ($showQuestion) {
-									echo '<td class="showQuestion">';
+									echo '<td class="left semi-bold">';
-									echo '<span class="anl_variabla">';
 									echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>';
-									echo '</span>';
 									echo '</td>';
-									echo '<td colspan="'.(count($this->_missings)+count($this->_unsets)+$added_colspan ).'">';
+									echo '<td class="left semi-bold" colspan="'.($count_missing+count($this->_unsets)+$added_colspan+4).'">';
 									echo $spr['naslov'];
 									echo '</td>';
 								} else {
-									echo '<td colspan="'.(count($this->_missings)+count($this->_unsets)+$added_colspan ).'">';
+									echo '<td class="left semi-bold" colspan="'.($count_missing+count($this->_unsets)+$added_colspan+3).'">';
-									echo '<span class="anl_variabla">';
 									echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>';
-									echo '</span>';
 									echo '</td>';
 								}
-								if ($showGraph) {
-									echo '<td class="empty_cell30"></td>';
-								}
 								echo '</tr>';
 
 							}
 							else
 							{ #dodamo header za grupo
+
+								
 								echo '<tr class="multiVariablesHeader">';
 								
 								if($admin_type == '0'){
-									echo '<td>'.$spr['spr_id'].'</td>';	
+									echo '<td class="center">'.$spr['spr_id'].'</td>';	
-									echo '<td></td>';	
+									echo '<td class="center"></td>';	
 								}
 								
 								if ($showQuestion) {
-									echo '<td class="showQuestion">';
+									echo '<td class="left semi-bold">';
 									if (count($grids) > 1) {
-										echo '<span class="anl_variabla">';
 										echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $grid['variable'] . '</a>';
-										echo '</span>';
 									} else {
-										echo '<span class="anl_variabla">';
 										echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>';
-										echo '</span>';
 									}
 									echo '</td>';
-									echo '<td colspan="'.(count($this->_missings)+count($this->_unsets)+$added_colspan).'">';
+									echo '<td class="left semi-bold" colspan="'.($count_missing+count($this->_unsets)+$added_colspan+4).'">';
-									echo $grid['naslov'];
+									echo (strlen($grid['naslov']) > 30 ? substr($grid['naslov'],0,30)."..." : $grid['naslov']);
 									echo '</td>';
 								} else {
-									echo '<td colspan="'.(count($this->_missings)+count($this->_unsets)+$added_colspan).'">';
+									echo '<td class="left semi-bold" colspan="'.($count_missing+count($this->_unsets)+$added_colspan+3).'">';
 									if (count($grids) > 1) {
-										echo '<span class="anl_variabla">';
 										echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $grid['variable'] . '</a>';
-										echo '</span>';
 									} else {
-										echo '<span class="anl_variabla">';
 										echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $spr['variable'] . '</a>';
-										echo '</span>';
 									}
 									echo '</td>';
 								}
-								if ($showGraph) {
-									echo '<td class="empty_cell30"></td>';
-								}
 								echo '</tr>';
 							}
 						}
@@ -1168,28 +1088,26 @@ class SurveyParaAnalysis{
 							}
 							$delta  = $data_seq['delta'];
 */
-							echo '<tr class="'.$css_sublcass.'">';
+							echo '<tr>';
 							
 							if($admin_type == '0'){
-								echo '<td rowspan="'.($showPercent*2).'">'.$spr['spr_id'].'</td>';	
+								echo '<td class="center" rowspan="'.($showPercent*2).'">'.$spr['spr_id'].'</td>';	
-								echo '<td rowspan="'.($showPercent*2).'">'.$variable['vr_id'].'</td>';	
+								echo '<td class="center" rowspan="'.($showPercent*2).'">'.$variable['vr_id'].'</td>';	
 							}
 							
 							//echo '<td style="border-top:0px none !important;border-bottom:0px none !important;">&nbsp;</td>';
 								
-							echo '<td rowspan="'.($showPercent*2).'">';
+							echo '<td class="left" rowspan="'.($showPercent*2).'">';
-							echo '<span class="anl_variabla">';
 							echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $key . '\'); return false;" href="#">' . $variable['variable'] . '</a>';
-							echo '</span>';
 							echo '</td>';
 							if ($showQuestion) {
-								echo '<td class="showQuestion" rowspan="'.($showPercent*2).'">';
+								echo '<td class="left" rowspan="'.($showPercent*2).'">';
-								echo $variable['naslov'];
+								echo (strlen($variable['naslov']) > 30 ? substr($variable['naslov'],0,30)."..." : $variable['naslov']);
 								echo '</td>';
 							}
-							echo '<td>';
+							/*echo '<td>';
 							echo (int)$data_seq['veljavni'];
-							echo '</td>';
+							echo '</td>';*/
 							foreach ($this->_missings AS $value => $text) {
 								$missing = 0;
 								if (isset($data_seq['values'][$value])) {
@@ -1216,11 +1134,11 @@ class SurveyParaAnalysis{
 							}
 							echo "<td rowspan=\"".($showPercent*2)."\">" . common::formatNumber($data_seq['ns'],2) . "</td>";
 							if ($showGraph) {
-								echo "<td  rowspan=\"".($showPercent*2)."\" class=\"empty_cell30\">";
+								echo "<td rowspan=\"".($showPercent*2)."\" class=\"graph_cell left\">";
 								if ($data_seq['ns'] > 0) {
-									echo '<div class="para_analitics_bar" style="'.'width:'.($data_seq['ns']*100).'%; text-align:right; padding-right:5px; color:green;"></div>';
+									echo '<div class="graph_full" style="'.'width:'.($data_seq['ns']*100).'%;"></div>';
 								} else {
-									echo '<div class="para_analitics_bar null_value" style="'.'width:1px"></div>';
+									echo '/';
 								}
 								echo '</td>';
 							}
@@ -1229,19 +1147,19 @@ class SurveyParaAnalysis{
 							if ($showPercent)
 							{
 								echo '<tr class="'.$css_sublcass.' percent">';
-								echo '<td>';
+								/*echo '<td>';
 								$val = 0;
 								if ($percent_all > 0) {
 									$val = $data[$seq]['veljavni'] / $percent_all * 100;
 								}
 								echo common::formatNumber($val,0,null,'%') ;
-								echo '</td>';
+								echo '</td>';*/
 								foreach ($this->_missings AS $value => $text) {
 									$val = 0;
 									if ($percent_all > 0 && isset($data[$seq]['values'][$value])) {
 										$val = ($data[$seq]['values'][$value] / $percent_all * 100);
 									}
-									echo '<td>'.common::formatNumber($val,0,null,'%').'</td>';
+									echo '<td class="dashed">'.common::formatNumber($val,0,null,'%').'</td>';
 								}
 								foreach ($this->_unsets AS $value => $text)
 								{
@@ -1249,7 +1167,7 @@ class SurveyParaAnalysis{
 									if ($percent_all > 0 && isset($data[$seq]['values'][$value])) {
 										$val = ($data[$seq]['values'][$value] / $percent_all * 100);
 									}
-									echo '<td>'.common::formatNumber($val,0,null,'%').'</td>';
+									echo '<td class="dashed">'.common::formatNumber($val,0,null,'%').'</td>';
 								}
 								echo '</tr>';
 							}
@@ -1259,10 +1177,9 @@ class SurveyParaAnalysis{
 			}
 		}
 		echo '</table>';
+		echo '</div>';
+		echo '</div>';
 		SurveyAnalysisHelper::getInstance()->displayMissingLegend();
-
-		echo '<br class="clr" />';
-
 	}
 	
 	function getVariables()

admin/survey/classes/class.SurveyParaGraph.php

@@ -39,13 +39,13 @@ class SurveyParaGraph{
 		$paraData = $this->collectParaGraphDataNew();
 					
 		
-		echo '<p>'.$lang['srv_para_graph_text'].'</p>';
+		//echo '<p>'.$lang['srv_para_graph_text'].'</p>';
 		
 		
 		// PC, tablica, mobi
 		echo '<fieldset><legend>'.$lang['srv_para_graph_device'].'</legend>';		
 
-		// Filter po napravi
+		/* Filter po napravi
 		echo '<div style="margin:5px 0 15px 5px;">';
 		echo '<label>'.$lang['srv_analiza_filter'].': </label>';
 		echo '<label for="paraGraph_filter_pc"><input type="checkbox" id="paraGraph_filter_pc" '.($this->paraGraph_filter['pc']==1 ? ' checked="checked"' : '').' onClick="changeParaGraphFilter();">'.$lang['srv_para_graph_device0'].'</label>';
@@ -53,32 +53,43 @@ class SurveyParaGraph{
 		echo ' <label for="paraGraph_filter_tablet"><input type="checkbox" id="paraGraph_filter_tablet" '.($this->paraGraph_filter['tablet']==1 ? ' checked="checked"' : '').' onClick="changeParaGraphFilter();">'.$lang['srv_para_graph_device2'].'</label>';
 		echo ' <label for="paraGraph_filter_robot"><input type="checkbox" id="paraGraph_filter_robot" '.($this->paraGraph_filter['robot']==1 ? ' checked="checked"' : '').' onClick="changeParaGraphFilter();">'.$lang['srv_para_graph_device3'].'</label>';
 		echo '&nbsp;&nbsp;&nbsp;<label>('.$lang['srv_para_graph_filteredCnt'].' '.$paraData['allCount'].')</label>';
-		echo '</div>';
+		echo '</div>';/*/
 	
 		
-		echo '<table style="width:100%">';
+		echo '<table class="parapodatki_table">';
 		
 		echo '<tr>';
-		echo '<th nowrap>'.$lang['srv_para_graph_device0'].'</th>';
+		echo '<th>'.$lang['srv_para_graph_device'].'</th>';
-		echo '<td style="width:100%">';
+		echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
-		echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['pcCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+		echo '</tr>';
-		echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['pcCount'].'</span></span>';
+		
+		echo '<tr>';
+		echo '<td>'.$lang['srv_para_graph_device0'].'</td>';
+		echo '<td class="graph_cell">';
+		echo '<div class="graph_cell">';
+		echo '  <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['pcCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+		echo '  <span >'.$paraData['pcCount'].'</span>';
+		echo '</div>';
 		echo '</td>';
 		echo '</tr>';
 		
 		echo '<tr>';
-		echo '<th nowrap>'.$lang['srv_para_graph_device1'].'</th>';
+		echo '<td>'.$lang['srv_para_graph_device1'].'</td>';
-		echo '<td style="width:100%">';
+		echo '<td class="graph_cell">';
-		echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['mobiCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+		echo '<div class="graph_cell">';
-		echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['mobiCount'].'</span></span>';
+		echo '  <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['mobiCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+		echo '  <span >'.$paraData['mobiCount'].'</span>';
+		echo '</div';
 		echo '</td>';		
 		echo '</tr>';
 		
 		echo '<tr>';
-		echo '<th nowrap>'.$lang['srv_para_graph_device2'].'</th>';
+		echo '<td>'.$lang['srv_para_graph_device2'].'</td>';
-		echo '<td style="width:100%">';
+		echo '<td class="graph_cell">';
-		echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['tabletCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+		echo '<div class="graph_cell">';
-		echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['tabletCount'].'</span></span>';
+		echo '  <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['tabletCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+		echo '  <span >'.$paraData['tabletCount'].'</span>';
+		echo '</div';
 		echo '</td>';
 		echo '</tr>';
 		
@@ -87,7 +98,7 @@ class SurveyParaGraph{
 		echo '<th nowrap>'.$lang['srv_para_graph_device3'].'</th>';
 		echo '<td style="width:100%">';
 		echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['robotCount']/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
-		echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['robotCount'].'</span></span>';
+		echo '  <span >'.$paraData['robotCount'].'</span>';
 		echo '</td>';		
 		echo '</tr>';
 
@@ -102,7 +113,12 @@ class SurveyParaGraph{
 		// Browser		
 		echo '<fieldset><legend>'.$lang['srv_para_graph_browser'].'</legend>';		
 
-		echo '<table style="width:100%">';
+		echo '<table class="parapodatki_table">';
+
+		echo '<tr>';
+		echo '<th>'.$lang['srv_para_graph_browser'].'</th>';
+		echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
+		echo '</tr>';
 
 		if(count($paraData['browser']) > 0){
 			if(count($paraData['browser']) > 1)
@@ -112,10 +128,12 @@ class SurveyParaGraph{
 							
 				if($key != $lang['srv_para_graph_other_slo'] && $key != $lang['srv_para_graph_other_ang']){
 					echo '<tr>';
-					echo '<th nowrap>'.$key.'</th>';
+					echo '<td>'.$key.'</td>';
-					echo '<td style="width:100%">';
+					echo '<td class="graph_cell">';
-					echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $browserCnt/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+					echo '<div class="graph_cell">';
-					echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$browserCnt.'</span></span>';
+					echo '  <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $browserCnt/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+					echo '  <span >'.$browserCnt.'</span>';
+					echo '</div';
 					echo '</td>';
 					echo '</tr>';	
 				}
@@ -123,20 +141,24 @@ class SurveyParaGraph{
 		
 			if(isset($paraData['browser'][$lang['srv_para_graph_other_slo']]) && $paraData['browser'][$lang['srv_para_graph_other_slo']] > 0){
 				echo '<tr>';
-				echo '<th nowrap>'.$lang['srv_para_graph_other'].'</th>';
+				echo '<td>'.$lang['srv_para_graph_other'].'</td>';
-				echo '<td style="width:100%">';
+				echo '<td class="graph_cell">';
-				echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['browser'][$lang['srv_para_graph_other_slo']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+				echo '<div class="graph_cell">';
-				echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['browser'][$lang['srv_para_graph_other_slo']].'</span></span>';
+				echo '  <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['browser'][$lang['srv_para_graph_other_slo']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+				echo '  <span >'.$paraData['browser'][$lang['srv_para_graph_other_slo']].'</span>';
+				echo '</div';
 				echo '</td>';
 				echo '</tr>';
 			}
 			
 			if(isset($paraData['browser'][$lang['srv_para_graph_other_ang']]) && $paraData['browser'][$lang['srv_para_graph_other_ang']] > 0){
 				echo '<tr>';
-				echo '<th nowrap>'.$lang['srv_para_graph_other'].'</th>';
+				echo '<td>'.$lang['srv_para_graph_other'].'</td>';
-				echo '<td style="width:100%">';
+				echo '<td class="graph_cell">';
-				echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['browser'][$lang['srv_para_graph_other_ang']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+				echo '<div class="graph_cell">';
-				echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['browser'][$lang['srv_para_graph_other_ang']].'</span></span>';
+				echo '  <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['browser'][$lang['srv_para_graph_other_ang']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+				echo '  <span >'.$paraData['browser'][$lang['srv_para_graph_other_ang']].'</span>';
+				echo '</div';
 				echo '</td>';
 				echo '</tr>';
 			}
@@ -153,7 +175,12 @@ class SurveyParaGraph{
 		// Operacijski sistem		
 		echo '<fieldset><legend>'.$lang['srv_para_graph_os'].'</legend>';		
 
-		echo '<table style="width:100%">';
+		echo '<table class="parapodatki_table">';
+
+		echo '<tr>';
+		echo '<th>'.$lang['srv_para_graph_os'].'</th>';
+		echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
+		echo '</tr>';
 
 		if(count($paraData['os']) > 0){		
 			if(count($paraData['os']) > 1)
@@ -163,10 +190,12 @@ class SurveyParaGraph{
 				
 				if($key != $lang['srv_para_graph_other_slo'] && $key != $lang['srv_para_graph_other_ang']){
 					echo '<tr>';
-					echo '<th nowrap>'.$key.'</th>';
+					echo '<td>'.$key.'</td>';
-					echo '<td style="width:100%">';
+					echo '<td class="graph_cell">';
-					echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $osCnt/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+					echo '<div class="graph_cell">';
-					echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$osCnt.'</span></span>';
+					echo '  <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $osCnt/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+					echo '  <span >'.$osCnt.'</span>';
+					echo '</div>';
 					echo '</td>';
 					echo '</tr>';
 				}
@@ -174,20 +203,24 @@ class SurveyParaGraph{
 			
 			if(isset($paraData['os'][$lang['srv_para_graph_other_slo']]) && $paraData['os'][$lang['srv_para_graph_other_slo']] > 0){
 				echo '<tr>';
-				echo '<th nowrap>'.$lang['srv_para_graph_other'].'</th>';
+				echo '<td>'.$lang['srv_para_graph_other'].'</td>';
-				echo '<td style="width:100%">';
+				echo '<td class="graph_cell">';
-				echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['os'][$lang['srv_para_graph_other_slo']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+				echo '<div class="graph_cell">';
-				echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['os'][$lang['srv_para_graph_other_slo']].'</span></span>';
+				echo '  <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['os'][$lang['srv_para_graph_other_slo']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+				echo '  <span >'.$paraData['os'][$lang['srv_para_graph_other_slo']].'</span>';
+				echo '</div>';
 				echo '</td>';
 				echo '</tr>';
 			}
 			
 			if(isset($paraData['os'][$lang['srv_para_graph_other_ang']]) && $paraData['os'][$lang['srv_para_graph_other_ang']] > 0){
 				echo '<tr>';
-				echo '<th nowrap>'.$lang['srv_para_graph_other'].'</th>';
+				echo '<td>'.$lang['srv_para_graph_other'].'</td>';
-				echo '<td style="width:100%">';
+				echo '<td class="graph_cell">';
-				echo '  <div class="graph_lb" style="text-align: right; float: left; width: '.($paraData['allCount']>0 ? $paraData['os'][$lang['srv_para_graph_other_ang']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+				echo '<div class="graph_cell">';
-				echo '  <span style="display: block; margin: auto auto auto 5px; float: left">'.$paraData['os'][$lang['srv_para_graph_other_ang']].'</span></span>';
+				echo '  <div class="graph_full" style="width: '.($paraData['allCount']>0 ? $paraData['os'][$lang['srv_para_graph_other_ang']]/$paraData['allCount']*85 : '0').'%">&nbsp;</div>';
+				echo '  <span >'.$paraData['os'][$lang['srv_para_graph_other_ang']].'</span>';
+				echo '</div>';
 				echo '</td>';
 				echo '</tr>';
 			}

admin/survey/classes/class.SurveyPostProcess.php

@@ -41,26 +41,33 @@ class SurveyPostProcess {
 	function displayTab () {
 		global $lang;
 		
-		echo '<fieldset><legend>'.$lang['srv_compute'].'</legend>';
+		echo '<fieldset id="calculations"><legend>'.$lang['srv_compute'].'</legend>';
 		echo '<script>__vnosi=1;</script>';
 		
 		$b = new Branching($this->anketa);
 		
 		$sql = sisplet_query("SELECT s.id, s.naslov, s.variable FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$this->anketa' AND s.tip='22'");
+		$count = 0;
 		if (mysqli_num_rows($sql) > 0) {
 			
-			echo '<p>'.$lang['srv_compute_list'].'</p>';
+			echo '<p class="bottom16">'.$lang['srv_compute_list'].'</p>';
 			
 			while ($row = mysqli_fetch_array($sql)) {
-				
+				$count +=1;
-				echo '<p>'.$row['naslov'].': <a href="" onclick="calculation_editing(\'-'.$row['id'].'\'); return false;"><b> '.$row['variable'].'= '.$b->calculations_display(-$row['id'], 1).'</b></a></p>';
+				echo '<div class="icon_holder">';
+				echo '<p>'.$row['naslov'].' '.$count.': '.$b->calculations_display(-$row['id'], 1).'</p>';
+				echo '<span class="faicon edit aslink" onclick="calculation_editing(\'-'.$row['id'].'\'); return false;"></span>';
+				echo '<span class="faicon trash empty aslink" onclick="brisi_spremenljivko(\''.$row['id'].'\'); return false;"></span>';
+				echo '</div>';
 			}
 		}
 		
-		echo '<p><a href="" onclick="spremenljivka_new(0, 0, 1, 0, 22); return false;">'.$lang['srv_add_compute'].'</a></p>';
+		echo '<a class="noline" href="#" onClick="spremenljivka_new(0, 0, 1, 0, 22); return false;"><span class="faicon plus_circle link-right"></span>'.$lang['srv_add_compute'].'</a>';
 		
 		if (mysqli_num_rows($sql) > 0) {
-			echo '<span class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="postprocess_start_calculation(); return false;">'.$lang['srv_compute_start'].'</a></span>';
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onclick="postprocess_start_calculation(); return false;">'.$lang['srv_compute_start'].'</button>';				
+			echo '</div>';
 		}
 		
 		echo '</legend>';
@@ -93,9 +100,13 @@ class SurveyPostProcess {
 		$freq = SurveyAnalysis::getFrequencys();
 		
 		$ok = false;
-		
+
-		echo '<p id="ok">'.$lang['srv_mass_coding'].': ';
+		echo '<div id="ok">';
-		echo '<select name="spr_id" id="mass_coding_spr_id" style="width:250px">';
+
+		echo '<div class="setting_holder">';
+		echo '<label for="mass_coding_spr_id">'.$lang['srv_mass_coding'].'</label>';
+
+		echo '<select class="dropdown large w400" name="spr_id" id="mass_coding_spr_id">';
 		
 		foreach (SurveyAnalysis::$_HEADERS AS $key => $h) {
 			
@@ -116,22 +127,37 @@ class SurveyPostProcess {
 			}
 		}
 		
-		echo '</select> ';
+		echo '</select>';
+                                    
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
 		
-		echo '<select name="coding_type" id="coding_type">';
+		echo '<label for="coding_type">'.$lang['srv_mass_coding_count'].'</label>';
+		echo '<select class="dropdown large w400" name="coding_type" id="coding_type">';
 		echo '<option value="1">'.$lang['srv_coding_one'].'</option>';
 		echo '<option value="2">'.$lang['srv_coding_multi'].'</option>';
 		echo '</select> ';
-		
+
-		echo '<input type="submit" value="'.$lang['srv_save_and_run_profile'].'" onclick="$(this).prop(\'disabled\', true); mass_coding($(\'#mass_coding_spr_id\').val(), $(\'#coding_type\').val()); return false;"></p>';
+		echo '</div>';
-		
+
+		echo '<div class="button_holder intext">';
+		echo '<button class="medium blue" type="submit" onclick="$(this).prop(\'disabled\', true); mass_coding($(\'#mass_coding_spr_id\').val(), $(\'#coding_type\').val()); return false;">'.$lang['srv_mass_coding_run'].'</button>';              
+		echo '</div>';
+		echo '</div>';
 		
 		if (!$ok) {
-			?><script> $('#ok').hide(); </script><?
+			?><script> $('#ok').addClass('displayNone'); </script><?
-			echo '<p>'.$lang['srv_mass_coding_no_vars'].'</p>';
+			echo '<p class="bold">'.$lang['srv_mass_coding_no_vars'].'</p>';
+		}
+		else {
+			?><script> $('#ok').removeClass('displayNone'); </script><?
 		}
 		
-		echo '<p>'.$lang['srv_mass_coding_txt'].'</p>';
+		echo '<p class="top16">'.$lang['srv_mass_coding_txt1'].'</p>';
+		echo '<p class="top16">'.$lang['srv_mass_coding_txt2'].'</p>';
+		echo '<p class="top16">'.$lang['srv_mass_coding_txt3'].'</p>';
+		echo '<p class="top16">'.$lang['srv_mass_coding_txt4'].'</p>';
 		
 		echo '</fieldset>';
 	}
@@ -158,7 +184,7 @@ class SurveyPostProcess {
 		SurveyAnalysis::Init($this->anketa);
 		$freq = SurveyAnalysis::getFrequencys();
 		
-		echo '<p class="coding-refresh"><a href="index.php?anketa='.$this->anketa.'&a=data&m=coding">'.$lang['src_coding_refresh'].'</a></p>';
+		echo '<p class="coding-refresh bottom16"><a href="index.php?anketa='.$this->anketa.'&a=data&m=coding">'.$lang['src_coding_refresh'].'</a></p>';
 		
 		
 		SurveyVariablesProfiles::Init($this->anketa, $global_user_id);
@@ -166,12 +192,18 @@ class SurveyPostProcess {
 		if (SurveyVariablesProfiles::getCurentProfileId() != -1)
 			$variables = array();
 		
-		echo '<p>'.$lang['srv_hand_coding_text'] . '</p>';
+		echo '<p class="bottom16">'.$lang['srv_hand_coding_text'] . '</p>';
-		
+
-		echo '<p><label id="link_variable_profile_remove" onclick="removeVariableProfile();"><input type="radio" name="filter" '.(count($variables)==0?'checked':'').'> '.$lang['srv_coding_spr_1'].'</label></p>';
+		echo '<div class="setting_holder">';
-		
+
-		echo '<p><label onclick="coding_filter($(\'#mass_coding_spr_id\').val());"><input type="radio" name="filter" '.(count($variables)>0?'checked':'').' onclick="return false;"> '.$lang['srv_coding_spr'].':</label> ';
+		echo '<div class="setting_item">';
-		echo '<select name="spr_id" id="mass_coding_spr_id" style="width:200px" onchange="coding_filter($(\'#mass_coding_spr_id\').val()); return false;">';
+		echo '<input type="radio" name="filter" '.(count($variables)==0?'checked':'').'>';
+		echo '<label id="link_variable_profile_remove" onclick="removeVariableProfile();"> '.$lang['srv_coding_spr_1'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="filter" '.(count($variables)>0?'checked':'').' onclick="return false;">';
+		echo '<label onclick="coding_filter($(\'#mass_coding_spr_id\').val());"> '.$lang['srv_coding_spr'].':</label>';
+		echo '<select name="spr_id" id="mass_coding_spr_id" class="dropdown medium '.(count($variables)>0?'':'disabled').'" onchange="coding_filter($(\'#mass_coding_spr_id\').val()); return false;">';
 		
 		SurveyAnalysis::Init($this->anketa);
 		$freq = SurveyAnalysis::getFrequencys();
@@ -196,10 +228,9 @@ class SurveyPostProcess {
 		}
 		
 		echo '</select> ';
-		//echo '<input type="submit" value="'.$lang['srv_coding_filter'].'" onclick="$(this).prop(\'disabled\', true); coding_filter($(\'#mass_coding_spr_id\').val()); return false;"> ('.$lang['srv_coding_spr2'].')</p>';
+		echo '</div>';
-		if ( count($variables)>0 )
+					
-			echo '('.$lang['srv_coding_spr2'].')';
+		echo '</div>';
-		echo '</p>';
 		
 		
 		SurveyDataDisplay::displayVnosiHTML();
@@ -631,7 +662,9 @@ class SurveyPostProcess {
 		} else {
 			$coding_id = $spr_id;
 		}
-		echo '<h3 style="margin: 7px 10px">'.$lang['srv_hand_coding'].'</h3>';
+		echo '<div class="popup_close"><a href="#" onClick="toggle_coding_div(); return false;">✕</a></div>';
+		echo '<h2><span class="faicon fa-code-branch blue"></span>'.$lang['srv_hand_coding'].'</h2>';
+
 		echo '<form id="coding_'.$usr_id.'">';
 		
 		echo '<input type="hidden" value="'.$usr_id.'" name="usr_id">';
@@ -643,23 +676,34 @@ class SurveyPostProcess {
 			while ($row = mysqli_fetch_array($sql)) {
 				
 				echo '<fieldset style="position: relative">';
+
+				//Zgornji sivi del
+				echo '<div class="variable_name">';
 				
-				echo '<p style="float:left; min-height:20px"><strong>'.skrajsaj(strip_tags($row['naslov']), 20).'</strong> <a href="" onclick="$(\'.edit_'.$row['id'].'\').toggle(); return false;" title="'.$lang['edit2'].'"><span class="faicon edit"></span></a></p>';
+				echo '<div class="osnovno">';
-				echo '<p class="edit_'.$row['id'].'" style="display:none; float:left; margin-left:10px">'.$lang['srv_tip'].': ';
+				echo '<p class=semi-bold>'.skrajsaj(strip_tags($row['naslov']), 20).'</p>';
-				echo '<select name="tip" onchange="if (confirm(\''.$lang['srv_change_q_tip'].'\')) {coding_tip(\''.$row['id'].'\', \''.$usr_id.'\', $(this).val());} return false;"><option value="1" '.($row['tip']==1?'selected':'').'>'.$lang['srv_vprasanje_tip_1'].'</option><option value="2" '.($row['tip']==2?'selected':'').'>'.$lang['srv_vprasanje_tip_2'].'</option><option value="3" '.($row['tip']==3?'selected':'').'>'.$lang['srv_vprasanje_tip_3'].'</option></select>';
+				echo '<span class="faicon edit pointer blue" onclick="$(\'.edit_'.$row['id'].'\').toggle(); return false;" title="'.$lang['edit2'].'"></span>';
-				//echo '<a href="#" onclick="if (confirm(\''.$lang['srv_change_q_tip'].'\')) {coding_tip(\''.$row['id'].'\', \''.$usr_id.'\', \''.($row['tip']==1?'2':'1').'\');} return false;" title="'.$lang['srv_change_q_tip'].'">'.($row['tip']==1?$lang['srv_vprasanje_tip_1']:$lang['srv_vprasanje_tip_2']).'</a>';
+				echo '<span class="faicon delete empty blue pointer" onclick="brisi_spremenljivko(\''.$row['id'].'\'); return false;" title="'.$lang['srv_brisispremenljivko'].'"></span>';
-				echo ' <a href="index.php?anketa='.$this->anketa.'&spr_id='.$row['id'].'#branching_'.$row['id'].'">'.$lang['srv_napredno_urejanje'].'</a> <a href="" onclick="brisi_spremenljivko(\''.$row['id'].'\'); return false;" title="'.$lang['srv_brisispremenljivko'].'"><span class="faicon delete icon-grey_dark_link"></span></a></p>';
+				echo '</div>';
+
+				echo '<div class="urejanje edit_'.$row['id'].'" style="display:none;">'.$lang['srv_tip'].': ';
+				echo '<select name="tip" class="dropdown small" onchange="if (confirm(\''.$lang['srv_change_q_tip'].'\')) {coding_tip(\''.$row['id'].'\', \''.$usr_id.'\', $(this).val());} return false;"><option value="1" '.($row['tip']==1?'selected':'').'>'.$lang['srv_vprasanje_tip_1'].'</option><option value="2" '.($row['tip']==2?'selected':'').'>'.$lang['srv_vprasanje_tip_2'].'</option><option value="3" '.($row['tip']==3?'selected':'').'>'.$lang['srv_vprasanje_tip_3'].'</option></select>';
+				echo '<a class="noline" href="index.php?anketa='.$this->anketa.'&spr_id='.$row['id'].'#branching_'.$row['id'].'">'.$lang['srv_napredno_urejanje'].'</a></div>';
+
+				echo '</div>';
+
+				//Spodnji del
+				echo '<div class="variable_content">';
 				
 				echo '<input id="visible_'.$row['row'].'" type="hidden" value="1" name="visible_'.$row['id'].'">';
 				
-				//echo '<input type="hidden" value="'.$row['id'].'" name="spr_id">';
-				
-				echo '<p style="clear:both">';
 				if ($row['tip'] == 3) {
 					echo '<select name="vrednost_'.$row['id'].'">';
 				}
 				$sql1 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='$row[id]' ORDER BY vrstni_red ASC");
 				while ($row1 = mysqli_fetch_array($sql1)) {
+
+					echo '<div class="setting_holder horizontal">';
 					
 					$sql2 = sisplet_query("SELECT * FROM srv_data_vrednost".$this->db_table." WHERE spr_id='$row[id]' AND vre_id='$row1[id]' AND usr_id='$usr_id'");
 					if (mysqli_num_rows($sql2) > 0)
@@ -674,46 +718,48 @@ class SurveyPostProcess {
 					}
 					
 					if ($row['tip'] == 1 || $row['tip'] == 2) {
-						echo '<span style="display:none; color:gray; float:right" class="edit_'.$row['id'].'"><select onchange="coding_merge(\''.$row['id'].'\', \''.$row1['id'].'\', \''.$usr_id.'\', this.value)" style="width:150px">';
+						echo '<span style="display:none;" class="edit_'.$row['id'].'"><select class="dropdown small" onchange="coding_merge(\''.$row['id'].'\', \''.$row1['id'].'\', \''.$usr_id.'\', this.value)" style="width:150px">';
 						echo '<option value="0">'.$lang['srv_coding_merge'].':</option>';
 						
 						$sql2 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='$row[id]' AND id != '$row1[id]' ORDER BY vrstni_red ASC");
 						while ($row2 = mysqli_fetch_array($sql2))
 							echo '<option value="'.$row2['id'].'">'.$row2['naslov'].'</option>';
 						
-						echo '</select></span><br />';
+						echo '</select>';
 					}
+
+					echo '</div>';
 					
 				}
 				if ($row['tip'] == 3) {
 					echo '</select>';
 				}
-				echo '<input type="text" name="vrednost_new_'.$row['id'].'" value="" placeholder="'.$lang['srv_novavrednost'].'" style="margin-left:23px; width: 80px" /> <a href="#" onclick="coding_vrednost_new(\''.$row['id'].'\', \''.$usr_id.'\', $(\'input[name=vrednost_new_'.$row['id'].']\').val()); return false;"><span class="faicon add small icon-as_link" title="'.$lang['add'].'"></span></a>';
+				echo '<input type="text" class="text small" name="vrednost_new_'.$row['id'].'" value="" placeholder="'.$lang['srv_novavrednost'].'"/> <a href="#" onclick="coding_vrednost_new(\''.$row['id'].'\', \''.$usr_id.'\', $(\'input[name=vrednost_new_'.$row['id'].']\').val()); return false;"><span class="faicon add blue pointer" title="'.$lang['add'].'"></span></a>';
-				echo '</p>';
+
+				echo '</div>'; #div.variable_content
 				echo '</fieldset>';
 			}
 		} else {
-			echo '<fieldset>';
+			echo '<p class="italic bottom16">'.$lang['srv_coding_no_spr'].'</p>';
-			echo '<p>'.$lang['srv_coding_no_spr'].'</p>';
-			echo '</fieldset>';
 		}
 		
-		echo '<div class="new-spr">';
+
-		echo '<a href="#" onclick="'.(true?' $(\'#coding_spr_new\').toggle();':'').' return false;">'.$lang['srv_coding_new'].'</a>';
+		echo '<div class="button_holder left" id="dodaj_spr">';
-		echo '<div id="coding_spr_new" '.(true?' style="display:none"':'').'>';
+		echo '<button class="medium blue" onclick="'.(true?' $(\'#coding_spr_new\').toggle(); $(\'#dodaj_spr\').toggle();':'').' return false;">'.$lang['srv_coding_new'].'</button>';
-		echo '<p>'.$lang['name'].': <input type="text" name="spremenljivka_new" value="" style="width: 123px" /> <a href="#" onclick="coding_spremenljivka_new(\''.$coding_id.'\', \''.$usr_id.'\', $(\'input[name=spremenljivka_new]\').val()); return false;">'.$lang['add'].'</a></p>';
+		echo '</div>';
+
+		echo '<div class="setting_holder horizontal" id="coding_spr_new" '.(true?' style="display:none"':'').'>';
+		echo '<p>'.$lang['name'].':</p>';
+		echo '<div class="button_holder inline">';
+		echo '<input type="text" class="text large" name="spremenljivka_new" value=""/>';
+		echo '<button class="medium blue" onclick="coding_spremenljivka_new(\''.$coding_id.'\', \''.$usr_id.'\', $(\'input[name=spremenljivka_new]\').val()); return false;">'.$lang['add'].'</button>';
+		echo '<button class="medium white-blue" onclick="$(\'#coding_spr_new\').toggle(); $(\'#dodaj_spr\').toggle(); return false;">'.$lang['edit1338'].'</button>';
 		echo '</div>';
 		echo '</div>';
-		
+
-		
+		echo '<div class="button_holder left">';
-			
+		echo '<button class="medium white-blue" onclick="coding_save(\''.$usr_id.'\'); return false;">'.$lang['save'].'</button>';
-		echo '<p style="margin:20px 10px 10px 10px">';
+		echo '</div>';
-		
-		if (mysqli_num_rows($sql) > 0) {
-			//echo '<input type="submit" value="'.$lang['srv_close_profile'].'" onclick="coding_save(\''.$usr_id.'\'); return false;"> ';
-		}
-		echo '<a href="#" onclick="coding_save(\''.$usr_id.'\'); return false;">'.$lang['srv_close_profile'].'</a>';
-		echo '</p>';
 		
 		echo '</form>';
 		
@@ -861,12 +907,18 @@ class SurveyPostProcess {
 		session_start();
 		$_SESSION['sid_'.$this->anketa]['dataIcons_labels'] = true;
 		
+		echo '<h2><span class="faicon blue fa-check-circle"></span>'.$lang['srv_auto_coding_end_title'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onclick="popupClose();">✕</a></div>';
+
 		echo '<p>';
 		
 		printf($lang['srv_auto_coding_end'], $this->mass_coding_auto_vars, $link);
 		
 		echo '</p>';
-		
+        
+		echo '<div class="button_holder">';
+		echo '<button class="medium white-blue" onclick="popupClose(); window.location.reload(); return false;">'.$lang['srv_zapri'].'</button>';
+		echo '</div>';
 	}
 	
 	private $mass_coding_auto_vars = 0;

admin/survey/classes/class.SurveyQuotas.php

@@ -154,37 +154,46 @@ class SurveyQuotas {
 
         echo '<div class="popup_close"><a href="#" onClick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;">✕</a></div>';
 
-        echo '<div id="quota_editing_inner">';
+        echo '<div id="quota_editing_inner" class="podatki">';
         $this->quota_editing_inner($condition, $vrednost);
         echo '</div>';
 
-        echo '<div id="bottom_space">';
+        echo '<div id="bottom_options">';
 
 		$row = Cache::srv_spremenljivka(-$condition);
-        if ($condition < 0) {		
+        if ($condition < 0) {	
-			echo '<p style="float:left; padding:0; margin:0; margin-left:20px">'.$lang['srv_variable'].': <input type="text" id="variable_'.(-$condition).'" value="'.$row['variable'].'" onkeyup="quota_edit_variable(\''.-$condition.'\');" style="width:60px" /></p>';
+            echo '<div class="setting_horizontal_wrapper">';	
+
+            echo '<div class="setting_holder">';	
+			echo '  <label>'.$lang['srv_variable'].':</label>';
+            echo '  <input type="text" id="variable_'.(-$condition).'" class="large" value="'.$row['variable'].'" onkeyup="quota_edit_variable(\''.-$condition.'\');" />';
+            echo '</div>';
+
+            echo '</div>';
         }
 		
-
-        echo '<div id="condition_editing_close">';
-
-        // kvota kot spremenljivka (lahko jo zbrisemo)
-        if ($condition < 0) {
-	        echo '<span class="buttonwrapper spaceRight floatLeft">';
-	        echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="brisi_spremenljivko(\''.(-$condition).'\'); return false;"><span>'.$lang['srv_anketadelete_txt'].'</span></a>';
-	        echo '</span>';
-		}
-
-		echo '<span class="buttonwrapper spaceRight floatLeft">';
-        echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
-        echo '</span>';
-
-        echo '<span class="buttonwrapper floatLeft">';
-        echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
-        echo '</span>';
-
         echo '</div>';
+
+
+        echo '<div id="condition_editing_close" class="podatki">';
+		echo '  <div class="button_holder">';
+
+		// kalkulacija kot spremenljivka (lahko jo zbrisemo)
+        if ($condition < 0) 
+			echo '      <button class="medium white-blue" onclick="brisi_spremenljivko(\''.(-$condition).'\'); return false;">'.$lang['srv_anketadelete_txt'].'</button>';				
+
+		echo '      <button class="medium white-blue" onclick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;">'.$lang['srv_zapri'].'</button>';				
+		echo '      <button class="medium blue" onclick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;">'.$lang['srv_potrdi'].'</button>';
+		
+        echo '  </div>';
         echo '</div>';
+
+
+        ?><script>
+		$('#quota_editing_inner').sortable({items: 'form', handle: '.move', stop: function () {
+			quota_sort(<?=$condition?>);
+		} });
+		</script><?
     }
 
     private function quota_editing_inner ($condition, $vrednost=0) {
@@ -192,23 +201,16 @@ class SurveyQuotas {
 
         echo '<div class="quota_editing_preview">';
 
-        echo '<h2>'.$lang['srv_quota'].'</h2>';
+        echo '<h2><span class="blue faicon edit"></span>'.$lang['srv_quota'].'</h2>';
         echo '<div id="quota_editing_calculations">';
         echo $this->quota_display($condition, 1);
         echo '</div>';
+
 		echo '</div>';
 
-        echo '<div class="condition_editing_body">';
+
-        echo '<h2>'.$lang['srv_edit_quota'].'</h2>';
+        echo '<div class="quota_editing_body">';
-        echo '</div>';
+        
-		
-		// Vrednost kvote
-		/*$rowS = Cache::srv_spremenljivka(-$condition);
-		echo '<div id="quota_value_holder">';
-		echo $lang['srv_quota_value'].': ';
-		echo ' <input type="text" name="value" id="quota_value" value="'.$rowS['vsota_limit'].'" style="width:50px" onkeypress="checkNumber(this, 6, 0);" onkeyup="checkNumber(this, 9, 0);" onBlur="quota_value_edit(\''.$rowS['id'].'\');">';
-		echo '</div>';*/
-		
         $sql = sisplet_query("SELECT id FROM srv_quota WHERE cnd_id = '$condition' ORDER BY vrstni_red");
         if (mysqli_num_rows($sql) == 0) {
             sisplet_query("INSERT INTO srv_quota (id, cnd_id, vrstni_red) VALUES ('', '$condition', '1')");
@@ -218,12 +220,14 @@ class SurveyQuotas {
 			$this->quota_edit($row['id'], $vrednost);
         }
 
-        echo '<p id="quota_editing_operators" style="margin-left:62px">'.$lang['srv_add_cond'].':
+        echo '<p id="quota_editing_operators" class="div_quota_bottom">'.$lang['srv_add_cond'].':
-        <a href="#" onclick="quota_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
+            <a href="#" onclick="quota_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
-        <a href="#" onclick="quota_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
+            <a href="#" onclick="quota_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
-        <a href="#" onclick="quota_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,
+            <a href="#" onclick="quota_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,
-        <a href="#" onclick="quota_add(\''.$condition.'\', \'3\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;/&nbsp;</strong></a>
+            <a href="#" onclick="quota_add(\''.$condition.'\', \'3\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;/&nbsp;</strong></a>
-        </p>';
+            </p>';
+
+        echo '</div>';
     }
 
     /**
@@ -251,74 +255,76 @@ class SurveyQuotas {
         if (!$sql_count) die();
         $row_count = mysqli_fetch_array($sql_count);
 
-        if ($row['vrstni_red'] == 1 && $row_count['count'] > 1) {
-			echo '<table class="tbl_condition_editing">';
-			echo '<tr>';
-			echo '<th style="text-align:center; width:50px">'.$lang['srv_oklepaji'].'</th>'; // gumbi oklepaji
-			echo '<th  style="width:70px">&nbsp;</th>'; // logicni operatorji
-			echo '<th style="width:50px">&nbsp;</th>'; // oklepaji
-			echo '<th >&nbsp;</th>';
-			echo '<th style="text-align:center; width:50px;">'.$lang['srv_zaklepaji'].'</th>'; // gumbi zaklepaji
-			echo '<th style="text-align:center; width:60px">'.$lang['edit2'].'</th>'; // move
-			echo '</tr>';
-        	echo '</table>';
 
-        } elseif ($row['vrstni_red'] == 1) {
+        // operator
-			echo '<table class="tbl_condition_editing"><tr><th>&nbsp;</th></tr></table>';
+        if ($row['vrstni_red'] > 1) {
+            echo '<div class="condition_editing_row operator">';
+
+            if ($row['operator']==0)
+                echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'1\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;+&nbsp;</a>';
+            if ($row['operator']==1)
+                echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'2\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;-&nbsp;</a>';
+            if ($row['operator']==2)
+                echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'3\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;*&nbsp;</a>';
+            if ($row['operator']==3)
+                echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'0\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;/&nbsp;</a>';
+                
+            echo '</div>';
         }
 
+
         // form
         echo '<form name="quota_'.$quota.'" id="quota_'.$quota.'" action="" method="post" onsubmit="quota_edit(\''.$quota.'\'); return false;">'."\n\r";
 
-        echo '<table class="tbl_condition_editing" style="margin-bottom:10px; padding-bottom:10px; background-color:white">';
+        
-        echo '<tr>';
+        echo '<div class="condition_editing_row">';
 
+        // move
+        echo '<div class="move_holder">';
+        if ($row_count['count'] != 1 )
+            echo '<span class="faicon move_updown move" title="'.$lang['srv_move'].'"></span>';
+        echo '</div>';
+        
+
+        // Srednji bel del
+        echo '<div class="white_holder">';
 
         // left_bracket
+        echo '<div class="column bracket left">';
+
 		if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) {
-            echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
+
-			echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add small"></span></a>';
+            echo '<div class="bracket_icons">';
-			if ($row['left_bracket'] > 0)
+
-				echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon add small"></span></a>';
+			echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add"></span></a>';
+			
+            if ($row['left_bracket'] > 0)
+				echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
 			else
 				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
+
+            echo '</div>';    
+
+            echo '<div class="bracket_text">'.$lang['srv_oklepaji'].'</div>';
 		} 
-		else {
-            echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
-		}
-		echo '</td>';
-
-        // operator
-        echo '<td class="tbl_ce_tb white" style="width:77px; text-align:center">';
-
-        if ($row['vrstni_red'] == 1) {
-            // nimamo nic..
-        } else {
-
-            if ($row['operator']==0)
-				echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'1\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;+&nbsp;</a>';
-			if ($row['operator']==1)
-				echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'2\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;-&nbsp;</a>';
-			if ($row['operator']==2)
-				echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'3\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;*&nbsp;</a>';
-			if ($row['operator']==3)
-				echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'0\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;/&nbsp;</a>';
-        }
-
-        echo '</td>';
 
+		echo '</div>';
 
         // left_bracket
-        echo '<td class="tbl_ce_tb white" style="width:40px; text-align:center">';
+        echo '<div class="column display_bracket left">';
+
         for ($i=$row['left_bracket']; $i>0; $i--) {
-            echo ' ( ';        }
+            echo ' ( ';        
-        echo '</td>';
+        }
+
+        echo '</div>';
 
         // spremenljivka
-        echo '<td class="tbl_ce_tb white" style="width:auto">';
+        echo '<div class="column variable">';
+
         if ($row['spr_id']==0) echo '<span class="red">'.$lang['srv_select_spr'].'!</span>';
-        echo '<br />';
+
-        echo '<select name="quota_spremenljivka_'.$quota.'" id="quota_spremenljivka_'.$quota.'" size="1" style="width:150px" onchange="javascript:quota_edit(\''.$quota.'\', \''.$vrednost.'\');">'."\n\r";
+        echo '<select name="quota_spremenljivka_'.$quota.'" id="quota_spremenljivka_'.$quota.'" class="dropdown medium" size="1" style="width:150px" onchange="javascript:quota_edit(\''.$quota.'\', \''.$vrednost.'\');">'."\n\r";
 
         echo '<option value="0"></option>';
 		
@@ -443,61 +449,54 @@ class SurveyQuotas {
 
         echo '</select>';
 
-
+        echo '</div>';
-		// Vrednost kvote
-		/*echo ' <input type="text" name="value" id="quota_value_'.$quota.'" value="'.$row['value'].'" style="width:40px" >';
-		echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
-			echo '$(document).ready(function() {' .
-			'  $("input#quota_value_'.$quota.'").bind("blur", {}, function(e) {' .
-			'    quota_edit(\''.$quota.'\', \''.$vrednost.'\'); return false;  ' .
-			'  });' .
-			'});';
-		echo '</script>';*/
-
-
-        echo '<br />&nbsp;'."\n\r";
-        echo '</td>';
 
 
         // right_bracket
-        echo '<td class="tbl_ce_tb white" style="width:40px; text-align:center">';
+        echo '<div class="column display_bracket right">';
+
         for ($i=$row['right_bracket']; $i>0; $i--) {
             echo ' ) ';
         }
-        echo '</td>';
+
+        echo '</div>';
 
 
         // right_bracket buttons
+        echo '<div class="column bracket right">';
+
 		if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) {
-            echo '<td class="tbl_ce_lor" style="width:50px; text-align:center" nowrap>';
+
+            echo '<div class="bracket_icons">';
+
 			if ($row['right_bracket'] > 0)
 				echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'right\', \'minus\'); return false;" title="'.$lang['srv_zaklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
 			else
 				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
 
-			echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add small"></span></a>';
+			echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add"></span></a>';
-		} 
+
-		else {
+            echo '</div>';
-            echo '<td class="tbl_ce_lor white" style="width:50px; text-align:center" nowrap>';
+
-		}
+            echo '<div class="bracket_text">'.$lang['srv_zaklepaji'].'</div>';
-		echo '</td>';
+		} 
+
+		echo '</div>';
+
+		echo '</div>';
 
-		// move
-        echo '<td class="tbl_ce_bck_blue white" style="text-align:right; width:30px">';
-        if ($row_count['count'] != 1 )
-        	echo '<img src="img_0/move_updown.png" class="move" title="'.$lang['srv_move'].'" />';
-        echo '</td>';
 
         // remove
-        echo '<td class="tbl_ce_bck_blue white" style="text-align:left; width:30px">';
+        echo '<div class="delete_holder">';
+
         $sql3 = sisplet_query("SELECT id FROM srv_quota WHERE cnd_id='$row[cnd_id]'");
         if (mysqli_num_rows($sql3) != 1 )
             echo ' <a href="#" onclick="quota_remove(\''.$row['cnd_id'].'\', \''.$quota.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span class="faicon delete icon-grey_dark_link delte-if-block"></span></a>'."\n\r";
-        echo '</td>';
+        
+        echo '</div>';
 
 
-        echo '</tr>';
+        echo '</div>';
-        echo '</table>';
 
         echo '</form>'."\n\r";
     }

admin/survey/classes/class.SurveyRecoding.php

@@ -62,8 +62,8 @@ class SurveyRecoding
 	function DisplaySettings() {
 		global $lang;
 		echo '<fieldset><legend>'.$lang['srv_data_subnavigation_recode'].'</legend>';
-		echo $lang['srv_recode_note'].'<br/><br/>';
+		echo '<p class="bottom16">'.$lang['srv_recode_note'].'</p>';
-		echo $lang['srv_recode_note_text'].'<br/><br/>';
+		echo '<p class="bottom16">'.$lang['srv_recode_note_text'].'</p>';
 		#poiščemo spremenljivke ki so morda rekodirane v drugo spremenljivko
 		/*
 		$qry_str = "select distinct spr1, spr2 from srv_recode_vrednost WHERE ank_id = '$this->anketa'";
@@ -109,11 +109,16 @@ class SurveyRecoding
 		$qry_str = "SELECT s.id, s.variable, s.naslov FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$this->anketa' AND s.tip IN (1,2,3,6,16,17,7,18,20,22,25)ORDER BY g.vrstni_red ASC, s.vrstni_red ASC";
 		$sql = sisplet_query($qry_str);
 		if (mysqli_num_rows($sql)) {
+
+
+
 			echo '<table id="recode_table">';
-			echo '<thead><tr>';
+			echo '<tr>';
-			echo '<th colspan="4">'.$lang['srv_recode_h_variable'].'</th>';
+			echo '<th></th>';
-			echo '<th colspan="5">'.$lang['srv_recode_h_actions'].Help::display('srv_recode_h_actions').'</th>';
+			echo '<th>'.$lang['srv_recode_h_variable'].'</th>';
-			echo '</tr></thead>';
+			echo '<th>'.$lang['srv_recode_h_scale'].'</th>';
+			echo '<th class="center functions_column" colspan="2">'.$lang['srv_recode_h_actions'].Help::display('srv_recode_h_actions').'</th>';
+			echo '</tr>';
 			while (list($spr_id, $variable, $naslov) = mysqli_fetch_row($sql)) {
 				$vmv = new RecodeValues($this->anketa,$spr_id);
 				$hasRecoded = $vmv->hasRecodedValues() || in_array($spr_id,$recodedFrom);
@@ -149,20 +154,16 @@ class SurveyRecoding
 				$css_even_odd =  ( ($cnt_even_odd & 1) ? ' odd' : ' even' );
 				
 				echo '<tr id="recoding_variable_div_'.$spr_id.'" class="recoding_variable_div'.$css_even_odd.$css_border.'">';
-				echo '<td style="width:auto;">';
+				
+				echo '<td>';
 				SurveyAnalysis::showIcons($spr_id.'_0',$row,'desc',array('noReport' => true, 'showChart' => false));
 				echo '</td>';
-				echo '<td style="width:25px; text-align:center;" class="gray">';
-				echo $icon1;
-				echo '</td>';
-				echo '<td>';
-				echo '<span class="gray">'.$icon2.'</span>';
-				echo '<span class="green'.$css_strong.'">';
 				
+				echo '<td>';
 				echo '<a onclick="showspremenljivkaSingleVarPopup(\''.$spr_id.'_0\'); return false;" href="#">';
 				echo $variable;
 				echo '</a>';
-				echo '</span> - <span class="spaceRight'.$css_strong.'">'.skrajsaj(strip_tags($naslov),40).'</span>';
+				echo ' - '.skrajsaj(strip_tags($naslov),40);
 
 				if ($key) {
 					$row1 = Cache::srv_spremenljivka($key);
@@ -171,60 +172,57 @@ class SurveyRecoding
 			
 				echo '</td>';
 				
-				echo '<td class="gray" style="padding-right:10px; padding-left:10px;">';
+				echo '<td>';
 				$legend = Cache::spremenljivkaLegenda($spr_id);
-				echo '('.$legend['izrazanje'].' - '.$legend['skala'].')';
+				echo $legend['skala'];
 				echo '</td>';
-				echo '<td style="width:50px; text-align:center;" >';
+				
+				echo '<td class="functions_column">';
+				echo '<div class="functions">';
+
 				#dodaj
 				if ($is_recoded_new == true) {
-					echo '<span class="silver">&nbsp;</span>';
+					echo '<div class="sep silver">&nbsp;</div>';
 				} else {
 					if ((int)$hasRecoded > 0) {
-						echo '<span class="silver">'.$lang['srv_recode_add'].'</span>';
+						echo '<div class="sep sep silver">'.$lang['srv_recode_add'].'</div>';
 					} else {
-						echo '<span class="as_link" onclick="showQuestionRecode(\''.$spr_id.'\');">'.$lang['srv_recode_add'].'</span>';
+						echo '<div class="sep as_link" onclick="showQuestionRecode(\''.$spr_id.'\');">'.$lang['srv_recode_add'].'</div>';
 					}
 				}
-				echo '</td>';
 
-				echo '<td style="padding-right:10px; padding-left:10px;text-align:center;">';
 				# uredi
 				if ($is_recoded_new == true) {
-					echo '<span class="silver">&nbsp;</span>';
+					echo '<div class="sep silver">&nbsp;</div>';
 				} else {
 				
 					if ((int)$hasRecoded > 0) {
-						echo '<span class="as_link" onclick="showQuestionRecode(\''.$spr_id.'\');">'.$lang['srv_recode_edit'] .'</span>';
+						echo '<div class="sep as_link" onclick="showQuestionRecode(\''.$spr_id.'\');">'.$lang['srv_recode_edit'] .'</div>';
 					} else {
-						echo '<span class="silver">'.$lang['srv_recode_edit'] .'</span>';
+						echo '<div class="sep silver">'.$lang['srv_recode_edit'] .'</div>';
 					}
 				}
-				echo '</td>';
-				echo '<td style="padding-right:10px; padding-left:10px; text-align:center;">';
 				# odstrani
 				if ($is_recoded_new == true) {
-					echo '<span class="silver">&nbsp;</span>';
+					echo '<div class="sep silver">&nbsp;</div>';
 				} else {
 					if ((int)$hasRecoded > 0) {
-						echo '<span class="as_link" onclick="removeQuestionRecode(\''.$spr_id.'\',\''.$lang['srv_recode_confirm_delete'].'\');">'.$lang['srv_recode_remove'].'</span>';
+						echo '<div class="sep as_link" onclick="removeQuestionRecode(\''.$spr_id.'\',\''.$lang['srv_recode_confirm_delete'].'\');">'.$lang['srv_recode_remove'].'</div>';
 					} else {
-						echo '<span class="silver" >'.$lang['srv_recode_remove'].'</span>';					
+						echo '<div class="sep silver" >'.$lang['srv_recode_remove'].'</div>';					
 					}
 				}
-				echo '</td>';
-				
-				echo '<td style="padding-right:10px; padding-left:10px;">';
 				if ($is_recoded_new == true) {
-					echo '<span class="silver">&nbsp;</span>';
+					echo '<div class="sep silver">&nbsp;</div>';
 				} else {
 					if ($hasRecoded) {
-						echo '<label><span class="as_link" onclick="enableRecodeVariable(\''.$spr_id.'\',this);">'.($enabled ? $lang['srv_recode_enabled'] : $lang['srv_recode_disabled']).'</span></label>';
+						echo '<label><div class="sep as_link" onclick="enableRecodeVariable(\''.$spr_id.'\',this);">'.($enabled ? $lang['srv_recode_enabled'] : $lang['srv_recode_disabled']).'</div></label>';
 						#echo '<label><input type="checkbox" id="recoding_variable_cb_'.$spr_id.'" onchange="enableRecodeVariable(\''.$spr_id.'\',this);"'.($enabled?' checked="checked"':'').' autocomplete="off">'.$lang['srv_recode_enable'].'</label>';
 					} else {
-						echo '<span class="silver">'.$lang['srv_recode_enabled'].'</span>';
+						echo '<div class="sep silver">'.$lang['srv_recode_enabled'].'</div>';
 					}
 				}
+				echo '</div>';
 				echo '</td>';
 				
 				$visible= ((int)$row['visible'] == 1) ? true : false;
@@ -270,12 +268,12 @@ class SurveyRecoding
 			$vmv = new RecodeValues($this->anketa,$spr_id);
 			$vmv->DisplayMissingValuesForQuestion();
 			#echo '</span>';
-			
+
-			echo '<div class="recodeButtonHolder buttons_holder">';
+			echo '<div class="button_holder">';
-			echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="saveQuestionRecode(); return false;">'.$lang['save'].'</a></div></span>';
+			echo '<button class="medium white-blue" onClick="cancelQuestionRecode(); return false;">'.$lang['edit1338'].'</button>';              
-			echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancelQuestionRecode(); return false;"><span>'.$lang['srv_cancel'].'</span></a></div></span>';
+			echo '<button class="medium blue" onclick="saveQuestionRecode(); return false;">'.$lang['save'].'</button>';
-			echo '<br class="clr"/>';
 			echo '</div>';
+
 		} else {
 			echo 'Napaka!';
 		}
@@ -477,21 +475,21 @@ class SurveyRecoding
 				}
 				
 			}
-			
 		}
+
 		if (count($all_recoded) == 0) {
 			echo $lang['srv_recode_summary_nothing'];
-		} else {
+		} 
+        else {
 			#var_dump($all_recoded);#
-			echo '<span id="div_recent_recoding_1" class="as_link" onclick="$(\'#div_recent_recoding, #div_recent_recoding_1, #div_recent_recoding_2\').toggle();">+ '.$lang['srv_recode_summary'].'</span>';
+			echo '<span id="div_recent_recoding_1" class="as_link" onclick="$(\'#div_recent_recoding, #div_recent_recoding_1, #div_recent_recoding_2\').toggleClass(\'displayNone\');">+ '.$lang['srv_recode_summary'].'</span>';
-			echo '<span id="div_recent_recoding_2" class="as_link displayNone" onclick="$(\'#div_recent_recoding, #div_recent_recoding_1, #div_recent_recoding_2\').toggle();">- '.$lang['srv_recode_summary'].'</span>';
+			echo '<span id="div_recent_recoding_2" class="as_link displayNone" onclick="$(\'#div_recent_recoding, #div_recent_recoding_1, #div_recent_recoding_2\').toggleClass(\'displayNone\');">- '.$lang['srv_recode_summary'].'</span>';
 			echo '<div id="div_recent_recoding" class="displayNone">';
 			foreach ($all_recoded AS $msg) {
 				echo $msg['txt']."<br/>";
 			}
 			echo '</div>';
 		}
-
 	}
 	
 	function enableRecodeVariable() {

admin/survey/classes/class.SurveySkupine.php

@@ -66,36 +66,53 @@ class SurveySkupine {
 		echo '<fieldset><legend>'.$lang['srv_skupine'].'</legend>';
 		echo '<div id="skupine">';
 		
-		echo '<br />'.$lang['srv_skupine_insert'].' '.Help::display('srv_skupine');
+		echo '<div class="setting_holder">';
-
+		echo '<span class="setting_title">'.$lang['srv_skupine_insert'].' '.Help::display('srv_skupine').'</span>';
-		if($spr_id != 0){
+		echo '</div>';
-
-			// dodajanje skupin za anketo
-			$vrednosti = $this->getVrednosti($spr_id);
-			foreach($vrednosti as $vrednost){
-				echo '<p>';
-				
-				echo '<strong>'.$vrednost['naslov'].'</strong>';
-				
-				$link = $vrednost['url'];
-				if(isset($vrednost['nice_url']))
-					$link = $vrednost['nice_url'];
-				echo ' (<a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a>)';
-				
-				echo '<span class="faicon delete_circle icon-orange_link spaceLeft" style="margin-bottom:1px;" onclick="delete_skupina(\'1\', \''.$vrednost['id'].'\');"></span>';
-				
-				echo '</p>';
-			}
-        }
         
-        // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - ce ni ni gumba za dodajanje skupin
+        // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - ce ni, ni gumba za dodajanje skupin
         if(!$userAccess->checkUserAccess($what='skupine')){
-            echo '<br />';
             $userAccess->displayNoAccess($what='skupine');
         }
         else{
-            echo '<p class="add_skupina_button"><input type="text" name="skupina" autocomplete="off" onKeyUp="add_skupina_enter(\'1\', event);" /> <input type="button" value="'.$lang['add'].'" onclick="add_skupina(\'1\');" /></p>';
+			echo '<div class="setting_holder">';
+			echo '<label for="skupina">'.$lang['group_name'].':</label>';
+			echo '<div class="button_holder inline">';
+			echo '<input type="text" id="skupina" name="skupina" class="large" autocomplete="off" onKeyUp="add_skupina_enter(\'1\', event);" />';
+			echo '<button class="medium blue" onclick="add_skupina(\'1\');">'.$lang['add'].'</button>';
+			echo '</div>';
+			echo '</div>';
+
         }
+
+		
+
+			// izpis skupin za anketo
+			$vrednosti = $this->getVrednosti($spr_id);
+			echo '<table id="groups_table" '.(($spr_id == 0) ? 'class="displayNone"' : '').'>';
+
+			echo '<tr>';
+			echo '<th></th>';
+			echo '<th>'.$lang['group_name'].'</th>';
+			echo '<th>'.$lang['group_URL'].'</th>';
+			echo '</tr>';
+
+		if($spr_id != 0){
+			foreach($vrednosti as $vrednost){
+				
+			echo '<tr>';
+			echo '<td><a><span class="faicon trash empty" onclick="delete_skupina(\'1\', \''.$vrednost['id'].'\');"></span></a></td>';
+			echo '<td>'.$vrednost['naslov'].'</td>';
+
+			$link = $vrednost['url'];
+				if(isset($vrednost['nice_url']))
+					$link = $vrednost['nice_url'];
+			echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
+			
+			echo '</tr>';
+			}
+		}
+			echo '</table>';
 		
 		echo '</div>';
 		echo '</fieldset>';
@@ -263,7 +280,8 @@ class SurveySkupine {
                     $add = false;
                     
                     $anketa = $this->anketa;
-                    $nice_url = $row['link'];			
+                    $nice_url = $row['link'];	
+                    $skupina_string = strtolower($lang['srv_skupina']);		
                     
                     $sql2 = sisplet_query("SELECT vrstni_red FROM srv_vrednost WHERE id='$vre_id'");
                     $row2 = mysqli_fetch_array($sql2);
@@ -284,14 +302,14 @@ class SurveySkupine {
                     if (strlen($nice_url) < 3) $add = false;
                                     
                     if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
-                        $link = 'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;
+                        $link = 'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&'.$skupina_string.'='.$vre_id;
                     else
-                        $link = 'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;
+                        $link = 'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&'.$skupina_string.'='.$vre_id;
                     
                     if ($add) {		
                         $f = @fopen($site_path.'.htaccess', 'a');
                         if ($f !== false) {
-                            fwrite($f, "\nRewriteRule ^".$nice_url.'\b(.*)			'.$link."&foo=\$1&%{QUERY_STRING}");
+                            fwrite($f, "\nRewriteRule ^".$nice_url.'\b(?!-)(.*)			'.$link."&foo=\$1&%{QUERY_STRING}");
                             fclose($f);
                             
                             $sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$this->anketa','$row[id]','$vre_id','$nice_url')");
@@ -300,18 +318,24 @@ class SurveySkupine {
                 }
 
 
-                // Vrnemo novo geslo, ki ga vstavimo v html
+                // Vstavljanje v html tabelo
-                echo '<p>';
+                echo '<tr>';
-
+				
-                echo '<strong>'.stripslashes($naslov_vrednost).'</strong>';
+				//Skupine
                 if($skupine == 1){
+					echo '<td><a><span class="faicon trash empty" onclick="delete_skupina(\''.$skupine.'\', \''.$vre_id.'\');"></span></a></td>';
+					echo '<td>'.stripslashes($naslov_vrednost).'</td>';
                     $link = $this->getUrl($spr_id, $vre_id);
-                    echo ' (<a href="'.$link.'" target="_blank" title="URL skupine '.stripslashes($naslov_vrednost).'">'.$link.'</a>)';
+					echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.stripslashes($naslov_vrednost).'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
                 }
 
-                echo '<span class="faicon delete_circle icon-orange_link spaceLeft" style="margin-bottom:1px;" onclick="delete_skupina(\''.$skupine.'\', \''.$vre_id.'\');"></span>';		
+				//Gesla
-                
+				if($skupine == 2){
-                echo '</p>';
+					echo '<td>'.stripslashes($naslov_vrednost).'</td>';
+					echo '<td class="right"><button class="table-inline blue caps" type="button" onclick="delete_skupina(\''.$skupine.'\', \''.$vre_id.'\');">'.$lang['srv_password_remove'].'</button></td>';
+                }
+
+                echo '</tr>';
             }
 		}
 		
@@ -353,13 +377,14 @@ class SurveySkupine {
 				
 				$anketa = $this->anketa;
 				$nice_url = $row['link'].'_'.$index;
+                $skupina_string = strtolower($lang['srv_skupina']);
 
 				$f = fopen($site_path.'.htaccess', 'rb');
 				if ($f !== false) {
 					$output = array();
 					while (!feof($f)) {
 						$r = fgets($f);
-						if (strpos($r, "^".$nice_url.'\b(.*)	') !== false && strpos($r, "?anketa=".$anketa."&skupina=".$vre_id."") !== false) {
+						if (strpos($r, "^".$nice_url.'\b') !== false && strpos($r, "?anketa=".$anketa."&".$skupina_string."=".$vre_id."") !== false) {
 							// kao pobrisemo vrstico in vnos v bazi
 							$sqlD = sisplet_query("DELETE FROM srv_nice_links_skupine WHERE ank_id='$anketa' AND nice_link_id='$row[id]' AND vre_id='$vre_id'");
 						} 
@@ -388,19 +413,18 @@ class SurveySkupine {
         if ($_GET['a'] == 'show_add_password_mass') {
 
             // Naslov
-            echo '<h2>' . $lang['srv_password_add_mass'] . '</h2>';
+            echo '<h2><span class="faicon blue flipX file-import"></span>' . $lang['srv_password_add_mass'] . '</h2>';
 
             echo '<div class="popup_close"><a href="#" onClick="popupImportAnketaFromText_close();">✕</a></div>';
 
-            echo '<p  class="bold">' . $lang['srv_password_add_mass_instructions'] . '</p>';
+            echo '<p>' . $lang['srv_password_add_mass_instructions'] . '</p>';
-            //echo '<span class="italic">' . $lang['srv_password_add_mass_sample'] . '</span></p>';
 
-            echo '<textarea id="add_passwords_mass" name="add_passwords_mass" style="width:99%; height:300px; box-sizing:border-box; padding:5px;"></textarea>';
+            echo '<textarea id="add_passwords_mass" name="add_passwords_mass" style="width:100%; height:300px; box-sizing:border-box; padding:5px;"></textarea>';
 
-            echo '<br /><br />';
+            echo '<div class="button_holder">';
-
+            echo '  <button class="medium white-blue" onClick="popupImportAnketaFromText_close();">'.$lang['srv_zapri'].'</button>';
-            echo '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onClick="execute_add_passwords_mass();">'.$lang['srv_password_add_mass_execute'].'</a></span>';
+            echo '  <button class="medium blue" onClick="execute_add_passwords_mass();">'.$lang['srv_password_add_mass_execute'].'</button>';
-            echo '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onClick="popupImportAnketaFromText_close();">'.$lang['srv_zapri'].'</a></span>';
+            echo '</div>';
         }
 
         // Masovno dodajanje gesel

admin/survey/classes/class.SurveyStaticHtml.php

@@ -27,138 +27,83 @@ class SurveyStaticHtml
 
         $this->table_id = SurveyUserSetting:: getInstance()->getSettings('default_mc_table');
 
-        if (isset($this->table_id) && $this->table_id != '')
+        /*if (isset($this->table_id) && $this->table_id != '')
             $sql = sisplet_query("SELECT name FROM srv_mc_table WHERE id='$this->table_id' AND ank_id='$this->sid' AND usr_id='$global_user_id'");
         else
             $sql = sisplet_query("SELECT name FROM srv_mc_table WHERE ank_id='$this->sid' AND usr_id='$global_user_id' ORDER BY time_created ASC");
-        $row = mysqli_fetch_array($sql);
+        $row = mysqli_fetch_array($sql);*/
+
 
         echo '<div class="mc_settings_links">';
-        echo '<ul>';
 
-        // Izbiro tabele (popup) in dodajanje
-        echo '<li>';
-        echo '<span onClick="show_mc_tables();">' . $lang['srv_table'] . ': <span class="bold">' . $row['name'] . '</span></span>';
-        echo '<span id="mc_tables_plus" class="pointer spaceLeft faicon add icon-blue" title="' . $lang['srv_multicrosstabs_tables_add'] . '"></span></span>';
-        echo '</li>';
 
-        echo '<li class="space">&nbsp;</li>';
+        // Seznam tabel
+        echo '<div class="table_list">';
+
+        $sql = sisplet_query("SELECT id, name FROM srv_mc_table WHERE ank_id='$this->sid' AND usr_id='$global_user_id' ORDER BY time_created ASC");
+        while($row = mysqli_fetch_array($sql)){
+            echo '<div class="table_item '.($row['id'] == $this->table_id ? 'active' : '').'">';
+            echo '  <span onClick="switch_mc_table(\''.$row['id'].'\');">'.$row['name'].'</span>';
+            echo '</div>';
+        }
+
+        echo '</div>';
+
+
+        // Nastavtve, dodajanje tabele
+        echo '<div class="table_settings">';
+
+        // Urejanje
+        echo '  <span class="faicon edit" onClick="show_mc_tables();"></span>';
+
+        // Dodajanje
+        echo '  <span id="mc_tables_plus" class="faicon add" title="'.$lang['srv_multicrosstabs_tables_add'].'"></span>';
 
         // Nastavitve tabele (popup)
-        echo '<li>';
+        echo '  <span class="faicon wheel_32" onClick="showMCSettings();" title="'.$lang['srv_multicrosstabs_settings'].'"></span>';
-        echo '<span class="gray" onClick="showMCSettings();">' . $lang['srv_multicrosstabs_settings'] . '</span>';
+
-        echo '</li>';
+        echo '</div>';
+
 
-        echo '</ul>';
         echo '</div>';
     }
 
-    function displayAnalizaPreview()
+    function displayAnalizaPreview(){
-    {
         global $lang;
-        echo '<div id="srv_analiza_preview_div" class="displayNone;">';
-        echo '<div class="top-left"></div>';
-        echo '<div class="top-right"></div>';
-        echo '<div class="inside">';
 
-        echo '<div id="srv_analiza_preview_sub_1" class="srv_analiza_preview_sub hidden">';
+        $preview_files = array(
-        echo '<span class="red">' . $lang['srv_analize_preview_sample_choose'] . '</span><br/>';
+            1 => 'sumarnik.svg',
-        echo '<div id="srv_preview_analiza">';
+            2 => 'opisne.svg',
-        echo '<span class="large">' . $lang['srv_analize_preview_sample'] . '</span>';
+            3 => 'frekvence.svg',
-        echo '<span class="large">' . $lang['srv_analize_preview_1'] . '</span>';
+            4 => 'tabela.svg',
-        echo $lang['srv_analysys_perview_sample'];
+            5 => 'povprecja.svg',
-        include 'staticHtml/AnalizaPredogledSumarnik.html';
+            6 => 'ttest.svg',
-        echo '</div>'; //srv_preview_analiza
+            7 => 'razbitje.svg',
-        echo '</div>'; //srv_analiza_preview_sub_1
+            8 => 'multitabela.svg'
-
+        );
-        echo '<div id="srv_analiza_preview_sub_2" class="srv_analiza_preview_sub hidden">';
-        echo '<span class="red">' . $lang['srv_analize_preview_sample_choose'] . '</span><br/>';
-        echo '<div id="srv_preview_analiza">';
-        echo '<span class="large">' . $lang['srv_analize_preview_sample'] . '</span>';
-        echo '<span class="large">' . $lang['srv_analize_preview_2'] . '</span>';
-        echo $lang['srv_analysys_perview_sample'];
-        include 'staticHtml/AnalizaPredogledOpisne.html';
-        echo '</div>'; //srv_preview_analiza
-        echo '</div>'; //srv_analiza_preview_sub_2
-
-        echo '<div id="srv_analiza_preview_sub_3" class="srv_analiza_preview_sub hidden">';
-        echo '<span class="red">' . $lang['srv_analize_preview_sample_choose'] . '</span><br/>';
-        echo '<div id="srv_preview_analiza">';
-        echo '<span class="large">' . $lang['srv_analize_preview_sample'] . '</span>';
-        echo '<span class="large">' . $lang['srv_analize_preview_3'] . '</span>';
-        echo $lang['srv_analysys_perview_sample'];
-        include 'staticHtml/AnalizaPredogledFrekvence.html';
-        echo '</div>'; //srv_preview_analiza
-        echo '</div>'; //srv_analiza_preview_sub_3
-
-        echo '<div id="srv_analiza_preview_sub_4" class="srv_analiza_preview_sub hidden">';
-        echo '<span class="red">' . $lang['srv_analize_preview_sample_choose'] . '</span><br/>';
-        echo '<div id="srv_preview_analiza">';
-        echo '<span class="large">' . $lang['srv_analize_preview_sample'] . '</span>';
-        echo '<span class="large">' . $lang['srv_analize_preview_4'] . '</span>';
-        echo $lang['srv_analysys_perview_sample'];
-        include 'staticHtml/AnalizaPredogledTabele.html';
-        echo '</div>'; //srv_preview_analiza
-        echo '</div>'; //srv_analiza_preview_sub_4
-
-        echo '<div id="srv_analiza_preview_sub_5" class="srv_analiza_preview_sub hidden">';
-        echo '<span class="red">' . $lang['srv_analize_preview_sample_choose'] . '</span><br/>';
-        echo '<div id="srv_preview_analiza">';
-        echo '<span class="large">' . $lang['srv_analize_preview_sample'] . '</span>';
-        echo '<span class="large">' . $lang['srv_analize_preview_5'] . '</span>';
-        echo $lang['srv_analysys_perview_sample'];
-        include 'staticHtml/AnalizaPredogledPovprecja.html';
-        echo '</div>'; //srv_preview_analiza
-        echo '</div>'; //srv_analiza_preview_sub_5
 
 
-        echo '<div id="srv_analiza_preview_sub_6" class="srv_analiza_preview_sub hidden">';
+        echo '<div id="srv_analiza_preview_div">';
-        echo '<span class="red">' . $lang['srv_analize_preview_sample_choose'] . '</span><br/>';
-        echo '<div id="srv_preview_analiza">';
-        echo '<span class="large">' . $lang['srv_analize_preview_sample'] . '</span>';
-        echo '<span class="large">' . $lang['srv_analize_preview_6'] . '</span>';
-        echo $lang['srv_analysys_perview_sample'];
-        include 'staticHtml/AnalizaPredogledTTest.html';
-        echo '</div>'; //srv_preview_analiza
-        echo '</div>'; //srv_analiza_preview_sub_6
 
-        echo '<div id="srv_analiza_preview_sub_7" class="srv_analiza_preview_sub hidden">';
+        for($i=1; $i<9; $i++){
-        echo '<span class="red">' . $lang['srv_analize_preview_sample_choose'] . '</span><br/>';
-        echo '<div id="srv_preview_analiza">';
-        echo '<span class="large">' . $lang['srv_analize_preview_sample'] . '</span>';
-        echo '<span class="large">' . $lang['srv_analize_preview_7'] . '</span>';
-        echo $lang['srv_analysys_perview_sample'];
-        include 'staticHtml/AnalizaPredogledRazbitje.html';
-        echo '</div>'; //srv_preview_analiza
-        echo '</div>'; //srv_analiza_preview_sub_7
 
-        echo '<div id="srv_analiza_preview_sub_8" class="srv_analiza_preview_sub hidden">';
+            echo '<div id="srv_analiza_preview_sub_'.$i.'" class="srv_analiza_preview_sub displayNone">';
-        echo '<span class="red">' . $lang['srv_analize_preview_sample_choose'] . '</span><br/>';
-        echo '<div id="srv_preview_analiza">';
-        echo '<span class="large">' . $lang['srv_analize_preview_sample'] . '</span>';
-        echo '<span class="large">' . $lang['srv_analize_preview_8'] . '</span>';
-        echo $lang['srv_analysys_perview_sample'];
-        include 'staticHtml/AnalizaPredogledMultitabele.html';
-        echo '</div>'; //srv_preview_analiza
-        echo '</div>'; //srv_analiza_preview_sub_8
 
-        echo '<div id="srv_analiza_preview_sub_9" class="srv_analiza_preview_sub hidden">';
+            echo '<div class="title">';
-        echo '<span class="red">' . $lang['srv_analize_preview_sample_choose'] . '</span><br/>';
+            echo '  <span class="faicon table_icon"></span>'.$lang['srv_analize_preview_'.$i];
-        echo '<div id="srv_preview_analiza">';
+            echo '</div>';
-        echo '<span class="large">' . $lang['srv_analize_preview_sample'] . '</span>';
+            
-        echo '<span class="large">' . $lang['srv_analize_preview_9'] . '</span>';
+            echo '<div class="content">';
-        echo $lang['srv_analysys_perview_sample'];
+            echo '  <img src="../../../public/img/analysis_previews/'.$preview_files[$i].'">';
-        include 'staticHtml/AnalizaPredogledNeodgovori.html';
+            echo '</div>';
-        echo '</div>'; //srv_preview_analiza
-        echo '</div>'; //srv_analiza_preview_sub_9
 
-        echo '</div>'; // inside
+            echo '</div>';
-        echo '<div class="bottom-left"></div>';
+        }
-        echo '<div class="bottom-right"></div>';
+
-        echo '</div>'; // srv_analiza_preview_div
+        echo '</div>';
     }
 
-    public function displayArchiveNavigation($showDiv = true)
+    public function displayArchiveNavigation()
     {
         global $lang, $admin_type, $global_user_id;
 
@@ -168,52 +113,63 @@ class SurveyStaticHtml
         $this->survey_type = $sa->getSurvey_type($this->sid);
 
         echo '<div id="globalSetingsLinks" class="archive">';
-        echo '<ul class="">';
+        echo '<ul class="menu_left-list">';
 
         # arhivi vprasalnika
         if ($d->checkDostopSub('edit')) {
-            echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] != 'data' && $_GET['m'] != 'changes' && $_GET['m'] != 'survey' && $_GET['m'] != 'survey_data' && $_GET['m'] != 'testdata' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[1] . '>';
+            echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] != 'data' && $_GET['m'] != 'changes' && $_GET['m'] != 'survey' && $_GET['m'] != 'survey_data' && $_GET['m'] != 'testdata' ? ' class="active"' : '') . $_js_links[1] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '" title="' . $lang['srv_questionnaire_archives'] . '"><span>' . $lang['srv_questionnaire_archives'] . '</span></a>';
             echo '</li>';
         }
 
         # arhivi podatkov
         if ($d->checkDostopSub('edit') && $this->survey_type > 0) {
-            echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'data' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[1] . '>';
+            echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'data' ? ' class="active"' : '') . $_js_links[1] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=data" title="' . $lang['srv_arhiv_data'] . '"><span>' . $lang['srv_arhiv_data'] . '</span></a>';
             echo '</li>';
         }
 
+        # arhivi testnih vnosov
+        if ($this->survey_type > 1) {
+            echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'testdata' ? ' class="active"' : '') . '>';
+            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=testdata" title="' . $lang['srv_arhiv_testdata'] . '"><span>' . $lang['srv_arhiv_testdata'] . '</span></a>';
+            echo '</li>';
+        }
+
         # arhivi objave
         if ($d->checkDostopSub('publish')) {
-            echo '<li' . ($_GET['a'] == A_INVITATIONS && $_GET['m'] == 'view_archive' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[2] . '>';
+            echo '<li' . ($_GET['a'] == A_INVITATIONS && $_GET['m'] == 'view_archive' ? ' class="active"' : '') . $_js_links[2] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_INVITATIONS . '&m=view_archive' . '" title="' . $lang['srv_archive_invitation'] . '"><span>' . $lang['srv_archive_invitation'] . '</span></a>';
             echo '</li>';
         }
 
         # arhivi analiz
         if ($d->checkDostopSub('analyse')) {
-            echo '<li' . ($_GET['a'] == A_ANALYSIS && $_GET['m'] == M_ANALYSIS_ARCHIVE ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[3] . '>';
+            echo '<li' . ($_GET['a'] == A_ANALYSIS && $_GET['m'] == M_ANALYSIS_ARCHIVE ? ' class="active"' : '') . $_js_links[3] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_ARCHIVE . '" title="' . $lang['srv_archive_analysis'] . '"><span>' . $lang['srv_archive_analysis'] . '</span></a>';
             echo '</li>';
         }
 
+        echo '</ul>';
+
         # uvoz/izvoz ankete ali ankete s podatki
         if ($d->checkDostopSub('edit')) {
-            echo '<li' . ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') ? ' class="navi_tracking highlightLineTab"' : ' class="navi_tracking nonhighlight"') . $_js_links[1] . '>';
+            echo '<ul class="menu_left-list">';
+            echo '<span class="menu_left-title">'.$lang['srv_survey_archives_other'].'</span>';
+            echo '<li' . ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') ? ' class="navi_tracking active"' : ' class="navi_tracking"') . $_js_links[1] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives'] . '"><span>' . $lang['srv_survey_archives'] . '</span></a>';
             echo '</li>';
 
             if ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data')) {
-                echo '<ul id="sub_navi_tracking">';
+                echo '<ul class="menu_left-list second" id="sub_navi_tracking">';
 
                 // Uvoz/izvoz ankete
-                echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey' && $_GET['appendMerge'] != '1' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey' && $_GET['appendMerge'] != '1' ? ' class="active"' : ' ') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives_ie'] . '"><span>' . $lang['srv_survey_archives_ie'] . '</span></a>';
                 echo '</li>';
 
                 // Uvoz/izvoz ankete in podatkov
-                echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey_data' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey_data' ? ' class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey_data" title="' . $lang['srv_survey_archives_ie_data'] . '"><span>' . $lang['srv_survey_archives_ie_data'] . '</span></a>';
                 echo '</li>';
 
@@ -221,29 +177,17 @@ class SurveyStaticHtml
             }
         }
 
-        # arhivi testnih vnosov
-        if ($this->survey_type > 1) {
-            $str_testdata = "SELECT count(*) FROM srv_user WHERE ank_id='" . $this->sid . "' AND (testdata='1' OR testdata='2') AND deleted='0'";
-            $query_testdata = sisplet_query($str_testdata);
-            list($testdata) = mysqli_fetch_row($query_testdata);
-            if ((int)$testdata > 0) {
-                echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'testdata' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=testdata" title="' . $lang['srv_arhiv_testdata'] . '"><span>' . $lang['srv_arhiv_testdata'] . '</span></a>';
-                echo '</li>';
-            }
-        }
-
         # arhivi sprememb
         if ($d->checkDostopSub('edit')) {
-            echo '<li' . ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA  ? ' class="navi_tracking highlightLineTab"' : ' class="navi_tracking nonhighlight"') . '>';
+            echo '<li' . ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA  ? ' class="navi_tracking active"' : ' class="navi_tracking"') . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '" title="' . $lang['srv_survey_archives_tracking'] . '"><span>' . $lang['srv_survey_archives_tracking'] . '</span></a>';
             echo '</li>';
 
             if ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA) {
-                echo '<ul id="sub_navi_tracking">';
+                echo '<ul class="menu_left-list second" id="sub_navi_tracking">';
 
                 // Vse spremembe ankete
-                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] != 'tracking_data' && $_GET['appendMerge'] != '1' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] != 'tracking_data' && $_GET['appendMerge'] != '1' ? ' class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '" title="' . $lang['srv_survey_archives_tracking_survey'] . '"><span>' . $lang['srv_survey_archives_tracking_survey'] . '</span></a>';
                 echo '</li>';
 
@@ -257,23 +201,23 @@ class SurveyStaticHtml
                 if ($hierarhija) {
 
                     // Vsi podatki o gradnji hierarhije, šifrantov in ostalega
-                    echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'hierarhija' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                    echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'hierarhija' ? ' class="active"' : '') . '>';
                     echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING_HIERARHIJA. '&m=hierarhija" title="' . $lang['srv_survey_archives_tracking_hierarchy_structure'] . '"><span>' . $lang['srv_survey_archives_tracking_hierarchy_structure'] . '</span></a>';
                     echo '</li>';
 
                     // Vse spremembe pri dodajanju udeležencev
-                    echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'udelezenci' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                    echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'udelezenci' ? ' class="active"' : '') . '>';
                     echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING_HIERARHIJA . '&m=udelezenci" title="' . $lang['srv_survey_archives_tracking_hierarchy_users'] . '"><span>' . $lang['srv_survey_archives_tracking_hierarchy_users'] . '</span></a>';
                     echo '</li>';
                 }
 
                 // Spremembe na podatkih
-                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] == 'tracking_data' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] == 'tracking_data' ? ' class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '&m=tracking_data" title="' . $lang['srv_survey_archives_tracking_data'] . '"><span>' . $lang['srv_survey_archives_tracking_data'] . '</span></a>';
                 echo '</li>';
 
                 // Append/Merge (uvozi)
-                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['appendMerge'] == '1' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['appendMerge'] == '1' ? ' class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '&appendMerge=1" title="' . $lang['srv_survey_archives_tracking_append'] . '"><span>' . $lang['srv_survey_archives_tracking_append'] . '</span></a>';
                 echo '</li>';
 
@@ -300,18 +244,18 @@ class SurveyStaticHtml
         $query_autogen_testdata = sisplet_query($str_autogen_testdata);
         list($autogen_testdata) = mysqli_fetch_row($query_autogen_testdata);
 
-        echo '<div class="display_data_test_data_note"><span class="faicon warning icon-orange spaceRight"></span> ';
+        echo '<div class="top_note display_data_test_data_note">';
+        
+        echo '<div class="title">';
+        echo '  <span class="faicon warning"></span> '.$lang['srv_testni_podatki_alert_title'];
+        echo '</div>';
 
-        echo $lang['srv_testni_podatki_alert'] . ' <a href="#" onClick="delete_test_data();">' . $lang['srv_delete_testdata'] . '</a>';
+        echo $lang['srv_testni_podatki_alert'] . ' <a href="#" onClick="delete_test_data();">'.$lang['srv_delete_testdata'].' ('.$testdata.')</a>.';
-        echo ' (' . $testdata . '). ';
         if ($autogen_testdata > 0) {
-            echo $lang['srv_autogen_testni_podatki_alert'] . ' <a href="index.php?anketa=' . $this->sid . '&a=testiranje&m=testnipodatki&delete_autogen_testdata=1">' . $lang['srv_delete_autogen_testdata'] . '</a>';
+            echo ' '.$lang['srv_autogen_testni_podatki_alert'].' <a href="index.php?anketa=' . $this->sid . '&a=testiranje&m=testnipodatki&delete_autogen_testdata=1">'.$lang['srv_delete_autogen_testdata'].' ('.$autogen_testdata.')</a>.';
-            echo ' (' . $autogen_testdata . '). ';
         }
 
         if ($showAnalizeCheckbox == true && false) {
-            #		print_r("<pre>");
-            #		print_r($_SESSION);
             session_start();
             $checked = (isset($_SESSION['testData'][$this->sid]['includeTestData']) && $_SESSION['testData'][$this->sid]['includeTestData'] == 'false') ? '' : ' checked="checked"';
             echo '&nbsp;<label><input id="cnx_include_test_data" type="checkbox"' . $checked . ' onchange="surveyAnalisysIncludeTestData();" autocomplete="off">V analizah upoštevaj tudi testne vnose.';
@@ -342,7 +286,7 @@ class SurveyStaticHtml
   
         if( in_array($data_file_status, array(FILE_STATUS_SRV_DELETED, FILE_STATUS_NO_DATA))
             && in_array($podstran, array(
-                'para_analysis_graph', 'para_graph', 'usable_resp', 'status_advanced',
+                'status', 'para_analysis_graph', 'para_graph', 'usable_resp', 'status_advanced',
                 'data', 'quick_edit', 'variables', 'export', 
                 'sumarnik', 'descriptor', 'frequency', 'crosstabs', 'ttest', 'means', 'break', 'multicrosstabs', 'charts', 'analysis_links'
             )) ){
@@ -363,6 +307,9 @@ class SurveyStaticHtml
 
         $borderLeft = '';
 
+
+        echo '<div class="left_options_holder">';
+
         // Navigacija analiz - ANALIZE
         if ($analiza) {
             echo '<div id="analizaSubNav">';
@@ -372,70 +319,47 @@ class SurveyStaticHtml
             $borderLeft = ' class="borderLeft"';
         }
 
-
         // Preklop med porocilom po meri in navadnimi porocili
         if ($podstran == 'analysis_creport' || $podstran == 'analysis_links') {
             echo '<div id="additional_navigation">';
 
             // Link na navadna porocila
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=analysis&m=analysis_links"><span ' . ($podstran == 'analysis_links' ? ' class="active"' : '') . '>' . $lang['srv_standard_report'] . '</span></a>';
+            echo '<span '.($podstran == 'analysis_links' ? ' class="active"' : '').'><a href="index.php?anketa=' . $this->sid . '&a=analysis&m=analysis_links">'.$lang['srv_standard_report'] . '</a></span>';
 
             // Link na porocilo po meri
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=analysis&m=analysis_creport"><span ' . ($podstran == 'analysis_creport' ? ' class="active"' : '') . '>' . $lang['srv_custom_report'] . '</span></a>';
+            echo '<span '.($podstran == 'analysis_creport' ? ' class="active"' : '').'><a href="index.php?anketa=' . $this->sid . '&a=analysis&m=analysis_creport">'.$lang['srv_custom_report'].'</a></span>';
 
             echo '</div>';
 
             $borderLeft = ' class="borderLeft"';
         } 
         // Preklop na vpogled, hitri seznam, spremenljivke (podatki)
-        elseif ($podstran == 'data') {
+        elseif ($podstran == 'data' || $podstran == 'quick_edit' || $podstran == 'variables') {
             echo '<div id="additional_navigation">';
 
+            // Link na osnovno tabelo s podatki
+            echo '<span '.($podstran == 'data' ? ' class="active"' : '').'><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->sid . '&a=' . A_COLLECT_DATA . '">'.$lang['srv_lnk_data'].'</a></span>';
+            
             // Link na vpogled
-            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->sid . '&a=' . A_COLLECT_DATA . '&m=quick_edit&quick_view=1"><span>' . $lang['srv_lnk_vpogled'] . '</span></a>';
+            echo '<span '.($podstran == 'quick_edit' ? ' class="active"' : '').'><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->sid . '&a=' . A_COLLECT_DATA . '&m=quick_edit&quick_view=1">'.$lang['srv_lnk_vpogled'].'</a></span>';
 
             // Link na spremenljivke
-            echo '<a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->sid . '&a=' . A_COLLECT_DATA . '&m=' . M_COLLECT_DATA_VARIABLE_VIEW . '"><span>' . $lang['srv_lnk_pregled_variabel'] . '</span></a>';
+            echo '<span '.($podstran == 'variables' ? ' class="active"' : '').'><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->sid . '&a=' . A_COLLECT_DATA . '&m=' . M_COLLECT_DATA_VARIABLE_VIEW . '">'.$lang['srv_lnk_pregled_variabel'].'</a></span>';
 
             // Link na hitri seznam
-            echo '<a href="#" onClick="displayDataPrintPreview();"><span style="padding-right:0px !important;">' . $lang['srv_data_print_preview_link'] . '</span></a>';
+            echo '<span><a href="#" onClick="displayDataPrintPreview();">'.$lang['srv_data_print_preview_link'].'</a> '.Help:: display('srv_data_print_preview').'</span>';
-            echo '<span style="margin-right:40px;">' . Help:: display('srv_data_print_preview') . '</span>';
 
             echo '</div>';
 
             $borderLeft = ' class="borderLeft"';
-        } 
+        }
-        // Link nazaj na podatke - vpogled
-        elseif ($podstran == 'quick_edit') {
-            echo '<div id="additional_navigation">';
-
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_COLLECT_DATA . '"><span class="faicon arrow_back" title="' . $lang['srv_lnk_back_to_data'] . '"></span></a>';
-            echo '<a href="#"><span class="active">' . $lang['srv_data_title_quick_view'] . '</span></a>';
-
-            echo '</div>';
-
-            $borderLeft = ' class="borderLeft"';
-        } 
-        // Link nazaj na podatke - Spremenljivke
-        elseif ($podstran == 'variables') {
-            echo '<div id="additional_navigation">';
-
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_COLLECT_DATA . '"><span class="faicon arrow_back" title="' . $lang['srv_lnk_back_to_data'] . '"></span></a>';
-            echo '<a href="#"><span class="active">' . $lang['srv_data_title_variable_view'] . '</span></a>';
-
-            echo '</div>';
-
-            $borderLeft = ' class="borderLeft"';
-        } 
         // Link nazaj na diagnostiko - Ocenjevanje trajanja
         elseif ($podstran == 'ocena_trajanja') {
             echo '<div id="additional_navigation">';
 
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_PREDVIDENI . '" title="' . $lang['srv_testiranje_diagnostika_base'] . '"><span class="active">' . $lang['srv_testiranje_predvidenicas'] . '</span></a>';
+            echo '<span class="active"><a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_PREDVIDENI . '" title="' . $lang['srv_testiranje_diagnostika_base'] . '">'.$lang['srv_testiranje_predvidenicas'].'</a></span>';
-            echo '<a href="#"></a>';
             
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_CAS . '" title="' . $lang['srv_testiranje_diagnostika_base'] . '"><span>' . $lang['srv_testiranje_cas'] . '</span></a>';
+            echo '<span><a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_CAS . '" title="' . $lang['srv_testiranje_diagnostika_base'] . '">'.$lang['srv_testiranje_cas'].'</a></span>';
-            echo '<a href="#"></a>';
 
             echo '</div>';
 
@@ -445,11 +369,9 @@ class SurveyStaticHtml
         elseif ($podstran == 'dejanski_casi') {
             echo '<div id="additional_navigation">';
             
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_PREDVIDENI . '" title="' . $lang['srv_testiranje_predvidenicas'] . '"><span>' . $lang['srv_testiranje_predvidenicas'] . '</span></a>';
+            echo '<span><a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_PREDVIDENI . '" title="' . $lang['srv_testiranje_predvidenicas'] . '">'.$lang['srv_testiranje_predvidenicas'].'</a></span>';
-            echo '<a href="#"></a>';
 
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_CAS . '" title="' . $lang['srv_testiranje_cas'] . '"><span class="active">' . $lang['srv_testiranje_cas'] . '</span></a>';
+            echo '<span class="active"><a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_CAS . '" title="' . $lang['srv_testiranje_cas'] . '">'.$lang['srv_testiranje_cas'].'</a></span>';
-            echo '<a href="#"></a>';
 
             echo '</div>';
 
@@ -464,14 +386,14 @@ class SurveyStaticHtml
 
             echo '<div id="additional_navigation">';
 
-            //Komentarji na vprasanja
+            // Komentarji na vprasanja
+            echo '<span '.($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '').'>';
+
             echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI_ANKETA . '" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">';
-            echo '<span ' . ($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '') . '>';
             echo $lang['srv_testiranje_komentarji_anketa_title'];
-            echo '</span>';
             echo '</a>';
 
-            echo '<span class="bold" style="margin-right: 50px;"> (';
+            echo '<span class="bold">(';
             if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
                 echo '<span class="orange">';
             echo($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']);
@@ -480,14 +402,17 @@ class SurveyStaticHtml
             echo '/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']);
             echo ')</span>';
 
-            // Komentarji na anketo
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">';
-            echo '<span ' . ($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '') . '>';
-            echo $lang['srv_testiranje_komentarji_title'];
             echo '</span>';
+
+
+            // Komentarji na anketo
+            echo '<span '.($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '').'>';
+
+            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">';
+            echo $lang['srv_testiranje_komentarji_title'];
             echo '</a>';
 
-            echo '<span class="bold"> (';
+            echo '<span class="bold">(';
             if ($comment_count['question']['unresolved'] > 0)
                 echo '<span class="orange">';
             echo $comment_count['question']['unresolved'];
@@ -496,60 +421,67 @@ class SurveyStaticHtml
             echo '/' . $comment_count['question']['all'];
             echo ')</span>';
 
+            echo '</span>';
+
+
             echo '</div>';
 
             $borderLeft = ' class="borderLeft"';
-        } elseif ($podstran == 'theme-editor') {
+        } 
+        elseif ($podstran == 'theme-editor') {
             echo '<div id="additional_navigation">';
 
 			$mobile = (isset($_GET['mobile']) && $_GET['mobile'] == '1') ? '&mobile=1' : '';
 			
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=tema'.$mobile.'" title="' . $lang['srv_themes_select'] . '"><span class="faicon arrow_back"></span></a>';
+            echo '<span><a href="index.php?anketa=' . $this->sid . '&amp;a=tema'.$mobile.'" title="' . $lang['srv_themes_select'] . '"><span class="faicon arrow_back"></span></a></span>';
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=theme-editor&profile='. $_GET['profile'] . $mobile.'" title="' . $lang['srv_themes_mod'] . '"><span ' . ($_GET['a'] == 'theme-editor' && $_GET['t'] != 'css' && $_GET['t'] != 'upload' ? ' class="active"' : '') . '>' . $lang['srv_themes_mod'] . '</span></a>';
+            echo '<span ' . ($_GET['a'] == 'theme-editor' && $_GET['t'] != 'css' && $_GET['t'] != 'upload' ? ' class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&amp;a=theme-editor&profile='. $_GET['profile'] . $mobile.'" title="' . $lang['srv_themes_mod'] . '">' . $lang['srv_themes_mod'] . '</a></span>';
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=theme-editor&t=css&profile='. $_GET['profile'] . $mobile.'" title="' . $lang['srv_themes_edit'] . '"><span ' . ($_GET['a'] == 'theme-editor' && $_GET['t'] == 'css' ? ' class="active"' : '') . '>' . $lang['srv_themes_edit'] . '</span></a>';
+            echo '<span ' . ($_GET['a'] == 'theme-editor' && $_GET['t'] == 'css' ? ' class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&amp;a=theme-editor&t=css&profile='. $_GET['profile'] . $mobile.'" title="' . $lang['srv_themes_edit'] . '">' . $lang['srv_themes_edit'] . '</a></span>';
             
 			// Za mobilno temo zaenkrat nimamo uploada css-ja
 			if($mobile == '')
-				echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=theme-editor&t=upload&profile='. $_GET['profile'] . $mobile.'" title="' . $lang['srv_themes_upload_css'] . '"><span ' . ($_GET['a'] == 'theme-editor' && $_GET['t'] == 'upload' ? ' class="active"' : '') . '>' . $lang['srv_themes_upload_css'] . '</span></a>';
+				echo '<span ' . ($_GET['a'] == 'theme-editor' && $_GET['t'] == 'upload' ? ' class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&amp;a=theme-editor&t=upload&profile='. $_GET['profile'] . $mobile.'" title="' . $lang['srv_themes_upload_css'] . '">' . $lang['srv_themes_upload_css'] . '</a></span>';
 
             echo '</div>';
 
             $borderLeft = ' class="borderLeft"';
-        } // Link nazaj na podatke - Spremenljivke
+        } 
+        // Link nazaj na podatke - Spremenljivke
         elseif ($podstran == 'para_analysis_graph') {
 
             // Info o neodgovorih
             echo '<div id="nonresponse_info">';
             echo $lang['srv_para_graph_text2'];
             echo '</div>';
-            $borderLeft = ' class="borderLeft"';
 
-            echo '<div id="additional_navigation" ' . $borderLeft . ' style="padding-left: 40px;">';
+            echo '<div id="additional_navigation" class="nonresponse">';
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '"><span ' . (!isset($_GET['m']) || $_GET['m'] == '' ? 'class="active"' : '') . '>' . $lang['srv_para_label_variables'] . '</span></a>';
+            echo '<span ' . (!isset($_GET['m']) || $_GET['m'] == '' ? 'class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '">' . $lang['srv_para_label_variables'] . '</a></span>';
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '&m=breaks"><span ' . ($_GET['m'] === 'breaks' ? 'class="active"' : '') . '>' . $lang['srv_para_label_breaks'] . '</span></a>';
+            echo '<span ' . ($_GET['m'] === 'breaks' ? 'class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '&m=breaks">' . $lang['srv_para_label_breaks'] . '</a></span>';
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '&m=advanced"><span ' . ($_GET['m'] === 'advanced' ? 'class="active"' : '') . '>' . $lang['srv_para_label_details'] . '</span></a>';
+            echo '<span ' . ($_GET['m'] === 'advanced' ? 'class="active"' : '') . '><a href="index.php?anketa=' . $this->sid . '&a=' . A_NONRESPONSE_GRAPH . '&m=advanced">' . $lang['srv_para_label_details'] . '</a></span>';
             echo '</div>';
+
             $borderLeft = ' class="borderLeft"';
         } 
         elseif ($podstran == 'aapor') {
             echo '<div id="additional_navigation">';
 
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . NAVI_AAPOR . '&m=aapor1"><span>' . $lang['srv_lnk_AAPOR1'] . '</span></a>';
+            echo '<span><a href="index.php?anketa=' . $this->sid . '&a=' . NAVI_AAPOR . '&m=aapor1">' . $lang['srv_lnk_AAPOR1'] . '</a></span>';
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . NAVI_AAPOR . '&m=aapor2"><span>' . $lang['srv_lnk_AAPOR2'] . '</span></a>';
+            echo '<span><a href="index.php?anketa=' . $this->sid . '&a=' . NAVI_AAPOR . '&m=aapor2">' . $lang['srv_lnk_AAPOR2'] . '</a></span>';
+
             echo '</div>';
         } 
         elseif ($podstran == 'diagnostics') {
             echo '<div id="additional_navigation">';
-            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . NAVI_AAPOR . '&m=aapor1"><span>' . $lang['srv_lnk_AAPOR1'] . '</span></a>';
-            echo '<div id="toggleDataCheckboxes" ' . $borderLeft . ' onClick="toggleDataCheckboxes(\'paraAnalysisGraph\');"><span class="faicon ' . ($arrow == 1 ? ' dropup_blue' : 'dropdown_blue') . '"></span> ' . $lang['srv_data_settings_checkboxes'] . '</div>';
-            echo '</div>';
 
+            echo '<a href="index.php?anketa=' . $this->sid . '&a=' . NAVI_AAPOR . '&m=aapor1"><span>' . $lang['srv_lnk_AAPOR1'] . '</span></a>';
+            echo '<div id="toggleDataCheckboxes" ' . $borderLeft . ' onClick="toggleDataCheckboxes(\'paraAnalysisGraph\');"><span class="faicon ' . ($arrow == 1 ? ' fa-angle-up' : 'fa-angle-down') . '"></span> ' . $lang['srv_data_settings_checkboxes'] . '</div>';
+            
+            echo '</div>';
         }
 
         // Nastavitve tabele (checkboxi) - PODATKI
         if ($podstran == 'para_analysis_graph') {
             $arrow = (isset($_SESSION['sid_' . $this->sid]['paraAnalysisGraph_settings'])) ? $_SESSION['sid_' . $this->sid]['paraAnalysisGraph_settings'] : 0;
-            echo '<div id="toggleDataCheckboxes" ' . $borderLeft . ' onClick="toggleDataCheckboxes(\'paraAnalysisGraph\');"><span class="faicon ' . ($arrow == 1 ? ' dropup_blue' : 'dropdown_blue') . '"></span> ' . $lang['srv_data_settings_checkboxes'] . '</div>';
+            echo '<div id="toggleDataCheckboxes" ' . $borderLeft . ' onClick="toggleDataCheckboxes(\'paraAnalysisGraph\');"><span class="faicon blue ' . ($arrow == 1 ? ' fa-angle-up' : 'fa-angle-down') . '"></span> ' . $lang['srv_data_settings_checkboxes'] . '</div>';
         }
 
         // Info o uporabnih enotah
@@ -570,6 +502,7 @@ class SurveyStaticHtml
         // Radio status (vsi, ustrezni...)
         if ($analiza || in_array($podstran, array('data', 'export', 'charts', 'analysis_creport', 'analysis_links', 'para_graph', 'reminder_tracking', 'heatmap'))) {
             echo '<div id="dataOnlyValid" ' . $borderLeft . '>';
+            echo '<span class="dataOnlyValid_label">'.$lang['srv_data_valid_label'].':</span>';
             SurveyStatusProfiles::displayOnlyValidCheckbox();
             echo '</div>';
         }
@@ -586,12 +519,15 @@ class SurveyStaticHtml
             echo '</div>';
         }
 
+        echo '</div>';
+
+
         // Nastavitve na desni
         if ($analiza || in_array($podstran, array('data', 'export', 'charts', 'analysis_creport', 'analysis_links', 'dejanski_casi', 'para_analysis_graph', 'heatmap'))) {
 
             $active_filter = $this->filteredData($podstran);
 
-            echo '<div id="analiza_right_options_holder">';
+            echo '<div id="analiza_right_options_holder" class="right_options_holder">';
 
             if ($analiza || in_array($podstran, array('charts'))) {
 
@@ -615,13 +551,13 @@ class SurveyStaticHtml
 
                 // Nastavitve za filtre (po spr, zoom, statusi...)
                 echo '<div title="' . $lang['settings'] . '" id="analiza_right_options2" class="spaceRight spaceLeft">';
-                echo '<span id="filters_span2" class="faicon wheel_32 pointer icon-as_link"></span>';
+                echo '<span id="filters_span2" class="faicon wheel_32"></span>';
                 $this->displayAnalizaRightOptions2($podstran);
                 echo '</div>';
             } 
             elseif ($podstran == 'data' || $podstran == 'export') {
                 // Ikona za ponovno generiranje datoteke
-                echo '<span title="' . $lang['srv_deleteSurveyDataFile_link'] . '" class="faicon refresh icon-as_link pointer spaceRight spaceLeft" onClick="changeColectDataStatus(); return false;"></span>';
+                echo '<span title="' . $lang['srv_deleteSurveyDataFile_link'] . '" class="faicon refresh" onClick="changeColectDataStatus(); return false;"></span>';
             }
 
             echo '<div title="' . $lang['filters'] . '" id="analiza_right_options" '.(!$userAccess->checkUserAccess($what='filters') ? 'class="user_access_locked"' : '').'>';
@@ -639,174 +575,116 @@ class SurveyStaticHtml
 
             # nastavitve komentarjev
             if ($d->checkDostopSub('edit')) {
-                echo '<div id="analiza_right_options_holder">';
+                echo '<div id="analiza_right_options_holder" class="right_options_holder">';
+
                 echo '<div title="' . $lang['settings'] . '" id="analiza_right_options">';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=urejanje" title="' . $lang['srv_settings_komentarji1'] . '">';
-                echo '<span class="faicon wheel_32 pointer icon-as_link"></span>';
+                echo '<span class="faicon wheel_32"></span>';
-                //echo '<span id="filters_span" class="bold pointer">'.$lang['settings'].'</span>';
                 echo '</a>';
                 echo '</div>';
+
                 echo '</div>';
             }
         } 
-        // Nastavitve statusa
-        elseif ($podstran == 'status') {
-
-            $ss = new SurveyStatistic();
-            $ss->Init($this->sid);
-
-            echo '<div id="div_status_filtri_right" class="floatRight">';
-
-            echo '<div id="dashboardEmailInvitationFilter" style="position:absolute; right:20px; top:46px;">';
-            echo $ss->emailInvitationFilter($this->emailInvitation);
-            echo '</div>';
-
-            echo '<ul>';
-            # če imamo vabila
-            $row = SurveyInfo::getSurveyRow();
-
-            if ($row['email'] || $row['user_base']) {
-                if ($ss->cnt_all == $ss->cnt_email) {
-                    echo '<li>';
-                    # filter za emaile
-                    echo $lang['srv_statistic_email_invitation'];
-                    echo '<select id="filter_email_status" name="filter_email_status" onchange="statisticRefreshAllBoxes(\'invitation\'); return false;" >';
-                    echo '<option value="0" disabled="disabled">' . $lang['srv_statistic_email_invitation_all'] . '</option>';
-                    echo '<option value="1" selected="selected">' . $lang['srv_statistic_email_invitation_only_email'] . '</option>';
-                    echo '<option value="2" disabled="disabled">' . $lang['srv_statistic_email_invitation_no_email'] . '</option>';
-                    echo '</select>';
-                    echo '</li>';
-                } else {
-                    echo '<li>';
-                    # filter za emaile
-                    echo $lang['srv_statistic_email_invitation'];
-                    echo '<select id="filter_email_status" name="filter_email_status" onchange="statisticRefreshAllBoxes(\'invitation\'); return false;" >';
-                    echo '<option value="0"' . ($ss->emailInvitation == 0 ? ' selected="selected"' : '') . '>' . $lang['srv_statistic_email_invitation_all'] . '</option>';
-                    echo '<option value="1"' . ($ss->emailInvitation == 1 ? ' selected="selected"' : '') . '>' . $lang['srv_statistic_email_invitation_only_email'] . '</option>';
-                    echo '<option value="2"' . ($ss->emailInvitation == 2 ? ' selected="selected"' : '') . '>' . $lang['srv_statistic_email_invitation_no_email'] . '</option>';
-                    echo '</select>';
-                    echo '</li>';
-                }
-            }
-            echo '<li>';
-            # filter za čase
-            $TimeProfileData = SurveyTimeProfiles:: GetDates();
-            $separator = ($row['email'] || $row['user_base']) ? true : false;
-            SurveyTimeProfiles::DisplayLink(false, $separator);
-            echo '</li>';
-            echo '</ul>';
-
-            echo '</div>';
-        }
-
 
         echo '</div>';
     }
 
-    public function displayAnalizaSubNavigation($showDiv = true)
+    public function displayAnalizaSubNavigation()
     {
         global $lang, $admin_type, $global_user_id;
 
         $_js_links = array();
-
+        for ($i=1; $i<9; $i++) {
-        UserSetting:: getInstance()->Init($global_user_id);
+            $_js_links[$i] = ' onmouseover="show_anl_prev('.$i.'); return false;" onmouseout="hide_anl_prev(); return false"';
-        $show_analiza_preview = (int)UserSetting:: getInstance()->getUserSetting('showAnalizaPreview') == 1 ? true : false;
-        if ($show_analiza_preview == true) {
-            for ($i = 1; $i <= 9; $i++) {
-                $_js_links[$i] = ' onmouseover="show_anl_prev(' . $i . '); return false;" onmouseout="hide_anl_prev(); return false"';
-            }
-
         }
+
         if ($_GET['m'] != M_ANALYSIS_CHARTS && $_GET['m'] != M_ANALYSIS_LINKS && $_GET['m'] != M_ANALYSIS_CREPORT) {
-            if (true) {
+            
-                echo '<span class="srv_statistic_menu">' . $lang['srv_statistic_menu'] . Help::display('srv_menu_statistic') . '&nbsp;</span>';
+            echo '<span>'.$lang['srv_statistic_menu'].' '.Help::display('srv_menu_statistic').'</span>';
-                echo '<div id="globalSetingsLinks" class="analiza">';
+            
-            }
+            echo '<div id="globalSetingsLinks" class="analiza">';
+
             if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) {
                 echo '<ul class="analizaSubNavigation">';
+
                 echo '<li' . ($_GET['m'] == M_ANALYSIS_MEANS_HIERARHY ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[5] . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_MEANS_HIERARHY . '" title="' . $lang['srv_means'] . '"><span>' . $lang['srv_means'] . '</span></a>';
                 echo '</li>';
-                echo '</ul>';
 
-            } else {
+                echo '</ul>';
+            } 
+            else {
                 echo '<ul class="analizaSubNavigation">';
+
                 echo '<li' . ($_GET['m'] == M_ANALYSIS_SUMMARY ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[1] . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_SUMMARY . '" title="' . $lang['srv_sumarnik'] . '"><span>' . $lang['srv_sumarnik'] . '</span></a>';
                 echo '</li>';
+
                 # opisne
                 echo '<li' . ($_GET['m'] == M_ANALYSIS_DESCRIPTOR ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[2] . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_DESCRIPTOR . '" title="' . $lang['srv_descriptor'] . '"><span>' . $lang['srv_descriptor_short'] . '</span></a>';
                 echo '</li>';
+
                 # frekvence
                 echo '<li' . ($_GET['m'] == M_ANALYSIS_FREQUENCY ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[3] . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_FREQUENCY . '" title="' . $lang['srv_frequency'] . '"><span>' . $lang['srv_frequency'] . '</span></a>';
                 echo '</li>';
-                # crostabs
+
-                echo '<li' . ($_GET['m'] == M_ANALYSIS_CROSSTAB ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[4] . '>';
+                // Pri glasovanju nimamo teh modulov ker imamo samo 1 vprasanje
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_CROSSTAB . '" title="' . $lang['srv_crosstabs'] . '"><span>' . $lang['srv_crosstabs'] . '</span></a>';
+                if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") != 0){
-                echo '</li>';
+
-                # multicrostabs
+                    # crostabs
-                echo '<li' . ($_GET['m'] == M_ANALYSIS_MULTICROSSTABS ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[8] . '>';
+                    echo '<li' . ($_GET['m'] == M_ANALYSIS_CROSSTAB ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[4] . '>';
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_MULTICROSSTABS . '" title="' . $lang['srv_multicrosstabs'] . '"><span>' . $lang['srv_multicrosstabs'] . '</span></a>';
+                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_CROSSTAB . '" title="' . $lang['srv_crosstabs'] . '"><span>' . $lang['srv_crosstabs'] . '</span></a>';
-                echo '</li>';
+                    echo '</li>';
-                # povprečaj
+
-                echo '<li' . ($_GET['m'] == M_ANALYSIS_MEANS ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[5] . '>';
+                    # multicrostabs
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_MEANS . '" title="' . $lang['srv_means'] . '"><span>' . $lang['srv_means'] . '</span></a>';
+                    echo '<li' . ($_GET['m'] == M_ANALYSIS_MULTICROSSTABS ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[8] . '>';
-                echo '</li>';
+                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_MULTICROSSTABS . '" title="' . $lang['srv_multicrosstabs'] . '"><span>' . $lang['srv_multicrosstabs'] . '</span></a>';
-                # ttest
+                    echo '</li>';
-                if ($admin_type == 0) {
+
-                    echo '<li' . ($_GET['m'] == M_ANALYSIS_TTEST ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[6] . '>';
+                    # povprečaj
-                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_TTEST . '" title="' . $lang['srv_ttest'] . '"><span>' . $lang['srv_ttest'] . '</span></a>';
+                    echo '<li' . ($_GET['m'] == M_ANALYSIS_MEANS ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[5] . '>';
+                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_MEANS . '" title="' . $lang['srv_means'] . '"><span>' . $lang['srv_means'] . '</span></a>';
+                    echo '</li>';
+
+                    # ttest
+                    if ($admin_type == 0) {
+                        echo '<li' . ($_GET['m'] == M_ANALYSIS_TTEST ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[6] . '>';
+                        echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_TTEST . '" title="' . $lang['srv_ttest'] . '"><span>' . $lang['srv_ttest'] . '</span></a>';
+                        echo '</li>';
+                    }
+
+                    # break
+                    echo '<li' . ($_GET['m'] == M_ANALYSIS_BREAK ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[7] . '>';
+                    echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_BREAK . '" title="' . $lang['srv_break'] . '"><span>' . $lang['srv_break'] . '</span></a>';
                     echo '</li>';
                 }
-                # break
-                echo '<li' . ($_GET['m'] == M_ANALYSIS_BREAK ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"') . $_js_links[7] . '>';
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_BREAK . '" title="' . $lang['srv_break'] . '"><span>' . $lang['srv_break'] . '</span></a>';
-                echo '</li>';
-                # para statistike - so pod status??
-                /*if ($admin_type === '0') {
 
-                    echo '<li'.($_GET['m']==M_ANALYSIS_PARA ? ' class="highlightLineTab"' : ' class="nonhighlight displayNone"').$_js_links[9].'>';
-                    echo '<a href="index.php?anketa='.$this->sid.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_PARA.'" title="'.$lang['srv_para_neodgovori'].'"><span>'.$lang['srv_para_neodgovori'].'</span></a>';
-                    echo '</li>';
-                }	*/
-                # predogled
-                echo '<li class="previewCheck displayNone">';
-                echo '<label><input type="checkbox" id="cbx_shoq_analiza_preview" onchange="change_analiza_preview();"' . ($show_analiza_preview == true ? ' checked=checked' : '') . '>' . $lang['srv_preview'] . '</label>';
-                echo '</li>';
                 echo '</ul>';
             }
-            if ($showDiv) {
+      
-                echo '</div>';
+            echo '</div>';
-            }
+
-            ?>
+
-            <script>
+            ?><script>
                 function show_anl_prev(tip) {
                     $("#srv_analiza_preview_div").show();
-                    //var tip = parseInt($(event.target).parent().attr('anl_prv'));
-
 
                     if (tip > 0) {
                         // 	skrijemo ostale previev-e
-                        $('.srv_analiza_preview_sub').addClass('hidden');
+                        $('.srv_analiza_preview_sub').addClass('displayNone');
                         // prikažemo ustrezen predogled
-                        $('#srv_analiza_preview_sub_' + tip).removeClass('hidden');
+                        $('#srv_analiza_preview_sub_' + tip).removeClass('displayNone');
                     }
                 }
                 function hide_anl_prev() {
                     $("#srv_analiza_preview_div").hide();
                 }
-                // mousever preview vprasanja
+            </script><?php
-                //$('#globalSetingsLinks ul li a').bind('mouseover', function (event) {
-
-                //}).bind('mouseout', function (event) {
-
-                //});
-            </script>
-            <?php
-
         }
+
         $this->displayAnalizaPreview();
     }
 
@@ -886,7 +764,7 @@ class SurveyStaticHtml
 
             if ($podstran == 'export') {
                 echo '<li>';
-                echo '<span class="as_link" id="link_export_setting" onClick="$(\'#fade\').fadeTo(\'slow\', 1);$(\'#div_export_setting_show\').fadeIn(\'slow\'); return false;" title="' . $lang['srv_dsp_link'] . '">' . $lang['srv_dsp_link'] . '</span>';
+                echo '  <span id="link_export_setting" onClick="$(\'#fade\').fadeTo(\'slow\', 1);$(\'#div_export_setting_show\').fadeIn(\'slow\'); return false;" title="' . $lang['srv_dsp_link'] . '">' . $lang['srv_dsp_link'] . '</span>';
                 echo '</li>';
             }
 
@@ -945,7 +823,7 @@ class SurveyStaticHtml
             // profili statusov
             $statusCasi = SurveyStatusCasi:: getProfiles();
             echo '<div style="margin-top: 15px;">';
-            echo '<span class="as_link" id="link_status_casi" title="' . $lang['srv_statusi'] . '">' . $lang['srv_statusi'] . ': </span>';
+            echo '<span id="link_status_casi" title="' . $lang['srv_statusi'] . '">' . $lang['srv_statusi'] . ': </span>';
             echo '<span id="div_vnosi_status_profile_dropdown">';
             echo '<select id="vnosi_current_status_casi" name="vnosi_current_status_casi" onchange="statusCasiAction(\'change\'); return false;" >';
             foreach ($statusCasi as $key => $value) {
@@ -1104,15 +982,16 @@ class SurveyStaticHtml
         }
     }
 
-    public function displayChartOptions()
+    public function displayChartOptions(){
-    {
         global $lang, $admin_type;
 
+        SurveyChart::Init($this->sid);
+        
         // Nastavitev HQ grafov
-        echo '<li><label>';
+        echo '<li>';
-        echo $lang['srv_chart_hq'] . ': ';
+        echo '  <input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" '.(SurveyChart::$quality == 3 ? ' checked="checked"' : '').'>';
-        echo '<input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" ' . (SurveyChart::$quality == 3 ? ' checked="checked"' : '') . '>';
+        echo '  <label for="chart_hq">'.$lang['srv_chart_hq'] . '</label>';
-        echo '</label></li>';
+        echo '</li>';
 
 
         // Nastavitev skina grafov
@@ -1175,15 +1054,9 @@ class SurveyStaticHtml
         if ($hideAdvanced == false) {
 
             echo '<li>';
-            echo '<span class="as_link" id="link_chart_color" title="' . $lang['srv_chart_skin'] . '">' . $lang['srv_chart_skin'] . ': <span style="font-weight: 500;">' . $name . '</span></span>';
+            echo '  <span id="link_chart_color" title="' . $lang['srv_chart_skin'] . '">' . $lang['srv_chart_skin'] . ': <span style="font-weight: 500;">' . $name . '</span></span>';
             echo '</li>';
         }
-
-        // Separator
-        /*echo '<li style="border-bottom:1px #0C377A dashed;">';
-        echo '</li>';
-        echo '<li>';
-        echo '</li>';*/
     }
 
 

admin/survey/classes/class.SurveyStatusProfiles.php

@@ -136,13 +136,15 @@ class SurveyStatusProfiles
 		if (($_podstran == A_COLLECT_DATA && $_GET['m'] == 'quick_edit') || $_POST['podstran'] == 'quick_edit') {
 			$_podstran = 'vpogled';
 		}
+
+
 		self::$currentProfileId = SurveyUserSetting :: getInstance()->getSettings('default_status_profile_'.$_podstran);
 		
 		if (!self::$currentProfileId) {
-			
 			#self::$currentProfileId = 2;
 			self::$currentProfileId = self::$survayDefaultUstrezni; # je lahko 2 ali 3
 		}
+
 		# ustrezni je lahko samo če so kakšni ustrezni zapisi v bazi ob pogoju da pa neustrezni obstajajao
 		if (self::$allValidCount == 0 && self::$allUserCount > 0) {
 			if (self::$currentProfileId == 2 || self::$currentProfileId == 3 ) {
@@ -153,16 +155,22 @@ class SurveyStatusProfiles
 		
 		# ce imamo nastavljen curent pid in profil z tem pid ne obstaja nastavomo na privzet profil 
 		if (self::$currentProfileId != 1) {
+
 			if (!isset(self::$profiles[self::$currentProfileId])) {
 				self::$currentProfileId = 1;
-			} 
+			}
+            // Ce smo preklopili default ustrezni iz status 5,6 na 6 ali obratno
+            elseif(self::$currentProfileId == 2 || self::$currentProfileId == 3){
+                self::$currentProfileId = self::$survayDefaultUstrezni;
+            }
 		}
 		
 		# ce ne obstajajo podatki za cpid damo error
 		if (!isset(self::$profiles[self::$currentProfileId])) {
 			die("Profile data is missing!");
 			return false;
-		} else {
+		} 
+        else {
 			return true;
 		}
 	}
@@ -197,29 +205,46 @@ class SurveyStatusProfiles
         		
 		#vsebino shranimo v buffer
 		ob_start();
-		if ( self::$currentProfileId != SSP_DEFAULT_PROFILE ) {
-	       	echo '<div id="not_default_setting">';
-	        echo $lang['srv_not_default_setting'];
-	        echo '</div><br class="clr displayNone">';
-        }
 
         echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">✕</a></div>';
 
-		echo ' <div id="status_profile_holder">';
+		
+        if ( self::$currentProfileId != SSP_DEFAULT_PROFILE ) {
+	       	echo '<div id="not_default_setting" class="popup_note">';
+	        echo $lang['srv_not_default_setting'];
+	        echo '</div>';
+        }
+
+
+        echo '<div class="popup_main with_menu">';
+
+		echo ' <div id="status_profile_holder" class="popup_left">';
 		self :: DisplayProfileOptions($pid);
 		echo ' </div>';
 
-		echo ' <div id="status_profile_data_holder">';
+		echo ' <div id="status_profile_data_holder" class="popup_right">';
 		self :: DisplayProfileData($pid);
-		echo ' <br class="clr" />';
 		echo ' </div>';
-                
+        
+		echo ' </div>';
+
+
 		// cover Div
         echo '<div id="statusProfileCoverDiv"></div>';
         
         // div za shranjevanje novega profila
-        echo '<div id="newProfile">'.$lang['srv_missing_profile_name'].': ';
+        echo '<div id="newProfile">';
-        echo '<input id="newProfileName" name="newProfileName" type="text" size="45"  />';
+		
+		echo '<div class="setting_holder">';
+
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+		
         $button = new PopUpButton($lang['srv_save_profile']);
         echo $button -> setFloat('right')
         		->setButtonColor('orange')
@@ -227,12 +252,26 @@ class SurveyStatusProfiles
         $button = new PopUpButton($lang['srv_cancel']);
         echo $button -> setFloat('right')
         		-> addAction('onClick','statusProfileAction(\'newCancel\'); return false;');
+		
+		echo '</div>';
+
         echo '</div>';
 
         // div za preimenovanje
-        echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': ';
+        echo '<div id="renameProfileDiv">';
-        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" size="45"  />';
+		
+		echo '<div class="setting_holder">';
+
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" class="text large"  />';
         echo '<input id="renameProfileId" type="hidden" value="' . $pid . '"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+		
+		
         $button = new PopUpButton($lang['srv_rename_profile_yes']);
         echo $button -> setFloat('right')
         		->setButtonColor('orange')
@@ -242,20 +281,25 @@ class SurveyStatusProfiles
         echo $button -> setFloat('right')
         		-> addAction('onClick','statusProfileAction(\'renameCancel\'); return false;');
         echo '</div>';
+        echo '</div>';
 
         // div za brisanje
-        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . self::$profiles[$pid]['name'] . '</b>?';
+        echo '<div id="deleteProfileDiv">';
-        echo '<input id="deleteProfileId" type="hidden" value="' . $pid . '"  />';
+
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . self::$profiles[$pid]['name'] . '</span>?';
+		
+		echo '<input id="deleteProfileId" type="hidden" value="' . $pid . '"  />';
+
+        echo '<div class="button_holder">';
 
         $button = new PopUpButton($lang['srv_delete_profile_yes']);
-        echo $button -> setFloat('right')
+        echo $button -> setButtonColor('orange')
-        		->setButtonColor('orange')
         		-> addAction('onClick','statusProfileAction(\'deleteConfirm\'); return false;');
         
         $button = new PopUpButton($lang['srv_cancel']);
-        echo $button -> setFloat('right')
+        echo $button -> addAction('onClick','statusProfileAction(\'deleteCancel\'); return false;');
-        		-> addAction('onClick','statusProfileAction(\'deleteCancel\'); return false;');
         
+        echo '</div>';
         echo '</div>';
         
         $content = ob_get_clean();
@@ -263,44 +307,28 @@ class SurveyStatusProfiles
         #dodamo vsebino
         $popUp->setContent($content);
 
-       /* 
+
-        if ($pid < 0) { #Imamo sejo, lahko poženemo samo kot sejo
+        # dodamo gumb Prekliči
-        	$run_lbl = $lang['srv_run_as_session_profile'];
+		$button = new PopUpCancelButton();
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="statusProfileAction(\'runSession\'); return false;"><span>'.$run_lbl.'</span></a></span></span>';
-        } else {
-        	# shrani - pozeni
-        	$run_lbl = $lang['srv_run_profile'];
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick=""><span>'.$run_lbl.'</span></a></span></span>';
-        	$run_lbl = $lang['srv_run_as_session_profile'];
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="statusProfileAction(\'runSession\'); return false;"><span>'.$run_lbl.'</span></a></span></span>';
-        
-        }
-        */
-        $button = new PopUpButton($lang['srv_choose_profile']);
-        $button -> setFloat('right')
-        	->setButtonColor('orange')
-        	-> addAction('onClick','statusProfileAction(\'choose\'); return false;');
         $popUp->addButton($button);
         
         #dodamo gumb shrani
-        if (self::$profiles[$pid]['system'] != 1 && $pid != -1) 
+        if (self::$profiles[$pid]['system'] != 1 && $pid != -1){
-        {
 	        $button = new PopUpButton($lang['srv_save_profile']);
-	        $button -> setFloat('right')
+	        $button -> addAction('onClick','statusProfileAction(\'save\'); return false;');
-	        	-> addAction('onClick','statusProfileAction(\'save\'); return false;');
 	        $popUp->addButton($button);
         }
         
         $button = new PopUpButton($lang['srv_new_profile_name']);
-        $button -> setFloat('right')
+        $button -> addAction('onClick','statusProfileAction(\'newName\'); return false;');
-        -> addAction('onClick','statusProfileAction(\'newName\'); return false;');
         $popUp->addButton($button);
-        
+
-		# dodamo gumb Prekliči
+        $button = new PopUpButton($lang['srv_choose_profile']);
-		$button = new PopUpCancelButton();
+        $button ->setButtonColor('orange')
-		$button -> setFloat('right');
+        	-> addAction('onClick','statusProfileAction(\'choose\'); return false;');
         $popUp->addButton($button);
 		
+
         echo $popUp;
 	}
 
@@ -321,56 +349,49 @@ class SurveyStatusProfiles
 		# preverimo kaere statuse disejblamo na podlagi izbire načina kreiranja datoteke (samo 5,6 / vsi satusi)
 		list($collect_all_status) = mysqli_fetch_row(sisplet_query("SELECT collect_all_status FROM srv_data_files WHERE sid = '".self::$sid."'"));
 
-		echo '<table><tr>';
+		
+		echo '<div class="valid_units_wrap">';
+
 		// dodamo veljavne
 		foreach (self::$appropriateStatus as $index) {
-			if ($cnt&1) { 
+			echo '<div class="valid_units_box">';
-				echo '</tr><tr>';
+			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
-			}
-			echo '<td style="width:50%">';
-			echo '<label><input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
-			 ($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' disabled="true"' : '' ). '/>';
+			 ($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' disabled' : '' ). '/><label for="' . $index . '">';
 			echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>';
-			echo '</label></td>';
+			echo '</label></div>';
-			$cnt++;
 		}
+
 		// dodamo neveljavne
 		foreach (self::$unAppropriateStatus as $index) {
-			if ($cnt&1) 
+			echo '<div class="valid_units_box">';
-				echo '</tr><tr>';
+			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
-			echo '<td style="width:50%">';
-			echo '<label><input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') . 
-			 ($disabled  || ( (int)$collect_all_status == 0 && $index < 5  ) ? ' disabled="true"' : '' ) . '/>';
+			 ($disabled  || ( (int)$collect_all_status == 0 && $index < 5  ) ? ' disabled' : '' ) . '/><label for="' . $index . '">';
 			//echo $lang['srv_userstatus_' . $index]. " (".$index.")";
 			echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>';
-			echo '</label></td>';
+			echo '</label></div>';
-			$cnt++;
 		}
+
 		// dodamo null
 		foreach (self::$unKnownStatus as $index) {
-
+			echo '<div class="valid_units_box">';
-			if ($cnt&1) 
+			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
-				echo '</tr><tr>';
-			echo '<td style="width:50%">';
-			echo '<label><input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
-			 ($disabled  || ( (int)$collect_all_status == 0 && $index < 5  ) ? ' disabled="true"' : '' ) . '/>';
+			 ($disabled  || ( (int)$collect_all_status == 0 && $index < 5  ) ? ' disabled' : '' ) . '/><label for="' . $index . '">';
 			//echo $lang['srv_userstatus_' . $index]. " (".$index.")";
 			echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>';
-			echo '</label></td>';
+			echo '</label></div>';
-			$cnt++;
 		}
 		
-		echo '</tr></table>';
+		echo '</div>'; #valid_units_wrap
 		
 		echo '</fieldset>';
 		
 		
 		if ($disabled ) {
 			$html_disabled = ' disabled="true"';
-			$css_disabled = ' class="gray"';
+			$css_disabled = ' disabled';
 		}
 		
 		
@@ -379,19 +400,51 @@ class SurveyStatusProfiles
 		
 		// lurkerji
 		# lurker = 0 - obveezno ni lurker, lurker = 1 - obvezno je lurker, lurker = 2 - je ali ni lurker
-		#echo '<hr><label><input type="checkbox" name="srv_userstatus[]" id="lurker" '.($curentProfileData['statuslurker'] == 1 ? ' checked="checked"' : '') . ($disabled ? ' disabled="true"' : '' ) . '> '.$lang['srv_lurkers'].'</label>';
+		#echo '<hr><label><input type="checkbox" name="srv_userstatus[]" id="lurker" '.($curentProfileData['statuslurker'] == 1 ? ' checked="checked"' : '') . ($disabled ? ' disabled' : '' ) . '> '.$lang['srv_lurkers'].'</label>';
-		echo '<label'.$css_disabled.'>'.$lang['srv_lurkers'].'</label>';
+		
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_lurker" value="0" '.((int)$curentProfileData['statuslurker'] == 0 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['no'].'</label>';
+		echo '<div class="setting_holder '.$css_disabled.'">';
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_lurker" value="1" '.((int)$curentProfileData['statuslurker'] == 1 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_only_empty'].'</label>';
+		echo '<p class="setting_title">'.$lang['srv_lurkers'];
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_lurker" value="2" '.((int)$curentProfileData['statuslurker'] == 2 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_also'].'</label>';
+		echo '<br><span class="italic">'.$lang['srv_lurkers_subnote'].'</span></p>';
-		echo '<br/><label class="small">'.$lang['srv_lurkers_subnote'].'</label>';
+		
+		echo '<div class="horizontal">';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_lurker0" name="srv_us_lurker" value="0" '.((int)$curentProfileData['statuslurker'] == 0 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_lurker0">'.$lang['no'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_lurker1" name="srv_us_lurker" value="1" '.((int)$curentProfileData['statuslurker'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_lurker1">'.$lang['srv_only_empty'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_lurker2" name="srv_us_lurker" value="2" '.((int)$curentProfileData['statuslurker'] == 2 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_lurker2">'.$lang['srv_also'].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>';
 		
 		// testni vnosi
 		# testni = 0 - obveezno ni testni, testni = 1 - obvezno je tesni, testni = 2 - je ali ni testni
-		echo '<br/><br/><label'.$css_disabled.'>'.$lang['srv_testni_vnos'].'</label>';
+
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_testni" value="0" '.((int)$curentProfileData['statustestni'] == 0 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['no'].'</label>';
+		echo '<div class="setting_holder '.$css_disabled.'">';
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_testni" value="1" '.((int)$curentProfileData['statustestni'] == 1 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_only_test'].'</label>';
+		echo '<p class="setting_title">'.$lang['srv_testni_vnos'].'</p>';
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_testni" value="2" '.((int)$curentProfileData['statustestni'] == 2 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_also'].'</label>';
+
+		echo '<div class="horizontal">';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_testni0" name="srv_us_testni" value="0" '.((int)$curentProfileData['statustestni'] == 0 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_testni0">'.$lang['no'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_testni1" name="srv_us_testni" value="1" '.((int)$curentProfileData['statustestni'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_testni1">'.$lang['srv_only_test'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_testni2" name="srv_us_testni" value="2" '.((int)$curentProfileData['statustestni'] == 2 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_testni2">'.$lang['srv_also'].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>';
 
 		echo '</fieldset>';
 		
@@ -401,10 +454,25 @@ class SurveyStatusProfiles
 		echo '<legend>' . $lang['srv_usableResp_usable_unit'] . '</legend>';
 		
 		// 2->uporabni, 1->delno uporabni, 0->neuporabni
-		echo '<label'.$css_disabled.'><input type="checkbox" name="srv_us_nonusable" value="1" '.((int)$curentProfileData['statusnonusable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_usableResp_unusable'].'</label>';
+
-		echo '<span class="spaceLeft"></span><label'.$css_disabled.'><input type="checkbox" name="srv_us_partusable" value="1" '.((int)$curentProfileData['statuspartusable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>'.$lang['srv_usableResp_partusable'].'</label>';
+		echo '<div class="setting_holder '.$css_disabled.'">';
-		echo '<span class="spaceLeft"></span><label'.$css_disabled.'><input type="checkbox" name="srv_us_usable" value="1" '.((int)$curentProfileData['statususable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>'.$lang['srv_usableResp_usable'].'</label>';
 		
+		echo '<div class="horizontal">';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="srv_us_nonusable" name="srv_us_nonusable" value="1" '.((int)$curentProfileData['statusnonusable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_nonusable">'.$lang['srv_usableResp_unusable'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="srv_us_partusable" name="srv_us_partusable" value="1" '.((int)$curentProfileData['statuspartusable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_partusable">'.$lang['srv_usableResp_partusable'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="srv_us_usable" name="srv_us_usable" value="1" '.((int)$curentProfileData['statususable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_usable">'.$lang['srv_usableResp_usable'].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>';
 		
 		echo '</fieldset>';
 		echo '</form>';
@@ -418,15 +486,18 @@ class SurveyStatusProfiles
 		$_sql_qry = sisplet_query($_sql_string);
 		$_sql_row = mysqli_fetch_assoc($_sql_qry);
 		
-		echo '<div id="status_profile" class="select">';
+		echo '<div id="status_profile" class="list select">';
+
 		foreach ( self::$profiles as $key => $profile ) {
 			if ($key != 1 || ($key == 1 && (int)$_sql_row['collect_all_status'] > 0 )) {
 				
-				echo '<div id="status_profile_'.$profile['id'].'" class="option' . ($profile['id'] == $pid ? ' active' : '') . '" value="'.$profile['id'].'" '.($profile['id'] == $pid ? '' : '  onclick="show_status_profile_data(' . $profile['id'] . '); return false;"').'>';
+				echo '<div id="status_profile_'.$profile['id'].'" class="list-item option' . ($profile['id'] == $pid ? ' active' : '') . '" value="'.$profile['id'].'" '.($profile['id'] == $pid ? '' : '  onclick="show_status_profile_data(' . $profile['id'] . '); return false;"').'>';
 
 				echo $profile['name'];
 
 				if($profile['id'] == $pid){
+                    echo '<div class="profile_icons">';
+
 					#dodamo gumb izbriši
 					if (self::$profiles[$pid]['system'] != 1 ){
 						echo ' <a href="#" onclick="statusProfileAction(\'deleteAsk\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
@@ -435,6 +506,8 @@ class SurveyStatusProfiles
 					if (self::$profiles[$pid]['system'] != 1 && $pid != -1){
 						echo ' <a href="#" onclick="statusProfileAction(\'renameAsk\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
 					}
+
+                    echo '</div>';
 				}
 				
 				echo '</div>';
@@ -443,9 +516,7 @@ class SurveyStatusProfiles
 		echo '</div>';
 		
 		echo '<script>';
-		echo '$(function() {';
+		echo '  $(function(){ scrollToProfile("#status_profile_'.$pid.'"); });';
-		echo 'scrollToProfile("#status_profile_'.$pid.'");';
-		echo '});';
 		echo '</script>';
 	}
 	
@@ -953,19 +1024,17 @@ class SurveyStatusProfiles
 		
 	static function DisplayLink($hideAdvanced = true, $hideSeperator = false) {
 		global $lang;
+
 		// profili statusov
         $statusProfiles = self :: getProfiles();
         $izbranStatusProfile = self :: getCurentProfileId();
 		
         $css = ($izbranStatusProfile == SSP_DEFAULT_PROFILE ? ' gray' : '');
         if ($hideAdvanced == false || $izbranStatusProfile != SSP_DEFAULT_PROFILE) {
-        	if ($hideSeperator == false) {
+
-        		echo '<li class="space">&nbsp;</li>';
-        	}
         	echo '<li>';
-	        echo '<span class="as_link'.$css.'" onclick="show_status_profile();return false;" title="' . $lang['srv_statusi'] . '">' . $lang['srv_statusi'] . '</span>';
+	        echo '  <span class="'.$css.'" onclick="show_status_profile(); return false;" title="' . $lang['srv_statusi'] . '">' . $lang['srv_statusi'] . '</span>';
-	        echo '</li>';
+	        echo '</li>';    	
-	        	
         }		
 	}
 	
@@ -975,11 +1044,10 @@ class SurveyStatusProfiles
 		$_sql_string = "SELECT collect_all_status FROM srv_data_files WHERE sid = '".self::$sid."'";
 		$_sql_qry = sisplet_query($_sql_string);
 		$_sql_row = mysqli_fetch_assoc($_sql_qry);
-				
+
-		echo '<li class="space">&nbsp;</li>';
 		echo '<li>';
         $css = ((int)$_sql_row['collect_all_status'] > 0 ? ' gray' : '');
-        echo '<span class="as_link'.$css.'" onclick="showColectDataSetting(); return false;" title="' . $lang['srv_collect_data_setting_note'] . '">' . $lang['srv_collect_data_setting_note'] . '</span>';
+        echo '  <span class="'.$css.'" onclick="showColectDataSetting(); return false;" title="' . $lang['srv_collect_data_setting_note'] . '">' . $lang['srv_collect_data_setting_note'] . '</span>';
         echo '</li>';
         
 		return;
@@ -1133,36 +1201,30 @@ class SurveyStatusProfiles
             }
 		} 
 
-		echo '<label class="middle'.$disabledAllGray.'">';
 		echo '<input type="radio" id="statusAllUnit" name="statusOnlyValid" value="1"'.($pid == 1?' checked="checked"':'').$disabledAll.' onchange="changeOnlyValidRadio();" autocomplete="off">';
-		echo $lang['srv_data_all_units'].'&nbsp;('.(int)self::$allUserCount.')';
+		echo '<label for="statusAllUnit" class="middle'.$disabledAllGray.'">'.$lang['srv_data_all_units'].'&nbsp;('.(int)self::$allUserCount.')</label>';
-		echo '</label>';
-		echo '&nbsp;';
 		
 		if (self::$survayDefaultUstrezni == 2) {
-			echo '<label class="middle'.$disabledGray .'">';
 			echo '<input type="radio" id="statusValidUnit" name="statusOnlyValid" value="2"'.($pid==2?' checked="checked"':'').$disabledValid.' onchange="changeOnlyValidRadio();" autocomplete="off">';
-			echo $lang['srv_data_valid_units'].'&nbsp;('.(int)self::$allValidCount.')';
+			echo '<label for="statusValidUnit" class="middle'.$disabledGray.'">'.$lang['srv_data_valid_units'].'&nbsp;('.(int)self::$allValidCount.') '.Help::display('srv_data_only_valid').'</label>';
-			echo '</label>';
 		} 
         else {
-			echo '<label class="middle'.$disabledGray .'">';
 			echo '<input type="radio" id="statusValidUnit" name="statusOnlyValid" value="3"'.($pid==3?' checked="checked"':'').$disabledValid.' onchange="changeOnlyValidRadio();" autocomplete="off">';
-			echo $lang['srv_data_finished_units'].'&nbsp;('.(int)self::$allValidCount.')';	
+			echo '<label for="statusValidUnit" class="middle'.$disabledGray.'">'.$lang['srv_data_finished_units'].' ('.(int)self::$allValidCount.') '.Help::display('srv_data_only_valid').'</label>';	
 		}
-	
-		echo '&nbsp;'.Help::display('srv_data_only_valid');
 	}
 	
 	static function changeOnlyValidRadio() {
+        
 		if (isset($_POST['checked']) && (int)$_POST['checked'] > 0) {
 			$dpid = (int)$_POST['checked'];
-		} else {
+		} 
+        else {
 			#$dpid = 2;
 			$dpid = (int)self::$survayDefaultUstrezni;
 		}
+
 		self::setDefaultProfileId($dpid);
-		
 	}
 	
 	/** preveri obstoj profila in vrne enak id če obstaja, če ne vrne id privzetega profila

admin/survey/classes/class.SurveyTheme.php

@@ -64,7 +64,7 @@ class SurveyTheme {
 						10 => 'Otroci4.css',
 						11 => 'Embed.css', 
 						12 => 'Embed2.css', 
-						13 => 'Slideshow.css'
+						//13 => 'Slideshow.css'
 					);
 
                     $standard_skins[14] = 'Uni.css';
@@ -313,12 +313,6 @@ class SurveyTheme {
 		
 		echo '<div class="themes-content">';
 		
-		$sql = sisplet_query("SELECT name FROM srv_theme_profiles".$mobile." WHERE id = '".$_GET['profile']."'");
-		$row = mysqli_fetch_array($sql);
-		
-		echo '<h2>'.$lang['srv_themes_mod'].': <span class="red">'.$row['name'].'</span></h2>';
-		//self::displayTabs();
-		
 		if ( !isset($_GET['t']) ) {
 			
 			$ste = new SurveyThemeEditor($this->sid);
@@ -347,22 +341,98 @@ 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'];
 		}
 
+		echo '<h2 class="first">'.$lang['srv_current_theme'].'</h2>';
 
-		echo '<span class="theme_header">'.$lang['srv_current_theme'].': ';
+		//AKTIVNA SPLOŠNA TEMA
-		if($row['skin_profile'] == 0){
+		echo '<div class="theme_list active_theme">';
-			echo '<a href="index.php?anketa=' . $this->sid . '&a=theme-editor&profile_new=' . $simple_name . '"><span class="bold" style="font-size:16px;">' . $skin_name . '</span>' . '</a>';
+
-		}else {
+		echo '<div class="theme">';
-			echo '<a href="index.php?anketa=' . $this->sid . '&a=theme-editor&profile=' . $row['skin_profile'] . '"><span class="bold" style="font-size:16px;">' . $skin_name . '</span>' . '</a>';
+		echo '<span class="name">'.$skin_name.'</span>';
+		echo '<span class="desc">('.$lang['srv_current_theme_general'].')</span>';
+		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 {
+			$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'] . '\'';
+		}
+
+		//Gumbi
+		echo '<div class="options">';
+
+		//Predogled
+		echo '<div class="button theme_links_preview" src="'.$preview_link.'" 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 '<span class="faicon palette"></span>';
+		echo $lang['srv_te_theme_edit'];
+		echo '</div>';
 		
-		echo '</span><br /><br />';
+		echo '</div>';
+
+		echo '</div>';
+
+
+		//AKTIVNA MOBILNA TEMA
+		$simple_name = $this->current_mobile_skin;
+
+		if ($row['skin_profile_mobile'] == 0) {
+			$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);
+			$skin_name = $rowa['name'];
+		}
+
+		echo '<div class="theme_list active_theme">';
+		echo '<div class="theme">';
+		echo '<span class="name">'.$skin_name.'</span>';
+		echo '<span class="desc">('.$lang['srv_current_theme_mobile'].')</span>';
+		echo '</div>';
+
+        if($row['skin_profile_mobile'] == 0){
+			$preview_link_mobile = SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme='.$simple_name.'&mobile=1';
+			$modify_link_mobile = '\'index.php?anketa=' . $this->sid . '&a=theme-editor&mobile=1&profile_new_mobile=' . $simple_name . '\'';
+		}
+        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
+		echo '<div class="button theme_links_preview" src="'.$preview_link_mobile.'" 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_mobile.'" title="'.$lang['srv_te_theme_edit'].'">';
+		echo '<span class="faicon palette"></span>';
+		echo $lang['srv_te_theme_edit'];
+		echo '</div>';
+		
+		echo '</div>';
+
+		echo '</div>';
+
 	}
 	
 	function displayAdvancedSettings ($groupId) {
@@ -445,8 +515,6 @@ class SurveyTheme {
 		global $lang, $site_url;
 		global $global_user_id;
  
-		//if (count($this->groups[$groupId]['skins'])>0 || $groupId == -1) {
-			
 		$rowa = SurveyInfo::getSurveyRow();
 		
 		if($groupId == -2)
@@ -456,12 +524,15 @@ class SurveyTheme {
 		elseif ($groupId != -1)
 			echo '<h2>'.$lang['srv_system_themes'].'</h2>';
 		else{
-			echo '<h2>'.$lang['srv_user_themes'].' ';
+			echo '<h2 class="pointer" onClick="toggle_custom_themes(); return false;"><span class="user_themes_button faicon fa-angle-down"> </span>'.$lang['srv_user_themes'].' ';
-			echo '<span class="user_themes_button faicon plus icon-blue pointer" style="margin-bottom:6px;" onClick="toggle_custom_themes(); return false;"> </span>';
 			echo '</h2>';
 		}
 
-		echo '<div id="div_theme_group" '.($groupId==-1 ? ' class="custom" style="display:none;"' : '').'>';
+		if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) {
+			echo '<div id="theme_grid_holder">';
+		}
+
+		echo '<div class="div_theme_group '.($groupId==-1 ? ' custom' : '').'">';
 		
 		$sqlg = sisplet_query("SELECT id FROM srv_grupa WHERE ank_id='$this->sid' ORDER BY vrstni_red ASC LIMIT 1");
 		$rowg = mysqli_fetch_array($sqlg);
@@ -498,24 +569,48 @@ class SurveyTheme {
 				$skin = $row['skin'];
 				$src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].'';
 				$is_current_skin = ($rowa['skin_profile'] == $row['id']) ? true : false;
-								
-				echo '<div class="custom_theme_holder '.($is_current_skin ? ' active' : '').'">';
-				
-				// Title
-				echo '<span class="custom_theme_title" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$row['name'].'" title="'.$lang['srv_changetheme'].'" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" alt="'.$row['name'].'">'.substr($row['name'], 0, 30).(strlen($row['name']) > 30 ? '...' : '').'</span>';
-			
-				// Preview theme
-				echo ' <a href="#" class="theme_links_preview" src="'.$src.'"><span class="custom_theme_preview"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</span></a>';
 
-				// Delete theme
+				echo '<div class="theme_list">';
-				if ($groupId == -1) 
+
-					echo ' <a href="#" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); return false;" class="theme_delete" css="'.urlencode($skin).'"><span class="custom_theme_delete"><span class="faicon delete_circle icon-orange"></span> '.$lang['srv_anketadelete_txt'].'</span></a>';
+				echo '<div class="theme">';
-					
+				echo '<span class="name">'.$skin_name.'</span>';
-				// Edit theme
+				echo '<span class="name">'.substr($row['name'], 0, 30).(strlen($row['name']) > 30 ? '...' : '').'</span>';
-				echo ' <a href="index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'"><span class="custom_theme_edit"><span class="faicon palette"></span> '.$lang['edit3'].'</span></a>';	
+				echo '<span class="desc">('.$lang['srv_current_theme_general'].')</span>';
-			
 				echo '</div>';
+
+				//Gumbi
+				echo '<div class="options">';
+
+				//Aktiviraj
+				echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
+				echo '<span class="faicon fa-hand-pointer"></span>';
+				echo $lang['srv_te_theme_activate'];
+				echo '</div>';
+
+				//Predogled
+				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=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'" title="'.$lang['srv_te_theme_edit'].'">';
+				echo '<span class="faicon palette"></span>';
+				echo $lang['srv_te_theme_edit'];
+				echo '</div>';
+
+				//Izbriši
+				if ($groupId == -1) {
+					echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
+					echo '<span class="faicon trash empty"></span>';
+					echo $lang['srv_anketadelete_txt'];
+					echo '</div>';
+				}
 				
+				echo '</div>'; //div.options
+
+				echo '</div>'; //div.theme_list
+
 				$profiles++;
 			}
 			
@@ -526,31 +621,54 @@ class SurveyTheme {
 				$skin = $row['skin'];
 				$src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].'&mobile=1';
 				$is_current_skin = ($rowa['skin_profile_mobile'] == $row['id']) ? true : false;
-								
-				echo '<div class="custom_theme_holder '.($is_current_skin ? ' active' : '').'">';
-				
-				// Title
-				echo '<span class="custom_theme_title" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$row['name'].'" title="'.$lang['srv_changetheme'].'" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" alt="'.$row['name'].'">'.substr($row['name'], 0, 30).(strlen($row['name']) > 30 ? '...' : '').' <span class="italic">('.$lang['srv_mobile_theme'].')</span></span>';
-			
-				// Preview theme
-				echo ' <a href="#" class="theme_links_preview" src="'.$src.'"><span class="custom_theme_preview"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</span></a>';
 
-				// Delete theme
+				echo '<div class="theme_list">';
-				if ($groupId == -1) 
+
-					echo ' <a href="#" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); return false;" class="theme_delete" css="'.urlencode($skin).'"><span class="custom_theme_delete"><span class="faicon delete_circle icon-orange"></span> '.$lang['srv_anketadelete_txt'].'</span></a>';
+				echo '<div class="theme">';
-					
+				echo '<span class="name">'.$skin_name.'</span>';
-				// Edit theme
+				echo '<span class="name">'.substr($row['name'], 0, 30).(strlen($row['name']) > 30 ? '...' : '').'</span>';
-				echo ' <a href="index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1"><span class="custom_theme_edit"><span class="faicon palette"></span> '.$lang['edit3'].'</span></a>';	
+				echo '<span class="desc">('.$lang['srv_mobile_theme'].')</span>';
-			
 				echo '</div>';
+
+				//Gumbi
+				echo '<div class="options">';
+
+				//Aktiviraj
+				echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
+				echo '<span class="faicon fa-hand-pointer"></span>';
+				echo $lang['srv_te_theme_activate'];
+				echo '</div>';
+
+				//Predogled
+				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=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'" title="'.$lang['srv_te_theme_edit'].'">';
+				echo '<span class="faicon palette"></span>';
+				echo $lang['srv_te_theme_edit'];
+				echo '</div>';
+
+				//Izbriši
+				if ($groupId == -1) {
+					echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
+					echo '<span class="faicon trash empty"></span>';
+					echo $lang['srv_anketadelete_txt'];
+					echo '</div>';
+				}
 				
+				echo '</div>'; //div.options
+
+				echo '</div>'; //div.theme_list
+			
 				$profiles++;
 			}
-			
-			if(mysqli_num_rows($sql) > 0)
-				echo '<br />';
 		}
-		
+
+
+		// Splošne teme - GRID
 		if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) {
 			
 			foreach ($this->groups[$groupId]['skins'] AS $skinid => $skin) {
@@ -568,33 +686,64 @@ class SurveyTheme {
 				
 				// Preview slika
 				if ($groupId == -1) echo '<a href="#" class="theme_delete theme" gid="'.$groupId.'" css="'.urlencode($skin).'">'.$lang['srv_anketadelete_txt'].'</a>';
-				//echo '<span class="theme_links_rename as_link" theme="'.urlencode($skin).'">Preimenuj</span>';
+				
-				if ($groupId == -1)
+				if ($groupId == -1) {
-					echo '<img src="'.$site_url.'public/img/skins_previews/'.($groupId==-1?'usertheme':urlencode($simple_name)).'.png" onclick="te_change_profile_oldskin(\''.$simple_name.'\', true); return false;" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$simple_name.'" title="'.$lang['srv_changetheme'].'">';
+					echo '<img src="'.$site_url.'public/img/skins_previews/'.($groupId==-1?'usertheme':urlencode($simple_name)).'.png" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$simple_name.'" title="'.$lang['srv_changetheme'].'">';
+				}
 				else
 					echo '<img src="'.$site_url.'public/img/skins_previews/'.urlencode($simple_name).'.png" class="theme" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$simple_name.'" title="'.$lang['srv_changetheme'].'">';
 				
 				// 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_'.$simple_name);
+                    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>';
 				
 				echo '</div>';
-					
+
-				if($is_current_skin)
+				//Gumbi
-					echo ' <a href="index.php?anketa='.$this->sid.'&a=theme-editor&profile_new='.$rowa['skin'].'"><span class="faicon palette"></span> '.$lang['srv_te_theme_edit'].'</a>';
+				echo '<div class="theme_label_options">';
-				
+
-				if($is_current_mobile_skin)
+				$css = urlencode($skin);
-					echo ' <a href="index.php?anketa='.$this->sid.'&a=theme-editor&profile_new_mobile='.$rowa['mobile_skin'].'"><span class="faicon palette"></span> '.$lang['srv_te_theme_edit'].'</a>';
+				$gid = $groupId;
-	
+
-				echo '<a href="#" class="theme_links_preview" src="'.$src.'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a>';
+				// Aktiviraj
+				echo '<div class="button wtext" onclick="changeTheme(\''.$gid.'\', \''.$css.'\');" title="'.$lang['srv_te_theme_activate2'].'">';
+				echo '  <span class="faicon fa-hand-pointer"></span>';
+				echo    $lang['srv_te_theme_activate'];
+				echo '</div>';
+
+				// Predogled
+				echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
+				echo '  <span class="faicon fa-desktop"></span>';
+				echo '</div>';
+
+				// 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
+                        $link = 'index.php?anketa='.$this->sid.'&a=theme-editor&profile_new='.$rowa['skin'];
+
+                    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>';
+				
+				echo '</div>'; //div.theme_label
 			}		
 		} 
 		elseif ($profiles == 0) {
@@ -603,6 +752,10 @@ class SurveyTheme {
 		}
 						
 		echo '</div>';
+		
+		if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) { // div#theme_grid_holder
+			echo '</div>';
+		}
 	}
 	
 	function changeTheme($css, $gid) {
@@ -663,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();
 	}
 	
@@ -796,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, '_')) ) )
@@ -822,18 +984,28 @@ class SurveyTheme {
 	
 		$default = 'Default';
 		$skin = ($row['skin'] == '') ? $default : $row['skin'];
+
+		echo '<fieldset id="theme-upload"><legend>'.$lang['srv_themes_upload_css'].'</legend>';
+
+		$sql = sisplet_query("SELECT name FROM srv_theme_profiles".$mobile." WHERE id = '".$_GET['profile']."'");
+		$row = mysqli_fetch_array($sql);
 		
-		echo '<br /><span class="bold">'.$lang['srv_add_theme_upload'].'</span>';
+		echo '<h2>'.$lang['srv_themes_mod2'].': <span class="name">'.$row['name'].'</span></h2>';
+		
+		echo '<p class="bottom16">'.$lang['srv_add_theme_upload'].':</p>';
 		echo '<form name="upload" enctype="multipart/form-data" action="upload.php?anketa=' . $this->sid . '&profile='.$_GET['profile'].'" method="post">';
-		echo '<p><label for="skin">' . $lang['srv_uploadtheme'] . ':</label> ';
 		echo '<input type="file" name="fajl" onchange="submit();">';
-		echo ' (' . $lang['srv_skintmpl1'] . ' <a href="' . $site_url . 'main/survey/skins/'.$skin.'.css" target="_blank">' . $lang['srv_skintmpl'] . '</a>)';
+		echo '</form>';
-		echo '</p></form>';
+		echo '<p class="top16">'.$lang['srv_skintmpl1'] . ' <a href="' . $site_url . 'main/survey/skins/'.$skin.'.css" target="_blank">' . $lang['srv_skintmpl'] . '</a>.</p>';
 		
 		
-		echo '<p style="font-size:90%; color: gray">'.$lang['srv_skin_disclamer'].'</p>';
+		echo '<p class="top16">'.$lang['srv_skin_disclamer'].'</p>';
+		
+		echo '<p class="top16">'.$lang['srv_skin_warning'].'</p>';
 		
 		echo '<a href="#" onclick="$(\'#vrednost_edit\').hide().html(\'\'); return false;" style="position:absolute; right:10px; bottom:10px">'.$lang['srv_zapri'].'</a>';
+
+		echo '</fieldset>';
 		
 	}
 	
@@ -848,10 +1020,14 @@ class SurveyTheme {
 		
 		$skin = $_GET['skin'];
 
+		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']."'");
+		$row = mysqli_fetch_array($sql);
 		
-		echo '<div id="theme-editor-warning">'.$lang['srv_themes_edit_warning'].'</div>';
+		echo '<h2>'.$lang['srv_themes_mod2'].': <span class="name">'.$row['name'].'</span></h2>';
-		
+
 		echo '<form name="editcss" action="ajax.php?anketa='.$this->sid.'&a=save_editcss" method="post" onsubmit="return false;">';
 		
 		$profile = $_GET['profile'];
@@ -866,54 +1042,17 @@ class SurveyTheme {
 		echo '<input type="hidden" name="skin_name" value="'.$skin_name.'">';
 		echo '<input type="hidden" name="profile" value="'.$_GET['profile'].'">';
 		echo '<input type="hidden" name="mobile" value="'.($mobile ? '1' : '0').'">';
-		
+
-		echo '<br />';
+		//Upload slike / Logo
-		
+		/*echo '<p class="top16"><a href="#" onclick="javascript:$(\'#show_more\').slideToggle(); return false;">'.$lang['srv_upload_pic'].'</a></p>';
-		echo '<span class="bold">'.$lang['srv_themes_edit'].'</span>';
-		echo '<p><textarea name="css_content" style="width:100%; height: 400px">';
-		
-		readfile('../../main/survey/skins/'.$skin.'.css');
-		
-		echo '</textarea></p>';
-				
-		echo '<p>';
-				
-		echo '<p><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings floatLeft spaceRight" href="#" onclick="'; 
-			?>$.post('ajax.php?anketa=<?=$this->sid?>&a=save_editcss', $('form[name=editcss]').serialize(), function (data) { 
-				//if ( $('input[name=skin_name]').val() != $('input[name=old_name]').val() ) {
-				//	window.location.href = 'index.php?anketa=<?=$this->sid?>&a=edit_css&skin='+data;
-				//} else {
-					var iframe = document.getElementById('theme-preview-iframe');
-					iframe.src = iframe.src;
-					if ( $('input[name=current_skin]').is(':checked') ) $('input[name=current_skin]').attr('disabled', true); 
-				//}
-			}); return false;<?php
-		echo '"><span>'. $lang['edit1337'] . '</span></a>';
-		
-		//echo '<a class="ovalbutton ovalbutton_gray spaceRight floatLeft" href="index.php?anketa='.$this->sid.'&a=tema"><span>'.$lang['srv_theme_save_as_new'].'</span></a>';
-		
-		echo '<a class="ovalbutton ovalbutton_gray floatLeft" href="index.php?anketa='.$this->sid.'&a=tema"><span>'.$lang['back'].'</span></a></p>';
-		echo '<div class="clr"></div>';
-		echo '</div></p>';
-		echo '</form>';
-		
-		echo '<br /><p><a href="#" onclick="javascript:$(\'#show_more\').slideToggle(); return false;">'.$lang['srv_upload_pic'].'</a></p>';
 		
 		echo '<fieldset id="show_more" style="'.($_GET['pic']=='open'?'':'display:none;').' margin-bottom:40px">';
 
-		
+		echo '<p class="bottom16">'.$lang['srv_upload_pic'].':</p>';
-		echo '<br /><span class="bold">'.$lang['srv_upload_pic'].':</span>';
-		/*echo '<form name="upload" enctype="multipart/form-data" action="upload.php?anketa=' . $this->sid . '&logo=1" method="post" />';
-		echo '<p><label for="skin">' . $lang['srv_upload_logo'] . ':</label> ';
-		echo '<input type="file" name="fajl" onchange="submit();" onmouseout="survey_upload();" />';
-		echo '</p></form>';		*/
-		
 		echo '<form name="upload" enctype="multipart/form-data" action="upload.php?anketa=' . $this->sid . '&skin='.$skin.'&profile='.$_GET['profile'].'" method="post" />';
-		echo '<p><label for="skin">' . $lang['srv_upload_pic2'] . ':</label> ';
 		echo '<input type="file" name="fajl" onchange="submit();" onmouseout="survey_upload();" />';
 		echo '</p></form>';
-		echo '<p style="font-size:90%; color: gray">'.$lang['srv_upload_pic_disclaimer'].'</p><br />';
+
-		
 		// prikazemo uploadane slike
 		$dir = opendir($site_path . 'main/survey/uploads/');
 		$skinsArray = array();
@@ -934,9 +1073,36 @@ class SurveyTheme {
 				}
 			}
 		}
-		echo '</fieldset>';
 		
-		echo '<div id="success_save"></div>';
+		echo '</fieldset>';*/
+
+		echo '<p class="top16 bottom16">'.$lang['srv_skin_warning_edit'].'</p>';
+		
+		echo '<p><textarea id="css_content" name="css_content">';
+		
+		readfile('../../main/survey/skins/'.$skin.'.css');
+		
+		echo '</textarea></p>';
+				
+		echo '<p>';
+
+		echo '<div class="button_holder css_edit">';
+			echo '<button class="medium white-blue" onClick="window.location.href=\'index.php?anketa='.$this->sid.'&a=tema\';return false;">'.$lang['edit1338'].'</button>';				
+			echo '<button class="medium blue" onclick="'; 
+			?>$.post('ajax.php?anketa=<?=$this->sid?>&a=save_editcss', $('form[name=editcss]').serialize(), function (data) { 
+				//if ( $('input[name=skin_name]').val() != $('input[name=old_name]').val() ) {
+				//	window.location.href = 'index.php?anketa=<?=$this->sid?>&a=edit_css&skin='+data;
+				//} else {
+					var iframe = document.getElementById('theme-preview-iframe');
+					iframe.src = iframe.src;
+					if ( $('input[name=current_skin]').is(':checked') ) $('input[name=current_skin]').attr('disabled', true); 
+				//}
+			}); return false;<?php
+		echo '"><span>'. $lang['edit1337'].'</button>';
+			echo '</div>';
+		
+		
+		echo '</form>';
 		
 		echo '</div>';
 		
@@ -944,16 +1110,11 @@ class SurveyTheme {
 		$row = mysqli_fetch_array($sql);
 		$grupa = $row['id'];
 		
-		//echo '<div id="theme-preview"><iframe id="theme-preview-iframe" src="'.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme='.$skin.'"></iframe></div>';
 		echo '<div id="theme-preview"><iframe id="theme-preview-iframe" src="'.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$_GET['profile'].'&theme-preview=1'.($mobile ? '&mobile=1' : '').'"></iframe><div class="theme-overflow"></div></div>';		
-
-		//echo '</div>';
-		
-		//echo '<div class="clr"></div>';
-		
-		//echo '</div>';
 		
 		SurveyThemeEditor::new_theme_alert($skin_name, true);
+		echo '</div>';
+
 	}
 	
 	function ajax_add_theme () {

admin/survey/classes/class.SurveyThemeEditor.php

@@ -48,12 +48,20 @@ class SurveyThemeEditor {
 		SurveyInfo::getInstance()->SurveyInit($this->anketa);
 		$row = SurveyInfo::getInstance()->getSurveyRow();
 		
-		$sqla = sisplet_query("SELECT id, name, logo FROM srv_theme_profiles".$this->mobile." WHERE id = '$this->profile'");
+		$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">';
+		
+		echo '<h2>'.$lang['srv_themes_mod2'].': <span class="name">'.$skin_name.'</span></h2>';
+
 		echo '<input type="hidden" name="profile" id="profile" value="'.$this->profile.'">';
 		
 		$mobile = (isset($_GET['mobile']) && $_GET['mobile'] == '1') ? 1 : 0;
@@ -61,131 +69,129 @@ class SurveyThemeEditor {
 		
 		echo '<div id="picker"></div>';
 			
-		echo '<fieldset><legend>'.$lang['srv_skinname'].'</legend>';
+		echo '<h3>'.$lang['srv_skinname'].'</h3>';
-		echo '<p>'.$lang['srv_skinname'].': <input type="text" name="skin-name" value="'.$rowa['name'].'" onblur="te_change_name(this);"></p>';
+		echo '<input type="text" class="text medium" id="skin-name" name="skin-name" value="'.$skin_name.'" onblur="te_change_name(this);">';
-		echo '</fieldset>';
-	
-		echo '<br />';
 
 		// Mobilni skin nima logotipa
 		if($mobile != 1){
-			echo '<fieldset><legend>'.$lang['srv_upload_logo'].'</legend>';
+			echo '<h3>'.$lang['srv_upload_logo'].'</h3>';
 			echo '<form name="upload" enctype="multipart/form-data" action="upload.php?anketa=' . $this->anketa . '&logo=1&te=1&profile='.$this->profile.'" method="post" />';
-			echo '<p>' . $lang['srv_upload_logo'] . ': ';
 			echo '<input type="file" name="fajl" onchange="submit();" onmouseout="survey_upload();" />';				
 			if ($rowa['logo'] != '') {
 				echo '<p>'.$rowa['logo'];
-				echo ' <a href="#" onclick="survey_remove_logo(\''.$this->profile.'\'); return false" title="'.$lang['srv_te_remove_setting'].'"><span class="faicon delete_circle icon-orange_link"></span></a>';
+				echo ' <a href="#" onclick="survey_remove_logo(\''.$this->profile.'\'); return false" title="'.$lang['srv_te_remove_setting'].'"><span class="faicon trash"></span></a>';
 				echo '</p>';
 			}	
 			echo '</p></form>';
-			echo '</fieldset>';
 			
-			echo '<br />';
 		}
 
 		// Mobilni skin nima progressbara
 		if($mobile != 1){
 			$sqlg = sisplet_query("SELECT id FROM srv_grupa WHERE ank_id = '$this->anketa'");	
 			if (mysqli_num_rows($sqlg) > 1) {
-				echo '<fieldset><legend>'.$lang['srv_te_progressbar'].'</legend>';
+
-				echo '<div id="theme_progressbar">';
+                $sqlAnketa = sisplet_query("SELECT progressbar FROM srv_anketa WHERE id='$this->anketa'");
-				echo '<p><label>' . $lang['srv_te_progressbar_show'] . ':</label> ';
+                $rowAnketa = mysqli_fetch_array($sqlAnketa);	
-				echo '<label for="theme_progressbar_1"><input type="radio" id="theme_progressbar_1" name="progressbar" value="1"' . ($row['progressbar'] == 1 ? ' checked="checked"' : '') . ' autocomplete="off"/>' . $lang['yes'] . '</label> ';
+
-				echo '<label for="theme_progressbar_0"><input type="radio" id="theme_progressbar_0" name="progressbar" value="0"' . ($row['progressbar'] == 0 ? ' checked="checked"' : '') . ' autocomplete="off"/>' . $lang['no1'] . '</label> ';
+				echo '<h3>'.$lang['srv_te_progressbar'].'</h3>';
-				echo '</p></div>'; # id="theme_progressbar"
+
-				echo '</fieldset>';
+				echo '<div class="setting_holder">';
-				
+				echo '<span class="setting_title">' . $lang['srv_te_progressbar_show'] . '</span>';
-				echo '<br />';
+
+				echo '<div class="setting_item" id="theme_progressbar">';
+				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"' . ($rowAnketa['progressbar'] == 0 ? ' checked="checked"' : '') . ' autocomplete="off"/>';
+				echo '<label for="theme_progressbar_0">' . $lang['no1'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
 			}
 		}
 		
-		echo '<fieldset><legend>'.$lang['srv_te_survey_h_text'].'</legend>';
+		echo '<h3>'.$lang['srv_te_survey_h_text'].'</h3>';
+		echo '<div class="columns">';
 		$this->displayOption(1, 1);
 		$this->displayOption(1, 4);
 		$this->displayOption(1, 2);
 		$this->displayOption(1, 3);
-		echo '</fieldset>';
+		echo '</div>';
 		
-		echo '<br />';
+		echo '<h3>'.$lang['srv_te_background_color'].'</h3>';
-		
+		echo '<div class="columns">';
-		echo '<fieldset><legend>'.$lang['srv_te_outer_frame'].'</legend>';
 		$this->displayOption(6, 3);
-		echo '</fieldset>';
+		echo '</div>';
 		
-		echo '<br />';
+		echo '<h3>'.$lang['srv_te_question_text'].'</h3>';
-		
+		echo '<div class="columns">';
-		echo '<fieldset><legend>'.$lang['srv_te_question_border'].'</legend>';
-		$this->displayOption(5, 5);
-		echo '</fieldset>';
-		
-		echo '<br />';
-		
-		echo '<fieldset><legend>'.$lang['srv_te_question_text'].'</legend>';
 		$this->displayOption(2, 1);
 		$this->displayOption(2, 4);
 		$this->displayOption(2, 2);
+		echo '</div>';
+		echo '<div class="columns top16">';
 		$this->displayOption(5, 3);
-		echo '</fieldset>';
+		$this->displayOption(5, 5);
+		echo '</div>';
 		
-		echo '<br />';
+		echo '<h3>'.$lang['srv_te_answers_text'].'</h3>';
-		
+		echo '<div class="columns">';
-		echo '<fieldset><legend>'.$lang['srv_te_answers_text'].'</legend>';
 		$this->displayOption(3, 1);
 		$this->displayOption(3, 4);
-		$this->displayOption(3, 2);
+		echo '</div>';
+		echo '<div class="columns top16">';$this->displayOption(3, 2);
 		$this->displayOption(4, 3);
-		echo '</fieldset>';
+		echo '</div>';
-
-        echo '<br />';
 
 		// Custom checkbox/radio (stars, smilies, thumbs)
-        echo '<fieldset>';
 		// Radio/checkboxi za pc
 		if($mobile != 1){
-			echo '<legend>'.$lang['srv_te_custom_checkbox_radio'].'</legend>';		
+			echo '<h3>'.$lang['srv_te_custom_checkbox_radio'].'</h3>';		
+			echo '<div class="columns">';
 			$this->displayOption(7, 7);
 			$this->displayOption(7, 15);
+			echo '</div>';
 			//$this->displayOption(10, 17);
 		}
 		// Radio/checkboxi za mobitel
 		else{
-			echo '<legend>'.$lang['srv_te_custom_mobile_checkbox_radio'].'</legend>';	
+			echo '<h3>'.$lang['srv_te_custom_mobile_checkbox_radio'].'</h3>';
+			echo '<div class="columns">';
 			$this->displayOption(7, 8);
 			$this->displayOption(7, 16);
+			echo '</div>';
 			// Za mobitel ne rabimo accessibility ikon
 			//$this->displayOption(10, 17);
 		}
-        echo '</fieldset>';
-
-		echo '<br />';
 		
 		// Tooltipster/slovar/glossary
-		echo '<fieldset><legend>'.$lang['srv_te_custom_glossary_popup'].'</legend>';
+		echo '<h3>'.$lang['srv_te_custom_glossary_popup'].Help::display('srv_oblika_slovarSlovar').'</h3>';
+		echo '<div class="columns">';
 		$this->displayOption(8, 9);
 		$this->displayOption(8, 11);
 		$this->displayOption(8, 10);
 		$this->displayOption(8, 12);
-		echo '</fieldset>';
+		echo '</div>';
-
-		echo '<br />';
 		
-		echo '<fieldset><legend>'.$lang['srv_te_custom_glossary_keywords'].'</legend>';
+		echo '<h3>'.$lang['srv_te_custom_glossary_keywords'].Help::display('srv_oblika_slovarIKljucna').'</h3>';
+		echo '<div class="columns">';
 		$this->displayOption(9, 9);
 		$this->displayOption(9, 13);
 		$this->displayOption(9, 14);
-		echo '</fieldset>';
+		echo '</div>';
-		
+				
-		
+		echo '<div class="button_holder">';
-		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 '<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>';
-		echo '<p>';
-		echo '<div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange floatLeft" href="index.php?anketa='.$this->anketa.'&a=tema"><span>'.$lang['edit1337'].'</span></a></div>';
-		echo '</p>';
-		
 		echo '</div>';
 		
+		echo '</div>';
+
 		$this->preview();
+
+		echo '</div>';
 		
 		?>
 		<script>
@@ -195,8 +201,6 @@ class SurveyThemeEditor {
 		</script>
 		<?
 		
-		//echo '</div>';
-			
 	}
 	
 	static function new_theme_alert ($name, $css=false) {
@@ -233,29 +237,33 @@ class SurveyThemeEditor {
 		$sql = sisplet_query("SELECT value FROM srv_theme_editor".$this->mobile." WHERE profile_id='$this->profile' AND id='$id' AND type='$type'");
 		$row = mysqli_fetch_array($sql);
 		
-		echo '<p>';
-		
 		// pisava
 		if ($type == 1) {
+
+			echo '<div class="setting_box">';
 			
-			echo ''.$lang['srv_te_font_family'].': <select name="font'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo ''.$lang['srv_te_font_family'].': <select class="dropdown large auto-save" name="font'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
-			echo '<option value=""'.(''==$row['value']?' selected':'').' style="font-size:13px">'.$lang['srv_te_default'].'</option>';
+			echo '<option value=""'.(''==$row['value']?' selected':'').'">'.$lang['srv_te_default'].'</option>';
 			foreach (self::$fonts AS $key => $val) {
 				echo '<option value="'.$key.'"'.($key==$row['value']?' selected':'').' style="font-family: '.$val.'; font-size:13px">'.substr($val, 0, strpos($val, ',')).'</option>';
 			}
 			echo '</select> ';
-
+			
 			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])) {
 			
 			if ($row['value'] == '') $value = '#000000'; else $value = $row['value'];
 			
+			echo '<div class="setting_box">';
+			
 			if ($type == 2 || $type == 9)
 				echo ''.$lang['srv_te_font_color'].': ';
-			elseif ($type == 3)
+			elseif($type == 3)
 				echo ''.$lang['srv_te_background_color'].': ';
 			elseif($type == 10)
 				echo ''.$lang['srv_te_custom_border_color'].': ';
@@ -266,17 +274,23 @@ class SurveyThemeEditor {
             elseif($type == 16)
                 echo ''.$lang['srv_te_custom_icon_mobile_color'].': ';
 			
-			if ($row['value'] == '') echo '<span><a href="#" onclick="$(\'#color-'.$id.'-'.$type.'\').show(); $(this).parent().hide(); return false;" title="'.$lang['edit4'].'">'.$lang['srv_te_default'].' <span class="faicon edit"></span></a></span>';
+			if ($row['value'] == '') echo '<div class="input_box"><a href="#" onclick="$(\'#color-'.$id.'-'.$type.'\').show(); $(this).parent().hide(); return false;" title="'.$lang['edit4'].'">'.$lang['srv_te_default'].' <span class="faicon edit"></span></a></div>';
 			
-			echo '<span id="color-'.$id.'-'.$type.'" '.($row['value']==''?'style="display:none;"':'').'>';
+			echo '<div id="color-'.$id.'-'.$type.'" '.($row['value']==''?'style="display:none;"':'').'>';
-			echo '<input type="text" id="color'.$id.'-'.$type.'" class="colorwell auto-save" name="color'.$id.'-'.$type.'" value="'.$value.'" data-id="'.$id.'" data-type="'.$type.'"> ';
+			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'].'"><span class="sprites arrow_undo"></span></a>';
+			echo '</div>';
-			echo '</span>';
+
+            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
 		} elseif ($type == 4) {
+
+			echo '<div class="setting_box">';
 			
-			echo ''.$lang['srv_te_font_size'].': <select name="fontsize'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo ''.$lang['srv_te_font_size'].': <select class="dropdown large auto-save" name="fontsize'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
 			echo '<option value=""'.(''==$row['value']?' selected':'').'>'.$lang['srv_te_default'].'</option>';
 			for ($i=50; $i<=200; $i+=10) {
 				echo '<option value="'.$i.'"'.($i==$row['value']?' selected':'').' style="font-size: '.$i.'%;">'.$i.'%</option>';
@@ -284,25 +298,33 @@ class SurveyThemeEditor {
 			echo '</select> ';
 			
 			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) {
 			
 			if ($row['value'] == '') $value = '1'; else $value = $row['value'];
 
-			echo $lang['srv_te_question_border'].': <select name="question_border'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo '<div class="setting_box">';
-			echo '<option value="" '.(''==$row['value']?' selected':'').'>'.$lang['default'].'</option>';
+
+			echo $lang['srv_te_question_border'].':<select class="dropdown large auto-save" name="question_border'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
+			echo '<option value="" '.(''==$row['value']?' selected':'').'>'.$lang['srv_te_default'].'</option>';
 			echo '<option value="0" '.($row['value']=='0'?' selected':'').'>'.$lang['srv_te_question_border_0'].'</option>';
 			echo '<option value="1" '.($row['value']=='1'?' selected':'').'>'.$lang['srv_te_question_border_1'].'</option>';
 			echo '<option value="2" '.($row['value']=='2'?' selected':'').'>'.$lang['srv_te_question_border_2'].'</option>';
 			echo '</select> ';
+			echo '</div> ';
 
         // izbira custom checkbox/radio gumbov
         } elseif($type == 7 ) {
+
+			echo '<div class="setting_box">';
+
             echo $lang['srv_te_custom_icon_pc'] . ': ';
-            echo '<select id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">
+            echo '<select class="dropdown large auto-save" id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'">
-                <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['default'].'</option>
+                <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['srv_te_default'].'</option>
                 <option value="18" '.($row['value'] == 18 ? " selected":"").'>18 px</option>
                 <option value="21" '.($row['value'] == 21 ? " selected":"").'>21 px</option>
                 <option value="25" '.($row['value'] == 25 ? " selected":"").'>25 px</option>
@@ -312,13 +334,14 @@ class SurveyThemeEditor {
                 <option value="45" '.($row['value'] == 45 ? " selected":"").'>45 px</option>
                 <option value="50" '.($row['value'] == 50 ? " selected":"").'>50 px</option>
                 <option value="55" '.($row['value'] == 55 ? " selected":"").'>55 px</option>
-              </select>';
+              </select></div>';
 
 
         } elseif($type == 8) {
+			echo '<div class="setting_box">';
             echo $lang['srv_te_custom_icon_mobile'] . ': ';
-            echo '<select id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">
+            echo '<select class="dropdown large auto-save" id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'">
-                <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['default'].'</option>
+                <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['srv_te_default'].'</option>
                 <option value="21" '.($row['value'] == 20 ? " selected":"").'>20 px</option>
                 <option value="25" '.($row['value'] == 25 ? " selected":"").'>25 px</option>
                 <option value="30" '.($row['value'] == 30 ? " selected":"").'>30 px</option>
@@ -327,44 +350,55 @@ class SurveyThemeEditor {
                 <option value="45" '.($row['value'] == 45 ? " selected":"").'>45 px</option>
                 <option value="50" '.($row['value'] == 50 ? " selected":"").'>50 px</option>
                 <option value="55" '.($row['value'] == 55 ? " selected":"").'>55 px</option>
-              </select>';
+              </select></div>';
 
 		// Izpišemo border opcije
         } elseif($type == 11) {
+			echo '<div class="setting_box">';
+
 				echo $lang['srv_te_custom_border_size'].': ';
-				echo '<select name="bordersize'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+				echo '<select class="dropdown large auto-save" name="bordersize'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
 				echo '<option value=""'.(''==$row['value']?' selected':'').'>'.$lang['srv_te_default'].'</option>';
 				for ($i=1; $i<=6; $i++) {
 					echo '<option value="'.$i.'"'.($i==$row['value']?' selected':'').'>'.$i.'px</option>';
 				}
 				echo '</select> ';
+				echo '</div> ';
 
 		} elseif($type == 12) {
+			echo '<div class="setting_box">';
+
 			echo $lang['srv_te_custom_border_radius'].': ';
-			echo '<select name="borderradius'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo '<select class="dropdown large auto-save" name="borderradius'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
 			echo '<option value=""'.(''==$row['value']?' selected':'').'>'.$lang['srv_te_default'].'</option>';
 			for ($i=5; $i<=30; $i+=5) {
 				echo '<option value="'.$i.'"'.($i==$row['value']?' selected':'').'>'.$i.'px</option>';
 			}
 			echo '</select> ';
+			echo '</div> ';
 		
 		// Stil pisave bold, italic, underline
 		} elseif($type == 14) {
+			echo '<div class="setting_box">';
+
 			echo $lang['srv_te_custom_font_style_keywords'].': ';
-			echo '<select name=""keyword_style'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo '<select class="dropdown large auto-save" name=""keyword_style'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
 			echo '<option value=""'.(''==$row['value']?' selected':'').'>'.$lang['srv_te_default'].'</option>';
 			echo '<option value="bold" '.('bold'==$row['value']?' selected':'').'>'.$lang['srv_te_custom_font_style_keywords_bold'].'</option>';
 			echo '<option value="italic" '.('italic'==$row['value']?' selected':'').'>'.$lang['srv_te_custom_font_style_keywords_italic'].'</option>';
 			echo '<option value="underline" '.('underline'==$row['value']?' selected':'').'>'.$lang['srv_te_custom_font_style_keywords_underline'].'</option>';
 			echo '</select> ';
+			echo '</div> ';
 			
 		// Accessibility checkbox (radio/checkboxi niso obarvani)
 		} elseif($type == 17) {
+			echo '<div class="setting_box">';
+
 			echo '<label for="accessibility'.$id.'">'.$lang['srv_te_custom_icon_accessibility'].': ';
 			echo '<input type="checkbox" value="1" name="accessibility'.$id.'" id="accessibility'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save" '.($row['value'] == '1' ? ' checked="checked"' : '').'></label>';
+			echo '</div> ';
 		}
 
-		echo '</p>';
 	}
 	
 	function preview () {

admin/survey/classes/class.SurveyTimeProfiles.php

@@ -361,13 +361,9 @@ class SurveyTimeProfiles {
         
         $css = ($izbranProfil == STP_DEFAULT_PROFILE ? ' gray' : '');
         if ($hideAdvanced == false || $izbranProfil != STP_DEFAULT_PROFILE) {
-        	if ($showseperator == true) {
-        		echo '<li class="space">&nbsp;</li>';
-        	}
         	echo '<li>';
-        	echo '<span class="as_link'.$css.'" id="link_time_profile" title="' . $lang['srv_time_profile_link_title'] . '" onClick="timeProfileAction(\'showProfiles\');">' . $lang['srv_time_profile_link'] . '</span>';
+        	echo '  <span class="'.$css.'" id="link_time_profile" title="' . $lang['srv_time_profile_link_title'] . '" onClick="timeProfileAction(\'showProfiles\');">' . $lang['srv_time_profile_link'] . '</span>';
         	echo '</li>';
-        	
         }
 	}
 	
@@ -390,25 +386,30 @@ class SurveyTimeProfiles {
         $currentFilterProfile = $_all_profiles[$current_pid];
 
         if ( $current_pid != STP_DEFAULT_PROFILE ) {
-	       	echo '<div id="not_default_setting">';
+	       	echo '<div id="not_default_setting" class="popup_note">';
 	        echo $lang['srv_not_default_setting'];
-	        echo '</div><br class="clr displayNone">';
+	        echo '</div>';
         }
         
-		echo '<div class="time_profile_left_right floatLeft">';
-       	echo '<div class="time_profile_holder">';
-		# zlistamo vse profile
 
-       	echo '<div id="time_profile" class="select">';
+        echo '<div class="popup_main with_menu">';
+
+
+		echo '<div class="time_profile_holder popup_left">';
+
+		# zlistamo vse profile
+       	echo '<div id="time_profile" class="list select">';
 		
 		if (count($_all_profiles)) {
 			foreach ($_all_profiles as $id=>$profile) {
 				
-				echo '<div class="option' . ($current_pid == $id ? ' active' : '') . '" id="time_profile_' . $id . '" value="'.$id.'">';
+				echo '<div class="list-item option' . ($current_pid == $id ? ' active' : '') . '" id="time_profile_' . $id . '" value="'.$id.'">';
 
 				echo $profile['name'];
 				
 				if($current_pid == $id){
+                    echo '<div class="profile_icons">';
+
 					# privzetega profila ne moremo ne zbrisat ne preimenovat
 					if ($current_pid != 0) {
 						echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="timeProfileAction(\'show_delete\'); return false;"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>';
@@ -416,68 +417,96 @@ class SurveyTimeProfiles {
 					if ($current_pid > 0) {
 						echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="timeProfileAction(\'show_rename\'); return false;"><span class="faicon edit floatRight spaceRight"></span></a>';
 					}
+                    echo '</div>';	
 				}
 				
 				echo '</div>';	
 			}
 		}
-		echo '	</div>'; // time_profile
-		echo '</div>'; //time_profile_holder
 
-		echo '</div>'; //time_profile_left
+		echo '</div>';
+
+        echo '<button class="small white-black" title="'.$lang['srv_create_new_profile'].'" onclick="timeProfileAction(\'show_create\'); return false;"><span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'] . '</button>';
+
+		echo '</div>';
 
 		
-		echo '<div class="time_profile_left_right floatRight">';
+		echo '<div id="time_profile_content" class="profile_right">';
-		echo '<div id="time_profile_content">';
 		self::DisplayProfileData($current_pid);
 		echo '</div>'; // time_profile_content
-		echo '</div>'; // time_profile_right
+
+
+		echo '</div>';
 		
 		
-		echo '<div class="time_profile_button_right_holder floatRight">';
+		echo '<div class="button_holder">';
 		if ($current_pid == 0) {
-			echo '<span class="floatRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
+			echo '<button class="medium white-black" title="'.$lang['srv_close_profile'].'" onclick="timeProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
-#			echo '<span class="floatRight spaceRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
+			echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'].'" onclick="timeProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
+		} 
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
+        else if ($current_pid == -1) {
-		} else if ($current_pid == -1) {
+			echo '<button class="medium white-black" title="'.$lang['srv_close_profile'].'" onclick="timeProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
-			echo '<span class="floatRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
+			echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'].'" onclick="timeProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
+		} 
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
+        else  {
-		} else  {
+			echo '<button class="medium white-black" title="'.$lang['srv_close_profile'].'" onclick="timeProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
-			echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
+			echo '<button class="medium white-blue" title="'.$lang['srv_run_as_session_profile'].'" onclick="timeProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
+			echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'].'" onclick="timeProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
 			
 		}
-		echo '</div>'; // time_profile_button_right_holder
+		echo '</div>';
 		
 		
 		// cover Div
         echo '<div id="timeProfileCoverDiv"></div>';
 		
         // div za kreacijo novega
-        echo '<div id="newProfileDiv">'.$lang['srv_missing_profile_name'].': ';
+        echo '<div id="newProfileDiv">';
-        echo '<input id="newProfileName" name="newProfileName" type="text" value="" size="50"  />';
+
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'do_create\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_save'].'</span></a></span></span>';            
+		echo '<div class="setting_holder">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel_create\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
+
+		echo '<div class="setting_item">';
+		echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
+		echo '</div>';
+		echo '</div>';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-black" onClick="timeProfileAction(\'cancel_create\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="timeProfileAction(\'do_create\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
+        echo '</div>';
+
         echo '</div>';
         
         // div za preimenovanje
-        echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': ';
+        echo '<div id="renameProfileDiv">';
-        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" size="50"  />';
+
+		echo '<div class="setting_holder">';
+
+		echo '<div class="setting_item">';
+		echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="renameProfileName" class="text large" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" size="50"  />';
         echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'do_rename\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>';            
+		echo '</div>';
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel_rename\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';
+		echo '</div>';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-black" onClick="timeProfileAction(\'cancel_rename\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="timeProfileAction(\'do_rename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
         echo '</div>';
-                
+
+        echo '</div>';
+
         // div za brisanje
-        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . $currentFilterProfile['name'] . '</b>?';
+        echo '<div id="deleteProfileDiv">';
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . $currentFilterProfile['name'] . '</span>?';
         echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="timeProfileAction(\'do_delete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>';
+
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="timeProfileAction(\'cancel_delete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>';            
+		echo '<div class="button_holder">';
-        echo '</div>';		
+        echo '<button class="medium white-black" onClick="timeProfileAction(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="timeProfileAction(\'do_delete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
+
     }
     
 	/** Funkcija prikaze osnovnih informacije profila
@@ -499,22 +528,30 @@ class SurveyTimeProfiles {
 			$time = $p_data['interval_txt'];
 		}
 
-		echo '<input type="radio" name="type" id="time_date_type" value="0" '.($type == '0' ? ' checked="checked"' : '').' autocomplete="off"><label> ' . $lang['srv_time_profile_from'] . ': </label>';
+		echo '<div class="setting_holder">';
-		echo '<input id="startDate" type="text" name="startDate" value="' . $p_data['starts'] . '" onclick="changeTimeProfileType();" readonly="true" '.' autocomplete="off"/>&nbsp;';
+		echo '<p class="setting_title">' . $lang['srv_time_profile_time'] . '</p>';
-		echo '<span class="faicon calendar_icon icon-as_link" id="starts_img"></span>';
+
-		echo '<label> ' . $lang['srv_time_profile_to'] . ': </label>';
+		echo '<div class="setting_item">';
-		echo '<input id="endDate" type="text" name="endDate" value="' . $p_data['ends'] . '" onclick="changeTimeProfileType();" readonly="true" '.'cautocomplete="off"/>&nbsp;';
+		echo '<input type="radio" name="type" id="time_date_type" value="0" '.($type == '0' ? ' checked="checked"' : '').' autocomplete="off"><label>' . $lang['srv_time_profile_from'] . ':</label>';
-		echo '<span class="faicon calendar_icon icon-as_link" id="expire_img"></span>' . "\n" ;
+		echo '<input id="startDate" type="text" class="text medium" name="startDate" value="' . $p_data['starts'] . '" onclick="changeTimeProfileType();" readonly="true" '.' autocomplete="off"/>&nbsp;';
-		echo '<br />';
+		echo '<span class="faicon calendar_icon pointer blue" id="starts_img"></span>';
-		echo '<p><input type="radio"  name="type" id="time_date_interval" value="1" '.($type == '0' ? '' : ' checked="checked"').' autocomplete="off">'.$lang['srv_statistic_period_label'].':';
+		echo '<label>' . $lang['srv_time_profile_to'] . ':</label>';
-		echo '<select name="stat_interval" id="stat_interval" onclick="changeTimeProfileType(\'interval\');" '.'autocomplete="off">';
+		echo '<input id="endDate" type="text" class="text medium" name="endDate" value="' . $p_data['ends'] . '" onclick="changeTimeProfileType();" readonly="true" '.'cautocomplete="off"/>&nbsp;';
+		echo '<span class="faicon calendar_icon pointer blue" id="expire_img"></span>' . "\n" ;
+		echo '</div>';
+	
+		echo '<div class="setting_item">';
+		echo '<input type="radio"  name="type" id="time_date_interval" value="1" '.($type == '0' ? '' : ' checked="checked"').' autocomplete="off"><label>'.$lang['srv_statistic_period_label'].':</label>';
+		echo '<select class="dropdown medium" name="stat_interval" id="stat_interval" onclick="changeTimeProfileType(\'interval\');" '.'autocomplete="off">';
 		echo '<option value="" selected="true">'.$lang['srv_time_profile_choose_interval'].'</option>';
 		foreach (self::$STP_ARRAYS as $INTERVAL) {
 			echo '<option value="'.$INTERVAL.'"' . ($time == $INTERVAL ? ' selected' : '') . '>'.$lang['srv_diagnostics_'.$INTERVAL].'</option>';
 		}
 			echo '</select>';
-		echo '</p>';
+		echo '</div>';
-		
+					
+		echo '</div>';
+
 		echo '<script type="text/javascript">';
 		# za profil id=0 (privzet profil ne pustimo spreminjat
 			echo 

admin/survey/classes/class.SurveyUrlLinks.php

@@ -56,29 +56,28 @@ class SurveyUrlLinks
 		
 		$podstran = $_REQUEST['podstran'];
 		$m = $_REQUEST['m'];
-		
+
-		$popUp = new PopUp();
+		echo '<div id="div_survey_links">';
-		$popUp->setId('div_survey_links');
+
-		$popUp->setHeaderText($lang['srv_public_link_title'].':');
+		echo '<h2>'.$lang['srv_public_link_title'].'</h2>';
-		
+		echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">✕</a></div>';
+
 		#vsebino shranimo v buffer
         ob_start();
-        
-        echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">✕</a></div>';
 
 		if ($msg != null){
-			echo ($msg);
+			echo '<p class="bottom16">'.($msg);
-			echo '<br />';
+			echo '</p>';
 		}
 		$hashUrl = new HashUrl($this->_anketa);
 		$links = $hashUrl->getSurveyHashes();
 		if (count($links) == 0){
-			echo $lang['srv_public_link_noLink'].'<br />';
+			echo '<p class="bottom16">'.$lang['srv_public_link_noLink'].'</p>';
 		}
-		echo '<p><a href="#" onclick="addSurveyUrlLink(\''.$podstran.'\',\''.$m.'\');">'.$lang['srv_public_link_addLink'].'</a></p>';
+		echo '<p class="bottom16"><a href="#" onclick="addSurveyUrlLink(\''.$podstran.'\',\''.$m.'\');">'.$lang['srv_public_link_addLink'].'</a></p>';
 		if (count($links) > 0){
 		
-			echo '<caption>'.$lang['srv_public_link_existing'].'</caption>';
+			echo '<caption>'.$lang['srv_public_link_existing'].':</caption>';
 			echo '<table class="tbl_survey_links">';
 			
 			echo '<tr>';
@@ -118,7 +117,7 @@ class SurveyUrlLinks
 				echo '</span></td>';
                                 
                                 echo '<td style="text-align: center;">';
-				echo '<input type="checkbox" name="hash_link_refresh" id="hash_link_refresh_'.$this->_anketa.'_'.$link['hash'].'" data-hash="'.$link['hash'].'" data-anketa="'.$this->_anketa.'" onchange="hash_refresh_change(this);"'. (($link['refresh'] == '1') ? ' checked' : '') .'>';
+				echo '<input type="checkbox" name="hash_link_refresh" id="hash_link_refresh_'.$this->_anketa.'_'.$link['hash'].'" data-hash="'.$link['hash'].'" data-anketa="'.$this->_anketa.'" onchange="hash_refresh_change(this);"'. (($link['refresh'] == '1') ? ' checked' : '') .'><label for="hash_link_refresh_'.$this->_anketa.'_'.$link['hash'].'" class="empty"></label>';
 				echo '</td>';
 				
 				echo '<td>';
@@ -155,19 +154,14 @@ class SurveyUrlLinks
 			
 			echo '</table>';
 		}
-		
-		#dodamo vsebino
-		$content = ob_get_clean();
-		$popUp->setContent($content);
-		
-		# dodamo gumb Preklici
-		$buttonClose = new PopUpCancelButton();
-        $buttonClose->setCaption($lang['srv_zapri'])->setTitle($lang['srv_zapri']);
-        $buttonClose->setFloat('right');
-		$popUp->addButton($buttonClose);
 
-		echo $popUp;
+		echo $content;
-		
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium blue" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+        echo '</div>';
+
+        echo '</div>';
 	}
 	
 	function addLink(){

admin/survey/classes/class.SurveyUserSession.php

@@ -39,9 +39,18 @@ class SurveyUserSession
         }
         self::$ank_id = $anketa;
 
+        // Ce ni prijavljen v 1ko nastavimo usr_id na avtorja ankete, da se prikazejo njegovi grafi
+        if($global_user_id == -1){
+            SurveyInfo::getInstance()->SurveyInit(self::$ank_id);
+            $usr_id = SurveyInfo::getInstance()->getSurveyColumn("insert_uid");
+        }
+        else{
+            $usr_id = $global_user_id;
+        }
+
         # preberemo vse nastavitve za to anketo - ce jih se nimamo
         if (!is_countable(self::$dataArray) || count(self::$dataArray) == 0) {
-            $sql = sisplet_query("SELECT data FROM srv_user_session WHERE ank_id='" . self::$ank_id . "' AND usr_id='$global_user_id'");
+            $sql = sisplet_query("SELECT data FROM srv_user_session WHERE ank_id='" . self::$ank_id . "' AND usr_id='$usr_id'");
             $row = mysqli_fetch_array($sql);
 
             self::$dataArray = unserialize($row['data']);

admin/survey/classes/class.SurveyVariableView.php

@@ -33,6 +33,8 @@ class VariableView {
 	 	#inicializiramo class za datoteke
 		self::$SDF = SurveyDataFile::get_instance();
 		self::$SDF->init($sid);
+
+        self::$SDF->prepareFiles($show_loading);
 		
 		self::$headFileName = self::$SDF->getHeaderFileName();
 		self::$dataFileName = self::$SDF->getDataFileName();
@@ -44,18 +46,14 @@ class VariableView {
 	 public static function displayVariables() {
 	 	global $lang;
 				
-         echo '<table class="variableView">';
+        echo '<table class="variableView">';
          
-	 	echo '<thead><tr>';
+	 	echo '<tr>';
-	 	echo '<th>'.$lang['srv_variableView_h_'].'</th>';
+	 	echo '<th>'.$lang['srv_variableView_h_name'].'</th>';
 	 	echo '<th>'.$lang['srv_variableView_h_type'].'</th>';
-	 	echo '<th>'.$lang['srv_variableView_h_width'].'</th>';
-	 	echo '<th>'.$lang['srv_variableView_h_decimals'].'</th>';
-	 	echo '<th>'.$lang['srv_variableView_h_label'].'</th>';
 	 	echo '<th>'.$lang['srv_variableView_h_measure'].'</th>';
-         echo '</tr></thead>';
+	 	echo '<th>'.$lang['srv_variableView_h_label'].'</th>';
-         
+		echo '</tr>';
-         echo '<tbody>';
          
         foreach (self::$_HEADERS AS $skey => $spremenljivka) {
              
@@ -70,16 +68,13 @@ class VariableView {
                  
 	 			echo '<tr>';
 	 			echo '<td>'.$spremenljivka['variable'].'</td>';
-	 			echo '<td>'.$legenda['izrazanje'].'</td>';
+	 			echo '<td class="nowrap">'.$legenda['izrazanje'].'</td>';
-	 			echo '<td>'.(int)$spss_length['0'].'</td>';
-	 			echo '<td>'.(int)$spss_length['1'].'</td>';
-	 			echo '<td>'.$spremenljivka['naslov'].'</td>';
 	 			echo '<td>'.$legenda['skala'].'</td>';
+	 			echo '<td>'.((strlen($spremenljivka['naslov']) > 100) ? substr($spremenljivka['naslov'], 0, 97).'...' : $spremenljivka['naslov']).'</td>';
 	 			echo '</tr>';
 	 		}
          }
          
-	 	echo '</tbody>';
 	 	echo '</table>';
 	}
 }

admin/survey/classes/class.SurveyVariablesProfiles.php

@@ -185,9 +185,8 @@ class SurveyVariablesProfiles
 		$css = ($izbranProfil == SVP_DEFAULT_PROFILE ? ' gray' : '');
 
 		if ($hideAdvanced == false || $css != ' gray') {
-			echo '<li class="space">&nbsp;</li>';
 			echo '<li>';
-			echo '<span class="as_link'.$css.'"  onclick="displayVariableProfile();" title="'.$lang['srv_filtri'].'">'.$lang['srv_filtri'].'</span>';
+			echo '  <span class="'.$css.'"  onclick="displayVariableProfile();" title="'.$lang['srv_filtri'].'">'.$lang['srv_filtri'].'</span>';
 			echo '</li>';
 
 		}
@@ -292,144 +291,188 @@ class SurveyVariablesProfiles
 
 		if ($cvp == null)
 			$cvp = self::$currentId;
+
 		$svp_ap = self::$profiles;
 		$svp_pv = self :: getProfileVariables($cvp);
 		$svp_av = self::$SDF->getSurveyVariables();
 
 		if ( self::$currentId != SVP_DEFAULT_PROFILE ) {
-			echo '<div id="not_default_setting">';
+			echo '<div id="not_default_setting" class="popup_note red">';
 			echo $lang['srv_not_default_setting'];
 			echo '</div>';
-			echo '<br class="clr" />';
 		}
 
-		echo '<div class="variable_profile_holder">';
+
-		echo '	<div id="variable_profile" class="select">';
+        echo '<div class="popup_main with_menu">';
+        
+
+		echo '<div class="variable_profile_holder popup_left">';
+
+		echo '	<div id="variable_profile" class="list select">';
 		foreach ($svp_ap as $key => $value) {
 		
-			echo '<div class="option'.($cvp==$value['id']?' active':'').'" value="'.$value['id'].'" '.($cvp==$value['id'] ? '' : ' onclick="changeVariableProfile(\''.$value['id'].'\');"').'>';
+			echo '<div class="list-item option'.($cvp==$value['id']?' active':'').'" value="'.$value['id'].'" '.($cvp==$value['id'] ? '' : ' onclick="changeVariableProfile(\''.$value['id'].'\');"').'>';
 			
 			echo $value['name'];
 			
 			if($cvp == $value['id']){
+
+                echo '<div class="profile_icons">';
+                
 				// izbriši
 				if ((int)$cvp != 0){
-					echo ' <a href="#" onclick="variableProfileAction(\'deleteAsk\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
+                    echo ' <a href="#" onclick="variableProfileAction(\'deleteAsk\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
 				}
 				// preimenuj
 				if ((int)$cvp != 0){
-					echo ' <a href="#" onclick="variableProfileAction(\'renameAsk\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit icon-as_link floatRight spaceRight"></span></a>'."\n";
+                    echo ' <a href="#" onclick="variableProfileAction(\'renameAsk\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit icon-as_link floatRight spaceRight"></span></a>'."\n";
 				}
+                
+                echo '</div>';
 			}
 			
 			echo '</div>';
 		}
 		echo '	</div>';
 		
-		// izberi / odznaci vse
-		echo '<div style="position:absolute; bottom:20px; left:20px;">';
-		echo '<a href="#" onClick="variableProfileSelectAll(1); return false;">'.$lang['srv_select_all'].'</a>';
-		echo ' / <a href="#" onClick="variableProfileSelectAll(0); return false;">'.$lang['srv_deselect_all'].'</a>';
-		echo '</div>';
-		
 		echo '</div>';
 		
 
-		echo '<div id="vp_list">';
+		echo '<div id="vp_list" class="popup_right">';
 
 		$empty = count($svp_pv) == 0;
-		echo '<ul id="vp_list_ul" class="left">';
+		echo '<div id="vp_list_ul" class="settings_block">';
-		if (count($svp_av) > 0)
+		if (count($svp_av) > 0){
-		{
+
-			foreach($svp_av as $key => $variabla)
+			foreach($svp_av as $key => $variabla){
-			{
 				$_name = self::$SDF->getVariableName($key);
 				$checked = ($empty || in_array($key, $svp_pv));
-				echo '<li'.($checked?' class="selected"':'').'>';
+
-				echo '<label>';
+				echo '<div class="setting_line">';
-				echo '<input type="checkbox" '.($checked?' checked="checekd"':'').' name="vp_list_li" value="'.$key.'" id="variable_'.$key.'" onchange="variableProfileCheckboxChange(this);">'.limitString($_name);
+				echo '  <input type="checkbox" '.($checked?' checked="checekd"':'').' name="vp_list_li" value="'.$key.'" id="variable_'.$key.'" onchange="variableProfileCheckboxChange(this);">';
-				echo '</label></li>';
+				echo '  <label for="variable_'.$key.'">'.limitString($_name).'</label>';
+                echo '</div>';
 			}
 		}
-		echo '</ul>';
+		echo '</div>';
+
+		// izberi / odznaci vse
+		echo '<div class="settings_block">';
+		echo '  <div class="setting_line">';
+		echo '      <a href="#" onClick="variableProfileSelectAll(1); return false;">'.$lang['srv_select_all'].'</a> / <a href="#" onClick="variableProfileSelectAll(0); return false;">'.$lang['srv_deselect_all'].'</a>';
+		echo '  </div>';
+		echo '</div>';
 
 		echo '</div>';
+
+
+        echo '</div>';
+
+        
 		// cover Div
 		echo '<div id="variableProfileCoverDiv"></div>';
 
 		// div za shranjevanje novega profila
-		echo '<div id="newProfile">'.$lang['srv_missing_profile_name'].': ';
+		echo '<div id="newProfile">';
-		echo '<input id="newProfileName" name="newProfileName" type="text" size="45"  />';
+
+		echo '<div class="setting_holder">';
+
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+		echo '<input id="newProfileName" name="newProfileName" type="text" class="text large"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+
+		$button = new PopUpButton($lang['srv_cancel']);
+		echo $button -> setFloat('right')
+		-> addAction('onClick','variableProfileAction(\'newCancel\'); return false;');
+		
 		$button = new PopUpButton($lang['srv_save_profile']);
 		echo $button -> setFloat('right')
 		->setButtonColor('orange')
 		-> addAction('onClick','variableProfileAction(\'newSave\'); return false;');
-		$button = new PopUpButton($lang['srv_cancel']);
+
-		echo $button -> setFloat('right')
+        echo '</div>';
-		-> addAction('onClick','variableProfileAction(\'newCancel\'); return false;');
+
 		echo '</div>';
 
 		// div za preimenovanje
-		echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': ';
+		echo '<div id="renameProfileDiv">';
-		echo '<input id="renameProfileName" name="renameProfileName" type="text" value="'.$svp_ap[$cvp]['name'].'" size="45"  />';
+
+		echo '<div class="setting_holder">';
+
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+		echo '<input id="renameProfileName" name="renameProfileName" type="text" value="'.$svp_ap[$cvp]['name'].'" class="text large"  />';
 		echo '<input id="renameProfileId" type="hidden" value="'.$pid.'"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+
+		$button = new PopUpButton($lang['srv_cancel']);
+		echo $button -> setFloat('right')
+		-> addAction('onClick','variableProfileAction(\'renameCancel\'); return false;');
+		
 		$button = new PopUpButton($lang['srv_rename_profile_yes']);
 		echo $button -> setFloat('right')
 		->setButtonColor('orange')
 		-> addAction('onClick','variableProfileAction(\'renameProfile\'); return false;');
 
-		$button = new PopUpButton($lang['srv_cancel']);
+		echo '</div>';
-		echo $button -> setFloat('right')
+		
-		-> addAction('onClick','variableProfileAction(\'renameCancel\'); return false;');
 		echo '</div>';
 
 		// div za brisanje
-		echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>'.$svp_ap[$cvp]['name'].'</b>?';
+		echo '<div id="deleteProfileDiv">';
+		
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">'.$svp_ap[$cvp]['name'].'</span>?';
 		echo '<input id="deleteProfileId" type="hidden" value="'.$pid.'"  />';
 
-		$button = new PopUpButton($lang['srv_delete_profile_yes']);
+        echo '<div class="button_holder">';
-		echo $button -> setFloat('right')
-		->setButtonColor('orange')
-		-> addAction('onClick','variableProfileAction(\'deleteConfirm\'); return false;');
 
 		$button = new PopUpButton($lang['srv_cancel']);
 		echo $button -> setFloat('right')
 		-> addAction('onClick','variableProfileAction(\'deleteCancel\'); return false;');
+		
+		$button = new PopUpButton($lang['srv_delete_profile_yes']);
+		echo $button -> setFloat('right')
+		->setButtonColor('orange')
+		-> addAction('onClick','variableProfileAction(\'deleteConfirm\'); return false;');
+		
+		echo '</div>';
+		
 		echo '</div>';
 
 		$content = ob_get_clean();
 		#dodamo vsebino
 		$popUp->setContent($content);
 
-		# gumb izberi
+        # dodamo gumb Preklici
-		$button = new PopUpButton($lang['srv_choose_profile']);
+		$button = new PopUpCancelButton();
-		$button -> setFloat('right')
-		->setButtonColor('orange')
-		-> addAction('onClick','variableProfileAction(\'choose\'); return false;');
 		$popUp->addButton($button);
 
 		# gumb shrani
-		if ((int)$cvp != 0) 
+		if ((int)$cvp != 0){
-		{
 			$button = new PopUpButton($lang['srv_save_profile']);
-			$button -> setFloat('right')
+			$button->addAction('onClick','variableProfileAction(\'save\'); return false;');
-				->setButtonColor('gray')
-				-> addAction('onClick','variableProfileAction(\'save\'); return false;');
 			$popUp->addButton($button);
 		}
 		
 		# gumb shrani kot now
 		$button = new PopUpButton($lang['srv_new_profile_name']);
-		$button -> setFloat('right')
+		$button->addAction('onClick','variableProfileAction(\'newName\'); return false;');
-			-> addAction('onClick','variableProfileAction(\'newName\'); return false;');
 		$popUp->addButton($button);
 		
-		# dodamo gumb Preklici
+        # gumb izberi
-		$button = new PopUpCancelButton();
+		$button = new PopUpButton($lang['srv_choose_profile']);
-		$button -> setFloat('right');
+		$button -> setFloat('right')
+		->setButtonColor('orange')
+		-> addAction('onClick','variableProfileAction(\'choose\'); return false;');
 		$popUp->addButton($button);
 
-
 		echo $popUp;
 	}
 

admin/survey/classes/class.SurveyZankaProfiles.php

@@ -126,13 +126,13 @@ class SurveyZankaProfiles {
 	
 	static function DisplayLink($hideAdvanced = true) {
 		global $lang;
+
 		// profili statusov
         $allProfiles = self :: $profiles;
         $css = (self::$currentProfileId == SZP_DEFAULT_PROFILE ? ' gray' : '');
         if ($hideAdvanced == false || self::$currentProfileId != SZP_DEFAULT_PROFILE) {
-        	echo '<li class="space">&nbsp;</li>';
         	echo '<li>';
-        	echo '<span class="as_link'.$css.'" id="link_zanka_profile" title="' . $lang['srv_zanke'] . '" onClick="zankaProfileAction(\'showProfiles\');">' . $lang['srv_zanke'] . '</span>'."\n";
+        	echo '  <span class="'.$css.'" id="link_zanka_profile" title="' . $lang['srv_zanke'] . '" onClick="zankaProfileAction(\'showProfiles\');">' . $lang['srv_zanke'] . '</span>'."\n";
         	echo '</li>';
         	
         }
@@ -174,6 +174,7 @@ class SurveyZankaProfiles {
 			break;
 		}
 	}
+
 	static function showProfiles ($pid = null) {
 		global $lang;
         
@@ -206,69 +207,80 @@ class SurveyZankaProfiles {
 				}			
 			}
 		}		
-		#echo '<div id="currentZankaProfile">'.$lang['srv_analiza_selected_profile'].': <b>' . self::$profiles[$pid]['name'] . '</b></div >'.NEW_LINE;
         
 		if ( self::$currentProfileId != SZP_DEFAULT_PROFILE ) {
-	       	echo '<div id="not_default_setting">';
+	       	echo '<div id="not_default_setting" class="popup_note">';
 	        echo $lang['srv_not_default_setting'];
-	        echo '</div><br class="clr displayNone">';
+	        echo '</div>';
         }
 		
         
-		echo '<div class="zanka_profile_holder">'.NEW_LINE;
+        echo '<div class="popup_main with_menu">';
-		echo '	<div id="zanka_profile" class="select">'.NEW_LINE;
+
+
+		echo '<div class="popup_left zanka_profile_holder">'.NEW_LINE;
+
+		echo '	<div id="zanka_profile" class="list select">'.NEW_LINE;
 		if (count(self::$profiles) > 0 ){
 			foreach (self::$profiles as $key => $value) {
 				
 				if ($value['id'] != null) {
 				
-					echo '<div class="option' . ($pid == $value['id'] ? ' active' : '') . '" id="zanka_profile_' . $value['id'] . '" value="'.$value['id'].'">';
+					echo '<div class="list-item option' . ($pid == $value['id'] ? ' active' : '') . '" id="zanka_profile_' . $value['id'] . '" value="'.$value['id'].'">';
 
 					echo $value['name'];
 
 					if($value['id'] == $pid){
+
+                        echo '<div class="profile_icons">';
+
 						if ( $pid != 0) {
-							# sistemskega ne pustimo izbrisat
+                            # sistemskega ne pustimo izbrisat
 							echo '   <a href="#" title="'.$lang['srv_delete_profile'].'" onclick="zankaProfileAction(\'deleteAsk\'); return false;"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'.NEW_LINE;
 						}
 						if ( $pid > 0) {  
-							# seje in sistemskega ne pustimo preimenovat
+                            # seje in sistemskega ne pustimo preimenovat
 							echo '   <a href="#" title="'.$lang['srv_rename_profile'].'" onclick="zankaProfileAction(\'renameAsk\'); return false;"><span class="faicon edit icon-as_link floatRight spaceRight"></span></a>'.NEW_LINE;
-						}		
+						}	
+                        	
+                        echo '</div>';
 					}
 					
 					echo '</div>'.NEW_LINE;				
 				}
 			}
 		}
+
+        echo '      <button class="small white-black" onclick="zankaProfileAction(\'newName\'); return false;">'.$lang['srv_save_new_profile'].'</button>'.NEW_LINE;
+
 		echo '	</div>'.NEW_LINE;
 
-		echo '<div class="clr"></div>'.NEW_LINE;
-
 		echo '</div>'.NEW_LINE;
+
+
 		
 		// izrišemo dva stolpca z možnostjo premikanja enih in drugih variabelS		
-		echo '<div id="fs_list">'.NEW_LINE;
+		echo '<div id="fs_list" class="popup_right">'.NEW_LINE;
-		echo '<div class="left link_no_decoration">'.NEW_LINE;
+
+		echo '<div id="skupine_left">';
+		
+		echo '<div class="top">'.NEW_LINE;
+		
+		echo '<div class="select">'.NEW_LINE;
 		echo $lang['srv_select'].NEW_LINE; 
-		echo '<a href="#" onclick="return $.dds.selectAll(\'fs_list_3\');">'.$lang['srv_all'].'</a>'.NEW_LINE; 
+		echo '<a href="#" onclick="return $.dds.selectAll(\'fs_list_3\');">'.$lang['srv_all'].'</a> - '.NEW_LINE; 
-		echo '<a href="#" onclick="return $.dds.selectNone(\'fs_list_3\');">'.$lang['srv_none'].'</a> '.NEW_LINE;
+		echo '<a href="#" onclick="return $.dds.selectNone(\'fs_list_3\');">'.$lang['srv_none'].'</a> - '.NEW_LINE;
 		echo '<a href="#" onclick="return $.dds.selectInvert(\'fs_list_3\');">'.$lang['srv_invert'].'</a>'.NEW_LINE;
 		echo '</div>'.NEW_LINE;
-		echo '<div class="left link_no_decoration" style="width:200px; text-align:center">'.NEW_LINE;
+		
+		echo '<div class="clear_multiply">'.NEW_LINE;
 		echo '<a href="#" onclick="zankaProfileAction(\'clearDdsZanka\'); return false;">'.$lang['srv_clear'].'</a>'.NEW_LINE;
 		echo '<input type="checkbox" name="mnozenje" id="mnozenje" value="1"'.($mnozenje==1?' checked="checked"':'').' autocomplete="off"/><label for="mnozenje">'.$lang['srv_analiza_krat'].'</label>'.NEW_LINE;
 		echo '</div>'.NEW_LINE;
+		
+		echo '</div>'.NEW_LINE; #top
 
-		echo '<div class="right link_no_decoration">'.NEW_LINE;
+		echo '<div class="fs_container">'.NEW_LINE;
-		echo $lang['srv_select'].NEW_LINE; 
-    		echo '<a href="#" onclick="return $.dds.selectAll(\'fs_list_4\');">'.$lang['srv_all'].'</a>'.NEW_LINE; 
-    		echo '<a href="#" onclick="return $.dds.selectNone(\'fs_list_4\');">'.$lang['srv_none'].'</a> '.NEW_LINE;
-    		echo '<a href="#" onclick="return $.dds.selectInvert(\'fs_list_4\');">'.$lang['srv_invert'].'</a>'.NEW_LINE;
-		echo '</div>'.NEW_LINE;
-		echo '<br class="clr" />'.NEW_LINE;
-		echo '<br />'.NEW_LINE;
-		echo '<div class="left fs_container">'.NEW_LINE;
 		echo '<ul id="fs_list_3" class="left">'.NEW_LINE;
 		$sdf = SurveyDataFile::get_instance();
 		$sdf->init($sid);
@@ -280,7 +292,31 @@ class SurveyZankaProfiles {
 		}
 		echo '</ul>'.NEW_LINE;
 		echo '</div>'.NEW_LINE;
-		echo '<div class="right fs_container">'.NEW_LINE;
+		
+
+		echo '</div>'; #left
+
+
+
+		echo '<div id="skupine_right">';
+
+		echo '<div class="top">'.NEW_LINE;
+		echo '<div class="select">'.NEW_LINE;
+		echo $lang['srv_select'].NEW_LINE; 
+    		echo '<a href="#" onclick="return $.dds.selectAll(\'fs_list_4\');">'.$lang['srv_all'].'</a> - '.NEW_LINE; 
+    		echo '<a href="#" onclick="return $.dds.selectNone(\'fs_list_4\');">'.$lang['srv_none'].'</a> - '.NEW_LINE;
+    		echo '<a href="#" onclick="return $.dds.selectInvert(\'fs_list_4\');">'.$lang['srv_invert'].'</a>'.NEW_LINE;
+		echo '</div>'.NEW_LINE;
+
+
+		echo '<div class="clear_multiply">'.NEW_LINE;
+		echo '</div>'.NEW_LINE;
+		
+		echo '</div>'.NEW_LINE; #top
+
+
+
+		echo '<div class="fs_container">'.NEW_LINE;
 		echo '<ul id="fs_list_4" class="left">'.NEW_LINE;
 		if (count($selected_variables) > 0 ) {
 			foreach($selected_variables as $key => $variabla) {
@@ -290,6 +326,9 @@ class SurveyZankaProfiles {
 		}
 		echo '</ul>'.NEW_LINE;
 		echo '</div>'.NEW_LINE;
+
+		echo '</div>'; #right
+
 		echo '<script type="text/javascript">'.NEW_LINE;
         echo '$(document).ready(function() {';
         echo '$(function(){'.NEW_LINE;
@@ -303,45 +342,77 @@ class SurveyZankaProfiles {
         echo '});'.NEW_LINE;
 		echo '</script>'.NEW_LINE;
 
-		echo '<br class="clr" />'.NEW_LINE;
-
 		echo '</div>'.NEW_LINE;
 
-		echo '<div id="missingProfilebuttons">'.NEW_LINE;
+        echo '</div>';
-		if ((int)$pid < 0 ) {// pri seji in sistemskem ne pustimo shranjevanja
+
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zankaProfileAction(\'runSession\'); return false;"><span>'.$lang['srv_run_as_session_profile'].'</span></a></span></span>'.NEW_LINE;
+
-		} else {
+		echo '<div id="missingProfilebuttons" class="button_holder">'.NEW_LINE;
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange"   href="#" onclick="zankaProfileAction(\'run\'); return false;"><span>'.$lang['srv_save_and_run_profile'].'</span></a></span></span>'.NEW_LINE;
+
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'runSession\'); return false;"><span>'.$lang['srv_run_as_session_profile'].'</span></a></span></span>'.NEW_LINE;
+        echo '<button class="medium white-blue" onclick="zankaProfileAction(\'cancle\'); return false;">'.$lang['srv_close_profile'].'</button>'.NEW_LINE;
+
+        // pri seji in sistemskem ne pustimo shranjevanja
+		if ((int)$pid < 0 ) {
+			echo '<button class="medium blue" onclick="zankaProfileAction(\'runSession\'); return false;">'.$lang['srv_run_as_session_profile'].'</button>'.NEW_LINE;
+		} 
+        else {
+            echo '<button class="medium white-blue" onclick="zankaProfileAction(\'runSession\'); return false;">'.$lang['srv_run_as_session_profile'].'</button>'.NEW_LINE;
+			echo '<button class="medium blue" onclick="zankaProfileAction(\'run\'); return false;">'.$lang['srv_save_and_run_profile'].'</button>'.NEW_LINE;
 		}
-						
+							
-		echo '<span class="floatRight spaceLeft"><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'newName\'); return false;"><span>'.$lang['srv_save_new_profile'].'</span></a></span></span>'.NEW_LINE;
-		echo '<span class="floatRight spaceLeft"><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'cancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'.NEW_LINE;
-		
 		echo '</div>'.NEW_LINE;
+
+
 		echo '<div id="zankaProfileCoverDiv"></div>'.NEW_LINE;
 
 		// div za shranjevanje novega profila
-		echo '<div id="newProfileDiv">'.$lang['srv_missing_profile_name'].': '.NEW_LINE;
+		echo '<div id="newProfileDiv">';
-		echo '<input id="newProfileName" name="newProfileName" type="text" size="45"  />'.NEW_LINE;
+
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'newCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'.NEW_LINE;
+		echo '<div class="setting_holder">';
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zankaProfileAction(\'newCreate\'); return false;"><span>'.$lang['srv_save_profile'].'</span></a></span></span>'.NEW_LINE;			
+
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="zankaProfileAction(\'newCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="zankaProfileAction(\'newCreate\'); return false;">'.$lang['srv_save_profile'].'</button>';
+        echo '</div>';
+		
 		echo '</div>'.NEW_LINE;
 
 		// div za preimenovanje
-		echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': '.NEW_LINE;
+		echo '<div id="renameProfileDiv">';
-		echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" size="45"  />'.NEW_LINE;
+		
-		echo '<input id="renameProfileId" type="hidden" value="' . $czp . '"  />'.NEW_LINE;
+		echo '<div class="setting_holder">';
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zankaProfileAction(\'renameConfirm\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>'.NEW_LINE;			
+
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'renameCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'.NEW_LINE;
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" class="text large"/>';
+        echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="zankaProfileAction(\'renameCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="zankaProfileAction(\'renameConfirm\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+        echo '</div>';
 		
 		echo '</div>'.NEW_LINE;
 
 		// div za brisanje
-		echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . self::$profiles[$pid]['name'] . '</b>?'.NEW_LINE;
+		echo '<div id="deleteProfileDiv">';
-		echo '<input id="deleteProfileId" type="hidden" value="' . $czp . '"  />'.NEW_LINE;
+		
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zankaProfileAction(\'deleteConfirm\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'.NEW_LINE;
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . self::$profiles[$pid]['name'] . '</span>?';
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'deleteCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'.NEW_LINE;
+        echo '<input id="deleteProfileId" type="hidden" value="' . $czp . '"  />';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="zankaProfileAction(\'deleteCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="zankaProfileAction(\'deleteConfirm\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
+		
 		echo '</div>'.NEW_LINE;
 	}
 

admin/survey/classes/class.SurveyZoom.php

@@ -122,11 +122,9 @@ class SurveyZoom
 		$css = (self::$currentProfileId == 0 ? ' gray' : '');
 		
 		if ($hideAdvanced == false || self::$currentProfileId != 0) {
-			echo '<li class="space">&nbsp;</li>';
 			echo '<li>';
-	        echo '<span class="as_link'.$css.'" id="link_zoom" title="'.$lang['srv_zoom_setting'].'" onclick="showZoomSettings();">'.$lang['srv_zoom_setting'].'</span>';
+	        echo '  <span class="'.$css.'" id="link_zoom" title="'.$lang['srv_zoom_setting'].'" onclick="showZoomSettings();">'.$lang['srv_zoom_setting'].'</span>';
 	        echo '</li>';
-	     
 		}
 	}
 	
@@ -216,23 +214,30 @@ class SurveyZoom
         
         $currentFilterProfile = self::$profiles[$current_pid];
         if ( self::$currentProfileId != ZOOM_DEFAULT_PROFILE ) {
-	       	echo '<div id="not_default_setting">';
+	       	echo '<div id="not_default_setting" class="popup_note">';
 	        echo $lang['srv_not_default_setting'];
-	        echo '</div><br class="clr displayNone">';
+	        echo '</div>';
         }
       
-       	echo '<div id="zoom_profiles_left">';
+
-       	echo '<span id="zoom_profiles_holder">';
+        echo '<div class="popup_main with_menu">';
+
+
+       	echo '<div id="zoom_profiles_left" class="popup_left">';
+       	echo '<div id="zoom_profiles_holder">';
+
 		# zlistamo vse profile
-       	echo '<span id="zoom_profiles" class="select">';
+       	echo '<div id="zoom_profiles" class="list select">';
 		if (count(self::$profiles)) {
 			foreach (self::$profiles as $id => $profile) {
 				
-				echo '<div class="option' . ($current_pid == $id ? ' active' : '') . '" id="zoom_profile_' . $id . '" value="'.$id.'" '.($current_pid == $id ? '' : ' onclick="zoomChangeProfile(\''.$id.'\')"').'>';
+				echo '<div class="list-item option' . ($current_pid == $id ? ' active' : '') . '" id="zoom_profile_' . $id . '" value="'.$id.'" '.($current_pid == $id ? '' : ' onclick="zoomChangeProfile(\''.$id.'\')"').'>';
 
 				echo $profile['name'];
 				
 				if($current_pid == $id){
+                    echo '<div class="profile_icons">';
+
 					# sistemskega ne moremo izbrisati
 					if ($current_pid != 0) {
 						echo '<a href="#" title="'.$lang['srv_delete_profile'].'" onclick="zoomProfileAction(\'showDelete\'); return false;"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
@@ -242,23 +247,29 @@ class SurveyZoom
 					if ($current_pid > 0) {
 						echo '<a href="#" title="'.$lang['srv_rename_profile'].'" onclick="zoomProfileAction(\'showRename\'); return false;"><span class="faicon edit icon-as_link floatRight spaceRight"></span></a>'."\n";
 					}				
+                    
+                    echo '</div>';
 				}
 				
 				echo '</div>';
 			}
 		}
-		echo '</span>'; # zoom_profilea
+		echo '</div>'; # zoom_profilea
-		echo '</span>'; # zoom_profiles_holder
+
-		
+        // Gumb za dodajanje novega profila
+        echo '<button class="small white-black" title="'.$lang['srv_create_new_profile'].'" onclick="zoomProfileAction(\'newName\'); return false;">';
+        echo '  <span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'];
+        echo '</button>';
+
+		echo '</div>'; # zoom_profiles_holder
 		echo '</div>'; # zoom_profiles_left
 
 		
-		echo '<div id="zoom_profiles_right">'."\n";
+		echo '<div id="zoom_profiles_right" class="popup_right">'."\n";
 		if ($current_pid == 0) {
-			echo '<div id="zoom_note">';
+			echo '<div id="zoom_note" class="popup_right_note">';
 			echo $lang['srv_change_default_profile'];
 			echo '</div>'; // zoom_profile_note
-			echo '<br class="clr" />'."\n";
 		}	
 		
 		echo '<div id="zoom_content">';
@@ -266,20 +277,23 @@ class SurveyZoom
 		echo '</div>'; // zoom_profile_content
 
 		echo '</div>'; // zoom_profile_right
+
+
+		echo '</div>';
 		
 		
-		echo '<div id="zoom_button_holder">'."\n";
+		echo '<div id="zoom_button_holder" class="button_holder">'."\n";
+
 		if ((int)$current_pid <= 0 ) {
-			echo '<span class="floatRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
+			echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="zoomProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
+			echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="zoomProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
+		} 
-		} else  {
+        else  {
-			echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'runProfile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
+			echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="zoomProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
+            echo '<button class="medium white-blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="zoomProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
+			echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="zoomProfileAction(\'runProfile\'); return false;">'.$lang['srv_run_profile'] . '</button>';	
-			echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
-			
 		}
+
 		echo '</div>'."\n"; // zoom_button_holder
 		
 		
@@ -287,26 +301,54 @@ class SurveyZoom
         //echo '<div id="zoom_cover_div"></div>'."\n";
 		
         // div za kreacijo novega
-        echo '<div id="newProfileDiv">'.$lang['srv_missing_profile_name'].': '."\n";
+        echo '<div id="newProfileDiv">';
-        echo '<input id="newProfileName" name="newProfileName" type="text" value="" size="45"  />'."\n";
+		
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'newCreate\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_save'].'</span></a></span></span>'."\n";            
+		echo '<div class="setting_holder">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'newCancel\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+
-        echo '</div>'."\n";
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="zoomProfileAction(\'newCancel\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="zoomProfileAction(\'newCreate\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
         
         // div za preimenovanje
-        echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': '."\n";
+        echo '<div id="renameProfileDiv">';
-        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" size="45"  />'."\n";
+		
-        echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />'."\n";
+		echo '<div class="setting_holder">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'doRename\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>'."\n";            
+
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancelRename\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+        echo '<div class="setting_item">';
-        echo '</div>'."\n";
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" class="text large"/>';
+        echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="zoomProfileAction(\'cancelRename\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="zoomProfileAction(\'doRename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+        echo '</div>';
+		
+        echo '</div>';
                 
         // div za brisanje
-        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . $currentFilterProfile['name'] . '</b>?'."\n";
+        echo '<div id="deleteProfileDiv">';
-        echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />'."\n";
+		
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'doDelete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'."\n";
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . $currentFilterProfile['name'] . '</span>?';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancelDelete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";            
+        echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
-        echo '</div>'."\n";
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="zoomProfileAction(\'cancelDelete\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="zoomProfileAction(\'doDelete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
 	}
 	
 	/** Funkcija prikaze osnovnih informacije profila
@@ -314,9 +356,11 @@ class SurveyZoom
 	 */
 	function DisplayProfileData($current_pid=null) {
 		global $lang;
+
 		if (isset($_POST['error'])) {
 			echo '<span class="red">* '.$lang[$_POST['error']].'</span><br/>';
 		}
+        
 		# podatki profila
 		if ($current_pid == null) {
 			$current_pid = self::$currentProfileId;
@@ -326,39 +370,44 @@ class SurveyZoom
 		
 		$all_spr = Cache::cache_all_srv_spremenljivka(self::$sid,true);
 		
-		echo '<span>'.$lang['srv_zoom_choose'].'</span>';
+
+        echo '<div class="setting_line">';
+		echo $lang['srv_zoom_choose'];
+        echo '</div>';
+
 		
 		if (count($all_spr) > 0)
 		foreach ($all_spr AS $id => $spremenljivka) {
 			if ( in_array($spremenljivka['tip'], array(1,2,3) ) ) {
-				echo '<div class="zoom_var">';
+				echo '<div class="settings_block">';
-				
+
-				echo '<label>';
+				echo '  <div class="setting_line">';
-				echo '<input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox"'
+				echo '      <input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox" '.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
-				.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
+				echo '      <label for="zoom_var_'.$spremenljivka['id'].'">'.strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
-				echo strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
+				echo '  </div>';
-				
+                
 				echo '</div>';
-			} else if ( in_array($spremenljivka['tip'], array(6,16,17))) {
+			} 
-				echo '<div class="zoom_var">';
+            else if ( in_array($spremenljivka['tip'], array(6,16,17))) {
-				
+                echo '<div class="settings_block">';
+                
 				# izpišemo glavno spremenljivko
-				echo '<label style="margin-left:20px;">';
+                echo '  <div class="setting_line">';
-				echo strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
+				echo '      <label>'.strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
+                echo '  </div>';
 				
 				# izpišemo gride (zamaknjeno)
 				$sql = sisplet_query("SELECT id, naslov, variable FROM srv_vrednost WHERE spr_id='$id' AND other = 0 ORDER BY vrstni_red");
 	            while ($row = mysqli_fetch_assoc($sql)) {
-					echo '<label style="margin-left:25px; margin-top:5px;">';
+                    echo '  <div class="setting_line indent">'; 
-					echo '<input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'_'.$row['id'].'" value="'.$spremenljivka['id'].'_'.$row['id'].'" type="checkbox"'
+					echo '      <input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'_'.$row['id'].'" value="'.$spremenljivka['id'].'_'.$row['id'].'" type="checkbox" '.(is_array($vars) && in_array($spremenljivka['id'].'_'.$row['id'],$vars) ? ' checked' : '').'>';
-					.(is_array($vars) && in_array($spremenljivka['id'].'_'.$row['id'],$vars) ? ' checked' : '').'>';
+                    echo '      <label for="zoom_var_'.$spremenljivka['id'].'_'.$row['id'].'">'.strip_tags($row['variable']).' - '.strip_tags($row['naslov']).'</label>';
-					echo strip_tags($row['variable']).' - '.strip_tags($row['naslov']).'</label>';
+                    echo '  </div>';
 	        	}
+
 				echo '</div>';
 			}
 		} 
-		
-		echo '<br class="clr"/>';
 	}
 	
 	/* Shranimo izbrane variable in resetiramo if na 0, ter pobrišemo morebitni pogoj če obstaja

admin/survey/classes/mobile/class.MobileSurveyAdmin.php

@@ -25,7 +25,6 @@ class MobileSurveyAdmin{
         $this->first_action = $navigationArray['first_action'];
         $this->second_action = $navigationArray['second_action'];
         $this->third_action = $navigationArray['third_action'];
-
 	}
 
     // Izris glave z menijem - znotraj ankete
@@ -278,7 +277,7 @@ class MobileSurveyAdmin{
 
         // Odjava na nov nacin preko frontend/api
         echo '          <div><form name="odjava" id="form_odjava" method="post" action="'.$site_url.'frontend/api/api.php?action=logout">';
-        echo '              <span class="as_link" onClick="$(\'#form_odjava\').submit();"><span class="faicon logout"></span>' . $lang['logout'] . '</span>';
+        echo '              <span class="as_link noline" onClick="$(\'#form_odjava\').submit();"><span class="faicon logout"></span>' . $lang['logout'] . '</span>';
         echo '          </form></div>';
 
         echo '      </div>';
@@ -749,11 +748,6 @@ class MobileSurveyAdmin{
                     'url'   => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=settings',
                     'active' => ($_GET['a'] == A_VABILA && ($_GET['m'] == '' || $_GET['m'] == 'settings') ? 'active' : '')
                 ),
-                array(
-                    'title' => $lang['srv_publication_url'], 
-                    'url'   => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=url',
-                    'active' => ($_GET['a'] == A_VABILA && $_GET['m'] == 'url' ? 'active' : '')
-                ),
                 array(
                     'title' => $lang['srv_inv_nav_invitations'], 
                     'url'   => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_INVITATIONS . '&m=settings',
@@ -1017,19 +1011,19 @@ class MobileSurveyAdmin{
         // Anketa je zaklenjena
         if($row['locked'] == 1){
             echo '<div class="mobile_add_question bottom">';
-            echo '  <span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="return false;">';
+            echo '  <button class="medium blue" onclick="return false;">';
             echo '      <span class="faicon lock_close"></span> ';
-            echo '  </a></span>';
+            echo '  </button>';
             echo '</div>';
 
             return;
         }
 
         echo '<div class="mobile_add_question bottom">';
-        echo '  <span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mobile_add_question_popup(); return false;">';
+        echo '  <button class="medium blue" onclick="mobile_add_question_popup(); return false;">';
         echo '      <span class="plus">+</span> ';
         echo '      <span>'.$lang['srv_mobile_add_question'].'</span>';
-        echo '  </a></span>';
+        echo '  </button>';
         echo '</div>';
 
 
@@ -1043,9 +1037,7 @@ class MobileSurveyAdmin{
         echo '  <div class="mobile_add_question_item" onClick="mobile_add_question(\'5\');"><span class="faicon nagovor"></span> <span class="item_text">'.$lang['srv_vprasanje_tip_5'].'</span></div>';
         echo '  <div class="mobile_add_question_item" onClick="mobile_add_question(\'6\');"><span class="faicon matrix_32"></span> <span class="item_text">'.$lang['srv_vprasanje_tip_6'].'</span></div>';
 
-        echo '  <span class="buttonwrapper mobile_add_question_button">';
+        echo '  <button class="blue medium mobile_add_question_button" onclick="mobile_add_question_popup_close(); return false;">Zapri</button>';
-        echo '      <a class="ovalbutton ovalbutton_orange" href="#" onclick="mobile_add_question_popup_close(); return false;"><span>Zapri</span></a>';
-        echo '  </span>';
 
         echo '</div>';
     }
@@ -1058,10 +1050,10 @@ class MobileSurveyAdmin{
         echo '<style>.mobile_add_question.bottom{display: none;}</style>';
 
         echo '<div class="mobile_add_question center">';
-        echo '  <span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mobile_add_question_popup(); return false;">';
+        echo '  <button class="blue medium" onclick="mobile_add_question_popup(); return false;">';
         echo '      <span class="plus">+</span> ';
         echo '      <span>'.$lang['srv_mobile_add_question'].'</span>';
-        echo '  </a></span>';
+        echo '  </button>';
         echo '</div>';
     }
 
@@ -1070,7 +1062,7 @@ class MobileSurveyAdmin{
         global $lang;
 
         echo '<div class="add-variable-mobile">';
-        echo '  <a href="#" onclick="vrednost_new_mobile(\''.$spr_id.'\', \''.$tip.'\'); return false;" title="'.$lang['srv_novavrednost'].'"><span class="faicon add small"></span> '.$lang['srv_novavrednost'].'</a>';
+        echo '  <a href="#" onclick="vrednost_new_mobile(\''.$spr_id.'\', \''.$tip.'\'); return false;" title="'.$lang['srv_novavrednost'].'"><span class="faicon add"></span> '.$lang['srv_novavrednost'].'</a>';
         echo '</div>';
     }
 }

admin/survey/classes/objects/obj.PopUp.php

@@ -85,51 +85,50 @@ class PopUp
 		return $this;
 	}
 	
-	public function display()
+	public function display(){
-	{
+
 		$this->_displayed = true;
 		
 		#začnemo osnovni div
 		echo '<div';
-		if ($this->_id != null)
+		if ($this->_id != null){
-		{
 			echo ' id="'.$this->_id.'"';
 		}
-		if (count($this->_css) > 0)
+		if (count($this->_css) > 0){
-		{
 			echo ' class="'. implode(' ',$this->_css).'"';
 		}
 		echo '>';
+
 		
 		#dodamo header 
-		if ($this->_headerText != null)
+		if ($this->_headerText != null){
-		{
 			echo '<div class="divPopUp_top">';
 			echo $this->_headerText;
 			echo '</div>'; #PM_top
+
+			echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">✕</a></div>';
 		}
 		
+
 		#dodamo vsebino - content
-		echo '<div class="divPopUp_content">';
+		echo '<div class="popup_main">';
 		echo $this->_content;
-		echo '</div>'; # class="divPopUp_content"
+		echo '</div>';
 		
-		# začnemo div z gumbi
+
-		echo '<div class="divPopUp_btm">';
+		# div z gumbi
-		
+		echo '<div class="button_holder">';
-		# izrišemo gumbe
 		if (count($this->_buttons) > 0) {
-			foreach ($this->_buttons AS $button)
+			foreach ($this->_buttons AS $button){
-			{
 				echo $button;
 			}
 		}
-		
-		#zaključimo div z gumbi
-		echo '</div>'; #class="inv_FS_btm clr"
-		
-		#zaključimo div z gumbi
 		echo '</div>';
+		
+
+		#zaključimo osnovni div
+		echo '</div>';
+
 		return $this;
 	}
 	

admin/survey/classes/objects/obj.PopUpButton.php

@@ -51,7 +51,7 @@ class PopUpButton
 	private $_float = 'floatLeft';
 	private $_space = 'spaceLeft';
 	
-	private $_buttonColor = 'gray';
+	private $_buttonColor = 'white-blue';
 	private $_actions = array();
 	
 	public function __construct($caption = null)
@@ -99,11 +99,15 @@ class PopUpButton
 	{
 		switch ($buttonColor) {
 			case 'orange':
-				$this->_buttonColor = 'orange';
+				$this->_buttonColor = 'blue';
 			break;
 			
+			case 'white-black':
+				$this->_buttonColor = 'white-black';
+			break;
+
 			default:
-				$this->_buttonColor = 'gray';
+				$this->_buttonColor = 'white-blue';
 			break;
 		}
 		
@@ -121,13 +125,10 @@ class PopUpButton
 	}
 	
 	public function __toString() {
-		$str  = '<div class="'.$this->_float.' '.$this->_space.'">';
+		$str  = '<button class="medium '.$this->_buttonColor.'" title="'.$this->_title.'" '.implode(' ', $this->_actions).'>';
-		$str .= '<div class="buttonwrapper" title="'.$this->_title.'">';
+		$str .=     $this->_caption;
-		$str .= '<a class="ovalbutton ovalbutton_'.$this->_buttonColor.'" href="#" '.implode(' ', $this->_actions).'>';
+		$str .= '</button>';
-		$str .= '<span>'.$this->_caption.'</span>';
+
-		$str .= '</a>';
-		$str .= '</div>';
-		$str .= '</div>';
 		return $str;
 	}
 }

admin/survey/classes/objects/obj.PopUpCancelButton.php

@@ -53,5 +53,6 @@ class PopUpCancelButton extends PopUpButton
     	global $lang;
     	parent::__construct($lang['srv_cancel']);
         $this -> addAction('onClick',"$('#fade').fadeOut('slow');$('#fullscreen').fadeOut('slow').html(''); return false;");
+        $this -> setButtonColor('white-black');
     }
 }

admin/survey/classes/staticHtml/AnalizaPredogledFrekvence.html

@@ -1,363 +0,0 @@
-		<table class="anl_tbl anl_bt anl_br tbl_clps">
-			<tbody>
-				<tr>
-					<td class="anl_bl anl_br anl_bb anl_ac anl_bck_freq_1 anl_w110"><span
-						class="anl_variabla"><a href="#"
-					</td>
-					<td class="anl_br anl_bb anl_al anl_bck_freq_1" colspan="5"><span
-						class="anl_variabla_label">Spol</span></td>
-				</tr>
-				<tr>
-					<td class="anl_bl anl_br anl_bb anl_ac anl_bck anl_w110"><span
-						class="taCenter printHide iconHide"><a href="#"><span
-								class="sprites analysis_sums_gray"
-								title="Sumarne frekvence (print, pdf, word, excel)"></span></a><a
-							href="#"><span
-								class="sprites analysis_sums_new_gray"
-								title="Dopolnjene frekvence (print, pdf, word, excel)"></span></a><a
-							href="#" ><span
-								class="sprites analysis_statistic_gray"
-								title="Opisne statistike (print, pdf, word, excel)"></span></a><a
-							href="#" ><span
-								class="sprites analysis_frequencys"
-								title="Osnovne frekvence (print, pdf, word, excel)"></span></a></span></td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_variabla_line">Odgovori</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Frekvenca</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Odstotek</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Veljavni</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Kumulativa</td>
-				</tr>
-				<tr >
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">1</div>
-						(Moški)</td>
-					<td class="anl_ac anl_br anl_bck_0_0">3</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">33.3%</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">33.3%</td>
-					<td class="anl_ar anl_bck_0_0 anl_pr10">33.3%</td>
-				</tr>
-				<tr >
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_1"><div class="anl_user_text_more">2</div>
-						(Ženski)</td>
-					<td class="anl_ac anl_br anl_bck_0_1">6</td>
-					<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">66.7%</td>
-					<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">66.7%</td>
-					<td class="anl_ar anl_bck_0_1 anl_pr10">100.0%</td>
-				</tr>
-				<tr class="anl_bb">
-					<td class="anl_bl anl_br anl_al gray anl_ti_20 anl_bck_text_1">Veljavni<span
-						class="gray" value="0">&nbsp;(<span
-							class="sprites plus_orange folder_plusminus"
-							style="width: 12px; height: 12px"></span>)
-					</span><span 
-						class="gray displayNone">&nbsp;(<span
-							class="sprites minus_orange folder_plusminus"
-							style="width: 12px; height: 12px"></span>)
-					</span></td>
-					<td class="anl_br anl_al anl_ita red anl_bck_text_1">Skupaj</td>
-					<td class="anl_ita red anl_br anl_ac anl_bck_text_1">9</td>
-					<td class="anl_ita red anl_br anl_ar anl_bck_text_1 anl_pr10">100.0%</td>
-					<td class="anl_ita red anl_br anl_ar anl_bck_text_1 anl_pr10">100.0%</td>
-					<td class="anl_ita red anl_ac anl_bck_text_1">&nbsp;</td>
-				</tr>
-				<tr class="anl_dash_red_bb displayNone">
-					<td class="anl_bl anl_al anl_br gray anl_ti_20 anl_bck_text_1">Manjkajoči</td>
-					<td class="anl_br anl_ita red anl_bck_text_1">Skupaj<span
-						class="printHide anl_ita anl_detail_percent">&nbsp;&nbsp;<a
-							href="#single_missing_6" > <span
-								class="sprites plus_orange folder_plusminus"
-								style="width: 12px; height: 12px"></span>
-						</a></span><span 
-						class="printHide anl_ita anl_detail_percent displayNone">&nbsp;&nbsp;<a
-							href="#single_missing_6" > <span
-								class="sprites minus_orange folder_plusminus"
-								style="width: 12px; height: 12px"></span>
-						</a></span>
-					<div 
-							class="floatRight anl_w50 anl_dash_bl anl_dash_bt  anl_ac anl_detail_percent displayNone">100.0%</div>
-						<div 
-							class="floatRight anl_w30 anl_dash_bt anl_ac anl_detail_percent displayNone"></div>
-					</td>
-					<td class="anl_ac anl_br anl_detail_cnt anl_ita red anl_bck_text_1">0</td>
-					<td class="anl_ar anl_br anl_ita red anl_bck_text_1 anl_pr10">0.0%</td>
-					<td class="anl_ar anl_br anl_ita red anl_bck_text_1 anl_pr10"><span
-						class="">&nbsp;</span></td>
-					<td class="anl_ar anl_ita red anl_bck_text_1 anl_pr10">&nbsp;</td>
-				</tr>
-				<tr class="displayNone">
-					<td
-						class="anl_bl anl_ac anl_dash_bt anl_bb red anl_ita anl_bck_text_0">SKUPAJ</td>
-					<td class="anl_dash_bt anl_br anl_bb anl_bck_text_0">&nbsp;</td>
-					<td
-						class="anl_ac anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0">9</td>
-					<td
-						class="anl_ar anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0 anl_pr10">100.0%</td>
-					<td
-						class="anl_ar anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0 anl_pr10">&nbsp;</td>
-					<td class="anl_ac anl_dash_bt anl_bb anl_ita red anl_bck_text_0">&nbsp;</td>
-				</tr>
-			</tbody>
-		</table>
-
-	<br>
-		<table class="anl_tbl anl_bt anl_br tbl_clps">
-			<tbody>
-				<tr>
-					<td class="anl_bl anl_br anl_bb anl_ac anl_bck_freq_1 anl_w110"><span
-						class="anl_variabla"><a
-							href="#">Q2</a></span></td>
-					<td colspan="5" class="anl_br anl_bb anl_al anl_bck_freq_1"><span
-						class="anl_variabla_label">Dohodek</span></td>
-				</tr>
-				<tr>
-					<td class="anl_bl anl_br anl_bb anl_ac anl_bck anl_w110"><span
-						class="taCenter printHide iconHide"><a
-							href="#"><span
-								title="Sumarne frekvence (print, pdf, word, excel)"
-								class="sprites analysis_sums_gray"></span></a><a
-							href="#"><span
-								title="Opisne statistike (print, pdf, word, excel)"
-								class="sprites analysis_statistic_gray"></span></a><a
-							href="#"><span
-								title="Osnovne frekvence (print, pdf, word, excel)"
-								class="sprites analysis_frequencys"></span></a></span></td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_variabla_line">Odgovori</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Frekvenca</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Odstotek</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Kumulativa</td>
-				</tr>
-				<tr 
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">900</div></td>
-					<td class="anl_ac anl_br anl_bck_0_0">1</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">11.1%</td>
-					<td class="anl_ar anl_bck_0_0 anl_pr10">11.1%</td>
-				</tr>
-				<tr
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_1"><div class="anl_user_text_more">1000</div></td>
-					<td class="anl_ac anl_br anl_bck_0_1">1</td>
-					<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">11.1%</td>
-					<td class="anl_ar anl_bck_0_1 anl_pr10">22.2%</td>
-				</tr>
-				<tr
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">1300</div></td>
-					<td class="anl_ac anl_br anl_bck_0_0">3</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">33.3%</td>
-					<td class="anl_ar anl_bck_0_0 anl_pr10">55.6%</td>
-				</tr>
-				<tr 
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_1"><div class="anl_user_text_more">1500</div></td>
-					<td class="anl_ac anl_br anl_bck_0_1">1</td>
-					<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">11.1%</td>
-					<td class="anl_ar anl_bck_0_1 anl_pr10">66.7%</td>
-				</tr>
-				<tr 
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">1600</div></td>
-					<td class="anl_ac anl_br anl_bck_0_0">1</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">11.1%</td>
-					<td class="anl_ar anl_bck_0_0 anl_pr10">77.8%</td>
-				</tr>
-				<tr 
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_1"><div class="anl_user_text_more">1700</div></td>
-					<td class="anl_ac anl_br anl_bck_0_1">1</td>
-					<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">11.1%</td>
-					<td class="anl_ar anl_bck_0_1 anl_pr10">88.9%</td>
-				</tr>
-				<tr
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">2000</div></td>
-					<td class="anl_ac anl_br anl_bck_0_0">1</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">11.1%</td>
-					<td class="anl_ar anl_bck_0_0 anl_pr10">100.0%</td>
-				</tr>
-				<tr class="anl_bb">
-					<td class="anl_bl anl_br anl_al gray anl_ti_20 anl_bck_text_1">Veljavni<span
-						value="0" class="gray" >&nbsp;(<span
-							style="width: 12px; height: 12px"
-							class="sprites plus_orange folder_plusminus"></span>)
-					</span><span class="anl_gray displayNone"
-						>&nbsp;(<span
-							style="width: 12px; height: 12px"
-							class="sprites minus_orange folder_plusminus"></span>)
-					</span></td>
-					<td class="anl_br anl_al anl_ita red anl_bck_text_1">Skupaj</td>
-					<td class="anl_ita red anl_br anl_ac anl_bck_text_1">9</td>
-					<td class="anl_ita red anl_br anl_ar anl_bck_text_1 anl_pr10">100.0%</td>
-					<td class="anl_ita red anl_ac anl_bck_text_1">&nbsp;</td>
-				</tr>
-				<tr class="anl_dash_red_bb displayNone" >
-					<td class="anl_bl anl_al anl_br gray anl_ti_20 anl_bck_text_1">Manjkajoči</td>
-					<td class="anl_br anl_ita red anl_bck_text_1">Skupaj<span
-						class="printHide anl_ita anl_detail_percent"
-						>&nbsp;&nbsp;<a
-							href="#single_missing_7"> <span
-								style="width: 12px; height: 12px"
-								class="sprites plus_orange folder_plusminus"></span>
-						</a></span><span class="printHide anl_ita anl_detail_percent displayNone"
-						>&nbsp;&nbsp;<a
-							href="#single_missing_7"> <span
-								style="width: 12px; height: 12px"
-								class="sprites minus_orange folder_plusminus"></span>
-						</a></span>
-					<div
-							class="floatRight anl_w50 anl_dash_bl anl_dash_bt  anl_ac anl_detail_percent displayNone"
-							>100.0%</div>
-						<div
-							class="floatRight anl_w30 anl_dash_bt anl_ac anl_detail_percent displayNone"
-							></div>
-					</td>
-					<td class="anl_ac anl_br anl_detail_cnt anl_ita red anl_bck_text_1">0</td>
-					<td class="anl_ar anl_br anl_ita red anl_bck_text_1 anl_pr10">0.0%</td>
-					<td class="anl_ar anl_ita red anl_bck_text_1 anl_pr10">&nbsp;</td>
-				</tr>
-				<tr class="displayNone" >
-					<td
-						class="anl_bl anl_ac anl_dash_bt anl_bb red anl_ita anl_bck_text_0">SKUPAJ</td>
-					<td class="anl_dash_bt anl_br anl_bb anl_bck_text_0">&nbsp;</td>
-					<td
-						class="anl_ac anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0">9</td>
-					<td
-						class="anl_ar anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0 anl_pr10">100.0%</td>
-					<td class="anl_ac anl_dash_bt anl_bb anl_ita red anl_bck_text_0">&nbsp;</td>
-				</tr>
-			</tbody>
-		</table>
-	<br>
-		<table class="anl_tbl anl_bt anl_br tbl_clps">
-			<tbody>
-				<tr>
-					<td class="anl_bl anl_br anl_bb anl_ac anl_bck_freq_1 anl_w110"><span
-						class="anl_variabla"><a
-							href="#">Q3</a></span></td>
-					<td colspan="5" class="anl_br anl_bb anl_al anl_bck_freq_1"><span
-						class="anl_variabla_label">Država</span></td>
-				</tr>
-				<tr>
-					<td class="anl_bl anl_br anl_bb anl_ac anl_bck anl_w110"><span
-						class="taCenter printHide iconHide"><a
-							href="#"><span
-								title="Sumarne frekvence (print, pdf, word, excel)"
-								class="sprites analysis_sums_gray"></span></a><a
-							href="#"><span
-								title="Dopolnjene frekvence (print, pdf, word, excel)"
-								class="sprites analysis_sums_new_gray"></span></a><a
-							href="#"><span
-								title="Opisne statistike (print, pdf, word, excel)"
-								class="sprites analysis_statistic_gray"></span></a><a
-							href="#"><span
-								title="Osnovne frekvence (print, pdf, word, excel)"
-								class="sprites analysis_frequencys"></span></a></span></td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_variabla_line">Odgovori</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Frekvenca</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Odstotek</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Veljavni</td>
-					<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Kumulativa</td>
-				</tr>
-				<tr >
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">1</div>
-						(Slovenija)</td>
-					<td class="anl_ac anl_br anl_bck_0_0">2</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-					<td class="anl_ar anl_bck_0_0 anl_pr10">22.2%</td>
-				</tr>
-				<tr >
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_1"><div class="anl_user_text_more">2</div>
-						(Hrvaška)</td>
-					<td class="anl_ac anl_br anl_bck_0_1">2</td>
-					<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">22.2%</td>
-					<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">22.2%</td>
-					<td class="anl_ar anl_bck_0_1 anl_pr10">44.4%</td>
-				</tr>
-				<tr >
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">3</div>
-						(Avstrija)</td>
-					<td class="anl_ac anl_br anl_bck_0_0">2</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-					<td class="anl_ar anl_bck_0_0 anl_pr10">66.7%</td>
-				</tr>
-				<tr >
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_1"><div class="anl_user_text_more">4</div>
-						(Italija)</td>
-					<td class="anl_ac anl_br anl_bck_0_1">1</td>
-					<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">11.1%</td>
-					<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">11.1%</td>
-					<td class="anl_ar anl_bck_0_1 anl_pr10">77.8%</td>
-				</tr>
-				<tr >
-					<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-					<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">5</div>
-						(Madžarska)</td>
-					<td class="anl_ac anl_br anl_bck_0_0">2</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-					<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-					<td class="anl_ar anl_bck_0_0 anl_pr10">100.0%</td>
-				</tr>
-				<tr class="anl_bb" >
-					<td class="anl_bl anl_br anl_al gray anl_ti_20 anl_bck_text_1">Veljavni<span
-						value="0" class="gray" >&nbsp;(<span
-							style="width: 12px; height: 12px"
-							class="sprites plus_orange folder_plusminus"></span>)
-					</span><span class="anl_gray displayNone"
-						>&nbsp;(<span
-							style="width: 12px; height: 12px"
-							class="sprites minus_orange folder_plusminus"></span>)
-					</span></td>
-					<td class="anl_br anl_al anl_ita red anl_bck_text_1">Skupaj</td>
-					<td class="anl_ita red anl_br anl_ac anl_bck_text_1">9</td>
-					<td class="anl_ita red anl_br anl_ar anl_bck_text_1 anl_pr10">100.0%</td>
-					<td class="anl_ita red anl_br anl_ar anl_bck_text_1 anl_pr10">100.0%</td>
-					<td class="anl_ita red anl_ac anl_bck_text_1">&nbsp;</td>
-				</tr>
-				<tr class="anl_dash_red_bb displayNone" >
-					<td class="anl_bl anl_al anl_br gray anl_ti_20 anl_bck_text_1">Manjkajoči</td>
-					<td class="anl_br anl_ita red anl_bck_text_1">Skupaj<span
-						class="printHide anl_ita anl_detail_percent"
-						>&nbsp;&nbsp;<a
-							href="#single_missing_8"> <span
-								style="width: 12px; height: 12px"
-								class="sprites plus_orange folder_plusminus"></span>
-						</a></span><span class="printHide anl_ita anl_detail_percent displayNone"
-						>&nbsp;&nbsp;<a
-							href="#single_missing_8"> <span
-								style="width: 12px; height: 12px"
-								class="sprites minus_orange folder_plusminus"></span>
-						</a></span>
-					<div
-							class="floatRight anl_w50 anl_dash_bl anl_dash_bt  anl_ac anl_detail_percent displayNone"
-							>100.0%</div>
-						<div
-							class="floatRight anl_w30 anl_dash_bt anl_ac anl_detail_percent displayNone"
-							></div>
-					</td>
-					<td class="anl_ac anl_br anl_detail_cnt anl_ita red anl_bck_text_1">0</td>
-					<td class="anl_ar anl_br anl_ita red anl_bck_text_1 anl_pr10">0.0%</td>
-					<td class="anl_ar anl_br anl_ita red anl_bck_text_1 anl_pr10"><span
-						>&nbsp;</span></td>
-					<td class="anl_ar anl_ita red anl_bck_text_1 anl_pr10">&nbsp;</td>
-				</tr>
-				<tr class="displayNone" >
-					<td
-						class="anl_bl anl_ac anl_dash_bt anl_bb red anl_ita anl_bck_text_0">SKUPAJ</td>
-					<td class="anl_dash_bt anl_br anl_bb anl_bck_text_0">&nbsp;</td>
-					<td
-						class="anl_ac anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0">9</td>
-					<td
-						class="anl_ar anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0 anl_pr10">100.0%</td>
-					<td
-						class="anl_ar anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0 anl_pr10">&nbsp;</td>
-					<td class="anl_ac anl_dash_bt anl_bb anl_ita red anl_bck_text_0">&nbsp;</td>
-				</tr>
-			</tbody>
-		</table>

admin/survey/classes/staticHtml/AnalizaPredogledMultitabele.html

@@ -1,330 +0,0 @@
-<!-- 	<br>Χ<sup>2</sup> = 4.500--><table gd2="undefined" sp2="149_0" sq2="6" gd1="undefined" sp1="153_0"
-		sq1="8" style="padding: 0px; margin: 0px; margin-top: 10px;"
-		class="anl_tbl_crosstab fullWidth fullHeight">
-		<colgroup>
-			<col style="width: auto; min-width: 100px;">
-			<col style="width: auto; min-width: 100px;">
-			<col style="width: 12%;">
-			<col style="width: 12%;">
-			<col style="width: 12%;">
-			<col style="width: 12%;">
-			<col style="width: 12%;">
-			<col style="width: 12%;">
-		</colgroup>
-		<tbody>
-			<tr>
-				<td rowspan="2" colspan="2">&nbsp;</td>
-				<td colspan="6" class="anl_bt anl_bl anl_br anl_ac rsdl_bck_title ctbCll"><span
-					class="anl_variabla"><a	title="Predogled vprašanja" href="/">Spol&nbsp;(Q2)</a></span>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="3" class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Moški<br>
-					( 1 )
-				</td>
-				<td colspan="3" class="anl_bt anl_bl anl_br anl_ac rsdl_bck_variable1 ctbCll">Ženska<br>
-					( 2 )
-				</td>
-			</tr>
-			<tr>
-				<td rowspan="2" colspan="2">&nbsp;</td>
-				<td colspan="3" class="anl_bt anl_bl anl_ac rsdl_bck_title ctbCll"><span
-					class="anl_variabla"><a	title="Predogled vprašanja" href="/">Starost&nbsp;(Q3)</a></span>
-				</td>
-				<td colspan="3" class="anl_bt anl_bl anl_br anl_ac rsdl_bck_title ctbCll"><span
-					class="anl_variabla"><a	title="Predogled vprašanja" href="/">Starost&nbsp;(Q3)</a></span>
-				</td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">pod 20<br>
-					( 1 )
-				</td>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">20 - 40<br>
-					( 2 )
-				</td>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">nad 40<br>
-					( 3 )
-				</td>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">pod 20<br>
-					( 1 )
-				</td>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">20 - 40<br>
-					( 2 )
-				</td>
-				<td class="anl_bt anl_bl anl_br anl_ac rsdl_bck_variable1 ctbCll">nad 40<br>
-					( 3 )
-				</td>
-			</tr>
-			
-						
-			<tr>
-				<td rowspan="5" class="anl_bt anl_bb anl_bl anl_ac rsdl_bck_title ctbCll"><span
-					class="anl_variabla"><a	title="Predogled vprašanja" href="/">Država&nbsp;(Q1)</a></span>
-				</td>
-				
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Slovenija<br>
-					( 1 )
-				</td>
-				<td v2="" v1="" n2="Moški" n1="Slovenija" k2="1" k1="1"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Hrvaška" k2="1" k1="2"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Avstrija" k2="1" k1="3"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Italija" k2="1" k1="4"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell anl_br"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Hrvaška<br>
-					( 2 )
-				</td>
-				<td v2="" v1="" n2="Moški" n1="Slovenija" k2="1" k1="1"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">4</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Hrvaška" k2="1" k1="2"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Avstrija" k2="1" k1="3"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Italija" k2="1" k1="4"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">2</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell anl_br"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Avstrija<br>
-					( 3 )
-				</td>
-				<td v2="" v1="" n2="Moški" n1="Slovenija" k2="1" k1="1"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Hrvaška" k2="1" k1="2"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Avstrija" k2="1" k1="3"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Italija" k2="1" k1="4"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">2</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell anl_br"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">3</td>
-							</tr>
-						</tbody>
-					</table></td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Italija<br>
-					( 4 )
-				</td>
-				<td v2="" v1="" n2="Moški" n1="Slovenija" k2="1" k1="1"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Hrvaška" k2="1" k1="2"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Avstrija" k2="1" k1="3"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Italija" k2="1" k1="4"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell anl_br"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Madžarska<br>
-					( 5 )
-				</td>
-				<td v2="" v1="" n2="Moški" n1="Slovenija" k2="1" k1="1"
-					class="ct_in_cell anl_bb"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Hrvaška" k2="1" k1="2"
-					class="ct_in_cell anl_bb"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">2</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Avstrija" k2="1" k1="3"
-					class="ct_in_cell anl_bb"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Italija" k2="1" k1="4"
-					class="ct_in_cell anl_bb"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell anl_bb"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell anl_br anl_bb"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac rsdl_bck0 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-			</tr>
-		</tbody>
-	</table>

admin/survey/classes/staticHtml/AnalizaPredogledNeodgovori.html

@@ -1,108 +0,0 @@
-	<table class="anl_tbl anl_ba">
-		<tbody>
-			<tr>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb anl_w70">Variabla<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Vprašanje<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Veljavni<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">-1 (Ni odgovoril)<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">-2 (Preskok (if))<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">-3 (Prekinjeno)<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">-4 (Naknadno vprasanje)<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">-5 (Prazna enota)<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">-97 (Neustrezno)<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">-98 (Zavrnil)<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">-99 (Ne vem)<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Ustrezni<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Vse enote<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">NS<span></span></td>
-			</tr>
-			
-			
-			<tr>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_ac anl_br anl_bt"><span class="anl_variabla"><a href="#">Q1</a></span></td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_bt">Spol</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">10</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">34</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_ac anl_bt">44</td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_ac anl_bt">53</td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0.8</td>
-			</tr>
-			<tr>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">23%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">77%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-			</tr>
-			
-			
-			<tr>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_ac anl_br anl_bt"><span class="anl_variabla"><a href="#">Q2</a></span></td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_bt">Dohodek</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">15</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">29</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_ac anl_bt">44</td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_ac anl_bt">53</td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0.7</td>
-			</tr>
-			<tr>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">34%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">66%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-			</tr>
-			
-			
-			<tr>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_ac anl_br anl_bt"><span class="anl_variabla"><a href="#">Q3</a></span></td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_bt">Država</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">6</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">38</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0</td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_ac anl_bt">44</td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_ac anl_bt">53</td>
-				<td rowspan="2" class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0.9</td>
-			</tr>
-			<tr>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">14%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">86%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0%</td>
-			</tr>
-			
-		</tbody>
-	</table>

admin/survey/classes/staticHtml/AnalizaPredogledOpisne.html

@@ -1,106 +0,0 @@
-	<table class="anl_tbl anl_ba">
-		<tbody>
-			<tr>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb anl_w70">&nbsp;<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb anl_w110">Spremenljivka<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Vprašanje<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Veljavno<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Št.
-					enot<span></span>
-				</td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Povprečje<br>/&nbsp;odstotek<span></span></td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Std.
-					Odklon<span></span>
-				</td>
-				<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Minimum<span></span></td>
-				<td class=" anl_ac anl_bck anl_variabla_line anl_bb">Maksimum<span></span></td>
-			</tr>
-			<tr>
-				<td class="anl_bck anl_ac anl_br anl_bt link_no_decoration"><span
-					class="taCenter printHide iconHide"><a
-						href="#"><span
-							title="Sumarne frekvence (print, pdf, word, excel)"
-							class="sprites analysis_sums_gray"></span></a><a
-						href="#"><span
-							title="Dopolnjene frekvence (print, pdf, word, excel)"
-							class="sprites analysis_sums_new_gray"></span></a><a
-						href="#"><span
-							title="Opisne statistike (print, pdf, word, excel)"
-							class="sprites analysis_statistic"></span></a><a
-						href="#"><span
-							title="Osnovne frekvence (print, pdf, word, excel)"
-							class="sprites analysis_frequencys_gray"></span></a></span></td>
-				<td class=" anl_bck_desc_1 anl_ac anl_br anl_bt"><span
-					class="anl_variabla"><a
-						href="#">Q1</a></span></td>
-				<td class=" anl_bck_desc_1 anl_br anl_bt">Spol</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">9</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">9</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">1.67</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0.50</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">1</td>
-				<td class=" anl_bck_desc_1 anl_ac anl_bt">2</td>
-			</tr>
-			<tr>
-				<td class="anl_bck anl_ac anl_br anl_bt link_no_decoration"><span
-					class="taCenter printHide iconHide"><a
-						href="#"><span
-							title="Sumarne frekvence (print, pdf, word, excel)"
-							class="sprites analysis_sums_gray"></span></a><a
-						href="#"><span
-							title="Opisne statistike (print, pdf, word, excel)"
-							class="sprites analysis_statistic"></span></a><a
-						href="#"><span
-							title="Osnovne frekvence (print, pdf, word, excel)"
-							class="sprites analysis_frequencys_gray"></span></a></span></td>
-				<td class=" anl_bck_desc_1 anl_ac anl_br anl_bt"><span
-					class="anl_variabla"><a
-						href="#">Q2</a></span></td>
-				<td class=" anl_bck_desc_1 anl_br anl_bt">Dohodek</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">&nbsp;</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">&nbsp;</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt"></td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt"></td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt"></td>
-				<td class=" anl_bck_desc_1 anl_ac anl_bt"></td>
-			</tr>
-			<tr>
-				<td class="anl_bck anl_ac anl_br  link_no_decoration">&nbsp;</td>
-				<td
-					class=" anl_bck_desc_2 anl_bt_dot  anl_ac anl_br link_no_decoration anl_variabla_sub">Q2</td>
-				<td class=" anl_bck_desc_2 anl_bt_dot  anl_tin anl_br">v €</td>
-				<td class=" anl_bck_desc_2 anl_bt_dot  anl_br anl_ac">9</td>
-				<td class=" anl_bck_desc_2 anl_bt_dot  anl_br anl_ac">9</td>
-				<td class=" anl_bck_desc_2 anl_bt_dot  anl_br anl_ac">1,400.00</td>
-				<td class=" anl_bck_desc_2 anl_bt_dot  anl_br anl_ac">342.78</td>
-				<td class=" anl_bck_desc_2 anl_bt_dot  anl_br anl_ac">900</td>
-				<td class=" anl_bck_desc_2 anl_bt_dot  anl_ac">2000</td>
-			</tr>
-			<tr>
-				<td class="anl_bck anl_ac anl_br anl_bt link_no_decoration"><span
-					class="taCenter printHide iconHide"><a
-						href="#"><span
-							title="Sumarne frekvence (print, pdf, word, excel)"
-							class="sprites analysis_sums_gray"></span></a><a
-						href="#"><span
-							title="Dopolnjene frekvence (print, pdf, word, excel)"
-							class="sprites analysis_sums_new_gray"></span></a><a
-						href="#"><span
-							title="Opisne statistike (print, pdf, word, excel)"
-							class="sprites analysis_statistic"></span></a><a
-						href="#"><span
-							title="Osnovne frekvence (print, pdf, word, excel)"
-							class="sprites analysis_frequencys_gray"></span></a></span></td>
-				<td class=" anl_bck_desc_1 anl_ac anl_br anl_bt"><span
-					class="anl_variabla"><a
-						href="#">Q3</a></span></td>
-				<td class=" anl_bck_desc_1 anl_br anl_bt">Država</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">9</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">9</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">2.89</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">1.54</td>
-				<td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">1</td>
-				<td class=" anl_bck_desc_1 anl_ac anl_bt">5</td>
-			</tr>
-		</tbody>
-	</table>

admin/survey/classes/staticHtml/AnalizaPredogledOpisne.min.html

@@ -1,2 +0,0 @@
-
-<table class="anl_tbl anl_ba"><tbody><tr><td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb anl_w70">&nbsp;<span></span></td><td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb anl_w110">Spremenljivka<span></span></td><td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Vprašanje<span></span></td><td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Veljavno<span></span></td><td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Št. enot<span></span></td><td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Povprečje<br>/&nbsp;odstotek<span></span></td><td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Std. Odklon<span></span></td><td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">Minimum<span></span></td><td class=" anl_ac anl_bck anl_variabla_line anl_bb">Maksimum<span></span></td></tr><tr><td class="anl_bck anl_ac anl_br anl_bt link_no_decoration"><span class="taCenter printHide iconHide"><a href="#"><span title="Sumarne frekvence (print, pdf, word, excel)" class="sprites analysis_sums_gray"></span></a><a href="#"><span title="Dopolnjene frekvence (print, pdf, word, excel)" class="sprites analysis_sums_new_gray"></span></a><a href="#"><span title="Opisne statistike (print, pdf, word, excel)" class="sprites analysis_statistic"></span></a><a href="#"><span title="Osnovne frekvence (print, pdf, word, excel)" class="sprites analysis_frequencys_gray"></span></a></span></td><td class=" anl_bck_desc_1 anl_ac anl_br anl_bt"><span class="anl_variabla"><a href="#">Q1</a></span></td><td class=" anl_bck_desc_1 anl_br anl_bt">Spol</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">9</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">9</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">1.67</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">0.50</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">1</td><td class=" anl_bck_desc_1 anl_ac anl_bt">2</td></tr><tr><td class="anl_bck anl_ac anl_br anl_bt link_no_decoration"><span class="taCenter printHide iconHide"><a href="#"><span title="Sumarne frekvence (print, pdf, word, excel)" class="sprites analysis_sums_gray"></span></a><a href="#"><span title="Opisne statistike (print, pdf, word, excel)" class="sprites analysis_statistic"></span></a><a href="#"><span title="Osnovne frekvence (print, pdf, word, excel)" class="sprites analysis_frequencys_gray"></span></a></span></td><td class=" anl_bck_desc_1 anl_ac anl_br anl_bt"><span class="anl_variabla"><a href="#">Q2</a></span></td><td class=" anl_bck_desc_1 anl_br anl_bt">Dohodek</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">&nbsp;</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">&nbsp;</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt"></td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt"></td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt"></td><td class=" anl_bck_desc_1 anl_ac anl_bt"></td></tr><tr><td class="anl_bck anl_ac anl_br link_no_decoration">&nbsp;</td><td class=" anl_bck_desc_2 anl_bt_dot anl_ac anl_br link_no_decoration anl_variabla_sub">Q2</td><td class=" anl_bck_desc_2 anl_bt_dot anl_tin anl_br">v €</td><td class=" anl_bck_desc_2 anl_bt_dot anl_br anl_ac">9</td><td class=" anl_bck_desc_2 anl_bt_dot anl_br anl_ac">9</td><td class=" anl_bck_desc_2 anl_bt_dot anl_br anl_ac">1,400.00</td><td class=" anl_bck_desc_2 anl_bt_dot anl_br anl_ac">342.78</td><td class=" anl_bck_desc_2 anl_bt_dot anl_br anl_ac">900</td><td class=" anl_bck_desc_2 anl_bt_dot anl_ac">2000</td></tr><tr><td class="anl_bck anl_ac anl_br anl_bt link_no_decoration"><span class="taCenter printHide iconHide"><a href="#"><span title="Sumarne frekvence (print, pdf, word, excel)" class="sprites analysis_sums_gray"></span></a><a href="#"><span title="Dopolnjene frekvence (print, pdf, word, excel)" class="sprites analysis_sums_new_gray"></span></a><a href="#"><span title="Opisne statistike (print, pdf, word, excel)" class="sprites analysis_statistic"></span></a><a href="#"><span title="Osnovne frekvence (print, pdf, word, excel)" class="sprites analysis_frequencys_gray"></span></a></span></td><td class=" anl_bck_desc_1 anl_ac anl_br anl_bt"><span class="anl_variabla"><a href="#">Q3</a></span></td><td class=" anl_bck_desc_1 anl_br anl_bt">Država</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">9</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">9</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">2.89</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">1.54</td><td class=" anl_bck_desc_1 anl_br anl_ac anl_bt">1</td><td class=" anl_bck_desc_1 anl_ac anl_bt">5</td></tr></tbody></table>

admin/survey/classes/staticHtml/AnalizaPredogledPovprecja.html

@@ -1,43 +0,0 @@
-	<table style="margin-top: 10px; min-width:370px" class="anl_tbl_crosstab">
-		<colgroup>
-			<col style="width: auto; min-width: 30px;">
-			<col style="width: auto; min-width: 30px;">
-			<col style="width: auto; min-width: 30px;">
-			<col style="width: auto; min-width: 30px;">
-		</colgroup>
-		<tbody>
-			<tr>
-				<td rowspan="2" class="anl_bt anl_bl anl_ac rsdl_bck_title ctbCll"><span
-					class="anl_variabla"><a
-						title="Predogled vprašanja" href="/">Spol</a></span></td>
-				<td colspan="2"
-					class="anl_bt anl_bl anl_br anl_ac rsdl_bck_title ctbCll"><span
-					class="anl_variabla"><a
-						title="Predogled vprašanja" href="/">Dohodek</a></span><br>cv €</td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Povprečje</td>
-				<td
-					class="anl_bl anl_bt anl_br anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">Št.
-					enot</td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Moški&nbsp;(
-					1 )</td>
-				<td v2="" v1="" n2="Moški" n1="" k2="1" k1="" class="ct_in_cell">1,500.000</td>
-				<td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 crostabSuma">3</td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Ženski&nbsp;(
-					2 )</td>
-				<td v2="" v1="" n2="Ženski" n1="" k2="2" k1="" class="ct_in_cell">1,350.000</td>
-				<td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 crostabSuma">6</td>
-			</tr>
-			<tr>
-				<td
-					class="anl_bb anl_bt anl_bl anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">Skupaj</td>
-				<td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">1,400.000</td>
-				<td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">9</td>
-			</tr>
-		</tbody>
-	</table>

admin/survey/classes/staticHtml/AnalizaPredogledPovprecja.min.html

@@ -1,2 +0,0 @@
-
-<table style="margin-top: 10px; min-width:370px" class="anl_tbl_crosstab"><colgroup><col style="width: auto; min-width: 30px;"><col style="width: auto; min-width: 30px;"><col style="width: auto; min-width: 30px;"><col style="width: auto; min-width: 30px;"></colgroup><tbody><tr><td rowspan="2" class="anl_bt anl_bl anl_ac rsdl_bck_title ctbCll"><span class="anl_variabla"><a title="Predogled vprašanja" href="/">Spol</a></span></td><td colspan="2" class="anl_bt anl_bl anl_br anl_ac rsdl_bck_title ctbCll"><span class="anl_variabla"><a title="Predogled vprašanja" href="/">Dohodek</a></span><br>cv €</td></tr><tr><td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Povprečje</td><td class="anl_bl anl_bt anl_br anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">Št. enot</td></tr><tr><td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Moški&nbsp;( 1 )</td><td v2="" v1="" n2="Moški" n1="" k2="1" k1="" class="ct_in_cell">1,500.000</td><td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 crostabSuma">3</td></tr><tr><td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Ženski&nbsp;( 2 )</td><td v2="" v1="" n2="Ženski" n1="" k2="2" k1="" class="ct_in_cell">1,350.000</td><td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 crostabSuma">6</td></tr><tr><td class="anl_bb anl_bt anl_bl anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">Skupaj</td><td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">1,400.000</td><td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">9</td></tr></tbody></table>

admin/survey/classes/staticHtml/AnalizaPredogledRazbitje.html

@@ -1,62 +0,0 @@
-<div class="breakTableDiv" id="150_0">
-	<table>
-		<tbody>
-			<tr>
-				<th rowspan="2"><span class="anl_variabla"><a
-						title="" href="#">Spol(Q1)</a></span></th>
-				<th colspan="1"><span class="anl_variabla"><a
-						title="" href="#">Dohodek(Q2)</a></span></th>
-			</tr>
-			<tr>
-				<th class="sub">v €(Q2)</th>
-			</tr>
-			<tr>
-				<th>Moški</th>
-				<td>1,500.00</td>
-			</tr>
-			<tr>
-				<th>Ženski</th>
-				<td>1,350.00</td>
-			</tr>
-		</tbody>
-	</table>
-</div>
-<br>
-<div class="breakTableDiv" id="153_0">
-	<table>
-		<tbody>
-			<tr>
-				<th rowspan="2"><span class="anl_variabla"><a
-						title="" href="#">Spol(Q1)</a></span></th>
-				<th colspan="6"><span class="anl_variabla"><a
-						title="" href="#">Država(Q3)</a></span></th>
-			</tr>
-			<tr>
-				<th class="sub">Slovenija(1)</th>
-				<th class="sub">Hrvaška(2)</th>
-				<th class="sub">Avstrija(3)</th>
-				<th class="sub">Italija(4)</th>
-				<th class="sub">Madžarska(5)</th>
-				<th>povprečje</th>
-			</tr>
-			<tr>
-				<th>Moški</th>
-				<td>1</td>
-				<td>0</td>
-				<td>1</td>
-				<td>1</td>
-				<td>0</td>
-				<td>2.67</td>
-			</tr>
-			<tr>
-				<th>Ženski</th>
-				<td>1</td>
-				<td>2</td>
-				<td>1</td>
-				<td>0</td>
-				<td>2</td>
-				<td>3.00</td>
-			</tr>
-		</tbody>
-	</table>
-</div>

admin/survey/classes/staticHtml/AnalizaPredogledRazbitje.min.html

@@ -1,2 +0,0 @@
-
-<div class="breakTableDiv" id="150_0"><table><tbody><tr><th rowspan="2"><span class="anl_variabla"><a title="" href="#">Spol(Q1)</a></span></th><th colspan="1"><span class="anl_variabla"><a title="" href="#">Dohodek(Q2)</a></span></th></tr><tr><th class="sub">v €(Q2)</th></tr><tr><th>Moški</th><td>1,500.00</td></tr><tr><th>Ženski</th><td>1,350.00</td></tr></tbody></table></div><br><div class="breakTableDiv" id="153_0"><table><tbody><tr><th rowspan="2"><span class="anl_variabla"><a title="" href="#">Spol(Q1)</a></span></th><th colspan="6"><span class="anl_variabla"><a title="" href="#">Država(Q3)</a></span></th></tr><tr><th class="sub">Slovenija(1)</th><th class="sub">Hrvaška(2)</th><th class="sub">Avstrija(3)</th><th class="sub">Italija(4)</th><th class="sub">Madžarska(5)</th><th>povprečje</th></tr><tr><th>Moški</th><td>1</td><td>0</td><td>1</td><td>1</td><td>0</td><td>2.67</td></tr><tr><th>Ženski</th><td>1</td><td>2</td><td>1</td><td>0</td><td>2</td><td>3.00</td></tr></tbody></table></div>

admin/survey/classes/staticHtml/AnalizaPredogledSumarnik.html

@@ -1,303 +0,0 @@
-<table class="anl_tbl anl_bt anl_br tbl_clps">
-	<tbody>
-		<tr>
-			<td class="anl_bl anl_br anl_bb anl_ac anl_bck_freq_1 anl_w110"><span
-				class="anl_variabla"><a href="#">Q1</a></span></td>
-			<td colspan="5" class="anl_br anl_bb anl_al anl_bck_freq_1"><span
-				class="anl_variabla_label">Spol</span></td>
-		</tr>
-		<tr>
-			<td class="anl_bl anl_br anl_bb anl_ac anl_bck anl_w110"><span
-				class="taCenter printHide iconHide"><a href="#"><span
-						title="Sumarne frekvence (print, pdf, word, excel)"
-						class="sprites analysis_sums_gray"></span></a><a href="#"><span
-						title="Dopolnjene frekvence (print, pdf, word, excel)"
-						class="sprites analysis_sums_new"></span></a><a href="#"><span
-						title="Opisne statistike (print, pdf, word, excel)"
-						class="sprites analysis_statistic_gray"></span></a><a href="#"><span
-						title="Osnovne frekvence (print, pdf, word, excel)"
-						class="sprites analysis_frequencys_gray"></span></a></span></td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_variabla_line">Odgovori</td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Frekvenca</td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Odstotek</td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Veljavni</td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Kumulativa</td>
-		</tr>
-		<tr >
-			<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-			<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">1</div>
-				(Moški)</td>
-			<td class="anl_ac anl_br anl_bck_0_0">3</td>
-			<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">33.3%</td>
-			<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">33.3%</td>
-			<td class="anl_ar anl_bck_0_0 anl_pr10">33.3%</td>
-		</tr>
-		<tr >
-			<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-			<td class="anl_br anl_bck_0_1"><div class="anl_user_text_more">2</div>
-				(Ženski)</td>
-			<td class="anl_ac anl_br anl_bck_0_1">6</td>
-			<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">66.7%</td>
-			<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">66.7%</td>
-			<td class="anl_ar anl_bck_0_1 anl_pr10">100.0%</td>
-		</tr>
-		<tr class="anl_bb">
-			<td class="anl_bl anl_br anl_al gray anl_ti_20 anl_bck_text_1">Veljavni<span
-				value="0" class=" gray" >&nbsp;(<span
-					style="width: 12px; height: 12px"
-					class="sprites plus_orange folder_plusminus"></span>)
-			</span><span class=" gray displayNone"
-				>&nbsp;(<span
-					style="width: 12px; height: 12px"
-					class="sprites minus_orange folder_plusminus"></span>)
-			</span></td>
-			<td class="anl_br anl_al anl_ita red anl_bck_text_1">Skupaj</td>
-			<td class="anl_ita red anl_br anl_ac anl_bck_text_1">9</td>
-			<td class="anl_ita red anl_br anl_ar anl_bck_text_1 anl_pr10">100.0%</td>
-			<td class="anl_ita red anl_br anl_ar anl_bck_text_1 anl_pr10">100.0%</td>
-			<td class="anl_ita red anl_ac anl_bck_text_1">&nbsp;</td>
-		</tr>
-		<tr class="anl_dash_red_bb displayNone" >
-			<td class="anl_bl anl_al anl_br gray anl_ti_20 anl_bck_text_1">Manjkajoči</td>
-			<td class="anl_br anl_ita red anl_bck_text_1">Skupaj<span
-				class="printHide anl_ita anl_detail_percent" >&nbsp;&nbsp;<a
-					href="#single_missing_6"> <span
-						style="width: 12px; height: 12px"
-						class="sprites plus_orange folder_plusminus"></span>
-				</a></span><span class="printHide anl_ita anl_detail_percent displayNone"
-				>&nbsp;&nbsp;<a
-					href="#single_missing_6"> <span
-						style="width: 12px; height: 12px"
-						class="sprites minus_orange folder_plusminus"></span>
-				</a></span>
-				<div
-					class="floatRight anl_w50 anl_dash_bl anl_dash_bt  anl_ac anl_detail_percent displayNone"
-					>100.0%</div>
-				<div
-					class="floatRight anl_w30 anl_dash_bt anl_ac anl_detail_percent displayNone"
-					></div>
-			</td>
-			<td class="anl_ac anl_br anl_detail_cnt anl_ita red anl_bck_text_1">0</td>
-			<td class="anl_ar anl_br anl_ita red anl_bck_text_1 anl_pr10">0.0%</td>
-			<td class="anl_ar anl_br anl_ita red anl_bck_text_1 anl_pr10"><span
-				>&nbsp;</span></td>
-			<td class="anl_ar anl_ita red anl_bck_text_1 anl_pr10">&nbsp;</td>
-		</tr>
-		<tr class="displayNone" >
-			<td
-				class="anl_bl anl_ac anl_dash_bt anl_bb red anl_ita anl_bck_text_0">SKUPAJ</td>
-			<td class="anl_dash_bt anl_br anl_bb anl_bck_text_0">&nbsp;</td>
-			<td
-				class="anl_ac anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0">9</td>
-			<td
-				class="anl_ar anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0 anl_pr10">100.0%</td>
-			<td
-				class="anl_ar anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0 anl_pr10">&nbsp;</td>
-			<td class="anl_ac anl_dash_bt anl_bb anl_ita red anl_bck_text_0">&nbsp;</td>
-		</tr>
-		<tr>
-			<td colspan="6"
-				style="font-size: 1px; height: 2px; line-height: 3px; border-right: 1px solid white;"
-				class="cll_clps">&nbsp;</td>
-		</tr>
-		<tr>
-			<td colspan="2" class="anl_br">&nbsp;</td>
-			<td
-				class="anl_bb anl_bt anl_br anl_p5 anl_ac anl_variabla_line anl_bck">Povprečje</td>
-			<td class="anl_bb anl_bt anl_br anl_ac anl_bck">1.67</td>
-			<td
-				class="anl_bb anl_bt anl_br anl_p5 anl_ac anl_variabla_line anl_bck">Std.
-				Odklon</td>
-			<td class="anl_bb anl_bt anl_ac anl_bck">0.50</td>
-		</tr>
-	</tbody>
-</table>
-<br />
-<table class="anl_tbl anl_bt anl_br anl_bb tbl_clps">
-	<tbody>
-		<tr>
-			<td class="anl_bl anl_br anl_bb anl_ac anl_bck_freq_1 anl_w110"><span
-				class="anl_variabla"><a href="#">Q2</a></span></td>
-			<td colspan="7" class="anl_br anl_bb anl_al anl_bck_freq_1"><span
-				class="anl_variabla_label">Dohodek</span></td>
-		</tr>
-		<tr>
-			<td class="anl_bl anl_br anl_bb anl_ac anl_bck"><span
-				class="taCenter printHide iconHide"><a href="#"><span
-						title="Sumarne frekvence (print, pdf, word, excel)"
-						class="sprites analysis_sums"></span></a><a href="#"><span
-						title="Opisne statistike (print, pdf, word, excel)"
-						class="sprites analysis_statistic_gray"></span></a><a href="#"><span
-						title="Osnovne frekvence (print, pdf, word, excel)"
-						class="sprites analysis_frequencys_gray"></span></a></span></td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_variabla_line">Podvprašanja</td>
-			<td
-				class="anl_br anl_ac anl_bck anl_bb anl_w70 anl_legend anl_variabla_line">Veljavno</td>
-			<td
-				class="anl_br anl_ac anl_bck anl_bb anl_w70 anl_legend anl_variabla_line">Št.
-				enot</td>
-			<td
-				class="anl_br anl_ac anl_bck anl_bb anl_w70 anl_legend anl_variabla_line">Povprečje</td>
-			<td
-				class="anl_br anl_ac anl_bck anl_bb anl_w70 anl_legend anl_variabla_line">Std.
-				Odklon</td>
-			<td
-				class="anl_br anl_ac anl_bck anl_bb anl_w70 anl_legend anl_variabla_line">Minimum</td>
-			<td
-				class="anl_bck anl_ac anl_bb anl_w70 anl_legend anl_variabla_line">Maksimum</td>
-		</tr>
-		<tr>
-			<td
-				class="anl_bck_desc_2 anl_ac anl_bl anl_br anl_variabla_sub anl_bt_dot">Q2_1</td>
-			<td class="anl_bck_desc_2 anl_al anl_br anl_bt_dot">v €</td>
-			<td class="anl_bck_desc_2 anl_ac anl_br anl_bl anl_bt_dot">9</td>
-			<td class="anl_bck_desc_2 anl_ac anl_br anl_bt_dot">9</td>
-			<td class="anl_bck_desc_2 anl_ac anl_br anl_bt_dot">1,400.00</td>
-			<td class="anl_bck_desc_2 anl_ac anl_br anl_bt_dot">342.78</td>
-			<td class="anl_bck_desc_2 anl_ac anl_br anl_bt_dot">900</td>
-			<td class="anl_bck_desc_2 anl_ac anl_br anl_bt_dot">2000</td>
-		</tr>
-	</tbody>
-</table>
-<br>
-<table class="anl_tbl anl_bt anl_br tbl_clps">
-	<tbody>
-		<tr>
-			<td class="anl_bl anl_br anl_bb anl_ac anl_bck_freq_1 anl_w110"><span
-				class="anl_variabla"><a href="#">Q3</a></span></td>
-			<td colspan="5" class="anl_br anl_bb anl_al anl_bck_freq_1"><span
-				class="anl_variabla_label">Država</span></td>
-		</tr>
-		<tr>
-			<td class="anl_bl anl_br anl_bb anl_ac anl_bck anl_w110"><span
-				class="taCenter printHide iconHide"><a href="#"><span
-						title="Sumarne frekvence (print, pdf, word, excel)"
-						class="sprites analysis_sums_gray"></span></a><a href="#"><span
-						title="Dopolnjene frekvence (print, pdf, word, excel)"
-						class="sprites analysis_sums_new"></span></a><a href="#"><span
-						title="Opisne statistike (print, pdf, word, excel)"
-						class="sprites analysis_statistic_gray"></span></a><a href="#"><span
-						title="Osnovne frekvence (print, pdf, word, excel)"
-						class="sprites analysis_frequencys_gray"></span></a></span></td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_variabla_line">Odgovori</td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Frekvenca</td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Odstotek</td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Veljavni</td>
-			<td class="anl_br anl_bb anl_ac anl_bck anl_w70 anl_variabla_line">Kumulativa</td>
-		</tr>
-		<tr>
-			<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-			<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">1</div>
-				(Slovenija)</td>
-			<td class="anl_ac anl_br anl_bck_0_0">2</td>
-			<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-			<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-			<td class="anl_ar anl_bck_0_0 anl_pr10">22.2%</td>
-		</tr>
-		<tr>
-			<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-			<td class="anl_br anl_bck_0_1"><div class="anl_user_text_more">2</div>
-				(Hrvaška)</td>
-			<td class="anl_ac anl_br anl_bck_0_1">2</td>
-			<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">22.2%</td>
-			<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">22.2%</td>
-			<td class="anl_ar anl_bck_0_1 anl_pr10">44.4%</td>
-		</tr>
-		<tr>
-			<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-			<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">3</div>
-				(Avstrija)</td>
-			<td class="anl_ac anl_br anl_bck_0_0">2</td>
-			<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-			<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-			<td class="anl_ar anl_bck_0_0 anl_pr10">66.7%</td>
-		</tr>
-		<tr >
-			<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-			<td class="anl_br anl_bck_0_1"><div class="anl_user_text_more">4</div>
-				(Italija)</td>
-			<td class="anl_ac anl_br anl_bck_0_1">1</td>
-			<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">11.1%</td>
-			<td class="anl_ar anl_br anl_bck_0_1 anl_pr10">11.1%</td>
-			<td class="anl_ar anl_bck_0_1 anl_pr10">77.8%</td>
-		</tr>
-		<tr >
-			<td class="anl_bl anl_ac anl_br gray">&nbsp;</td>
-			<td class="anl_br anl_bck_0_0"><div class="anl_user_text_more">5</div>
-				(Madžarska)</td>
-			<td class="anl_ac anl_br anl_bck_0_0">2</td>
-			<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-			<td class="anl_ar anl_br anl_bck_0_0 anl_pr10">22.2%</td>
-			<td class="anl_ar anl_bck_0_0 anl_pr10">100.0%</td>
-		</tr>
-		<tr class="anl_bb" >
-			<td class="anl_bl anl_br anl_al gray anl_ti_20 anl_bck_text_1">Veljavni<span
-				value="0" class="gray" >&nbsp;(<span
-					style="width: 12px; height: 12px"
-					class="sprites plus_orange folder_plusminus"></span>)
-			</span><span class="gray displayNone"
-				>&nbsp;(<span
-					style="width: 12px; height: 12px"
-					class="sprites minus_orange folder_plusminus"></span>)
-			</span></td>
-			<td class="anl_br anl_al anl_ita red anl_bck_text_1">Skupaj</td>
-			<td class="anl_ita red anl_br anl_ac anl_bck_text_1">9</td>
-			<td class="anl_ita red anl_br anl_ar anl_bck_text_1 anl_pr10">100.0%</td>
-			<td class="anl_ita red anl_br anl_ar anl_bck_text_1 anl_pr10">100.0%</td>
-			<td class="anl_ita red anl_ac anl_bck_text_1">&nbsp;</td>
-		</tr>
-		<tr class="anl_dash_red_bb displayNone" >
-			<td class="anl_bl anl_al anl_br gray anl_ti_20 anl_bck_text_1">Manjkajoči</td>
-			<td class="anl_br anl_ita red anl_bck_text_1">Skupaj<span
-				class="printHide anl_ita anl_detail_percent" >&nbsp;&nbsp;<a
-					href="#single_missing_8"> <span
-						style="width: 12px; height: 12px"
-						class="sprites plus_orange folder_plusminus"></span>
-				</a></span><span class="printHide anl_ita anl_detail_percent displayNone"
-				>&nbsp;&nbsp;<a
-					href="#single_missing_8"> <span
-						style="width: 12px; height: 12px"
-						class="sprites minus_orange folder_plusminus"></span>
-				</a></span>
-				<div
-					class="floatRight anl_w50 anl_dash_bl anl_dash_bt  anl_ac anl_detail_percent displayNone"
-					>100.0%</div>
-				<div
-					class="floatRight anl_w30 anl_dash_bt anl_ac anl_detail_percent displayNone"
-					></div>
-			</td>
-			<td class="anl_ac anl_br anl_detail_cnt anl_ita red anl_bck_text_1">0</td>
-			<td class="anl_ar anl_br anl_ita red anl_bck_text_1 anl_pr10">0.0%</td>
-			<td class="anl_ar anl_br anl_ita red anl_bck_text_1 anl_pr10"><span
-				>&nbsp;</span></td>
-			<td class="anl_ar anl_ita red anl_bck_text_1 anl_pr10">&nbsp;</td>
-		</tr>
-		<tr class="displayNone" >
-			<td
-				class="anl_bl anl_ac anl_dash_bt anl_bb red anl_ita anl_bck_text_0">SKUPAJ</td>
-			<td class="anl_dash_bt anl_br anl_bb anl_bck_text_0">&nbsp;</td>
-			<td
-				class="anl_ac anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0">9</td>
-			<td
-				class="anl_ar anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0 anl_pr10">100.0%</td>
-			<td
-				class="anl_ar anl_dash_bt anl_br anl_bb anl_ita red anl_bck_text_0 anl_pr10">&nbsp;</td>
-			<td class="anl_ac anl_dash_bt anl_bb anl_ita red anl_bck_text_0">&nbsp;</td>
-		</tr>
-		<tr>
-			<td colspan="6"
-				style="font-size: 1px; height: 2px; line-height: 3px; border-right: 1px solid white;"
-				class="cll_clps">&nbsp;</td>
-		</tr>
-		<tr>
-			<td colspan="2" class="anl_br">&nbsp;</td>
-			<td
-				class="anl_bb anl_bt anl_br anl_p5 anl_ac anl_variabla_line anl_bck">Povprečje</td>
-			<td class="anl_bb anl_bt anl_br anl_ac anl_bck">2.89</td>
-			<td
-				class="anl_bb anl_bt anl_br anl_p5 anl_ac anl_variabla_line anl_bck">Std.
-				Odklon</td>
-			<td class="anl_bb anl_bt anl_ac anl_bck">1.54</td>
-		</tr>
-	</tbody>
-</table>

admin/survey/classes/staticHtml/AnalizaPredogledTTest.html

@@ -1,41 +0,0 @@
-	<table border="0" class="ttestTable">
-		<tbody>
-			<tr>
-				<td rowspan="2" class="lightGreen"><span class="anl_variabla"><a
-						href="#">(Q1)Spol</a></span></td>
-				<td colspan="8" class="lightGreen"><span class="anl_variabla"><a
-						href="#">(Q2) v €</a></span></td>
-			</tr>
-			<tr>
-				<th>n</th>
-				<th><span class="avg">x</span></th>
-				<th>s²</th>
-				<th>se(<span class="avg">x</span>)
-				</th>
-				<th>±1,96×se(<span class="avg">x</span>)
-				</th>
-				<th>d</th>
-				<th>se(d)</th>
-				<th>t</th>
-			</tr>
-			<tr>
-				<td class="lightGreen">Moški</td>
-				<td>3</td>
-				<td>1,500.000</td>
-				<td>200.000</td>
-				<td>115.470</td>
-				<td>226.321</td>
-				<td rowspan="2">150.000</td>
-				<td rowspan="2">201.246</td>
-				<td rowspan="2">0.745</td>
-			</tr>
-			<tr>
-				<td class="lightGreen">Ženski</td>
-				<td>6</td>
-				<td>1,350.000</td>
-				<td>403.733</td>
-				<td>164.823</td>
-				<td>323.053</td>
-			</tr>
-		</tbody>
-	</table>

admin/survey/classes/staticHtml/AnalizaPredogledTTest.min.html

@@ -1,2 +0,0 @@
-
-<table border="0" class="ttestTable"><tbody><tr><td rowspan="2" class="lightGreen"><span class="anl_variabla"><a href="#">(Q1)Spol</a></span></td><td colspan="8" class="lightGreen"><span class="anl_variabla"><a href="#">(Q2) v €</a></span></td></tr><tr><th>n</th><th><span class="avg">x</span></th><th>s²</th><th>se(<span class="avg">x</span>) </th><th>±1,96×se(<span class="avg">x</span>) </th><th>d</th><th>se(d)</th><th>t</th></tr><tr><td class="lightGreen">Moški</td><td>3</td><td>1,500.000</td><td>200.000</td><td>115.470</td><td>226.321</td><td rowspan="2">150.000</td><td rowspan="2">201.246</td><td rowspan="2">0.745</td></tr><tr><td class="lightGreen">Ženski</td><td>6</td><td>1,350.000</td><td>403.733</td><td>164.823</td><td>323.053</td></tr></tbody></table>

admin/survey/classes/staticHtml/AnalizaPredogledTabele.html

@@ -1,209 +0,0 @@
-<!-- 	<br>Χ<sup>2</sup> = 4.500--><table gd2="undefined" sp2="149_0" sq2="6" gd1="undefined" sp1="153_0"
-		sq1="8" style="padding: 0px; margin: 0px; margin-top: 10px;"
-		class="anl_tbl_crosstab fullWidth fullHeight">
-		<colgroup>
-			<col style="width: auto; min-width: 100px;">
-			<col style="width: 20%;">
-			<col style="width: 20%;">
-			<col style="width: 20%;">
-			<col style="width: 20%;">
-			<col style="width: 20%;">
-			<col style="width: auto;">
-		</colgroup>
-		<tbody>
-			<tr>
-				<td rowspan="2" class="anl_bt anl_bl anl_ac rsdl_bck_title ctbCll"><span
-					class="anl_variabla"><a
-						title="Predogled vprašanja" href="/">Spol&nbsp;(Q1)</a></span></td>
-				<td colspan="5" class="anl_bt anl_bl anl_ac rsdl_bck_title ctbCll"><span
-					class="anl_variabla"><a
-						title="Predogled vprašanja" href="/">Država&nbsp;(Q3)</a></span></td>
-				<td class="anl_bl">&nbsp;</td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Slovenija<br>
-					( 1 )
-				</td>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Hrvaška<br>
-					( 2 )
-				</td>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Avstrija<br>
-					( 3 )
-				</td>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Italija<br>
-					( 4 )
-				</td>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Madžarska<br>
-					( 5 )
-				</td>
-				<td
-					class="anl_bl anl_bt anl_br anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">Skupaj</td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Moški<br>
-					( 1 )
-				</td>
-				<td v2="" v1="" n2="Moški" n1="Slovenija" k2="1" k1="1"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Hrvaška" k2="1" k1="2"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck4 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Avstrija" k2="1" k1="3"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Italija" k2="1" k1="4"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck1 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Moški" n1="Madžarska" k2="1" k1="5"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck4 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 anl_bb"><table
-						style="padding: 0px; margin: 0px;"
-						class="anl_tbl_crosstab fullWidth fullHeight">
-						<tbody>
-							<tr>
-								<td colspan="0" class="anl_ac ctbCll crostabSuma">3</td>
-							</tr>
-						</tbody>
-					</table></td>
-			</tr>
-			<tr>
-				<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">Ženski<br>
-					( 2 )
-				</td>
-				<td v2="" v1="" n2="Ženski" n1="Slovenija" k2="2" k1="1"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Ženski" n1="Hrvaška" k2="2" k1="2"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck1 ctbCll">2</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Ženski" n1="Avstrija" k2="2" k1="3"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck0 ctbCll">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Ženski" n1="Italija" k2="2" k1="4"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck4 ctbCll">0</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td v2="" v1="" n2="Ženski" n1="Madžarska" k2="2" k1="5"
-					class="ct_in_cell"><table class="ct_in_tbl">
-						<tbody>
-							<tr>
-								<td class="anl_ac  rsdl_bck1 ctbCll">2</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 anl_bb"><table
-						style="padding: 0px; margin: 0px;"
-						class="anl_tbl_crosstab fullWidth fullHeight">
-						<tbody>
-							<tr>
-								<td colspan="0" class="anl_ac ctbCll crostabSuma">6</td>
-							</tr>
-						</tbody>
-					</table></td>
-			</tr>
-			<tr>
-				<td
-					class="anl_bb anl_bt anl_bl anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">Skupaj</td>
-				<td class="anl_ac anl_bb anl_bt anl_bl rsdl_bck0"><table
-						style="padding: 0px; margin: 0px;"
-						class="anl_tbl_crosstab fullWidth fullHeight">
-						<tbody>
-							<tr>
-								<td colspan="0" class="anl_ac ctbCll crostabSuma">2</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td class="anl_ac anl_bb anl_bt anl_bl rsdl_bck0"><table
-						style="padding: 0px; margin: 0px;"
-						class="anl_tbl_crosstab fullWidth fullHeight">
-						<tbody>
-							<tr>
-								<td colspan="0" class="anl_ac ctbCll crostabSuma">2</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td class="anl_ac anl_bb anl_bt anl_bl rsdl_bck0"><table
-						style="padding: 0px; margin: 0px;"
-						class="anl_tbl_crosstab fullWidth fullHeight">
-						<tbody>
-							<tr>
-								<td colspan="0" class="anl_ac ctbCll crostabSuma">2</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td class="anl_ac anl_bb anl_bt anl_bl rsdl_bck0"><table
-						style="padding: 0px; margin: 0px;"
-						class="anl_tbl_crosstab fullWidth fullHeight">
-						<tbody>
-							<tr>
-								<td colspan="0" class="anl_ac ctbCll crostabSuma">1</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td class="anl_ac anl_bb anl_bt anl_bl rsdl_bck0"><table
-						style="padding: 0px; margin: 0px;"
-						class="anl_tbl_crosstab fullWidth fullHeight">
-						<tbody>
-							<tr>
-								<td colspan="0" class="anl_ac ctbCll crostabSuma">2</td>
-							</tr>
-						</tbody>
-					</table></td>
-				<td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0"><table
-						style="padding: 0px; margin: 0px;"
-						class="anl_tbl_crosstab fullWidth fullHeight">
-						<tbody>
-							<tr>
-								<td colspan="0" class="anl_ac ctbCll crostabSuma">9</td>
-							</tr>
-						</tbody>
-					</table></td>
-			</tr>
-		</tbody>
-	</table>

admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php

@@ -86,7 +86,7 @@ class SurveyAnalysisArchive {
 		
 		$users = array();		
 		$qry = "SELECT saa.*, UNIX_TIMESTAMP(saa.date) as insert_date, UNIX_TIMESTAMP(saa.duration) as duration_d, DATEDIFF(saa.duration, CURDATE()) as days_left"
-			# da ne delamo vlkege poizvedbe kadar ni potrebno 
+			# da ne delamo velike poizvedbe, kadar ni potrebno 
 			. ($defaultFields['insert'] ? " , us1.name as iname, us1.surname as isurname, us1.email as iemail " : "" )
 			. ($defaultFields['edit'] ? " , us2.name as ename, us2.surname as esurname, us2.email as eemail " : "" )
 			. " FROM srv_analysis_archive as saa "
@@ -96,73 +96,68 @@ class SurveyAnalysisArchive {
 		
 		$s = sisplet_query($qry);
 		if (mysqli_num_rows($s) > 0 ) {
-		
+
-                    if($defaultFields['create_new']){
 			echo '<fieldset>';
 			echo '<legend>'.$lang['srv_archive_analysis'].'</legend>';
 			
-			echo $lang['srv_analiza_archive_generate_quick'];
+			echo '<p>'.$lang['srv_analiza_archive_note1'].'</p>';
-			
+			echo '<p class="top16 bottom16">'.$lang['srv_analiza_archive_generate_quick'].'</p>';
-			echo '</fieldset>';
+
-			
+			echo '<div class="button_holder">';
-			echo '<br />';
+			echo '<button class="medium blue" type="button" onclick="doArchiveAnaliza();">'.$lang['srv_analiza_archive_generate_quick_button'].'</button>';
-                    }
+			echo '</div>';
-			
+
-			echo '<table class="arch_tbl anl_bt anl_bl" style="width:100%">';
+			echo '<p class="bold">'.$lang['srv_analiza_archive_list'].'</p>';
+
+			echo '<div class="table-horizontal-scroll-wrapper1">';
+			echo '<div class="table-horizontal-scroll-wrapper2">';
+
+			echo '<table>';
 			echo '<tr>';
-			if ($defaultFields['delete'])
+			
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_delete'].'</td>';
+			//Stolpec za ikone - prazen header
-			if ($defaultFields['edit'])
+			echo '<th></th>';
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_edit'].'</td>';
+			
-			if ($defaultFields['email'])
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_send'].'</td>';
 			if ($defaultFields['name'])
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_name'].'</td>';
+				echo '<th>'.$lang['srv_analiza_archive_lbl_name'].'</th>';
 			if ($defaultFields['note'])
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_note'].'</td>';
+				echo '<th>'.$lang['srv_analiza_archive_lbl_note'].'</th>';
-			if ($defaultFields['access'])
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_access'].'</td>';
 			if ($defaultFields['type'])
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_type'].'</td>';
+				echo '<th>'.$lang['srv_analiza_archive_lbl_type'].'</th>';
 			if ($defaultFields['date'])			
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_date'].'</td>';
+				echo '<th>'.$lang['srv_analiza_archive_lbl_date'].'</th>';
 			if ($defaultFields['duration'])			
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_duration'].'</td>';
+				echo '<th>'.$lang['srv_analiza_archive_lbl_duration'].'</th>';
 			if ($defaultFields['insert'])			
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_author'].'</td>';
+				echo '<th>'.$lang['srv_analiza_archive_lbl_author'].'</th>';
 			if ($defaultFields['edit'])			
-				echo '<td class="anl_bck gray anl_bb anl_br anl_ac">'.$lang['srv_analiza_archive_lbl_editor'].'</td>';
+				echo '<th>'.$lang['srv_analiza_archive_lbl_editor'].'</th>';
+			if ($defaultFields['access'])
+			echo '<th>'.$lang['srv_analiza_archive_lbl_access'].'</th>';
+			
 			echo '</tr>';
 			
 			while ($row = mysqli_fetch_assoc($s)) {
 				echo '<tr id="AnalysisArchiveRow_'.$row['id'].'">';
-				if ($defaultFields['delete']) {
+
-					echo '<td class="anl_bb anl_br anl_ac">';
+				//Stolpec za ikone - vrstice
-					echo '<span>';
+				echo '<td>';
-					echo '<a href="/" onclick="AnalysisArchiveDelete(\'' . $row['id'] . '\'); return false;" title="">';
+				echo '<div class="icon_holder multiple">';
-					echo '<img src="img_0/delete_red.png" alt="" />';
+
-					echo '</a>';
+				echo '<span class="faicon open_icon blue aslink" onclick="window.open(\''.$site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $row['id']. '\', \'_blank\'); return false;"></span>';
-					echo '</span>';
+
-					echo '</td>';
+				if ($defaultFields['email'])
-				}
+					echo '<span class="faicon fa-share-alt blue aslink" onclick="emailArchiveAnaliza(\'' . $row['id'] . '\'); return false;"></span>';
-				if ($defaultFields['edit']) {
+				if ($defaultFields['edit'])
-					echo '<td class="anl_bb anl_br anl_ac">';
+					echo '<span class="faicon edit blue aslink" onclick="AnalysisArchiveEdit(\'' . $row['id'] . '\'); return false;"></span>';
-					echo '<span>';
+				if ($defaultFields['delete'])
-					echo '<a href="/" onclick="AnalysisArchiveEdit(\'' . $row['id'] . '\'); return false;" title="">';
+					echo '<span class="faicon trash empty blue aslink" onclick="AnalysisArchiveDelete(\'' . $row['id'] . '\'); return false;"></span>';
-					echo '<img src="img_0/edit.png" alt="" />';
+
-					echo '</a>';
+				echo '</div>';
-					echo '</span>';
+				echo '</td>';
-					echo '</td>';
+
-				}
+
-				if ($defaultFields['email']) {
+				
-					echo '<td class="anl_bb anl_br anl_ac">';
-					echo '<span>';
-					echo '<a href="/" onclick="emailArchiveAnaliza(\'' . $row['id'] . '\'); return false;" title="">';
-					echo '<img src="icons/icons/email_link.png" alt="" />';
-					echo '</a>';
-					echo '</span>';
-					echo '</td>';
-				}
 				if ($defaultFields['name']) {
 					echo '<td class="anl_bb anl_br">';
 					echo '<span>';
@@ -180,9 +175,6 @@ class SurveyAnalysisArchive {
 				if ($defaultFields['note']) {
 					echo '<td class="anl_bb anl_br">'.$row['note'].'</td>';
 				}
-				if ($defaultFields['access']) {
-					echo '<td class="anl_bb anl_br">'.$lang['srv_analiza_arhiviraj_access_'.$row['access']].'</td>';
-				}
 				if ($defaultFields['type']) {
 					$key = $lang['srv_analiza_arhiviraj_type_'.$row['type']]; 
 					echo '<td class="anl_bb anl_br anl_ac">'.$key.'</td>';
@@ -212,17 +204,30 @@ class SurveyAnalysisArchive {
 					echo $row['eemail'];
 					echo '</td>';
 				}
+				if ($defaultFields['access']) {
+					echo '<td class="anl_bb anl_br">'.$lang['srv_analiza_arhiviraj_access_'.$row['access']].'</td>';
+				}
 				echo '</tr>';
 			}
 			echo '</table>';
+
+			echo '</div>';
+			echo '</div>';
+
+			echo '</fieldset>';
+
 		} 
 		else {
 			echo '<fieldset>';
 			echo '<legend>'.$lang['srv_archive_analysis'].'</legend>';
 			
-			echo $lang['srv_analiza_archive_note_no_archive'];
+			echo '<p class="bold bottom16">'.$lang['srv_analiza_archive_note_no_archive'].'</p>';
-			echo '<br/><br/>';
+			echo '<p>'.$lang['srv_analiza_archive_note1'].'</p>';
-			echo $lang['srv_analiza_archive_generate_quick'];
+			echo '<p class="top16 bottom16">'.$lang['srv_analiza_archive_generate_quick'].'</p>';
+
+			echo '<div class="button_holder bottom0">';
+			echo '<button class="medium blue" type="button" onclick="doArchiveAnaliza();">'.$lang['srv_analiza_archive_generate_quick_button'].'</button>';
+			echo '</div>';
 			
 			echo '</fieldset>';
 		}	
@@ -317,98 +322,124 @@ class SurveyAnalysisArchive {
 	static function DisplayDoArchive() {
 		global $lang, $site_url;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name">';
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 
-		echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>';
+		echo '<h2><span class="faicon arhiv blue"></span>'.$lang['srv_analiza_archive_generate_quick_button'].'</h2>';
-		
-		echo $lang['srv_analiza_arhiviraj_ime'];
-        echo ':&nbsp;<input id="newAnalysisArchiveName" name="newAnalysisArchiveName" type="text" size="60"  />'."\n";
 
-        echo '<br class="clr" />';
+		echo '<div class="setting_holder">';
-
+		echo '<span class="setting_title">'.$lang['srv_analiza_arhiviraj_ime'].':</span>';
-		echo '<div>';
+        echo '<input id="newAnalysisArchiveName" class="text large" name="newAnalysisArchiveName" type="text"/>';
-		echo $lang['srv_analiza_archive_note'].':';
-		echo '<textarea name="newAnalysisArchiveNote" id="newAnalysisArchiveNote" style="height:50px; width:100%"></textarea>';
 		echo '</div>';
-		echo '<br class="clr" />';
+
-		echo '<div>';
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_analiza_archive_note'].':</span>';
+		echo '<textarea class="textarea" name="newAnalysisArchiveNote" id="newAnalysisArchiveNote"></textarea>';
+		echo '</div>';
+
+		echo '<div class="alaysis_archive_wrap">';
 		// dostop
-		echo '<div class="floatLeft">';
+		echo '<div class="alaysis_archive_left">';
-		echo $lang['srv_analiza_archive_access'].':';
+
-		echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="0" checked="true" onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_all'];
+		echo '<div class="setting_holder">';
-		echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="1" onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_admins'];
+		echo '<span class="setting_title">'.$lang['srv_analiza_archive_access'].':</span>';
-                echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="2" onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_password'];
+
-                echo '<br/><div id="newAnalysisArchiveAccessPasswordDiv" style="visibility: hidden;">'.$lang['srv_analiza_archive_access_password_label'].'<input type="text" name="newAnalysisArchiveAccessPassword" id="newAnalysisArchiveAccessPassword" maxlength="25" />';
+		echo '<div class="setting_item">';
-		echo '</div></div>';
+		echo '<input type="radio" id="newAnalysisArchiveAccess0" name="newAnalysisArchiveAccess" value="0" checked="true" onchange="toggleAnalysisArchiveAccessPassword();"/>';
-		echo '<div class="floatLeft anl_w110"  >&nbsp;</div>';
+		echo '<label for="newAnalysisArchiveAccess0">'.$lang['srv_analiza_archive_access_all'].'</label>';
-		
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="newAnalysisArchiveAccess1" name="newAnalysisArchiveAccess" value="1" onchange="toggleAnalysisArchiveAccessPassword();"/>';
+		echo '<label for="newAnalysisArchiveAccess1">'.$lang['srv_analiza_archive_access_admins'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="newAnalysisArchiveAccess2" name="newAnalysisArchiveAccess" value="2" onchange="toggleAnalysisArchiveAccessPassword();"/>';
+		echo '<label for="newAnalysisArchiveAccess2">'.$lang['srv_analiza_archive_access_password'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item indent" id="newAnalysisArchiveAccessPasswordDiv">';
+		echo $lang['srv_analiza_archive_access_password_label'].':';
+		echo '<input type="text" class="text large" name="newAnalysisArchiveAccessPassword" id="newAnalysisArchiveAccessPassword" maxlength="25" />';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>'; //left
+
 		// trajanje
-		echo '<div class="floatLeft">';
+		echo '<div class="alaysis_archive_right">';
-		echo $lang['srv_analiza_archive_duration'].':';
+
-		echo '<br/>';
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_analiza_archive_duration'].':</span>';
+
 		$date = date("Y-m-d");// current date
 		$duration  = strtotime(date("Y-m-d", strtotime($date)) . " +3 month");
 		$duration = date("d.m.Y",$duration);
-		echo '<input type="radio" name="newAADurationType" id="newAADurationFixed" value="0" checked="true" />';
-		printf ($lang['srv_analiza_archive_duration_default'], $duration);
-		echo '<br/>';
-		echo '<input type="radio" name="newAADurationType" id="newAADurationUser" value="1" />'.$lang['srv_analiza_archive_duration_custom'].'&nbsp;<input id="newAnalysisArchiveDuration" type="text" name="newAnalysisArchiveDuration" value="' . $duration . '" disabled/>
-			<span class="faicon calendar_icon icon-as_link" id="duration_img"></span>
-			<script type="text/javascript">
-				Calendar.setup({
-					inputField  : "newAnalysisArchiveDuration",
-					ifFormat    : "%d.%m.%Y",
-					button      : "duration_img",
-					singleClick : true
-				});
-			</script>
-			';
-		echo '<br/>';
-		echo '<input type="radio" name="newAADurationType" id="newAADurationPermanent" value="2" />'.$lang['srv_permanent_archive'];
-		echo '</div>';
-		
-		echo '<div class="clr"></div>';
-		echo '</div>';
-		
-		echo '<div class="div_curent_archives">'."\n";
-		echo $lang['srv_analiza_current_archives'];
-		if (true) {
-				self :: ListArchive(array('create_new'=>false, 'delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>true, 'access'=>false, 'name_link'=>true,'duration'=>false, 'insert'=>true, 'edit'=>false));
-				#self :: ListArchive(array('delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>false, 'access'=>false, 'name_link'=>true, 'duration'=>false, 'insert'=>false, 'edit'=>false));
-		} else {
-			echo $lang['srv_analiza_no_current_archives'];
-        }
-        
-        echo '</div>'."\n"; // end: div_curent_archives
 
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="newAADurationType" id="newAADurationFixed" value="0" checked="true" />';
+		echo '<label for="newAADurationFixed">';
+		printf ($lang['srv_analiza_archive_duration_default'], $duration);
+		echo '</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="newAADurationType" id="newAADurationUser" value="1" />';
+		echo '<label for="newAADurationUser">'.$lang['srv_analiza_archive_duration_custom'].'</label>';
+		echo '<input id="newAnalysisArchiveDuration" class="text medium" type="text" name="newAnalysisArchiveDuration" value="' . $duration . '" readonly/>';
+		echo '<span class="faicon calendar_icon blue pointer" id="duration_img"></span>
+				<script type="text/javascript">
+					Calendar.setup({
+						inputField  : "newAnalysisArchiveDuration",
+						ifFormat    : "%d.%m.%Y",
+						button      : "duration_img",
+						singleClick : true
+					});
+				</script>
+				';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="newAADurationType" id="newAADurationPermanent" value="2" />';
+		echo '<label for="newAADurationPermanent">'.$lang['srv_permanent_archive'].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+
+
+		echo '</div>'; //right
+		
+		echo '</div>'; //wrap
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" title="'.$lang['srv_analiza_arhiviraj_cancle'].'" onClick="cancleArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';              
+
+		$action = '';
 
         if ($_GET['podstran'] == M_ANALYSIS_CROSSTAB || $_POST['podstran'] == M_ANALYSIS_CROSSTAB) {
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveCrosstabs(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
+        	$action = 'submitArchiveCrosstabs();';
         } else  if ($_GET['podstran'] == M_ANALYSIS_MEANS || $_POST['podstran'] == M_ANALYSIS_MEANS) {
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveMeans(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
+        	$action = 'submitArchiveMeans();';
         } else  if ($_GET['podstran'] == M_ANALYSIS_TTEST || $_POST['podstran'] == M_ANALYSIS_TTEST) {
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveTTest(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
+        	$action = 'submitArchiveTTest();';
         } else  if ($_GET['podstran'] == M_ANALYSIS_BREAK || $_POST['podstran'] == M_ANALYSIS_BREAK) {
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveBreak(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
+        	$action = 'submitArchiveBreak();';
         } else  if ($_GET['podstran'] == M_ANALYSIS_CHARTS || $_POST['podstran'] == M_ANALYSIS_CHARTS) {
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveChart(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
+        	$action = 'submitArchiveChart();';
         } else  if ($_GET['podstran'] == M_ANALYSIS_CREPORT || $_POST['podstran'] == M_ANALYSIS_CREPORT) {
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveCReport(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
+        	$action = 'submitArchiveCReport();';
         } else {
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
+        	$action = 'submitArchiveAnaliza();';
         }
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_cancle'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span></span>'."\n";
 
-		
+        echo '<button class="medium blue" title="'.$lang['srv_analiza_arhiviraj_create'].'" onclick="'.$action.' return false;">'.$lang['srv_analiza_arhiviraj_create'].'</button>';
-		echo '</div>'."\n"; // end div_analiza_archive_name
+
+		echo '</div>';
+
+		echo '</div>'; // end div_analiza_archive_name
 	}
 	
 	static function DisplayCreatedArchive($aid=null, $name) {
 		global $lang, $site_url;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name">';
         
         echo '<div class="popup_close"><a href="#" onClick="closeArchiveAnaliza(); return false;">✕</a></div>';
 		
@@ -416,115 +447,116 @@ class SurveyAnalysisArchive {
 		
 		$CAE = self::CheckArchiveExistance($aid); 
 		if ( $CAE > 0) {
-			echo '<div>';
+			echo '<p class="bottom16">';
 			printf( $lang['srv_analiza_arhiviraj_success'],$name);
-			echo '</div>';
+			echo '</p>';
-			echo '<br/>';
 
-			echo '<div>';
+			$archive_link = $site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid;
+
+			echo '<p>';
 			echo $lang['srv_analiza_arhiviraj_success_note'];
-			echo '<br/>';
+			echo ': <a href="'.$site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid . '" target="_blank" title="">';
-			echo '<span>';
+			echo $archive_link;
-			echo '<a href="'.$site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid . '" target="_blank" title="">';
-			echo $site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid;
 			echo '</a>';
-			echo '</span>';
+			echo '<span class="faicon copy empty pointer blue link-left" onClick="CopyToClipboard(\''.$archive_link.'\'); actionNotePopup(\'text_copied\', \'success\');"></span>';
+			echo '</p>';
+
+			echo '<div class="button_holder">';
+			echo '<button class="medium white-blue" title="'.$lang['srv_analiza_arhiviraj_close'].'" onClick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';              
+			//echo '<button class="medium blue" title="'.$lang['srv_analiza_arhiviraj_send_mail'].'" onclick="emailArchiveAnaliza(\''.$aid.'\'); return false;">'.$lang['srv_analiza_arhiviraj_send_mail'].'</button>';
 			echo '</div>';
-	        
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="closeArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
-	        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_send_mail'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="emailArchiveAnaliza(\''.$aid.'\'); return false;" ><span><img src="icons/icons/email_link.png" alt="" /> '.$lang['srv_analiza_arhiviraj_send_mail'].'</span></a></span></span>'."\n";
 		} else {
 			self::DisplayError($CAE);
 		}
-
-		# seznam arhivov
-		echo '<br class="clr" />';
-		echo '<div class="div_curent_archives">'."\n";
-		echo $lang['srv_analiza_current_archives'];
-		if (true) {
-			self :: ListArchive(array('delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>true, 'access'=>false, 'name_link'=>true,'duration'=>false, 'insert'=>true, 'edit'=>false));
-		} else {
-			echo $lang['srv_analiza_no_current_archives'];
-		}
-		echo '</div>'."\n"; // end: div_curent_archives
 	
-		echo '</div>'."\n"; // end div_analiza_archive_name
+		echo '</div>'; // end div_analiza_archive_name
 	}
 	
 	static function EmailArchive($aid) {
 		global $lang;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name">'."\n";
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 		
-		echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>';
+		echo '<h2>'.$lang['srv_export_hover_archive_mail'].'</h2>';
 		
 		# preverimo obstoj datoteke, in dostop
 		$CAE = self::CheckArchiveExistance($aid);
 		 
 		if ( $CAE > 0) {
 			# vsebina emaila in naslovi
-			echo '<div id="div_archives_email_left">'."\n";
+
-	
+			echo '<div class="setting_holder">';
-            echo '<p>'.$lang['srv_analiza_archive_message_note'].'</p>';
+			echo '<label for="email_archive_list">'.$lang['srv_analiza_archive_message_emails'].'</label>';
+			echo '<textarea class="textarea email" name="email_archive_list" id="email_archive_list" ></textarea>';
+			echo '</div>';
+
+			echo '<div class="setting_holder">';
+			echo '<label for="subject">' . $lang['srv_inv_archive_subject_text'] . ': </label>';
+			echo '<input type="text" class="text large wauto" name="email_archive_subject" id="email_archive_subject" value="'.$lang['srv_analiza_arhiviraj_mail_subject'].'"/>';
+			echo '</div>';
             
-			echo '<div ><label for="email_archive_list">'.$lang['srv_analiza_archive_message_emails'].':</label>'."\n";
+			echo '<labelfor="email_archive_text">' . $lang['message'] . ':</label>';
-			echo '<textarea name="email_archive_list" rows="4" id="email_archive_list" ></textarea>'."\n";
+
-            echo '</div>';
+			echo '<div id="div_archives_email_wrap">';
-            
+			echo '<div id="div_archives_email_left">';
-            echo '<br>';
-            
-			echo '<div class="anl_dash_bt">';
-			echo '<br/><label for="subject">' . $lang['subject'] . ': </label>';
-			echo '<input type="text" name="email_archive_subject" id="email_archive_subject" value="'.$lang['srv_analiza_arhiviraj_mail_subject'].'" size="90"/></p>';
-            echo '<p><label for="email_archive_text">' . $lang['text'] . ':</label>'."\n";
             
             $signature = Common::getEmailSignature();
 			echo '<textarea name="email_archive_text" id="email_archive_text" rows="2" >' . nl2br($lang['srv_analiza_arhiviraj_mail_text'].$signature). '</textarea>'."\n";
-            echo '</div>';
+            
             
 			echo '<script type="text/javascript">'."\n";
 			echo 'if ($("#email_archive_text")) {'."\n";
 			echo ' 	create_editor(\'email_archive_text\', false);'."\n";
 			echo '}'."\n";
             echo '</script>'."\n";
-            
+
-			echo '</div>'."\n";
+			echo '</div>'; #left
-			#gumbi
+
 			echo '<div id="div_archives_email_right" >'."\n";
+            
+			//Navodila
+			echo '<div class="message_instructions">';
+            
+			echo '<p class="bold caps bottom32">'.$lang['srv_alert_instruction1'].'</p>';
+            echo '<p class="bottom32">'.$lang['srv_alert_instruction1c'].'</p>';
 			
-			echo '<div id="div_archives_email_buttons">';
+			echo '<div class="sistemske">';
-	        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_do_send_mail'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="sendEmailArchiveAnaliza(\''.$aid.'\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_do_send_mail'].'</span></a></span></span>'."\n";
+			echo '<p>'.$lang['srv_alert_instruction_link_archive'].'</p>';
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
+			echo '<p>'.$lang['srv_alert_instruction_url_archive'].'</p>';
-			echo '<br class="clr" />';
+			echo '<p>'.$lang['srv_alert_instruction_name_archive'].'</p>';
+			echo '<p>'.$lang['srv_alert_instruction_survey'].'</p>';
+			echo '<p>'.$lang['srv_alert_instruction_date'].'</p>';
+			echo '<p>'.$lang['srv_alert_instruction_site'].'</p>';
 			echo '</div>';
-			echo '<div id="div_error">';
+			
-			# navodila
-			echo $lang['srv_analiza_arhiviraj_mail_note_0'];
 			echo '</div>';
-			echo '<br/>';
+			
-			echo '<br/>';
+			echo '</div>'; //right
-			echo '<div id="div_error">';
+
-			# navodila
+			echo '</div>'; //wrap
-			echo $lang['srv_analiza_arhiviraj_mail_note_1'];
+			
+			#gumbi
+			echo '<div class="button_holder">';
+			echo '<button class="medium white-blue" onClick="cancleArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';              
+			echo '<button class="medium blue" onclick="sendEmailArchiveAnaliza(\''.$aid.'\'); return false;">'.$lang['srv_analiza_arhiviraj_do_send_mail'].'</button>';
 			echo '</div>';
-			echo '</div>';
+
-	        echo '<br class="clr" />';
 		} else {
 			self::DisplayError($CAE);
 		}
-        echo '</div>'."\n"; // end div_analiza_archive_name
+        echo '</div>'; // end div_analiza_archive_name
 	}
 	
 	static function SendEmailArchive($aid = null, $subject, $text, $emails) {
 		global $lang, $site_url, $site_path, $global_user_id;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name">'."\n";
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 		
-		echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>';
+		echo '<h2>'.$lang['srv_export_hover_archive_mail'].'</h2>';
 		
 		$CAE = self::CheckArchiveExistance($aid); 
 		if ( $CAE > 0) {
@@ -625,19 +657,21 @@ class SurveyAnalysisArchive {
 				echo 'Pri pošiljanju e-mailov je prišlo do napake!';
 			}
 			
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
+			echo '<div class="button_holder">';
-			echo '<br class="clr" />';
+			echo '<button class="medium blue" onclick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
+			echo '</div>';
+
 		} else {
 			self::DisplayError($CAE);
 		}
 		
-		echo '</div>'."\n"; // end div_analiza_archive_name
+		echo '</div>'; // end div_analiza_archive_name
 	}
 	
 	static function EditArchive($aid) {
 		global $lang, $site_url, $site_path, $global_user_id;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n";
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 		
@@ -649,31 +683,53 @@ class SurveyAnalysisArchive {
 			$s = sisplet_query("SELECT *, UNIX_TIMESTAMP(duration) as duration_d FROM srv_analysis_archive WHERE id='".$aid."' AND sid='".self::$sid."'");			
 			$row = mysqli_fetch_assoc($s);
 
-			echo $lang['srv_analiza_arhiviraj_ime'];
-	        echo ':&nbsp;<input id="newAnalysisArchiveName" name="newAnalysisArchiveName" type="text" size="60"  value="'.$row['name'].'"/>'."\n";
 
-	        echo '<br class="clr" />';
+			echo '<div class="setting_holder">';
-			echo '<div>';
+		echo '<span class="setting_title">'.$lang['srv_analiza_arhiviraj_ime'].':</span>';
-			echo $lang['srv_analiza_archive_note'].':';
+        echo '<input id="newAnalysisArchiveName" class="text large" name="newAnalysisArchiveName" type="text" value="'.$row['name'].'"/>';
-			echo '<textarea name="newAnalysisArchiveNote" id="newAnalysisArchiveNote" style="height:50px; width:100%">'.$row['note'].'</textarea>';
+		echo '</div>';
-			echo '</div>';
+
-			echo '<div>';
+		echo '<div class="setting_holder">';
-			// dostop
+		echo '<span class="setting_title">'.$lang['srv_analiza_archive_note'].':</span>';
-			echo '<div class="floatLeft">';
+		echo '<textarea class="textarea" name="newAnalysisArchiveNote" id="newAnalysisArchiveNote">'.$row['note'].'</textarea>';
-			echo $lang['srv_analiza_archive_access'].':';
+		echo '</div>';
-			echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="0"'.((int)$row['access'] == 0 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_all'];
+
-			echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="1"'.((int)$row['access'] == 1 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_admins'];
+		echo '<div class="alaysis_archive_wrap">';
-                        echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="2"'.((int)$row['access'] == 2 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_password'];
+		// dostop
-                        echo '<br/><div id="newAnalysisArchiveAccessPasswordDiv" style="visibility: '.((int)$row['access'] == 2 ? 'visible' : 'hidden').';">'.$lang['srv_analiza_archive_access_password_label'].'<input type="text" name="newAnalysisArchiveAccessPassword" id="newAnalysisArchiveAccessPassword" maxlength="25"  value="'.$row['access_password'].'"/>';
+		echo '<div class="alaysis_archive_left">';
-                        echo '</div></div>';
+
-                        
+		echo '<div class="setting_holder">';
-			echo '<div class="floatLeft anl_w110"  >&nbsp;</div>';
+		echo '<span class="setting_title">'.$lang['srv_analiza_archive_access'].':</span>';
-			// trajanje
+
-			echo '<div class="floatLeft">';
+		echo '<div class="setting_item">';
-			echo $lang['srv_analiza_archive_duration'].':';
+		echo '<input type="radio" id="newAnalysisArchiveAccess0" name="newAnalysisArchiveAccess" value="0" '.((int)$row['access'] == 0 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>';
-			echo '<br/>';
+		echo '<label for="newAnalysisArchiveAccess0">'.$lang['srv_analiza_archive_access_all'].'</label>';
-			echo '<input id="newAnalysisArchiveDuration" type="text" name="newAnalysisArchiveDuration" value="' . date('d.m.Y',$row['duration_d']) . '" disabled/>
+		echo '</div>';
-				<span class="faicon calendar_icon icon-as_link" id="duration_img"></span>
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="newAnalysisArchiveAccess1" name="newAnalysisArchiveAccess" value="1" '.((int)$row['access'] == 1 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>';
+		echo '<label for="newAnalysisArchiveAccess1">'.$lang['srv_analiza_archive_access_admins'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="newAnalysisArchiveAccess2" name="newAnalysisArchiveAccess" value="2" '.((int)$row['access'] == 2 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>';
+		echo '<label for="newAnalysisArchiveAccess2">'.$lang['srv_analiza_archive_access_password'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item indent" id="newAnalysisArchiveAccessPasswordDiv">';
+		echo $lang['srv_analiza_archive_access_password_label'].':';
+		echo '<input type="text" class="text large" name="newAnalysisArchiveAccessPassword" id="newAnalysisArchiveAccessPassword" maxlength="25" />';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>'; //left
+
+		// trajanje
+		echo '<div class="alaysis_archive_right">';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_analiza_archive_duration'].':</span>';
+
+		echo '<div class="setting_item">';
+		echo '<input id="newAnalysisArchiveDuration" class="text medium" type="text" name="newAnalysisArchiveDuration" value="' . date('d.m.Y',$row['duration_d']) . '" readonly/>';
+		echo '<span class="faicon calendar_icon blue pointer" id="duration_img"></span>
 				<script type="text/javascript">
 					Calendar.setup({
 						inputField  : "newAnalysisArchiveDuration",
@@ -683,14 +739,20 @@ class SurveyAnalysisArchive {
 					});
 				</script>
 				';
-			
+		echo '</div>';
-			echo '</div>';
+		
-			echo '<div class="clr"></div>';
+		echo '</div>';
-			echo '</div>';
+
+
+		echo '</div>'; //right
+		
+		echo '</div>'; //wrap
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-black" title="'.$lang['srv_analiza_arhiviraj_cancle'].'" onClick="cancleArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';              
+        echo '<button class="medium blue" title="'.$lang['srv_analiza_arhiviraj_create'].'" onclick="saveArchiveAnaliza(\''.$aid.'\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
+		echo '</div>';
 
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_save'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="saveArchiveAnaliza(\''.$aid.'\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_save'].'</span></a></span></span>'."\n";			
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
-			echo '<br class="clr" />';
 		} else {
 			self::DisplayError($CAE);
 		}
@@ -929,8 +991,9 @@ class SurveyAnalysisArchive {
 		echo '</div>';
 		
 		if ($showButton) {
-        	echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="closeArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
+			echo '<div class="button_holder">';
-			echo '<br class="clr" />';
+			echo '<button class="medium blue" onclick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
+			echo '</div>';
 		}
 	}
         
@@ -981,7 +1044,7 @@ class SurveyAnalysisArchive {
 	static function AskDeleteArchive($aid) {
 		global $lang;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n";
         
 		$CAE = self::CheckArchiveExistance($aid);
   
@@ -1204,7 +1267,9 @@ class SurveyAnalysisArchive {
 	 * 
 	 */
 	static function createArchiveFromAnaliza() {
+
 		$content = null;
+
 		if($_POST['podstran'] == 'charts'){
 			# kreiramo arhiv za grafe
 			$SC = new SurveyChart();
@@ -1225,13 +1290,15 @@ class SurveyAnalysisArchive {
 			if ($_POST['podstran'] == 'anal_arch') {
 				$_POST['podstran'] = 'sumarnik';
 			}
+            
 			if (!isset($_POST['content'])) {
 				SurveyAnalysis::Init(self::$sid);
 				SurveyAnalysis::setUpIsForArchive(true);
 				SurveyAnalysis::setUpReturnAsHtml(true);
 				
 				$content = SurveyAnalysis::Display();
-			} else {
+			} 
+            else {
 				$content = $_POST['content'];
 			}
 		}	
@@ -1246,12 +1313,12 @@ class SurveyAnalysisArchive {
 		$ArchiveTypes = array(M_ANALIZA_SUMS => 0, M_ANALIZA_DESCRIPTOR=>1, M_ANALIZA_FREQUENCY=>2, M_ANALIZA_CROSSTAB=>3, M_ANALYSIS_MEANS=>4, M_ANALYSIS_TTEST=>5, M_ANALYSIS_BREAK=>6, M_ANALYSIS_CHARTS=>7, M_ANALYSIS_CREPORT=>8);
 		if (isset($_POST['podstran']))
 			$type = $ArchiveTypes[$_POST['podstran']];
-		if (isset($content) && trim($content) != null && self::$sid > 0) {
 
+		if (isset($content) && trim($content) != null && self::$sid > 0) {
 			SurveyAnalysisArchive :: Init(self::$sid);
-			SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password);
+			SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password);		
-						
+		} 
-		} else {
+        else {
 			echo 'Error! (SurveyAnalysisArchive :: CreateArchive)';
 		}
 		

admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php

@@ -47,9 +47,10 @@ class SurveyAnalysisHelper {
 			$sql = sisplet_query("SELECT id FROM srv_custom_report WHERE ank_id='".self::$anketa."' AND usr_id='".$creportAuthor."' AND type='$type' AND sub_type='$sub_type' AND spr1='$spr1' AND spr2='$spr2' AND profile='$creportProfile'");
 			$insert = (mysqli_num_rows($sql)) ? 0 : 1;
 			$id = $type.'-'.$sub_type.'-'.$spr1.'-'.$spr2;
+
 			// Samo zvezdica (sums, grafi, freq...)
 			if($type < 5)
-				echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 0); return false;"><span style="margin-left: 3px;" id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span></a>';
+				echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 0); return false;"><span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span></a>';
 			// Zvezdica s textom
 			else{
 				echo '<div class="custom_report_include">';
@@ -68,58 +69,67 @@ class SurveyAnalysisHelper {
 	function displayMissingLegend(){
 		global $lang;	
 		
-		echo '<div id="bottom_data_legend" class="floatLeft">';
+		echo '<div id="bottom_data_legend_missing" class="legend_box">';
-		echo '<div>';
+
-		echo '<div id="bdld1" class="as_link strong" onclick="$(\'#bottom_data_legend_detail, #bdld1, #bdld2\').toggle();"><span class="faicon plus"></span> '.$lang['srv_bottom_data_legend_note'].'</div>';
+		echo '<div class="legend_title" onclick="$(\'#bottom_data_legend_detail_missing\').toggle(\'fast\');">';
-		echo '<div id="bdld2" class="as_link strong" style="display:none" onclick="$(\'#bottom_data_legend_detail, #bdld1, #bdld2\').toggle();"><span class="faicon minus"></span> '.$lang['srv_bottom_data_legend_note'].'</div>';
+		echo '<span class="faicon arrow2_r"></span>'.$lang['srv_bottom_data_legend_note'];
 		echo '</div>';
-		echo '<div id="bottom_data_legend_detail" style="display:none">';
+
-		echo '<ul>';
+		echo '<div id="bottom_data_legend_detail_missing" class="legend_details">';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li1'].'</li>';
+		echo '  <ul>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li2'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li1'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li3'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li2'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li4'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li3'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li5'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li4'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li0'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li5'].'</li>';
-		echo '</ul>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li99'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li98'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li97'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li0'].'</li>';
+		echo '  </ul>';
 		echo '</div>';
+
 		echo '</div>';
 	}
 	
 	function displayStatusLegend(){
 		global $lang;
-		
+
-		echo '<div id="bottom_data_legend" class="floatLeft bg_blue">';
+		echo '<div id="bottom_data_legend_status" class="legend_box">';
-		echo '<div>';
+
-		echo '<div id="bdlds1" class="as_link strong" onclick="$(\'#bottom_data_legend_detail_status, #bdlds1, #bdlds2\').toggle();"><span class="faicon plus"></span> '.$lang['srv_bottom_data_legend_status_note'].'</div>';
+		echo '<div class="legend_title">';
-		echo '<div id="bdlds2" class="as_link strong" style="display:none" onclick="$(\'#bottom_data_legend_detail_status, #bdlds1, #bdlds2\').toggle();"><span class="faicon minus"></span> '.$lang['srv_bottom_data_legend_status_note'].'</div>';
+		echo '  <span onclick="$(\'#bottom_data_legend_detail_status\').toggle(\'fast\');"><span class="faicon arrow2_r"></span>'.$lang['srv_bottom_data_legend_status_note'].'</span>';
 		echo '</div>';
-		echo '<div id="bottom_data_legend_detail_status" style="display:none">';
+
-		echo '<ul>';
+		echo '<div id="bottom_data_legend_detail_status" class="legend_details">';
+		echo '  <ul>';
 		for ($i = 0; $i <= 6; $i++) {
-			echo '<li>'.$i.' - '.$lang['srv_userstatus_'.$i].'</li>';
+			echo '      <li>'.$i.' - '.$lang['srv_userstatus_'.$i].'</li>';
 		}
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li0'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li0'].'</li>';
-		echo '</ul>';
+		echo '  </ul>';
 		echo '</div>';
+
 		echo '</div>';
 	}
 	
 	function displayTestLegend(){
 		global $lang;
 		
-		echo '<div id="bottom_data_legend" class="floatLeft test">';
+		echo '<div id="bottom_data_legend_test" class="legend_box">';
-		echo '<div>';
+
-		echo '<div id="bdldt1" class="as_link strong" onclick="$(\'#bottom_data_legend_detail_test, #bdldt1, #bdldt2\').toggle();"><span class="faicon plus"></span> '.$lang['srv_bottom_data_legend_test_note'].'</div>';
+		echo '<div class="legend_title">';
-		echo '<div id="bdldt2" class="as_link strong" style="display:none" onclick="$(\'#bottom_data_legend_detail_test, #bdldt1, #bdldt2\').toggle();"><span class="faicon minus"></span> '.$lang['srv_bottom_data_legend_test_note'].'</div>';
+		echo '  <span onclick="$(\'#bottom_data_legend_detail_test\').toggle(\'fast\');"><span class="faicon arrow2_r"></span>'.$lang['srv_bottom_data_legend_test_note'].'</span>';
 		echo '</div>';
-		echo '<div id="bottom_data_legend_detail_test" style="display:none">';
+
-		echo '<ul>';
+		echo '<div id="bottom_data_legend_detail_test" class="legend_details">';
-		echo '<li>0 - '.$lang['srv_bottom_data_legend_test_note_li0'].'</li>';
+		echo '  <ul>';
-		echo '<li>1 - '.$lang['srv_bottom_data_legend_test_note_li1'].'</li>';
+		echo '      <li>0 - '.$lang['srv_bottom_data_legend_test_note_li0'].'</li>';
-		echo '<li>2 - '.$lang['srv_bottom_data_legend_test_note_li2'].'</li>';
+		echo '      <li>1 - '.$lang['srv_bottom_data_legend_test_note_li1'].'</li>';
-		echo '</ul>';
+		echo '      <li>2 - '.$lang['srv_bottom_data_legend_test_note_li2'].'</li>';
+		echo '  </ul>';
 		echo '</div>';
+
 		echo '</div>';
 	}
 }

admin/survey/classes/surveyAnalysis/class.SurveyMeans.php

@@ -43,6 +43,11 @@ class SurveyMeans{
 			SurveyInfo :: getInstance()->SurveyInit($this->sid);
 			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
 
+            // Pri glasovanju tega ne pustimo
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){
+                die();
+            }
+            
 			# Inicializiramo in polovimo nastavitve missing profila
 			SurveyStatusProfiles::Init($this->sid);
 			SurveyUserSetting::getInstance()->Init($this->sid, $global_user_id);
@@ -232,28 +237,26 @@ class SurveyMeans{
 	
 	function displayDropdowns() {
 		global $lang;
+
 		$variables1 = $this->getVariableList(1);
 		$variables2 = $this->getVariableList(2);
 
-		echo '<div id="meansLeftDropdowns" >';
+
-		if ((int)$this->variabla1['0']['seq'] > 0) {
+		echo '<div id="meansLeftHolder">';
-			echo '<span class="pointer space_means_new" >&nbsp;</span>';
+
-		}
+		echo '<span class="title">'.$lang['srv_means_label1'].'</span>';
-		echo $lang['srv_means_label1'];		
+        	
-		echo '<br />';		
 		# iz header datoteke preberemo spremenljivke
 		#js: $("#means_variable_1, #means_variable_2").live('click', function() {})
 		if (count($this->variabla1) > 0) {
-			$br=null;
+		
-			if ((int)$this->variabla1['0']['seq'] > 0) {
+            echo '<div id="meansLeftDropdowns">';
-				echo '<span class="pointer" id="means_add_new" onclick="means_add_new_variable(\'1\');"><span class="faicon add small icon-as_link" title=""></span></span>';
-			}
-				
-			foreach($this->variabla1 AS $_key => $variabla1) {
-				echo $_br;
-				echo '<span id="v1_'.$_key.'">';
 
-				echo '<select name="means_variable_1" id="means_variable_1" onchange="change_means(); return false;" autocomplete="off">';
+			foreach($this->variabla1 AS $_key => $variabla1) {
+
+				echo '<div id="v1_'.$_key.'" class="variabla_line">';
+
+				echo '<select name="means_variable_1" id="means_variable_1" class="dropdown large" onchange="change_means(); return false;" autocomplete="off">';
 
 				# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 				if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) {
@@ -271,38 +274,39 @@ class SurveyMeans{
 				}
 
 				echo '</select>';
-				if (count($this->variabla1) > 1) {
-					echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle icon-orange_link" title=""></span></span>';
-				} else {
-					#echo '<span class="space_means_new">&nbsp;</span>';
-				}
 
-				$_br = '<br/><span class="space_means_new">&nbsp;</span>';
+				if (count($this->variabla1) > 1) {
-				echo '</span>';
+					echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle" title=""></span></span>';
+				} 
+
+				echo '</div>';
+			}
+
+            echo '</div>';
+
+            // Gumb za dodajanje spremenljivke
+            if ((int)$this->variabla1['0']['seq'] > 0) {
+				echo '<button class="blue small" id="means_add_new" onclick="means_add_new_variable(\'1\');">'.$lang['srv_multicrosstabs_add'].'</span>';
 			}
-			$_br = null;
 		}
 
 		echo '</div>';
 
-		echo '<div id="meansRightDropdowns">';
+
-		if ((int)$this->variabla1['0']['seq'] > 0) {
+		echo '<div id="meansRightHolder">';
-			echo '<span class="pointer space_means_new" >&nbsp;</span>';
+        
-		}
+		echo '<span class="title">'.$lang['srv_means_label2'].'</span>';	
-		echo $lang['srv_means_label2'];
-		echo '<br />';		
-		
 		
 		# za vsako novo spremenljivko 2 nardimo svoj select
 		if (count($this->variabla2) > 0) {
-			if ((int)$this->variabla1['0']['seq'] > 0) {
+            
-				echo '<span class="pointer" id="means_add_new" onclick="means_add_new_variable(\'2\');"><span class="faicon add small icon-as_link" title="'.'"></span></span>';
+            echo '<div id="meansRightDropdowns">';
-			}
+
-				
 			foreach($this->variabla2 AS $_key => $variabla2) {
-				echo $_br;
+
-				echo '<span id="v2_'.$_key.'">';
+				echo '<div id="v2_'.$_key.'" class="variabla_line">';
-				echo '<select name="means_variable_2" id="means_variable_2" onchange="change_means(); return false;" autocomplete="off"'
+
+				echo '<select name="means_variable_2" id="means_variable_2" class="dropdown large" onchange="change_means(); return false;" autocomplete="off"'
 				. ((int)$this->variabla1['0']['seq'] > 0 ? '' : ' disabled="disabled" ')
 				.'>';
 
@@ -327,29 +331,45 @@ class SurveyMeans{
 
 				}
 				echo '</select>';
+
 				if (count($this->variabla2) > 1) {
 					echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle icon-orange_link" title=""></span></span>';
-				} else {
+				} 
-					echo '<span class="space_means_new">&nbsp;</span>';
-				}
 
-				$_br = '<br/><span class="space_means_new">&nbsp;</span>';
+				echo '</div>';
-				echo '</span>';
+			}
+            
+            echo '</div>';
+
+            // Gumb za dodajanje spremenljivke
+            if ((int)$this->variabla1['0']['seq'] > 0) {
+				echo '<button class="blue small" id="means_add_new" onclick="means_add_new_variable(\'2\');">'.$lang['srv_multicrosstabs_add'].'</button>';
 			}
 		}
 		echo '</div>';
 		
-		echo '<span id="meansSubSetting" class="floatLeft spaceLeft">';
-		if (count($this->variabla2) > 1) {	
-			echo '<label><input id="chkMeansSeperate" type="checkbox" onchange="changeMeansSubSetting();" '.($this->sessionData['means']['meansSeperateTables']==true?' checked="checked"':'' ).'> '.$lang['srv_means_setting_1'].'</label>';
-			
-			echo '<br /><span id="spanMeansJoinPercentage"'.($this->sessionData['means']['meansSeperateTables']!=true?'':' class="displayNone"').'><label><input id="chkMeansJoinPercentage" type="checkbox" onchange="changeMeansSubSetting();" '.($this->sessionData['means']['meansJoinPercentage']==true?' checked="checked"':'' ).'> '.$lang['srv_means_setting_2'].'</label></span>';
-		}
-		echo '<br /><label><input id="showChart" type="checkbox" onchange="showTableChart(\'mean\');" '.($this->sessionData['mean_charts']['showChart']==true?' checked="checked"':'' ).'> '.$lang['srv_show_charts'].'</label>';
-		echo '</span>';
-		
-		echo '<br class="clr"/>';	
 
+		echo '<div id="meansSubSetting">';
+		
+        echo '<span class="title">'.$lang['settings'].':</span>';
+
+        if (count($this->variabla2) > 1) {	
+
+            echo '<div class="setting_line">';
+			echo '  <input id="chkMeansSeperate" type="checkbox" onchange="changeMeansSubSetting();" '.($this->sessionData['means']['meansSeperateTables']==true?' checked="checked"':'' ).'><label for="chkMeansSeperate">'.$lang['srv_means_setting_1'].'</label>';
+            echo '</div>';
+            
+            echo '<div class="setting_line">';
+			echo '  <span id="spanMeansJoinPercentage"'.($this->sessionData['means']['meansSeperateTables']!=true?'':' class="displayNone"').'><input id="chkMeansJoinPercentage" type="checkbox" onchange="changeMeansSubSetting();" '.($this->sessionData['means']['meansJoinPercentage']==true?' checked="checked"':'' ).'><label for="chkMeansJoinPercentage">'.$lang['srv_means_setting_2'].'</label></span>';
+            echo '</div>';
+		}
+        
+        echo '<div class="setting_line">';
+		echo '  <input id="showChart" type="checkbox" onchange="showTableChart(\'mean\');" '.($this->sessionData['mean_charts']['showChart']==true?' checked="checked"':'' ).'><label for="showChart">'.$lang['srv_show_charts'].'</label>';
+        echo '</div>';
+
+		echo '</div>';
+		
 		// Ikone za izvoz (so tukaj da se refreshajo ob ajax klicu)
 		$this->displayExport();
 	}
@@ -358,7 +378,6 @@ class SurveyMeans{
 		global $lang;
 		global $admin_type;
 		
-		$br='';
 		$means = array();
 		
 		# če ne uporabljamo privzetega časovnega profila izpišemo opozorilo
@@ -374,6 +393,7 @@ class SurveyMeans{
 		$SR = new SurveyRecoding($this->sid);
 		$SR -> getProfileString();
 		
+
 		if ($this->getSelectedVariables(1) !== null && $this->getSelectedVariables(2) !== null) {
 			$variables1 = $this->getSelectedVariables(2);
 			$variables2 = $this->getSelectedVariables(1);
@@ -418,21 +438,25 @@ class SurveyMeans{
 			if (is_array($means) && count($means) > 0) {
 				$counter=0;
 				foreach ($means AS $mean_sub_grup) {
-					echo($br);
-					$this->displayMeansTable($mean_sub_grup);
-					$br='<br />';
 
-					// Zvezdica za vkljucitev v porocilo
+                    echo '<div class="means_table_holder">';
+                    
+                    // Zvezdica za vkljucitev v porocilo
 					$spr2 = $mean_sub_grup[0]['v1']['seq'].'-'.$mean_sub_grup[0]['v1']['spr'].'-'.$mean_sub_grup[0]['v1']['grd'];
 					$spr1 = $mean_sub_grup[0]['v2']['seq'].'-'.$mean_sub_grup[0]['v2']['spr'].'-'.$mean_sub_grup[0]['v2']['grd'];
 					SurveyAnalysis::Init($this->sid);
 					SurveyAnalysis::addCustomReportElement($type=6, $sub_type=0, $spr1, $spr2);
-
+                    
+                    // Izris tabele
+					$this->displayMeansTable($mean_sub_grup);
+                    
 					// Izrisemo graf za tabelo - zaenkrat samo admin
 					if($this->sessionData['mean_charts']['showChart'] && $_GET['m'] != 'analysis_creport'){
-						$tableChart = new SurveyTableChart($this->sid, $this, 'mean', $counter);
+                        $tableChart = new SurveyTableChart($this->sid, $this, 'mean', $counter);
 						$tableChart->display();
 					}
+
+                    echo '</div>';
 					
 					$counter++;
 				}
@@ -467,14 +491,19 @@ class SurveyMeans{
 			$href_pdf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=mean_izpis&anketa=' . $this->sid);
 			$href_rtf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=mean_izpis_rtf&anketa=' . $this->sid);
 			$href_xls = makeEncodedIzvozUrlString('izvoz.php?b=export&m=mean_izpis_xls&anketa=' . $this->sid);
-			echo '<script>';
+			
+
+            echo '<script>';
+
 			# nastavimopravilne linke
 			echo '$("#secondNavigation_links a#meansDoPdf").attr("href", "'.$href_pdf.'");';
 			echo '$("#secondNavigation_links a#meansDoRtf").attr("href", "'.$href_rtf.'");';
 			echo '$("#secondNavigation_links a#meansDoXls").attr("href", "'.$href_xls.'");';
+
 			# prikažemo linke
 			echo '$("#hover_export_icon").removeClass("hidden");';
 			echo '$("#secondNavigation_links a").removeClass("hidden");';
+
 			echo '</script>';
 		}
 	}
@@ -1066,68 +1095,65 @@ class SurveyMeans{
 		
 		$showSingleUnits = $this->sessionData['means']['meansJoinPercentage']==true && $this->sessionData['means']['meansSeperateTables'] == false;
 		
-		# izrišemo tabelo
-		echo '<table class="anl_tbl_crosstab fullWidth" style="margin-top:10px;">';
-		echo '<colgroup>';
-		echo '<col style="width:auto; min-width:30px;" />';
-		echo '<col style="width:auto; min-width:30px; " />';
-		for ($i = 0; $i < $cols; $i++) {
-			echo '<col style="width:auto; min-width:30px;" />';
-			if ($showSingleUnits == false) {
-				echo '<col style="width:auto; min-width:30px;" />';
-			}
-		}
-		if ($showSingleUnits == true) {
-			echo '<col style="width:auto; min-width:30px;" />';
-		}
-		echo '</colgroup>';
 
-		echo '<tr>';
+		# izrišemo tabelo
-		#echo '<td>xx&nbsp;</td>';
+		echo '<table class="table_means">';
+
+
+		echo '<tr class="row1">';
+
 		# ime variable
 		# teksti labele:
 		$label2 = $this->getSpremenljivkaTitle($_means[0]['v2']);
 		if ($showSingleUnits == false) {
 			$span = ' colspan="2"';
 		}
-		echo '<td class="anl_bt anl_bl anl_ac rsdl_bck_title ctbCll" rowspan="2">';
+		echo '<td class="cell_question" rowspan="2">';
 		echo $label2;
 		echo '</td>';
 		
 		for ($i = 0; $i < $cols; $i++) {
-			echo '<td class="anl_bt anl_bl anl_br anl_ac rsdl_bck_title ctbCll"'.$span.'>';
+			echo '<td class="cell_question" '.$span.'>';
 			$label1 = $this->getSpremenljivkaTitle($_means[$i]['v1']);
 			echo $label1;
 			echo '</td>';
 		}
 		if ($showSingleUnits == true) {
-			echo '<td class="anl_bl ">&nbsp;</td>';
+			echo '<td class="anl_bl">&nbsp;</td>';
 		}
 		echo '</tr>';
-		echo '<tr>';
+
+
+		echo '<tr class="row2">';
 		
 		for ($i = 0; $i < $cols; $i++) {
+
 			#Povprečje
-			echo '<td class="anl_bt anl_bl anl_br anl_ac rsdl_bck_variable1 ctbCll" >';
+			echo '<td class="cell_value">';
 			echo $lang['srv_means_label'];
 			echo '</td>';
+
 			#enote
 			if ($showSingleUnits == false) {
-				echo '<td class="anl_bl anl_bt anl_br anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">'.$lang['srv_means_label4'].'</td>';
+				echo '<td class="cell_value">'.$lang['srv_means_label4'].'</td>';
 			}
 		}
+
 		if ($showSingleUnits == true) {
-			echo '<td class="anl_bl anl_bt anl_br anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">'.$lang['srv_means_label4'].'</td>';
+			echo '<td class="cell_value">'.$lang['srv_means_label4'].'</td>';
 		}
 		
 		echo '</tr>';
 
+
 		if (count($_means[0]['options']) > 0) {
 			
 			foreach ($_means[0]['options'] as $ckey2 =>$crossVariabla2) {
 				$units_per_row = 0;
+
 				echo '<tr>';
-				echo '<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">';
+
+				echo '<td class="cell_question">';
 				echo $crossVariabla2['naslov'];
 				# če ni tekstovni odgovor dodamo key
 				if ($crossVariabla2['type'] !== 't' ) {
@@ -1140,48 +1166,61 @@ class SurveyMeans{
 					}
 				}
 				echo '</td>';
+
 				# celice z vsebino
 				for ($i = 0; $i < $cols; $i++) {
-					echo '<td class="ct_in_cell anl_br'.'" k1="'.$ckey1.'" k2="'.$ckey2.'" n1="'.$crossVariabla1['naslov'].'" n2="'.$crossVariabla2['naslov'].'" v1="'.$crossVariabla1['vr_id'].'" v2="'.$crossVariabla2['vr_id'].'">';
+					echo '<td class="cell_value" k1="'.$ckey1.'" k2="'.$ckey2.'" n1="'.$crossVariabla1['naslov'].'" n2="'.$crossVariabla2['naslov'].'" v1="'.$crossVariabla1['vr_id'].'" v2="'.$crossVariabla2['vr_id'].'">';
 					echo $this->formatNumber($_means[$i]['result'][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'));
 					echo '</td>';
+
 					if ($showSingleUnits == false) {
-						echo '<td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 crostabSuma">';
+						echo '<td class="cell_value">';
 						echo (int)$_means[$i]['sumaVrstica'][$ckey2];
 						echo '</td>';
-					} else {
+					} 
+                    else {
 						$units_per_row = max($units_per_row,(int)$_means[$i]['sumaVrstica'][$ckey2]);
 					}
 				}
+
 				if ($showSingleUnits == true) {
-					echo '<td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 crostabSuma">';
+					echo '<td class="cell_value">';
 					echo $units_per_row;
 					echo '</tr>';
 				}
+
 				echo '</tr>';
+
 				$max_units += $units_per_row;
 			}
 		}
+
+
 		echo '<tr>';
-		echo '<td class="anl_bb anl_bt anl_bl anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">'.$lang['srv_means_label3'].'</td>';
+
+		echo '<td class="cell_value">'.$lang['srv_means_label3'].'</td>';
+
 		for ($i = 0; $i < $cols; $i++) {
-			echo '<td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">';
 			
+            echo '<td class="cell_value">';
 			echo $this->formatNumber($_means[$i]['sumaMeans'], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'));
 			echo '</td>';
+
 			if ($showSingleUnits == false) {
-				echo '<td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">';
+				echo '<td class="cell_value">';
 				echo (int)$_means[$i]['sumaSkupna'];
 				echo '</td>';
 			}
 		}
+
 		if ($showSingleUnits == true) {
-			echo '<td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">';
+			echo '<td class="cell_value">';
 			echo $max_units;
-			echo '</tr>';
+			echo '</td>';
 		}
 		
 		echo '</tr>';
+
 		echo '</table>';
 	}
 	
@@ -1228,14 +1267,14 @@ class SurveyMeans{
 		$which = $_POST['which'];
 		$variables = $this->getVariableList($which);
 		$multiple = true;
-			
+        
-
+        
 		if ($which == '1') {
-			echo '<br/>';
+            echo '<div class="variabla_line">';
-			echo '<span class="space_means_new">&nbsp;</span>';
+            
-			echo '<select name="means_variable_'.$which.'" id="means_variable_'.$which.'" onchange="change_means(); return false;" autocomplete="off"'
+			echo '<select name="means_variable_'.$which.'" id="means_variable_'.$which.'" class="dropdown large" onchange="change_means(); return false;" autocomplete="off">';
-			.'>';
+			
-			# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
+            # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 			if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) {
 				echo '<option value="0" selected="selected" >'. $lang['srv_analiza_crosstab_izberi_more'].'</option>';
 			}
@@ -1249,20 +1288,23 @@ class SurveyMeans{
 				. $variable['variableNaslov'] . '</option>';
 
 			}
+
 			echo '</select>';
-			echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle icon-orange_link" title=""></span></span>';
+
-				
+			echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle" title=""></span></span>';
-		} else {
+            
-			# which = 2
+            echo '</div>';
-			echo '<br/>';
+		} 
-			echo '<span class="space_means_new">&nbsp;</span>';
+        else {
-			echo '<select name="means_variable_'.$which.'" id="means_variable_'.$which.'" onchange="change_means(); return false;" autocomplete="off"'
+			echo '<div class="variabla_line">';
-			.'>';
+
+			echo '<select name="means_variable_'.$which.'" id="means_variable_'.$which.'" class="dropdown large" onchange="change_means(); return false;" autocomplete="off">';
 				
 			# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
 			if ((int)$this->variabla1['0']['seq'] > 0) {
 				echo '<option value="0" selected="selected" >'. $lang['srv_analiza_crosstab_najprej_prvo'].'</option>';
-			} else {
+			} 
+            else {
 				# če druga variabla ni izbrana dodamo tekst za izbiro druge variable
 				echo '<option value="0" selected="selected">'. $lang['srv_analiza_crosstab_izberi_more'].'</option>';
 			}
@@ -1277,7 +1319,10 @@ class SurveyMeans{
 
 			}
 			echo '</select>';
-			echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle icon-orange_link" title=""></span></span>';
+            
+			echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle" title=""></span></span>';
+			
+            echo '</div>';
 		}
 	}
 	
@@ -1311,11 +1356,14 @@ class SurveyMeans{
 							if (strip_tags($grid['naslov']) != $lang['srv_new_text']) {
 								$labela .= '<br/>'.strip_tags($grid['naslov']);
 							}
+                            
 							$labela .= '&nbsp;('.strip_tags($grid['variable']).')' ;
-						} else {
+						} 
-							if (strip_tags($variable['naslov']) != $lang['srv_new_text']) {
+                        else {
+							if (strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje']) {
 								$labela .= '<br/>'.strip_tags($variable['naslov']);
 							}
+
 							if ($show_variables_values == true) {
 								$labela .= '&nbsp;('.strip_tags($variable['variable']).')';
 							}

admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php

@@ -75,6 +75,11 @@ class SurveyMultiCrosstabs {
 			# polovimo vrsto tabel (aktivne / neaktivne)
 			SurveyInfo :: getInstance()->SurveyInit($this->ank_id);
 			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
+
+            // Pri glasovanju tega ne pustimo
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){
+                die();
+            }
 			
 			$this->_CURRENT_STATUS_FILTER = STATUS_FIELD.' ~ /6|5/';
 			
@@ -214,7 +219,7 @@ class SurveyMultiCrosstabs {
 			if($spr['canChoose'] && in_array($spr['tip'], array(1,3,6))){
 				
 				echo '<li class="draggable mc_draggable" id="'.$spr['spr_id'].'-'.$spr['sequence'].'">';		
-				echo '<span class="strong">'.$spr['variable'].'</span> - '.$this->snippet($spr['naslov'], 25);			
+				echo '  <span class="strong"><span class="faicon grip"></span>'.$spr['variable'].'</span> - '.$this->snippet($spr['naslov'], 25);			
 				echo '</li>';
 			}
 		}
@@ -225,7 +230,7 @@ class SurveyMultiCrosstabs {
 		$this->displayMCTablesPopups();
 		
 		// Izris diva za nastavitve tabele
-		echo '<div id="mc_table_settings" class="mc_table_settings">';
+		echo '<div id="mc_table_settings" class="mc_table_settings divPopUp PopUpNarrow">';
 		$this->displayTableSettings();
 		echo '</div>';
 
@@ -250,9 +255,19 @@ class SurveyMultiCrosstabs {
 		// Napolnimo variable ki so ze izbrane
 		$this->getSelectedVars();
 
+        // Zvezdica za creport - ce smo v custom reportu tega ne izpisemo
+		/*if($_GET['m'] != 'analysis_creport'){
+		
+            echo '<div class="mc_table_top_settings">';
+
+			// Zvezdica za vkljucitev v porocilo	
+			SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=10, $sub_type=0, $spr1=$this->table_id);
+
+			echo '</div>';
+		}*/
+
 		echo '<table id="'.$this->table_id.'" cellspacing="0" cellpadding="0" class="mc_table">';
 
-		
 		// Imamo 2 nivoja
 		if($this->colLevel2){
 			
@@ -262,8 +277,10 @@ class SurveyMultiCrosstabs {
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';	
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';
+            
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $var){
 					
@@ -274,23 +291,27 @@ class SurveyMultiCrosstabs {
 					echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 					
 					// Gumb za brisanje
-					echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';
+					echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';
 					
 					echo '</td>';
 				}
 			}
 			// Izrisemo se zadnjo prazno navpicno celico vrstico
 			echo '<td id="undefined" class="spr vertical droppable empty" rowspan="4">'.$lang['srv_multicrosstabs_add'].'</td>';		
-			echo '</tr>';
 			
+            echo '</tr>';
+			
+            
 			// Izrisemo VARIABLE za spremenljivko - 2. vrstica
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';		
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';	
+
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $var){
 
@@ -309,16 +330,18 @@ class SurveyMultiCrosstabs {
 				}
 			}
 			echo '</tr>';
+
 			
 			// Izris vrstic za 2. nivo - 3. in 4. vrstica
-		
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';		
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';
+
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $parentVar){
 					
@@ -333,7 +356,7 @@ class SurveyMultiCrosstabs {
 								echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 								
 								// Gumb za brisanje
-								echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';
+								echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';
 								
 								echo '</td>';
 							}
@@ -350,15 +373,19 @@ class SurveyMultiCrosstabs {
 					}
 				}
 			}
+
 			echo '</tr>';
 			
+
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';		
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';
+
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $parentVar){
 					
@@ -373,7 +400,7 @@ class SurveyMultiCrosstabs {
 									echo $this->snippet($suboption, 25);
 									
 									// Gumb za brisanje
-									echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';
+									echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';
 									
 									echo '</td>';
 								}
@@ -382,10 +409,12 @@ class SurveyMultiCrosstabs {
 					}
 				}
 			}
+
 			echo '</tr>';
 		}
 		// Imamo samo 1 nivo
 		else{
+
 			// Izrisemo VERTIKALNO izbrane spremenljivkec - 1. vrstica	
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
@@ -393,7 +422,9 @@ class SurveyMultiCrosstabs {
 				$colspan = ' colspan="2"';
 			else
 				$colspan = ' colspan="4"';			
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';
+
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $var){
 					
@@ -403,7 +434,7 @@ class SurveyMultiCrosstabs {
 					echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 					
 					// Gumb za brisanje
-					echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';
+					echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';
 					
 					echo '</td>';
 				}
@@ -414,17 +445,21 @@ class SurveyMultiCrosstabs {
 			}
 
 			// Izrisemo se zadnjo prazno navpicno celico vrstico
-			echo '<td id="undefined" class="spr vertical droppable empty" rowspan="2">'.$lang['srv_multicrosstabs_add'].'</td>';		
+			echo '<td id="undefined" class="spr vertical droppable empty" rowspan="2">'.$lang['srv_multicrosstabs_add'].'</td>';
+
 			echo '</tr>';
 			
+
 			// Izrisemo VARIABLE za spremenljivko - 2. vrstica
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';	
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';	
+            
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $var){
 
@@ -447,6 +482,7 @@ class SurveyMultiCrosstabs {
 					}
 				}
 			}
+
 			echo '</tr>';
 		}
 
@@ -484,7 +520,7 @@ class SurveyMultiCrosstabs {
 										echo $this->snippet($this->variablesList[$parentVar['spr']]['naslov'], 25);
 										
 										// Gumb za brisanje
-										echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';				
+										echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';				
 										echo '</td>';
 									}
 									
@@ -505,7 +541,7 @@ class SurveyMultiCrosstabs {
 										echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 										
 										// Gumb za brisanje
-										echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';				
+										echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';				
 										echo '</td>';
 									}
 									
@@ -533,7 +569,7 @@ class SurveyMultiCrosstabs {
 									
 									echo '<tr>';
 									
-									echo '<td class="var sums">'.$lang['srv_analiza_crosstab_skupaj'].'</td>';
+									echo '<td class="var sums horizontal">'.$lang['srv_analiza_crosstab_skupaj'].'</td>';
 									
 									$crosstabs = $this->crosstabData[$parentVar['spr'].'-'.$var['spr']];
 								
@@ -559,7 +595,7 @@ class SurveyMultiCrosstabs {
 								echo $this->snippet($this->variablesList[$parentVar['spr']]['naslov'], 25);
 								
 								// Gumb za brisanje
-								echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';				
+								echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';				
 								echo '</td>';
 							}
 								
@@ -597,7 +633,7 @@ class SurveyMultiCrosstabs {
 							echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 							
 							// Gumb za brisanje
-							echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';				
+							echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';				
 							echo '</td>';
 						}
 						
@@ -620,7 +656,7 @@ class SurveyMultiCrosstabs {
 					// Vrstica za sumo (ce jo imamo vklopljeno)
 					if($this->table_settings[$this->table_id]['sums'] == 1 && count($this->selectedVars['ver']) > 0 && !$this->colLevel2){
 						echo '<tr>';
-						echo '<td class="var sums">'.$lang['srv_analiza_crosstab_skupaj'].'</td>';
+						echo '<td class="var sums horizontal">'.$lang['srv_analiza_crosstab_skupaj'].'</td>';
 						
 						// Loop cez vse stolpce
 						foreach($this->selectedVars['ver'] as $spr2){
@@ -681,37 +717,26 @@ class SurveyMultiCrosstabs {
 		
 		echo '</tr>';
 		
-		
 		echo '</table>';
 		
 		
-		
-		echo '<div class="mc_table_bottom_settings">';
-		
 		// Izrisemo legendo
+		echo '<div class="mc_table_bottom_settings">';
 		$this->displayLegend();
-		
-				
-		// Ce smo v custom reportu tega ne izpisemo
-		if($_GET['m'] != 'analysis_creport'){
-		
-			// Zvezdica za vkljucitev v porocilo	
-			SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=10, $sub_type=0, $spr1=$this->table_id);
-		
-		
-			echo '<script type="text/javascript">';
-			
-			// Nastavimo droppable (drugace po ajaxu ne dela)
-			echo '$(function(){createDroppable();});';	
-			
-			// Nastavimo gumb za brisanje spremenljivke
-			echo '$(".mc_table tr td.spr").mouseover(function(){$(this).find(".delete_var").show();});';
-			echo '$(".mc_table tr td.spr").mouseout(function(){$(this).find(".delete_var").hide();});';
-			
-			echo '</script>';
-		}
-		
 		echo '</div>';
+
+
+        // JS
+        echo '<script type="text/javascript">';
+			
+        // Nastavimo droppable (drugace po ajaxu ne dela)
+        echo '$(function(){createDroppable();});';	
+        
+        // Nastavimo gumb za brisanje spremenljivke
+        echo '$(".mc_table tr td.spr").mouseover(function(){$(this).find(".delete_var").show();});';
+        echo '$(".mc_table tr td.spr").mouseout(function(){$(this).find(".delete_var").hide();});';
+        
+        echo '</script>';
 	}
 	
 	// Izpis celic v vrstici s podatki
@@ -1106,7 +1131,7 @@ class SurveyMultiCrosstabs {
 			// Numerus
 			if($this->table_settings[$this->table_id]['numerus'] == 1){
 				echo '<tr><td class="bold white">';
-				echo $crosstabs['sumaSkupna'];
+				echo ($crosstabs['sumaSkupna'] != '') ? $crosstabs['sumaSkupna'] : '0';
 				echo '</td></tr>';
 			}
 			
@@ -1388,91 +1413,84 @@ class SurveyMultiCrosstabs {
 		echo '<input type="hidden" name="table_id" value="'.$this->table_id.'" />';
 		
 		
-		echo '<fieldset>';
+		echo '<h3>'.$lang['srv_multicrosstabs_settings_val'].'</h3>';
-		echo '<legend>'.$lang['srv_multicrosstabs_settings_val'].'</legend>';
+
-		
+		echo '<div class="setting_holder">';
+
 		// Prikaz numerusa
-		echo '<span class="clr"><input type="checkbox" id="numerus_'.$this->table_id.'" name="numerus" '.($this->table_settings[$this->table_id]['numerus'] == 1 ? ' checked="checked"':'').' value="1" /><label for="numerus_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_numerus'].'</label></span>';
+		echo '<div class="setting_item">';
-		
+		echo '<input type="checkbox" id="numerus_'.$this->table_id.'" name="numerus" '.($this->table_settings[$this->table_id]['numerus'] == 1 ? ' checked="checked"':'').' value="1" /><label for="numerus_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_numerus'].'</label>';
+		echo '</div>';
 		// Prikaz procentov
-		echo '<span class="clr"><input type="checkbox" id="percent_'.$this->table_id.'" name="percent" '.($this->table_settings[$this->table_id]['percent'] == 1 ? ' checked="checked"':'').' value="1" /><label for="percent_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_percent'].'</label></span>';	
+		echo '<div class="setting_item">';
-		
+		echo '<input type="checkbox" id="percent_'.$this->table_id.'" name="percent" '.($this->table_settings[$this->table_id]['percent'] == 1 ? ' checked="checked"':'').' value="1" /><label for="percent_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_percent'].'</label>';	
+		echo '</div>';
 		// Prikaz vsot
-		echo '<span class="clr"><input type="checkbox" id="sums_'.$this->table_id.'" name="sums" '.($this->table_settings[$this->table_id]['sums'] == 1 ? ' checked="checked"':'').' value="1" /><label for="sums_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_sum'].'</label></span>';
+		echo '<div class="setting_item">';
-				
+		echo '<input type="checkbox" id="sums_'.$this->table_id.'" name="sums" '.($this->table_settings[$this->table_id]['sums'] == 1 ? ' checked="checked"':'').' value="1" /><label for="sums_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_sum'].'</label>';
-		// Navedbe / enote
+		echo '</div>';
-		/*if($this->isCheckbox){
+					
-			echo '<span class="clr" style="line-height: 20px;">';
+		echo '</div>';
-			echo '<label for="navVsEno0_'.$this->table_id.'"><input type="radio" id="navVsEno0_'.$this->table_id.'" name="navVsEno" '.($this->table_settings[$this->table_id]['navVsEno'] == 0 ? ' checked="checked"':'').' value="0" />'.$lang['srv_analiza_crosstab_navedbe'].'</label>';
-			echo ' <label for="navVsEno1_'.$this->table_id.'"><input type="radio" id="navVsEno1_'.$this->table_id.'" name="navVsEno" '.($this->table_settings[$this->table_id]['navVsEno'] == 1 ? ' checked="checked"':'').' value="1" />'.$lang['srv_analiza_crosstab_enote'].'</label>';
-			echo '</span>';
-		}*/
 		
-		echo '</fieldset>';
+		echo '<h3>'.$lang['srv_multicrosstabs_settings_avg'].'</h3>';
-		
-		
-		echo '<fieldset>';
-		echo '<legend>'.$lang['srv_multicrosstabs_settings_avg'].'</legend>';
 		
 		// Variabla za racunanje povprecja - numeric in ordinal (radio, dropdown, mg)
 		$checked = $this->table_settings[$this->table_id]['avgVar'] == '' ? false : true;
-		echo '<span class="clr"><input type="checkbox" id="avgSetting_'.$this->table_id.'" name="avgSetting" '.($checked ? ' checked="checked"':'').' onClick="toggleMCSetting(\'avgVar\');" /><label for="avgSetting_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_avg'].'</label>';	
+
-		echo '<span id="avgVar" class="spaceLeft" '.($checked ? '' : ' style="display: none;"').'><select id="avgVar_'.$this->table_id.'" name="avgVar">';	
+		echo '<div class="setting_holder">';
+
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="avgSetting_'.$this->table_id.'" name="avgSetting" '.($checked ? ' checked="checked"':'').' onClick="toggleMCSetting(\'avgVar\');" /><label for="avgSetting_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_avg'].'</label>';	
+		echo '</div>';
+		echo '<div id="avgVar" class="setting_item" '.($checked ? '' : ' style="display: none;"').'>';
+		echo '<select class="dropdown medium" id="avgVar_'.$this->table_id.'" name="avgVar">';	
 		echo '<option value="">'.$lang['srv_select_spr'].'...</option>';
 		foreach($this->variablesList AS $spr){
 			if( $spr['canChoose'] && ($spr['tip'] == 7 || (in_array($spr['tip'], array(1,3,6)) && $spr['skala'] == 0)) ){			
 				echo '<option value="'.$spr['spr_id'].'-'.$spr['sequence'].'" '.($this->table_settings[$this->table_id]['avgVar'] == $spr['spr_id'].'-'.$spr['sequence'] ? ' selected="selected"' : '').'>('.$spr['variable'].') '.$this->snippet($spr['naslov'], 25).'</option>';
 			}
 		}
-		echo '</select></span>';
+		echo '</select>';
-		echo '</span>';
+		echo '</div>';
-		
+					
-		echo '</fieldset>';
+		echo '</div>';
 		
 		
-		echo '<fieldset>';
+		echo '<h3>'.$lang['srv_multicrosstabs_settings_del'].'</h3>';
-		echo '<legend>'.$lang['srv_multicrosstabs_settings_del'].'</legend>';
 		
 		// Variabla za racunanje deleza - ordinal in nominal (radio, dropdown, mg, po novem tudi checkbox, multicheckbox)
 		$checked = $this->table_settings[$this->table_id]['delezVar'] == '' ? false : true;
-		echo '<span class="clr"><input type="checkbox" id="delezSetting_'.$this->table_id.'" name="delezSetting" '.($checked ? ' checked="checked"':'').' onClick="toggleMCSetting(\'delezVar\');" /><label for="delezSetting_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_delez'].'</label>';	
+
-		
+		echo '<div class="setting_holder">';
-		echo '<span id="delezVar" class="spaceLeft" '.($checked ? '' : ' style="display: none;"').'><select id="delezVar_'.$this->table_id.'" name="delezVar" onChange="setDelez(this.value);">';
+
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="delezSetting_'.$this->table_id.'" name="delezSetting" '.($checked ? ' checked="checked"':'').' onClick="toggleMCSetting(\'delezVar\');" /><label for="delezSetting_'.$this->table_id.'"> '.$lang['srv_multicrosstabs_delez'].'</label>';	
+		echo '</div>';
+		echo '<div id="delezVar" class="setting_item" '.($checked ? '' : ' style="display: none;"').'>';
+		echo '<select class="dropdown medium" id="delezVar_'.$this->table_id.'" name="delezVar" onChange="setDelez(this.value);">';
 		echo '<option value="">'.$lang['srv_select_spr'].'...</option>';
 		foreach($this->variablesList AS $spr){
 			if($spr['canChoose'] && in_array($spr['tip'], array(1,3,6,2,16))){			
 				echo '<option value="'.$spr['spr_id'].'-'.$spr['sequence'].'" '.($this->table_settings[$this->table_id]['delezVar'] == $spr['spr_id'].'-'.$spr['sequence'] ? ' selected="selected"' : '').'>('.$spr['variable'].') '.$this->snippet($spr['naslov'], 25).'</option>';
 			}
 		}
-		echo '</select></span>';
+		echo '</select>';
-		echo '</span>';
+		echo '</div>';
+					
+		echo '</div>';
 		
 		echo '<div id="delez" '.($checked ? '' : ' style="display: none;"').'>';
 		$this->displayDelez($this->table_settings[$this->table_id]['delezVar']);
 		echo '</div>';
 		
-		echo '</fieldset>';
-		
 		
 		echo '</form>';
 		
-		
 		// Gumbi na dnu
-		echo '<div id="mcSettingsButtons">';
+		echo '<div class="button_holder">';
-		
+        echo '<button class="medium white-blue" onClick="closeMCSettings(\''.$this->table_id.'\');">'.$lang['srv_zapri'].'</button>';              
-		echo '<span class="buttonwrapper spaceRight floatLeft">';
+        echo '<button class="medium blue" onclick="saveMCSettings(\''.$this->table_id.'\');">'.$lang['srv_potrdi'].'</button>';
-		echo '<a class="ovalbutton ovalbutton_gray" onclick="closeMCSettings(\''.$this->table_id.'\');">';
+        echo '</div>';
-		echo '<span>'.$lang['srv_zapri'].'</span>';
-		echo '</a>';
-		echo '</span>';
-		
-		echo '<span class="buttonwrapper spaceRight spaceLeft floatLeft">';
-        echo '<a class="ovalbutton ovalbutton_orange" onclick="saveMCSettings(\''.$this->table_id.'\');">';
-		echo '<span>'.$lang['srv_potrdi'].'</span>';
-		echo '</a>';
-        echo '</span>';		
-	
-		echo '</div>';	
 	}
 	
 	// Prikazemo opcije variable (checkboxe) za delez
@@ -1490,9 +1508,13 @@ class SurveyMultiCrosstabs {
 				else
 					$val = 0;
 
-				echo '<span class="clr">';
+				echo '<div class="setting_holder">';
+
+				echo '<div class="setting_item">';
 				echo '<input type="checkbox" id="delez_'.$cnt.'" name="delez_'.$cnt.'" value="1" '.($val == 1 ? ' checked="checked"' : '').' /><label for="delez_'.$cnt.'"> '.$option.'</label>';
-				echo '</span>';
+				echo '</div>';
+
+				echo '</div>';
 				
 				$cnt++;
 			}
@@ -1528,10 +1550,12 @@ class SurveyMultiCrosstabs {
 		$href_xls = makeEncodedIzvozUrlString('izvoz.php?b=export&m=multicrosstabs_izpis_xls&anketa='.$this->ank_id);
 		
 		echo '<script>';
+
 		# nastavimopravilne linke
 		echo '$("#secondNavigation_links a#multicrosstabDoPdf").attr("href", "'.$href_pdf.'");';
 		echo '$("#secondNavigation_links a#multicrosstabDoRtf").attr("href", "'.$href_rtf.'");';
 		echo '$("#secondNavigation_links a#multicrosstabDoXls").attr("href", "'.$href_xls.'");';
+        
         # prikažemo linke
 		echo '$("#hover_export_icon a").removeClass("hidden");';
 		echo '$("#secondNavigation_links a").removeClass("hidden");';
@@ -2142,7 +2166,8 @@ class SurveyMultiCrosstabs {
 		$sql = sisplet_query("SELECT * FROM srv_mc_table WHERE id='$this->table_id' AND ank_id='$this->ank_id' AND usr_id='$global_user_id'");	
 		$current_table = mysqli_fetch_array($sql);
 		
-		echo '<h2>'.$lang['srv_multicrosstabs_tables'].'</h2>';		
+		echo '<h2>'.$lang['srv_multicrosstabs_tables'].'</h2>';	
+		echo '<div class="popup_close"><a href="#" onclick="close_mc_tables(); return false;">✕</a></div>';
 				
 				
 		echo '<div id="mc_tables_left">';	
@@ -2156,68 +2181,85 @@ class SurveyMultiCrosstabs {
 		}
 		
 		echo '</span>';
+
+		/*/ Cas kreiranja tabele
+		echo '<div id="table_create_time">';
+		$time_created = strtotime($current_table['time_created']);
+		echo $lang['srv_multicrosstabs_tables_time'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span>';
+		echo '</div>';*/
 				
 
-		// Na dnu imamo gumba brisi in preimenuj
+		// Na dnu imamo linka brisi in preimenuj
-		echo '<div style="float:left;">';
+        echo '<p class="blue pointer bottom8 top16" onClick="mc_table_action(\'show_rename\'); return false;">'.$lang['srv_multicrosstabs_tables_rename'].'</p>';              
-		echo '<a href="#" onclick="mc_table_action(\'show_rename\'); return false;">'.$lang['srv_multicrosstabs_tables_rename'].'</a><br/>'."\n";
+        echo '<p class="blue pointer" onclick="mc_table_action(\'show_delete\'); return false;">'.$lang['srv_multicrosstabs_tables_delete'].'</p>';
-		echo '<a href="#" onclick="mc_table_action(\'show_delete\'); return false;">'.$lang['srv_multicrosstabs_tables_delete'].'</a>'."\n";
-		echo '</div>';
 
 		
-		// Cas kreirranja tabele
-		echo '<div style="float:right; text-align:right;">';
-		$time_created = strtotime($current_table['time_created']);
-		echo $lang['srv_multicrosstabs_tables_time'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span><br />';
-		echo '</div>';
-			
 		echo '</div>';
 			
 		
 		// cover Div
-        echo '<div id="dsp_cover_div"></div>'."\n";	
+        echo '<div id="dsp_cover_div"></div>';	
 		
-		echo '<span class="clr"></span>';
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-black" onclick="close_mc_tables(); return false;">'.$lang['srv_zapri'].'</button>';
+        echo '<button class="medium white-blue" onClick="mc_table_action(\'show_new\'); return false;">'.$lang['srv_multicrosstabs_tables_add'].'</button>';              
+        echo '<button class="medium blue" onClick="use_mc_table(); return false;">'.$lang['srv_multicrosstabs_tables_use'].'</button>';              
+        echo '</div>';
+
+        echo '</div>';
 
-		echo '<div style="position:absolute; bottom:15px; right:15px;">';
-		
-		//echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="save_creport_profile(); return false;"><span>'.$lang['save'].'</span></a></div></span>';	
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="use_mc_table(); return false;"><span>'.$lang['srv_multicrosstabs_tables_use'].'</span></a></div></span>';
-		echo '<span class="floatRight spaceRight" title="'.$lang['srv_multicrosstabs_tables_add'].'"><div class="buttonwrapper"><a class="ovalbutton" href="#" onclick="mc_table_action(\'show_new\'); return false;"><span>'.$lang['srv_multicrosstabs_tables_add'] . '</span></a></div></span>';
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton" href="#" onclick="close_mc_tables(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
-	
-		echo '</div>';
 	}
 	
 	function displayMCTablesPopups(){
 		global $lang;
 		
 		// div za kreacijo novega
-        echo '<div id="newMCTable">';
+        echo '<div id="newMCTable" class="divPopUp PopUpNarrow">';
 
         echo '<h2>'.$lang['srv_new_table'].'</h2>';
-        
+
-		echo '<div style="float:left; width:400px; text-align:right;">'.$lang['srv_multicrosstabs_tables_name'].': '."\n";
+		echo '<div class="setting_holder">';
-        echo '<input id="newMCTableName" name="newMCTableName" type="text" value="" size="50"  /></div>'."\n";
+        echo '<label>'.$lang['srv_multicrosstabs_tables_name'].':</label>';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mc_table_action(\'new\'); return false;"><span>'.$lang['save'].'</span></a></span></span>'."\n";            
+		echo '<input id="newMCTableName" class="text large" name="newMCTableName" type="text" value="" />';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="mc_table_action(\'cancel_new\'); return false;"><span>'.$lang['srv_zapri'].'</span></a></span></span>'."\n";
+        echo '</div>';
-   		echo '<div class="floatRight clr" style="padding: 15px 5px 15px 0;"><a href="#" onClick="mc_table_action(\'goto_archive\');">'.$lang['srv_analiza_arhiv'].'</a></div>';
+
-		echo '</div>'."\n";
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-black" onclick="mc_table_action(\'goto_archive\');">'.$lang['srv_analiza_arhiv'].'</button>';
+        echo '<button class="medium white-blue" onClick="mc_table_action(\'cancel_new\'); return false;">'.$lang['srv_zapri'].'</button>';              
+        echo '<button class="medium blue" onClick="mc_table_action(\'new\'); return false;">'.$lang['save'].'</button>';              
+        echo '</div>';
+
+		echo '</div>';
 		
 		// div za preimenovanje
-        echo '<div id="renameMCTable">'.$lang['srv_multicrosstabs_tables_name'].': '."\n";
+        echo '<div id="renameMCTable" class="divPopUp PopUpNarrow">';
-        echo '<input id="renameMCTableName" name="renameMCTableName" type="text" size="45" />'."\n";
+		
-        echo '<input id="renameMCTableId" type="hidden" value="' . $this->table_id . '"  />'."\n";
+		echo '<div class="setting_holder">';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mc_table_action(\'rename\'); return false;"><span>'.$lang['srv_multicrosstabs_tables_rename_short'].'</span></a></span></span>'."\n";            
+		echo '<div class="setting_item">';
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="mc_table_action(\'cancel_rename\'); return false;"><span>'.$lang['srv_zapri'].'</span></a></span></span>'."\n";
+        echo '<label>'.$lang['srv_multicrosstabs_tables_name'].':</label>';
-        echo '</div>'."\n";
+		echo '<input id="renameMCTableName" name="renameMCTableName" class="text large" type="text" value="' . $this->table_id . '" />';
+        echo '</div>';
+        echo '</div>';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="mc_table_action(\'cancel_rename\'); return false;">'.$lang['srv_zapri'].'</button>';              
+        echo '<button class="medium blue" onclick="mc_table_action(\'rename\');">'.$lang['srv_multicrosstabs_tables_rename_short'].'</button>';
+        echo '</div>';
+		
+        echo '</div>';
 		
 		// div za brisanje
-        echo '<div id="deleteMCTable">'.$lang['srv_multicrosstabs_tables_delete_confirm'].': <span id="deleteMCTableName" style="font-weight:bold;"></span>?'."\n";
+        echo '<div id="deleteMCTable" class="divPopUp PopUpNarrow">';
-        echo '<input id="deleteMCTableId" type="hidden" value="' . $this->table_id . '"  />'."\n";
+		
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mc_table_action(\'delete\'); return false;"><span>'.$lang['srv_multicrosstabs_tables_delete_short'].'</span></a></span></span>'."\n";
+		echo $lang['srv_multicrosstabs_tables_delete_confirm'].': <span id="deleteMCTableName" class="semi-bold"></span>?';
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="mc_table_action(\'cancel_delete\'); return false;"><span>'.$lang['srv_zapri'].'</span></a></span></span>'."\n";            
+        echo '<input id="deleteMCTableId" type="hidden" value="' . $this->table_id . '"  />';
-        echo '</div>'."\n";
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="mc_table_action(\'cancel_delete\'); return false;">'.$lang['srv_zapri'].'</button>';              
+        echo '<button class="medium blue" onclick="mc_table_action(\'delete\');">'.$lang['srv_multicrosstabs_tables_delete_short'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
 	}
 	
 	// Vrnemo vse tabele uporabnika

admin/survey/classes/surveyAnalysis/class.SurveyTTest.php

@@ -33,11 +33,17 @@ class SurveyTTest
 	function __construct($sid) {
 
 		if ((int)$sid > 0) {
+            
 			$this->sid = $sid;
 
 			# polovimo vrsto tabel (aktivne / neaktivne)
 			SurveyInfo :: getInstance()->SurveyInit($this->sid);
 			$this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
+
+            // Pri glasovanju tega ne pustimo
+            if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){
+                die();
+            }
 				
 			# Inicializiramo in polovimo nastavitve missing profila
 			SurveyStatusProfiles::Init($this->sid);
@@ -162,17 +168,11 @@ class SurveyTTest
             $SSH = new SurveyStaticHtml($this->sid);
             $SSH -> displayTestDataBar(true);
 		}
-		
+							
-		/*echo '<div id="dataOnlyValid">';
-		SurveyStatusProfiles::displayOnlyValidCheckbox();
-		echo '</div>';*/
-			
-		//$this->DisplayLinks();
-		
 		echo '<div id="ttest_variables">';
 		$this->DisplayVariables();
 		echo '</div>'; # id="ttest_variables"
-		echo '<br class="clr">';
+
 		echo '<div id="ttestResults">';
 		$this->variableChange();
 		echo '</div>'; # id="ttestResults"
@@ -267,11 +267,12 @@ class SurveyTTest
 
 		$variables = $this->getVariableList(2);
 
-		echo '<span id="ttestSpremenljivkaSpan" class="floatLeft">';
-		echo $lang['srv_ttest_label1'];
-		echo '<br />';
 
-		echo '<select id="ttestSpremenljivka" name="ttestSpremenljivka" onchange="ttestSpremenljivkaChange();" autocomplete="off">';
+		echo '<div id="ttestSpremenljivkaSpan" class="ttestLeftHolder">';
+		
+        echo '<span class="title">'.$lang['srv_ttest_label1'].':</span>';
+
+		echo '<select id="ttestSpremenljivka" name="ttestSpremenljivka" class="dropdown large" onchange="ttestSpremenljivkaChange();" autocomplete="off">';
 		echo '<option value="0" selected="selected" >'. $lang['srv_ttest_select1_option'] . '</option>';
 		if (count($variables)) {
 			foreach ($variables as $variable) {
@@ -286,8 +287,8 @@ class SurveyTTest
 				.$variable['variableNaslov'] . '</option>';
 			}
 		}
-		echo '</select>'; # name="ttestSpremenljivka"
+		echo '</select>';
-		echo '<br class="clr"/><br/>';
+
 		#.(count($this->sessionData['ttest']['sub_conditions']) == 2?'':'class="active"').
 		$_active = $this->checkSubConditionsActive();
 		if ($this->sessionData['ttest']['spr2'] > 0) {
@@ -297,14 +298,17 @@ class SurveyTTest
 		} else {
 			echo '<div id="ttestVariablesSpan" style="display:none" '.($_active < 2 ? ' class="active"' : '').'></div>';
 		}
-		echo '</span>';
+
+		echo '</div>';
+
 
 		$cntSubConditionsActive = $this->checkSubConditionsActive();
-		echo '<span class="floatLeft spaceRight">&nbsp;</span>';
+
-		echo '<span id="ttestNumerusSpan" class="floatLeft'.($cntSubConditionsActive == 2 ? '' : ' gray').'">'; #gray
+		echo '<div id="ttestNumerusSpan" class="ttestRightHolder '.($cntSubConditionsActive == 2 ? '' : ' gray').'">';
-		echo $lang['srv_ttest_label2'];
+		
-		echo '<br />';
+        echo '<span class="title">'.$lang['srv_ttest_label2'].':</span>';
-		echo '<select id="ttestNumerus" name="ttestNumerus" onchange="ttestVariableChange();" autocomplete="off" '.($cntSubConditionsActive == 2 ? '' : ' disabled="disabled"').'>'; # 
+
+		echo '<select id="ttestNumerus" name="ttestNumerus" class="dropdown large" onchange="ttestVariableChange();" autocomplete="off" '.($cntSubConditionsActive == 2 ? '' : ' disabled="disabled"').'>'; # 
 		echo '<option value="0" selected="selected" >'. $lang['srv_ttest_select2_option'] . '</option>';
 		if (count($numerus)) {
 			foreach ($numerus as $variable) {
@@ -319,16 +323,27 @@ class SurveyTTest
 				. $variable['variableNaslov'] . '</option>';
 			}
 		}
-		echo '</select>'; # name="ttestSpremenljivka"		
+		echo '</select>';	
-		echo '</span>';
+
+		echo '</div>';
+        
 		
-		echo '<br /><span style="margin-left: 30px;">';
+        echo '<div class="ttestSubSetting">';
-		echo '<label><input id="showChart" type="checkbox" onchange="showTableChart(\'ttest\');" '.($this->sessionData['ttest_charts']['showChart']==true?' checked="checked"':'' ).'>'.$lang['srv_show_chart'].'</label>';
+
+        echo '<span class="title">'.$lang['settings'].':</span>';
+
+		echo '<span class="setting_line">';
+		echo '  <input id="showChart" type="checkbox" onchange="showTableChart(\'ttest\');" '.($this->sessionData['ttest_charts']['showChart']==true?' checked="checked"':'' ).'><label for="showChart">'.$lang['srv_show_chart'].'</label>';
 		echo '</span>';
-		echo '<span style="margin-left: 30px;"><a href="https://www.1ka.si/d/sl/pomoc/prirocniki/ttest?from1ka=1" target="_blank">';
+
-		echo $lang['srv_ttest_interpretacija_note'];
+        /*echo '<span class="setting_line">';
-		echo '</a></span>';
+		echo '  <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/ttest?from1ka=1" target="_blank">';
+		echo        $lang['srv_ttest_interpretacija_note'];
+		echo '  </a>';
 		echo Help::display('srv_ttest_interpretation');
+		echo '</span>';*/
+
+		echo '</div>';
 		
 		
 		// Shranimo spremenjene nastavitve v bazo
@@ -533,16 +548,17 @@ class SurveyTTest
 
 		if (isset($this->sessionData['ttest']['spr2']) && $this->sessionData['ttest']['spr2'] != 0){
 			$_spr = explode('_',$this->sessionData['ttest']['spr2']);
-			#$spr = $_spr[0];
 			$spr = $this->sessionData['ttest']['spr2'];
 				
 			if (isset($this->sessionData['ttest']['grid2'])){
 				$grid = $this->sessionData['ttest']['grid2'];
 			}
+
 			# poiščemo pripadajoče variable
 			$_spr_data = $this->_HEADERS[$this->sessionData['ttest']['spr2']];
-			echo $lang['srv_ttest_kategories_note'].' ('.$_spr_data['variable'].') '.$_spr_data['naslov'];
+
-			echo '<br/>';
+			echo '<span class="title">'.$lang['srv_ttest_kategories_note'].' ('.$_spr_data['variable'].') '.$_spr_data['naslov'].'</span>';
+
 			switch ($_spr_data['tip']) {
 				case 1:	#radio
 				case 3:	#dropdown
@@ -550,31 +566,42 @@ class SurveyTTest
 					#nardimo inpute za vse opcije
 					$sekvenca = $_spr_data['sequences'];
 					foreach ($_spr_data['options'] as $value => $option) {
-						echo '<label '.($this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value) == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>('.$value.') - '.$option.'</label><br/>';
+                        echo '<span class="setting_line '.($this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value) == ' disabled="disabled"' ? 'gray' : '').'">';
+						echo '  <input name="subTtest" id="subTtest_'.$spr.'_'.$sekvenca.'_'.$value.'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>';
+                        echo '  <label for="subTtest_'.$spr.'_'.$sekvenca.'_'.$value.'">('.$value.') - '.$option.'</label>';
+                        echo '</span>';
 					}
 					break;
-				case 2:	#checkbox
+                    case 2:	#checkbox
 					#nardimo inpute za vse opcije
 					$option = '1';
 					foreach ($_spr_data['grids'][0]['variables'] as $vid => $variable) {
-						echo '<label '.($this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option) == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option. '" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
+                        echo '<span class="setting_line '.($this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option) == ' disabled="disabled"' ? 'gray' : '').'">';
+						echo '  <input name="subTtest" id="subTtest_'.$spr.'_'.$variable['sequence'].'_'.$option.'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>';
+                        echo '  <label for="subTtest_'.$spr.'_'.$variable['sequence'].'_'.$option.'">('.$variable['variable'].') - '.$variable['naslov'].'</label>';
+                        echo '</span>';
 					}
 					break;
-				case 6:	#mgrid
+                    case 6:	#mgrid
 					#nardimo inpute za vse opcije
 					$sekvenca =	$this->sessionData['ttest']['seq2'];
 					foreach ($_spr_data['options'] as $value => $option) {
-						//$sekvenca = $_spr_data['grids'][$value]['variables'][0]['sequence'];
+                        echo '<span class="setting_line '.($this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value) == ' disabled="disabled"' ? 'gray' : '').'">';
-						echo '<label '.($this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value) == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>('.$value.') - '.$option.'</label><br/>';
+						echo '  <input name="subTtest" id="subTtest_'.$spr.'_'.$sekvenca.'_'.$value.'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>';
+                        echo '  <label for="subTtest_'.$spr.'_'.$sekvenca.'_'.$value.'">('.$value.') - '.$option.'</label>';
+                        echo '</span>';
 					}
 					break;
-				case 16:	#mcheck
+                    case 16:	#mcheck
 					#nardimo inpute za vse opcije
 					# poiščemo pripadajočo sekvenco
 					#nardimo inpute za vse opcije
 					$option = '1';
 					foreach ($_spr_data['grids'][$grid]['variables'] as $vid => $variable) {
-						echo '<label '.($this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option) == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>';
+                        echo '<span class="setting_line '.($this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option) == ' disabled="disabled"' ? 'gray' : '').'">';
+                        echo '  <input name="subTtest" id="subTtest_'.$spr.'_'.$variable['sequence'].'_'.$option.'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>';
+                        echo '  <label for="subTtest_'.$spr.'_'.$variable['sequence'].'_'.$option.'">('.$variable['variable'].') - '.$variable['naslov'].'</label>';
+                        echo '</span>';
 					}
 					break;
 
@@ -602,17 +629,13 @@ class SurveyTTest
 		if (count($this->sessionData['ttest']['sub_conditions']) > 1 ) {
 			$variables1 = $this->getSelectedVariables();
 			if (count($variables1) > 0) {
+
 				// ikone za izvoz
 				$this->displayExport();
+
 				foreach ($variables1 AS $v_first) {
 
-					$ttest = null;
+                    // Zvezdica za vkljucitev v porocilo
-					/*$ttest = $this->createTTestOld($v_first, $this->sessionData['ttest']['sub_conditions']);
-					$this->displayTtestTable($ttest);*/
-					$ttest = $this->createTTest($v_first, $this->sessionData['ttest']['sub_conditions']);
-					$this->displayTtestTable($ttest);
-					
-					// Zvezdica za vkljucitev v porocilo
 					$spid1 = $this->sessionData['ttest']['variabla'][0]['spr'];
 					$seq1 = $this->sessionData['ttest']['variabla'][0]['seq'];
 					$grid1 = $this->sessionData['ttest']['variabla'][0]['grd'];
@@ -626,6 +649,11 @@ class SurveyTTest
 					$spr1 = $seq2.'-'.$spid2.'-'.$grid2.'-'.$sub1.'-'.$sub2;
 					$spr2 = $seq1.'-'.$spid1.'-'.$grid1;
 					SurveyAnalysis::addCustomReportElement($type=7, $sub_type=0, $spr1, $spr2);
+
+                    // Tabela
+					$ttest = null;
+					$ttest = $this->createTTest($v_first, $this->sessionData['ttest']['sub_conditions']);
+					$this->displayTtestTable($ttest);
 					
 					// Izrisemo graf za tabelo
 					if(isset($this->sessionData['ttest_charts']['showChart']) && $this->sessionData['ttest_charts']['showChart'] == true){
@@ -989,22 +1017,28 @@ class SurveyTTest
 		$grid1 = $this->sessionData['ttest']['variabla'][0]['grd'];
 
 		if (is_array($ttest) && count($ttest) > 0 && (int)$seq1 > 0) {
+
 			if ($this->isArchive == false) {
+
 				echo '<div id="displayFilterNotes">';
+
 				# če ne uporabljamo privzetega časovnega profila izpišemo opozorilo
 				SurveyTimeProfiles :: printIsDefaultProfile();
-				# če imamo filter ifov ga izpišemo
+				
+                # če imamo filter ifov ga izpišemo
 				SurveyConditionProfiles:: getConditionString($doNewLine );
-				# če imamo filter spremenljivk ga izpišemo
+				
+                # če imamo filter spremenljivk ga izpišemo
 				SurveyVariablesProfiles:: getProfileString($doNewLine, true);
 				SurveyDataSettingProfiles :: getVariableTypeNote($doNewLine );
-				# če rekodiranje
+				
+                # če rekodiranje
 				$SR = new SurveyRecoding($this->sid);
 				$SR -> getProfileString();
+
 				echo '</div>';
-					
-				echo '<br class="clr" />';
 			}
+
 			$spr_data_1 = $this->_HEADERS[$spid1];
 			if ($grid1 == 'undefined') {
 
@@ -1019,7 +1053,8 @@ class SurveyTTest
 						}
 					}
 				}
-			} else {
+			} 
+            else {
 				# imamo subgrid
 				$sprLabel1 = '('.$spr_data_1['grids'][$grid1]['variable'].') '. $spr_data_1['grids'][$grid1]['naslov'];
 			}
@@ -1029,84 +1064,101 @@ class SurveyTTest
 			$sprLabel2 =  trim($this->sessionData['ttest']['label2']);
 			$label1 = $this->getVariableLabels($this->sessionData['ttest']['sub_conditions'][0]);
 			$label2 = $this->getVariableLabels($this->sessionData['ttest']['sub_conditions'][1]);
-			echo '<table border="0" class="ttestTable">';
+
-			echo '<tr>';
+
+			echo '<table class="table_ttest">';
+            
+
+			echo '<tr class="row1">';
+
 			#labele
-			echo '<td class="lightGreen" rowspan="2" >';
+			echo '<td class="cell_question" rowspan="2" >';
-			echo '<span class="anl_variabla">';
+			echo '  <span class="anl_variabla">';
-			echo '<a href="#" onclick="showspremenljivkaSingleVarPopup(\''.$spid2.'\'); return false;">';
+			echo '      <a href="#" onclick="showspremenljivkaSingleVarPopup(\''.$spid2.'\'); return false;">';
-			echo $sprLabel2.'</a>';
+			echo            $sprLabel2;
-			echo '</span>';
+            echo '      </a>';
+			echo '  </span>';
 			echo '</td>';
 				
-			echo '<td class="lightGreen" colspan="9">';
+			echo '<td class="cell_question" colspan="9">';
-			echo '<span class="anl_variabla">';
+			echo '  <span class="anl_variabla">';
-			echo '<a href="#" onclick="showspremenljivkaSingleVarPopup(\''.$spid1.'\'); return false;">';
+			echo '      <a href="#" onclick="showspremenljivkaSingleVarPopup(\''.$spid1.'\'); return false;">';
-			echo $sprLabel1.'</a>';
+			echo            $sprLabel1;
-			echo '</span>';
+			echo '      </a>';
+			echo '  </span>';
 			echo '</td>';
+
 			echo '</tr>';
-			echo '<tr>';
+
-			#echo '<th colspan="2">&nbsp;</th>';
+
+			echo '<tr class="row2">';
+
 			#frekvenca
-			echo '<th >n</th>';
+			echo '<td class="cell_value">n</td>';
 			#povprečje
-			echo '<th><span class="avg">x</span></th>';
+			echo '<td class="cell_value"><span class="avg">x</span></td>';
 			#varianca
-			echo '<th>s&#178;</th>';
+			echo '<td class="cell_value">s&#178;</td>';
 			#standardna napaka
-			echo '<th>se(<span class="avg">x</span>)</th>';
+			echo '<td class="cell_value">se(<span class="avg">x</span>)</td>';
 			#margini
-			echo '<th>&#177;1,96&#215;se(<span class="avg">x</span>)</th>';
+			echo '<td class="cell_value">&#177;1,96&#215;se(<span class="avg">x</span>)</td>';
 			#d
-			echo '<th>d</th>';
+			echo '<td class="cell_value">d</td>';
 			#sed
-			echo '<th>se(d)</th>';
+			echo '<td class="cell_value">se(d)</td>';
 			#signifikanca
-			echo '<th>Sig.</th>';
+			echo '<td class="cell_value">Sig.</td>';
 			#ttest
-			echo '<th>t</th>';
+			echo '<td class="cell_value">t</td>';
+
 			echo '</tr>';
 
+
 			echo '<tr>';
 
-			#labele
+			#labele	
-				
+			echo '<td class="cell_question">'.$label1.'</td>';
-			echo '<td class="lightGreen">'.$label1.'</td>';
 			#frekvenca
-			echo '<td>'.$this->formatNumber($ttest[1]['n'],0).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['n'],0).'</td>';
 			#povprečje
-			echo '<td>'.$this->formatNumber($ttest[1]['x'],3).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['x'],3).'</td>';
 			#varianca
-			echo '<td>'.$this->formatNumber($ttest[1]['s2'],3).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['s2'],3).'</td>';
 			#standardna napaka
-			echo '<td>'.$this->formatNumber($ttest[1]['se'],3).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['se'],3).'</td>';
 			#margini
-			echo '<td>'.$this->formatNumber($ttest[1]['margin'],3).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['margin'],3).'</td>';
 			#d
-			echo '<td rowspan="2">'.$this->formatNumber($ttest['d'],3).'</td>';
+			echo '<td class="cell_value" rowspan="2">'.$this->formatNumber($ttest['d'],3).'</td>';
 			#sed
-			echo '<td rowspan="2">'.$this->formatNumber($ttest['sed'],3).'</td>';
+			echo '<td class="cell_value" rowspan="2">'.$this->formatNumber($ttest['sed'],3).'</td>';
 			#sig
-			echo '<td rowspan="2">'.$this->formatNumber($ttest['sig'],3).'</td>';
+			echo '<td class="cell_value" rowspan="2">'.$this->formatNumber($ttest['sig'],3).'</td>';
 			#ttest
-			echo '<td rowspan="2">'.$this->formatNumber($ttest['t'],3).'</td>';
+			echo '<td class="cell_value" rowspan="2">'.$this->formatNumber($ttest['t'],3).'</td>';
+
 			echo '</tr>';
 
+
 			echo '<tr>';
+
 			#labele
-			echo '<td class="lightGreen">'.$label2.'</td>';
+			echo '<td class="cell_question">'.$label2.'</td>';
 			#frekvenca
-			echo '<td>'.$this->formatNumber($ttest[2]['n'],0).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['n'],0).'</td>';
 			#povprečje
-			echo '<td>'.$this->formatNumber($ttest[2]['x'],3).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['x'],3).'</td>';
 			#varianca
-			echo '<td>'.$this->formatNumber($ttest[2]['s2'],3).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['s2'],3).'</td>';
 			#standardna napaka
-			echo '<td>'.$this->formatNumber($ttest[2]['se'],3).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['se'],3).'</td>';
 			#margini
-			echo '<td>'.$this->formatNumber($ttest[2]['margin'],3).'</td>';
+			echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['margin'],3).'</td>';
+
 			echo '</tr>';
+
+
 			echo '</table>';
 		}
 		

admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php

@@ -1705,8 +1705,7 @@ class SurveyTableChart {
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
 		$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,0,0,0,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
 		$Test->drawGrid(4,TRUE,230,230,230,50);
@@ -1764,8 +1763,7 @@ class SurveyTableChart {
 		$Test->setGraphArea($this->settings['hq']*$startX,$this->settings['hq']*70,$this->settings['hq']*650,$this->settings['hq']*(220+$addHeight));
 		
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 
 		// Če gre za hierarhijo, potem je fiksna skala
@@ -1849,8 +1847,7 @@ class SurveyTableChart {
 			$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
 		
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
 		$Test->drawGrid(4,TRUE,230,230,230,50);
@@ -1905,24 +1902,12 @@ class SurveyTableChart {
 		$roundText = ($this->settings['labelWidth'] == 20) ? 35 : 65;
 		
 		// Pri navadnem radio in checkbox vprasanju imamo samo en stolpec - zato so dimenzije drugacne
-		/*if($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3){
+        $Test->setGraphArea($this->settings['hq']*$startX,$this->settings['hq']*70,$this->settings['hq']*650,$this->settings['hq']*(220+$addHeight));
-			$Test->setGraphArea($this->settings['hq']*200,$this->settings['hq']*50,$this->settings['hq']*630,$this->settings['hq']*220);
+        $Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255);
-			$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*243,5,255,255,255);
+        //$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(295+$addHeight),200,200,200);
-			//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
+        $Test->drawGraphArea(255,255,255,TRUE);
-			$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*295,200,200,200);
+        $Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE,1,FALSE,$roundText);
-			$Test->drawGraphArea(255,255,255,TRUE);
+        $Test->drawHorGrid(4,TRUE,230,230,230,50);
-			$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE);
-			$Test->drawHorGrid(4,TRUE,230,230,230,50);
-		}
-		else{*/
-			$Test->setGraphArea($this->settings['hq']*$startX,$this->settings['hq']*70,$this->settings['hq']*650,$this->settings['hq']*(220+$addHeight));
-			$Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255);
-			//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
-			$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(295+$addHeight),200,200,200);
-			$Test->drawGraphArea(255,255,255,TRUE);
-			$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE,1,FALSE,$roundText);
-			$Test->drawHorGrid(4,TRUE,230,230,230,50);
-		//}	
 
 		// Draw the 0 line
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
@@ -1975,12 +1960,8 @@ class SurveyTableChart {
 		
 		$Test->setLineStyle($this->settings['hq'],$DotSize=0);
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
-		//$Test->setGraphArea(50,40,685,220);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
-		//$Test->createColorGradientPalette(195,204,56,223,110,41,3);
-		//$Test->createColorGradientPalette(168,188,56,248,255,136,5);
 		
 		// Draw the pie graph
 		$labels = ($this->settings['sort'] == 1) ? 'custom_percent_sort' : 'custom_percent';
@@ -2018,12 +1999,8 @@ class SurveyTableChart {
 		
 		$Test->setLineStyle($this->settings['hq'],$DotSize=0);
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
-		//$Test->setGraphArea(50,40,685,220);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
-		//$Test->createColorGradientPalette(195,204,56,223,110,41,3);
-		//$Test->createColorGradientPalette(168,188,56,248,255,136,5);
 		
 		// Draw the pie graph
 		$labels = ($this->settings['sort'] == 1) ? 'custom_percent_sort' : 'custom_percent';
@@ -2067,8 +2044,7 @@ class SurveyTableChart {
 		$Test->setGraphArea($this->settings['hq']*270,$this->settings['hq']*50,$this->settings['hq']*530,$this->settings['hq']*(220+$addHeight));
 		
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		
 		
@@ -2122,11 +2098,7 @@ class SurveyTableChart {
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
 		$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*320);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*343,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*345,200,200,200);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*345,200,200,200);
-		//$Test->drawGraphArea(255,255,255,TRUE);
-		//$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,20,20,20,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
-		//$Test->drawGrid(4,TRUE,230,230,230,50);
 
 		// Draw the 0 line
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
@@ -2179,8 +2151,7 @@ class SurveyTableChart {
 		$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
 		$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
 		$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
-		//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
+		//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
-		$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
 		$Test->drawGraphArea(255,255,255,TRUE);
 		$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,0,0,0,TRUE,$angle,0,TRUE);
 		if($count <= 20)
@@ -2213,13 +2184,16 @@ class SurveyTableChart {
 		global $lang;
 				
 		// Ikone izvoza na vrhu posameznih nastavitev
-		//$this->displayExportIcons($chartID);
+		$this->displayExportIcons($chartID);
-		
-		
-		echo '<div id="switch_left_'.$chartID.'_loop_0" class="switch_left '.($this->settings_mode == 1 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'0\', \'0\')">'.$lang['srv_chart_settings_basic'].'</div>';		
-		//echo '<span id="switch_middle_'.$chartID.'_loop_0" class="'.($this->settings_mode == 1 ? 'rightHighlight' : 'leftHighlight').'"></span>';	
-		echo '<div id="switch_right_'.$chartID.'_loop_0" class="switch_right '.($this->settings_mode == 0 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'1\', \'0\')">'.$lang['srv_chart_settings_advanced'].'</div>';
 		
+
+		echo '<div class="chart_settings_content">';
+        
+
+        echo '<div class="tab_holder">';
+		echo '  <div id="switch_left_'.$chartID.'_loop_0" class="tab switch_left '.($this->settings_mode == 1 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'0\', \'0\')">'.$lang['srv_chart_settings_basic'].'</div>';		
+		echo '  <div id="switch_right_'.$chartID.'_loop_0" class="tab switch_right '.($this->settings_mode == 0 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'1\', \'0\')">'.$lang['srv_chart_settings_advanced'].'</div>';
+		echo '</div>';
 		
 		// OSNOVNE NASTAVITVE
 		echo '<div class="chart_settings_inner" id="chart_settings_basic_'.$chartID.'_loop_0" '.($this->settings_mode == 1 ? ' style="display:none;"' : '').'>';
@@ -2261,8 +2235,8 @@ class SurveyTableChart {
 				// visoka locljivost grafa
 				echo '<div class="chart_setting">';
 					
-				echo $lang['srv_chart_hq'].': ';
 				echo '<input type="checkbox" id="tablechart_hq_'.$chartID.'" name="tablechart_hq" '.($settings['hq']=='3'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \''.$this->podstran.'\', \'hq\');">';
+				echo '<label for="tablechart_hq_'.$chartID.'">'.$lang['srv_chart_hq'].'</label>';
 
 				echo '</div>';
 				break;
@@ -2273,33 +2247,18 @@ class SurveyTableChart {
 				
 				$checked = ($settings['show_numerus']=='1') ? ' checked="checked"': '';
 
-				echo $lang['srv_chart_showNumerus'].': ';
 				echo '<input type="checkbox" id="tablechart_show_numerus_'.$chartID.'" name="tablechart_show_numerus" '.$checked.' onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'show_numerus\');">';
+				echo '<label for="tablechart_show_numerus_'.$chartID.'">'.$lang['srv_chart_showNumerus'].'</label>';
 
 				echo '</div>';
 				
 			default:
 				break;
-		}
+		}			
-		
-		
-		// Link na urejanje label
-		//echo '<span class="edit" style="margin-top:15px;" onclick="chartAdvancedSettings(\''.$this->counter.'\');">'.$lang['srv_chart_advancedLink_labels'].'</span>';	
-		// Vprasajcek za pomoc
-		//echo Help :: display('displaychart_settings_labels');
-		
-		// Link na urejanje barv
-		echo '<span class="edit" onclick="tableChartAdvancedSettings(\''.$chartID.'\', \''.$this->podstran.'\')">'.$lang['srv_chart_advancedLink_colors'].'</span>';	
-		// Vprasajcek za pomoc
-		echo Help :: display('displaychart_settings_colors');		
-		
-		// Link na rekodiranje
-		//echo '<span class="edit" onclick="chartAdvancedSettings(\''.$this->counter.'\', \'3\');">'.$lang['srv_chart_advancedLink_recoding'].'</span>';	
-		// Vprasajcek za pomoc
-		//echo Help :: display('displaychart_settings_recoding');
-			
 			
 		echo '</div>';
+
+		echo '</div>';
 	}
 	
 	// ikone na vrhu posameznih nastavitev (izvozi)
@@ -2310,16 +2269,9 @@ class SurveyTableChart {
 		// linki
 		echo '<div class="chart_setting_exportLinks">';
 				
-			// Ikona za print
+        // Gumb za nastavitve
-			echo '<a href="#" onclick="showAnalizaSingleChartPopup(\''.$chartID.'\',\''.M_ANALYSIS_CHARTS.'\'); return false;">';		
+        echo '<button class="small white-blue" onClick="tableChartAdvancedSettings(\''.$chartID.'\', \''.$this->podstran.'\');"><span class="faicon wheel_32"></span>'.$lang['settings'].'</button>';
-			echo '<span class="faicon print_small icon-grey_dark_link" title="' . $lang['PRN_Izpis'] . '"></span>';
-			echo '</a>';
 
-			// Izvoz posameznega grafa v PDF/RTF/PPT
-			echo '&nbsp;<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts&anketa='.$this->anketa.'&sprID='.$chartID).'" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf"></span>&nbsp;</a>';
-			echo '&nbsp;<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_rtf&anketa='.$this->anketa.'&sprID='.$chartID).'" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf"></span>&nbsp;</a>';
-			echo '&nbsp;<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_ppt&anketa='.$this->anketa.'&sprID='.$chartID).'" target="_blank" title="'.$lang['PPT_Izpis'].'"><span class="faicon ppt"></span>&nbsp;</a>';
-			
 		echo '</div>';
 	}
 	
@@ -2331,7 +2283,7 @@ class SurveyTableChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'type\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'type\');">';
 
 		if($this->crossCheck){
 			// navedbe
@@ -2364,7 +2316,7 @@ class SurveyTableChart {
 			
 		// tip izpisa vrednosti		
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_valtype'].': <select id="tablechart_value_type_'.$chartID.'" name="tablechart_value_type" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'value_type\');">';
+		echo $lang['srv_chart_valtype'].': <select id="tablechart_value_type_'.$chartID.'" name="tablechart_value_type" class="dropdown small" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'value_type\');">';
 			
 		echo '  <option value="0" '.($settings['value_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_percent'].'</option>';
 		echo '  <option value="1" '.($settings['value_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_freq'].'</option>';
@@ -2374,29 +2326,12 @@ class SurveyTableChart {
 		
 		
 		// prikaz label v stolpcih
-		//if($settings['type'] == 0 || $settings['type'] == 1){
+        echo '<div class="chart_setting">';
-			echo '<div class="chart_setting">';
+        
-			
+        echo '<input type="checkbox" id="tablechart_barLabel_'.$chartID.'" name="tablechart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'barLabel\');">';
-			echo $lang['srv_chart_barLabel'].': ';
+        echo '<label for="tablechart_barLabel_'.$chartID.'">'.$lang['srv_chart_barLabel'].'</label>';
-			echo '<input type="checkbox" id="tablechart_barLabel_'.$chartID.'" name="tablechart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'barLabel\');">';
 
-			echo '</div>';
+        echo '</div>';
-		//}
-		
-		
-		// sirina label
-		/*if($settings['type'] == 0 || $settings['type'] == 3){
-			echo '<div class="chart_setting">';
-			
-			echo $lang['srv_wide_chart'].': <select id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'labelWidth\');">';
-			
-			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
-			echo '  <option value="20" '.($settings['labelWidth']=='20'?' selected="selected"':'').'>20%</option>';
-			
-			echo '</select>';
-			
-			echo '</div>';
-		}*/
 	}
 	
 	// Nastavitve za ttest graf
@@ -2407,7 +2342,7 @@ class SurveyTableChart {
 		// sirina label
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_wide_chart'].': <select id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'labelWidth\');">';
+		echo $lang['srv_wide_chart'].': <select class="dropdown small" id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'labelWidth\');">';
 		
 		echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
 		echo '  <option value="20" '.($settings['labelWidth']=='20'?' selected="selected"':'').'>20%</option>';
@@ -2420,8 +2355,8 @@ class SurveyTableChart {
 		// visoka locljivost grafa
 		echo '<div class="chart_setting">';
 			
-		echo $lang['srv_chart_hq'].': ';
 		echo '<input type="checkbox" id="tablechart_hq_'.$chartID.'" name="tablechart_hq" '.($settings['hq']=='3'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'hq\');">';
+		echo '<label for="tablechart_hq_'.$chartID.'">'.$lang['srv_chart_hq'].'</label>';
 
 		echo '</div>';
 	}
@@ -2433,7 +2368,7 @@ class SurveyTableChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'type\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'type\');">';
 
 		echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_avg_hor'].'</option>';
 		echo '  <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_avg_radar'].'</option>';
@@ -2446,8 +2381,8 @@ class SurveyTableChart {
 		// sortiranje
 		echo '<div class="chart_setting">';
 		
-		echo $lang['srv_chart_sort'].': ';
 		echo '<input type="checkbox" id="tablechart_sort_'.$chartID.'" name="tablechart_sort" '.($settings['sort']=='1'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'sort\');">';
+		echo '<label for="tablechart_sort_'.$chartID.'">'.$lang['srv_chart_sort'].'</label>';
 
 		echo '</div>';
 			
@@ -2456,7 +2391,7 @@ class SurveyTableChart {
 		if($settings['type'] == 0){
 			echo '<div class="chart_setting">';
 			
-			echo $lang['srv_wide_chart'].': <select id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'labelWidth\');">';
+			echo $lang['srv_wide_chart'].': <select class="dropdown small" id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'labelWidth\');">';
 			
 			echo '  <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
 			echo '  <option value="20" '.($settings['labelWidth']=='20'?' selected="selected"':'').'>20%</option>';
@@ -2470,7 +2405,7 @@ class SurveyTableChart {
 		// Tip radarja		
 		if($settings['type'] == 1){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_type\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_type\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -2482,7 +2417,7 @@ class SurveyTableChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == 1){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_scale\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_scale\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -2501,7 +2436,7 @@ class SurveyTableChart {
 		
 		// Tip grafa
 		echo '<div class="chart_setting">';
-		echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'type\');">';
+		echo $lang['srv_chart_type'].': <select class="dropdown small" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'type\');">';
 		
 		if($tip != 7)
 			echo '  <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar'].'</option>';
@@ -2515,7 +2450,7 @@ class SurveyTableChart {
 		// sortiranje
 		echo '<div class="chart_setting">';
 
-		echo $lang['srv_chart_sort'].': <select id="tablechart_sort_'.$chartID.'" name="tablechart_sort" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'sort\');">';
+		echo $lang['srv_chart_sort'].': <select class="dropdown small" id="tablechart_sort_'.$chartID.'" name="tablechart_sort" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'sort\');">';
 			
 		echo '  <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
 		if($tip != 7)
@@ -2531,13 +2466,13 @@ class SurveyTableChart {
 		
 		if($settings['rotate']=='1'){
 			echo $lang['srv_chart_rotate_grids'].' ';
-			echo '<span onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+			echo '<span class="faicon refresh" onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 			echo '<input type="hidden" id="tablechart_rotate_'.$chartID.'" name="tablechart_rotate" value="0">';
 			echo ' '.$lang['srv_chart_rotate_vars'].' ';
 		}
 		else{
 			echo $lang['srv_chart_rotate_vars'].' ';
-			echo '<span onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
+			echo '<span class="faicon refresh" onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
 			echo '<input type="hidden" id="tablechart_rotate_'.$chartID.'" name="tablechart_rotate" value="1">';
 			echo ' '.$lang['srv_chart_rotate_grids'];
 		}
@@ -2546,7 +2481,7 @@ class SurveyTableChart {
 		// Tip radarja		
 		if($settings['type'] == '0'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_type'].': <select id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_type\');">';
+			echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_type\');">';
 			
 			echo '  <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@@ -2558,7 +2493,7 @@ class SurveyTableChart {
 		// Postavitev skale pri radarju
 		if($settings['type'] == '0'){		
 			echo '<div class="chart_setting">';
-			echo $lang['srv_chart_radar_scale'].': <select id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_scale\');">';
+			echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_scale\');">';
 			
 			echo '  <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
 			echo '  <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@@ -2590,7 +2525,6 @@ class SurveyTableChart {
 		
 		// urejanje label
 		echo '<div id="chartSettingsArea2" class="chartSettingsArea" style="visibility: hidden;">';
-		//$this->displayAdvancedSettingsLabels($chartID);	
 		echo '</div>';
 		
 		echo '</form>';

admin/survey/classes/surveyData/class.SurveyDataCollect.php

@@ -3254,12 +3254,12 @@ class SurveyDataCollect{
 		}
 
 		$this->_array_random = array();
-            
+        $i=0;
         
 		// Preberemo vsa VPRASANJA ki imajo vklopljeno randomizacijo
 		$_qry_random_spr = sisplet_query("SELECT s.id, s.variable FROM srv_spremenljivka s, srv_grupa g 
                                             WHERE g.ank_id='".$this->sid."' AND s.gru_id=g.id AND s.random='1' 
-                                            ORDER BY s.vrstni_red");
+                                            ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
 		if (!$_qry_random_spr) {
 			$this->trigerError('get_random', mysqli_error($GLOBALS['connect_db']));
 		}
@@ -3269,11 +3269,14 @@ class SurveyDataCollect{
 
 		// Napolnimo array z randomiziranimi vprasanji
 		if ($cnt_rows > 0) {
+
+            
 			while ($row = mysqli_fetch_array($_qry_random_spr)) {
-					
+                $this->_array_random[$i]['id'] = $row['id'];
-				$this->_array_random[$row['id']]['id'] = $row['id'];
+				$this->_array_random[$i]['variable'] = $row['variable'];
-				$this->_array_random[$row['id']]['variable'] = $row['variable'];
+				$this->_array_random[$i]['type'] = 'spr';
-				$this->_array_random[$row['id']]['type'] = 'spr';
+
+                $i++;
 			}
 		}
 
@@ -3296,9 +3299,9 @@ class SurveyDataCollect{
 
 			while ($row = mysqli_fetch_array($_qry_random_blok)) {
 					
-				$this->_array_random[$row['id']]['id'] = $row['id'];
+				$this->_array_random[$i]['id'] = $row['id'];
-				$this->_array_random[$row['id']]['variable'] = $row['label'];
+				$this->_array_random[$i]['variable'] = $row['label'];
-                $this->_array_random[$row['id']]['number'] = $row['number'];
+                $this->_array_random[$i]['number'] = $row['number'];
                 
                 // Napolnimo string z id-ji blokov
                 $this->_str_blocks .= $prefix.$row['id'];
@@ -3306,12 +3309,14 @@ class SurveyDataCollect{
 		
 				// Blok ima randomizirane bloke
 				if($row['random'] == -2){
-					$this->_array_random[$row['id']]['type'] = 'blok_blok';
+					$this->_array_random[$i]['type'] = 'blok_blok';
 				}
 				// Blok ima randomizirana vprasanja
 				else{
-					$this->_array_random[$row['id']]['type'] = 'blok_spr';
+					$this->_array_random[$i]['type'] = 'blok_spr';
-				}					
+				}				
+                
+                $i++;
 			}
 		}
     }

admin/survey/classes/surveyData/class.SurveySNDataFile.php

@@ -338,8 +338,10 @@ class SurveySNDataFile {
 	
 	function displayFullTableCheckbox() {
 		global $lang;
+
 		session_start();
-		echo '<label><input id="snCreateFullTable" name="snCreateFullTable" onclick="setSnDisplayFullTableCheckbox();" type="checkbox"'.($this->snCreateFullTable==true?' checked="checked"':'').'>Prikaži razširjeno tabelo</label>';
+
+		echo '<input id="snCreateFullTable" name="snCreateFullTable" onclick="setSnDisplayFullTableCheckbox();" type="checkbox"'.($this->snCreateFullTable==true?' checked="checked"':'').'><label for="snCreateFullTable">Prikaži razširjeno tabelo</label>';
 	}
 	
 	
@@ -387,7 +389,7 @@ class SurveySNDataFile {
 					$SN_HEADER = unserialize(file_get_contents($_SN_head_file_name));
 					echo '<div id="tableContainer" class="tableContainer">';
 
-					echo '<h3>'.$lang['srv_loop_for_variable'].' <b>['. $this->sn_loop_data[$lpid]['variable']. '] - '. $this->sn_loop_data[$lpid]['naslov']. '</b>  ('.$lang['srv_loop_antonucci_circle'].' '.$this->sn_loop_data[$lpid]['antonucci'].')</h3>';
+					echo '<h3 class="sn_title">'.$lang['srv_loop_for_variable'].' <span class="semi-bold">['. $this->sn_loop_data[$lpid]['variable']. '] - '. $this->sn_loop_data[$lpid]['naslov']. '</span>  ('.$lang['srv_loop_antonucci_circle'].' '.$this->sn_loop_data[$lpid]['antonucci'].')</h3>';
 					
 
                     // TABELA

admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php

@@ -117,7 +117,7 @@ class SurveyUnsubscribe {
 		return array(substr($cookie,0,6), $cookie);
 	}
 
-	function doUnsubscribe() {
+	public function doUnsubscribe() {
 		global $lang;
 		
 		$anketa = self::$sid;

admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php

@@ -220,7 +220,7 @@ class SqualoApi {
         "gdprCanSend": true,
         "gdprCanTrack": true
     */
-    public function addRecipient($email, $list_id, $custom_attributes=array()){
+    public function addRecipient($email, $phone, $list_id, $custom_attributes=array()){
 
         $action = 'create-recipient';
         $method = 'POST';
@@ -240,6 +240,7 @@ class SqualoApi {
 
         $data = array(
             'email'         => $email,
+            'phone'         => $phone,
             'listIds'       => array($list_id),
             'accept'        => true,
             'confirmed'     => true,

admin/survey/classes/surveyEmails/squalo/class.SurveyInvitationsSqualo.php

@@ -144,13 +144,14 @@ class SurveyInvitationsSqualo {
                     //'email'         => $sql_row['email'],
                     'code'          => $sql_row['password'],
                     'password'      => $sql_row['password'],
-                    'phone'         => $sql_row['phone'],
+                    //'phone'         => $sql_row['phone'],
                     'custom'        => $sql_row['custom'],
                     'unsubscribe'   => $unsubscribe,
                 );
 
                 $recipients[] = array(
                     'email'             => $sql_row['email'],
+                    'phone'             => $sql_row['phone'],
                     'name'              => $sql_row['firstname'],
                     'surname'           => $sql_row['lastname'],
                     'custom_attributes' => $custom_attributes
@@ -356,10 +357,11 @@ class SurveyInvitationsSqualo {
         foreach($recipients as $recipient){
 
             $email = $recipient['email'];
+            $phone = $recipient['phone'];
 
             $custom_attributes = $recipient['custom_attributes'];
 
-            $recipient_id = $squalo_api->addRecipient($email, $list_id, $custom_attributes);
+            $recipient_id = $squalo_api->addRecipient($email, $phone, $list_id, $custom_attributes);
 
             // Napaka pri ustvarjanju seznama
             if($recipient_id == '0'){

admin/survey/classes/tracking/CrossRoad.php

@@ -13,26 +13,49 @@
  */
 
 class CrossRoad {
+
     static function MainNavigation($anketa=null){
+
+        // Status za tracking sprememb
         $status = -1;
+
+        // Lokacija v navigaciji
+        $first_action = '';
+        $second_action = '';
+        $third_action = '';
+
+        // Layout strani glede na to kje se nahajamo (imamo levi meni in sirina holderja)
+        $layout_menu = '';
+        $layout_width = '';
+        $hide_header = '';
+
         # ajaxa se poslje skupaj z ajaxom, da ob updatu vemo kaksen 'a' je bil na originalni strani
         # (drugace se ob updatu z ajaxom informacija o 'a'ju zgubi)
         $get = $_GET['a'];
+
         if (isset ($_GET['ajaxa']))
             $get = $_GET['ajaxa'];
-        if (trim($get) == '') {
+
+        if (trim($get) == '')
             $get = A_BRANCHING;
-        }
+
-        
+
         //smo vezani na anketo
         if($anketa != null && $anketa > 0){
+
             switch ($get) {
-                # status
+
+                # STATUS
                 case A_REPORTI:
                     $first_action = NAVI_STATUS;
                     $second_action = NAVI_STATUS_OSNOVNI;
+
+                    $layout_width = 'wide';
+
                     $status = 3;
+
                     break;
+
                 case A_NONRESPONSE_GRAPH:
                 case A_USABLE_RESP:
                 case A_KAKOVOST_RESP:
@@ -48,17 +71,30 @@ class CrossRoad {
                 case A_STATUS_ADVANCED:
                     $first_action = NAVI_STATUS;
                     $second_action = NAVI_STATUS_OSNOVNI;
+
+                    $layout_width = 'wide';
+                    if ($_GET['m'] == 'advanced')
+                        $layout_width = 'fullwidth';
+
                     $status = 4;
+
                     break;
 
-                # urejanje
+
+                # UREJANJE ANKETE
                 case A_BRANCHING:
                 case A_GLASOVANJE:
                     $first_action = NAVI_UREJANJE;
                     $second_action = NAVI_UREJANJE_BRANCHING;
+
+                    $layout_width = 'fullwidth';
+
                     $status = 0;
+
                     break;
 
+
+                # TESTIRANJE
                 case A_TESTIRANJE:
                     $first_action = NAVI_TESTIRANJE;
                     $second_action = M_TESTIRANJE_DIAGNOSTIKA;
@@ -71,20 +107,38 @@ class CrossRoad {
                     if ($_GET['m'] == M_TESTIRANJE_CAS) {
                         $second_action = NAVI_TESTIRANJE_CAS;
                     }
+
+                    $layout_width = 'narrow';
+
+                    if ($_GET['m'] == 'cas' || $_GET['m'] == 'predvidenicas') {
+                        $layout_width = 'wide';
+
+                    }
+
                     $status = 4;
+
                     break;
 
+        
+                # NASTAVITVE ANKETE
                 case A_KOMENTARJI:
                 case A_KOMENTARJI_ANKETA:
                     $first_action = NAVI_TESTIRANJE;
                     $second_action = NAVI_TESTIRANJE_KOMENTARJI;
-                    $status = 0;
-                    break;
 
+                    $layout_width = 'narrow';
+                    if ($_GET['a'] == 'komentarji' || $_GET['a'] == 'komentarji_anketa')
+                        $layout_width = 'wide';
+
+                    $layout_menu = '';
+
+                    $status = 0;
+
+                    break;
+                    
                 case A_SETTINGS:
                 case A_OSNOVNI_PODATKI:
                 case A_FORMA:
-
                 case A_COOKIE:
                 case A_TRAJANJE:
                 case A_DOSTOP:
@@ -99,7 +153,12 @@ class CrossRoad {
                 case A_GDPR:
                     $first_action = NAVI_UREJANJE;
                     $second_action = NAVI_UREJANJE_ANKETA;
+
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     $status = 0;
+
                     break;
 
                 case A_TEMA: # nastavitve prevajanje
@@ -107,30 +166,56 @@ class CrossRoad {
                 case 'edit_css': # nastavitve prevajanje
                     $first_action = NAVI_UREJANJE;
                     $second_action = NAVI_UREJANJE_TEMA;
+
+                    $layout_width = 'wide';
+                    if($_GET['t'] == 'upload')
+                        $layout_width = 'narrow';
+
                     $status = 0;
+
                     break;
 
                 case A_HIERARHIJA:
                     $first_action = NAVI_HIERARHIJA;
+
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     break;
 
                 case A_PREVAJANJE: # nastavitve prevajanje
                     $first_action = NAVI_UREJANJE;
                     $second_action = NAVI_UREJANJE_PREVAJANJE;
+
+                    $layout_width = 'fullwidth';
+
                     $status = 0;
+
                     break;
 
                 case A_ALERT:
                     $first_action = NAVI_UREJANJE;
                     $second_action = NAVI_UREJANJE_ANKETA;
+
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     $status = 0;
+
                     break;
 
                 case A_NAGOVORI:
                     $first_action = NAVI_UREJANJE;
+
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     $status = 0;
+
                     break;
 
+
+                # ARHIVI
                 case A_ARHIVI:
                     $first_action = ($_GET['m'] == 'data') ? NAVI_RESULTS : NAVI_UREJANJE;  
                     $second_action = NAVI_ARHIVI;
@@ -142,7 +227,12 @@ class CrossRoad {
                     elseif($_GET['m'] != 'data')
                         $third_action = NAVI_UREJANJE_ARHIVI;
 
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
+
                     $status = 0;
+
                     break;
 
                 case A_TRACKING:
@@ -156,29 +246,50 @@ class CrossRoad {
                     else
                         $third_action = NAVI_UREJANJE_ARHIVI_TRACKING1;
 
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     $status = 0;
+
                     break;
 
-                # objave, vabila
+
+                # OBJAVA, VABILA
                 case A_VABILA:
                     $first_action = NAVI_OBJAVA;
                     $_GET['m'] == 'settings' ? $second_action = NAVI_OBJAVA_SETTINGS : ($_GET['m'] == 'url' ? $second_action = NAVI_OBJAVA_URL : $second_action = '');
+
+                    $layout_width = 'narrow';
+
                     $status = 5;
+
                     break;
 
                 case A_EMAIL:
                     $first_action = NAVI_OBJAVA;
                     $second_action = NAVI_OBJAVA;
+
+                    $layout_width = 'wide';
+
                     $status = 5;
+
                     break;
 
                 case 'invitations':
                     $first_action = NAVI_OBJAVA;
                     $second_action = ($_GET['m'] == 'view_archive') ? NAVI_ARHIVI : 'invitations';  
+
+                    $layout_width = 'wide';
+                    
+                    if ($_GET['m'] == 'view_archive')
+                        $layout_menu = "menu_left";
+
                     $status = 5;
+
                     break;
 
-                # analize, podatki
+
+                # ANALIZE, PODATKI
                 case A_ANALYSIS:
                     $first_action = NAVI_ANALYSIS;
 
@@ -214,45 +325,85 @@ class CrossRoad {
                     elseif ($_GET['m'] == 'break') {
                         $third_action = NAVI_STATISTIC_ANALYSIS_BREAK;
                     }
-                                        
+
+        
+                    if  ($_GET['m'] == 'charts') {
+                        $layout_width = 'narrow';
+                    }
+                    else{
+                        $layout_width = 'wide';
+                    }
+                    
+                    if  ($_GET['m'] == 'anal_arch') {
+                        $layout_menu = 'menu_left';
+                    }
 
                     $status = 2;
+
                     break;
 
                 case A_COLLECT_DATA:
                     $first_action = NAVI_RESULTS;
                     $second_action = NAVI_DATA;
 
+                    $layout_width = 'fullwidth';
+
                     if ($_GET['m'] == M_COLLECT_DATA_CALCULATION) {
                         $second_action = NAVI_DATA_CALC;
                         $third_action = NAVI_DATA_CALC_CALCULATION;
+
+                        $layout_width = 'wide';
+                        $layout_menu = 'menu_left';
                     }
                     elseif($_GET['m'] == M_COLLECT_DATA_CODING){
                         $second_action = NAVI_DATA_CALC;  
                         $third_action = NAVI_DATA_CALC_CODING;  
+
+                        $layout_width = 'wide';
+                        $layout_menu = 'menu_left';
                     }
                     elseif($_GET['m'] == M_COLLECT_DATA_CODING_AUTO){
                         $second_action = NAVI_DATA_CALC;  
                         $third_action = NAVI_DATA_CALC_CODING_AUTO;  
+
+                        $layout_width = 'wide';
+                        $layout_menu = 'menu_left';
                     }
                     elseif($_GET['m'] == M_COLLECT_DATA_RECODING){
                         $second_action = NAVI_DATA_CALC;  
                         $third_action = NAVI_DATA_CALC_RECODING;  
+
+                        $layout_width = 'wide';
+                        $layout_menu = 'menu_left';
                     }
 
-                    elseif($_GET['m'] == M_COLLECT_DATA_APPEND){
+                    elseif($_GET['m'] == M_COLLECT_DATA_APPEND || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls'){
                         $second_action = NAVI_DATA_IMPORT;  
                         $third_action = NAVI_DATA_IMPORT_APPEND;  
+
+                        $layout_width = 'wide';
+                        $layout_menu = 'menu_left';
                     }
                     elseif($_GET['m'] == M_COLLECT_DATA_MERGE){
                         $second_action = NAVI_DATA_IMPORT;  
                         $third_action = NAVI_DATA_IMPORT_MERGE;  
+
+                        $layout_width = 'wide';
+                        $layout_menu = 'menu_left';
+                    }
+                    elseif  ($_GET['m'] == 'quick_edit') {
+                        $layout_width = 'wide';
+                    }
+                    elseif  ($_GET['m'] == 'variables') {
+                        $layout_width = 'wide';
                     }
 
                     $status = 4;
+
                     break;
 
-                #izvozi
+
+                # IZVOZI
                 case A_COLLECT_DATA_EXPORT:
                     $first_action = NAVI_RESULTS;
                     $second_action = NAVI_DATA_EXPORT;
@@ -273,6 +424,9 @@ class CrossRoad {
                         $third_action = NAVI_DATA_EXPORT_SPSS;  
                     }
 
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     $status = 4;
 
                     if ($_GET['m'] == A_COLLECT_DATA_EXPORT_ALL) {
@@ -285,7 +439,8 @@ class CrossRoad {
 
                     break;
 
-                # dodatne nastavitve
+
+                # DODATNE NASTAVITVE
                 case A_ADVANCED:
                 case A_UPORABNOST:
                 case A_HIERARHIJA_SUPERADMIN:
@@ -315,7 +470,12 @@ class CrossRoad {
                 case 'fieldwork':
                     $first_action = NAVI_UREJANJE;
                     $second_action = NAVI_UREJANJE_ANKETA;
+
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     $status = 0;
+
                     break;
 
                 case A_TELEPHONE:
@@ -323,35 +483,135 @@ class CrossRoad {
                 case T_PHONE:
                     $first_action = NAVI_UREJANJE;
                     $second_action = NAVI_UREJANJE_ANKETA;
+
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     $status = 5;
+
                     break;
 
                 case A_LANGUAGE_TECHNOLOGY:
                     $first_action = NAVI_TESTIRANJE;
                     $second_action = NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY;
+
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     $status = 4;
+
                     break;
 
                 case A_LANGUAGE_TECHNOLOGY_OLD:
                     $first_action = NAVI_TESTIRANJE;
                     $second_action = NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD;
+
+                    $layout_width = 'wide';
+                    $layout_menu = 'menu_left';
+
                     $status = 4;
+
                     break;
 
                 default:
                     break;
             }
 
-            //shrani tracking
+            // shrani tracking za anketo
             TrackingClass::update($anketa, $status);
-            //vrni podatke o navigaciji nazaj v SurveyAdmin
-            return array('first_action' => $first_action, 'second_action' => $second_action, 'third_action' => $third_action);   
         }
-        //nismo vezani na anketo, tracking uporabnika
+        // Nismo vezani na anketo, tracking uporabnika
         else{
+
+            switch ($get) {
+
+                # AKTIVNOST in UPORABNIKI
+                case 'diagnostics':
+
+                    // Uporabniki
+                    if($_GET['t'] == 'uporabniki'){
+                        $layout_width = 'narrow';
+                        if($_GET['m'] == 'all' || $_GET['m'] == ''){
+                            $layout_width = 'fullwidth';  
+                        } 
+                    }
+                    // Ativnost
+                    else{
+                        $layout_width = 'narrow';
+                    }
+
+                    break;
+
+                
+                # KNJIZNICA
+                case 'knjiznica':
+                    $layout_width = 'wide';  
+
+                    break;
+
+
+                # NASTAVITVE
+                case 'nastavitve':
+                    $layout_width = 'narrow';  
+
+                    break;
+
+
+                # OBVESTILA
+                case 'obvestila':
+                    $layout_width = 'narrow';  
+
+                    break;
+
+
+                # GDPR
+                case 'gdpr':
+                    if ($_GET['m'] == 'gdpr_requests' || $_GET['m'] == 'gdpr_requests_all')
+                        $layout_width = 'wide';  
+                    else
+                        $layout_width = 'narrow';  
+
+                    break;
+
+
+                # MODUL UL EVALVACIJE
+                case 'ul_evalvation':
+                    $layout_width = 'wide';  
+
+                    break;
+
+                    
+                # MOJE ANKETE
+                case 'pregledovanje':
+                default:
+                    $layout_width = 'wide';
+                    
+                    if ($_GET['a'] == 'ustvari_anketo' || $_GET['b'] == 'new_survey') {
+                        $layout_width = 'fullwidth';
+                        $layout_menu = 'menu_left';
+                        $hide_header = 'hide_header';
+                    }
+
+                    if ($_GET['a'] == 'narocila') {
+                        $layout_width = 'narrow';
+                    }
+
+                    break;
+            }
+
+            // shrani tracking za userja
             TrackingClass::update_user();
         }
-        
+
-        
+        // vrni podatke o navigaciji nazaj v SurveyAdmin
+        return array(
+            'first_action'  => $first_action, 
+            'second_action' => $second_action, 
+            'third_action'  => $third_action, 
+
+            'layout_width'  => $layout_width,
+            'layout_menu'   => $layout_menu,
+            'hide_header'   => $hide_header,
+        ); 
     }
 }

admin/survey/classes/tracking/TrackingClass.php

@@ -117,15 +117,11 @@ class TrackingClass
     {
         global $lang;
 
+        $surveyName = SurveyInfo::getInstance()->getSurveyTitle();
+
         echo '<fieldset>';
         echo '<legend>' . $lang['srv_survey_archives_tracking_' . $this->sub] . '</legend>';
 
-        // Izvoz v Excel
-        echo '<p><a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">Download Excel</a></p>';
-
-
-        echo '<table id="tracking">';
-
         // Tabela s podatki o spremembah podatkov
         if ($this->sub == 'data') {
 
@@ -138,74 +134,97 @@ class TrackingClass
 							OR (`get` LIKE \'%urejanje: "1"%\' AND status=\'4\')
 						)';
 
-            // Prva vrstica
+            
-            echo '<tr>';
-            echo '	<th>' . $lang['date'] . '</th>';
-            echo '	<th>User</th>';
-            echo '	<th class="center">IP</th>';
-            echo '	<th class="center">Recnum</th>';
-            echo '	<th>GET</th>';
-            echo '	<th>POST</th>';
-            echo '</tr>';
-
             // Vrstice s podatki
             $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $appendMerge . " " . $data . " ORDER BY datetime DESC");
-            while ($row = mysqli_fetch_array($sql)) {
+            
+            if(!empty(mysqli_fetch_array($sql))) {
+
+
+                echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1b'].' <a href="index.php?anketa=' . $this->anketa . '&a=data">\'<span class="caps">'.$lang['navigation_NAVI_RESULTS'].'</span>\' - \''.$lang['navigation_NAVI_DATA'].'\'</a> '.$lang['srv_survey_archives_tracking_survey_text1c'].' \''.$surveyName.'\'. '.$lang['srv_survey_archives_tracking_survey_text2'].' <a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">'.$lang['srv_survey_archives_tracking_survey_text3'].'</a>.</p>';
+
+                // Izvoz v Excel
+                echo '<div class="izvoz_nad_tabelo">';
+                echo '<a class="noline" href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download"><span class="faicon xls green link-right"></span>'.$lang['srv_export_excel'].'</a>';
+                echo '</div>';
+
+                echo '<table id="tracking" class="fullwidth">';
+                // Prva vrstica
                 echo '<tr>';
+                echo '	<th>' . $lang['date'] . '</th>';
+                echo '	<th>' . $lang['user'] . '</th>';
+                echo '	<th>IP</th>';
+                echo '	<th>Respondent</th>';
+                echo '	<th>GET</th>';
+                echo '	<th>POST</th>';
+                echo '</tr>';
 
-                $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'");
+                $count = 0;
-                $rowu = mysqli_fetch_array($sqlu);
+                while ($row = mysqli_fetch_array($sql)) {
+                    echo '<tr '.($count > 24 ? 'class="displayNone"' : '').($count == 24 ? ' class="show_as_last_row"' : '').'>';
 
-                // Pri podatkih dobimo posebej podatke o editiranem respondentu
+                    $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'");
-                $usr_id = '';
+                    $rowu = mysqli_fetch_array($sqlu);
-                $cookie = '';
 
-                // Preverimo ce imamo usr_id v GET-u
+                    // Pri podatkih dobimo posebej podatke o editiranem respondentu
-                $get_array_temp = explode(', ', $row['get']);
+                    $usr_id = '';
-                foreach ($get_array_temp AS $get_val) {
+                    $cookie = '';
-                    $param = explode(': ', $get_val);
-                    $get_array[$param[0]] = $param[1];
-                }
 
-                if (isset($get_array['usr_id']) && $get_array['usr_id'] != '') {
+                    // Preverimo ce imamo usr_id v GET-u
-                    $usr_id = trim($get_array['usr_id'], '"');
+                    $get_array_temp = explode(', ', $row['get']);
-                } // Preverimo ce iammo slucajno cookie
+                    foreach ($get_array_temp AS $get_val) {
-                elseif (isset($get_array['survey-' . $this->anketa]) && $get_array['survey-' . $this->anketa] != '') {
+                        $param = explode(': ', $get_val);
-                    $cookie = trim($get_array['survey-' . $this->anketa], '"');
+                        $get_array[$param[0]] = $param[1];
-                } else {
-                    // Preverimo ce imamo usr_id v POST-u
-                    $post_array_temp = explode(', ', $row['post']);
-                    foreach ($post_array_temp AS $post_val) {
-                        $param = explode(': ', $post_val);
-                        $post_array[$param[0]] = $param[1];
                     }
 
-                    if (isset($post_array['usr_id']) && $post_array['usr_id'] != '')
+                    if (isset($get_array['usr_id']) && $get_array['usr_id'] != '') {
-                        $usr_id = trim($post_array['usr_id'], '"');
+                        $usr_id = trim($get_array['usr_id'], '"');
+                    } // Preverimo ce iammo slucajno cookie
+                    elseif (isset($get_array['survey-' . $this->anketa]) && $get_array['survey-' . $this->anketa] != '') {
+                        $cookie = trim($get_array['survey-' . $this->anketa], '"');
+                    } else {
+                        // Preverimo ce imamo usr_id v POST-u
+                        $post_array_temp = explode(', ', $row['post']);
+                        foreach ($post_array_temp AS $post_val) {
+                            $param = explode(': ', $post_val);
+                            $post_array[$param[0]] = $param[1];
+                        }
+
+                        if (isset($post_array['usr_id']) && $post_array['usr_id'] != '')
+                            $usr_id = trim($post_array['usr_id'], '"');
+                    }
+
+                    if ($usr_id != '') {
+                        $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE id = '$usr_id'");
+                        $rowR = mysqli_fetch_array($sqlR);
+
+                        $recnum = $rowR['recnum'];
+                    } elseif ($cookie != '') {
+                        $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE cookie = '$cookie'");
+                        $rowR = mysqli_fetch_array($sqlR);
+
+                        $recnum = $rowR['recnum'];
+                    } else
+                        $recnum = 0;
+
+                    echo '	<td><div class="no_wrap">' . datetime($row['datetime']) . '</div></td>';
+                    echo '	<td><div class="no_wrap">' . $rowu['name'] . ' ' . $rowu['surname'] . '</div></td>';
+                    echo '	<td>' . $row['ip'] . '</td>';
+                    echo '	<td>' . $recnum . '</td>';
+                    echo '	<td><div class="postget_wrap">' . $row['get'] . '</div></td>';
+                    echo '	<td><div class="postget_wrap">' . (($row['post'] != "") ? $row['post'] : '/') . '</div></td>';
+
+                    echo '</tr>';
+
+                    $count++;
                 }
-
-                if ($usr_id != '') {
-                    $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE id = '$usr_id'");
-                    $rowR = mysqli_fetch_array($sqlR);
-
-                    $recnum = $rowR['recnum'];
-                } elseif ($cookie != '') {
-                    $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE cookie = '$cookie'");
-                    $rowR = mysqli_fetch_array($sqlR);
-
-                    $recnum = $rowR['recnum'];
-                } else
-                    $recnum = 0;
-
-                echo '	<td>' . datetime($row['datetime']) . '</td>';
-                echo '	<td>' . $rowu['name'] . ' ' . $rowu['surname'] . '</td>';
-                echo '	<td class="center">' . $row['ip'] . '</td>';
-                echo '	<td class="center">' . $recnum . '</td>';
-                echo '	<td>' . $row['get'] . '</td>';
-                echo '	<td>' . $row['post'] . '</td>';
-
-                echo '</tr>';
             }
+            else {
+                echo '<p class="bottom16">'.ucfirst($lang['srv_survey_archives_tracking_survey_text1b']).' <a href="index.php?anketa=' . $this->anketa . '&a=data">\'<span class="caps">'.$lang['navigation_NAVI_RESULTS'].'</span>\' - \''.$lang['navigation_NAVI_DATA'].'\'</a> '.$lang['srv_survey_archives_tracking_survey_text1d'].'.</p>';
+
+            }
+            
+            
         } // Tabela s podatki o spremembah - vse oz. merge/append
         else {
 
@@ -230,32 +249,50 @@ class TrackingClass
             else
                 $appendMerge = "";
 
-            // Prva vrstica
-            echo '<tr>';
-            echo '	<th>' . $lang['date'] . '</th>';
-            echo '	<th>User</th>';
-            echo '	<th class="center">IP</th>';
-            echo '	<th class="center">Podstran</th>';
-            echo '	<th>GET</th>';
-            echo '	<th>POST</th>';
-            echo '</tr>';
 
             // Vrstice s podatki
             $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $this->status . " " . $appendMerge . " " . $data . " ORDER BY datetime DESC");
-            while ($row = mysqli_fetch_array($sql)) {
+            
+            if(!empty(mysqli_fetch_array($sql))) {
+
+                if($appendMerge == "")
+                    echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1a'].' \''. $surveyName .'\'. '.$lang['srv_survey_archives_tracking_survey_text2'].' <a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">'.$lang['srv_survey_archives_tracking_survey_text3'].'</a>.</p>';
+                else
+                    echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_survey_text1'].', '.$lang['srv_survey_archives_tracking_survey_text_appendmerge'].' '.$lang['srv_survey_archives_tracking_survey_text1a'].' \''. $surveyName .'\'. '.$lang['srv_survey_archives_tracking_survey_text2'].' <a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">'.$lang['srv_survey_archives_tracking_survey_text3'].'</a>.</p>';
+
+                // Izvoz v Excel
+                echo '<div class="izvoz_nad_tabelo">';
+                echo '<a class="noline" href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download"><span class="faicon xls green link-right"></span>'.$lang['srv_export_excel'].'</a>';
+                echo '</div>';
+                
+                echo '<table id="tracking" class="fullwidth">';
+                // Prva vrstica
                 echo '<tr>';
-
+                echo '	<th>' . $lang['date'] . '</th>';
-                $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'");
+                echo '	<th>' . $lang['user'] . '</th>';
-                $rowu = mysqli_fetch_array($sqlu);
+                echo '	<th>IP</th>';
-
+                echo '	<th>Podstran</th>';
-                echo '	<td>' . datetime($row['datetime']) . '</td>';
+                echo '	<th>GET</th>';
-                echo '	<td>' . $rowu['name'] . ' ' . $rowu['surname'] . '</td>';
+                echo '	<th>POST</th>';
-                echo '	<td class="center">' . $row['ip'] . '</td>';
-                echo '	<td class="center">' . $statuses[$row['status']] . '</td>';
-                echo '	<td>' . $row['get'] . '</td>';
-                echo '	<td>' . $row['post'] . '</td>';
-
                 echo '</tr>';
+            
+                $count = 0;
+                while ($row = mysqli_fetch_array($sql)) {
+                    echo '<tr '.($count > 24 ? 'class="displayNone"' : '').($count == 24 ? ' class="show_as_last_row"' : '').'>';
+
+                    $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'");
+                    $rowu = mysqli_fetch_array($sqlu);
+
+                    echo '	<td><div class="no_wrap">' . datetime($row['datetime']) . '</div></td>';
+                    echo '	<td><div class="no_wrap">' . $rowu['name'] . ' ' . $rowu['surname'] . '</div></td>';
+                    echo '	<td>' . $row['ip'] . '</td>';
+                    echo '	<td>' . $statuses[$row['status']] . '</td>';
+                    echo '	<td><div class="postget_wrap">' . $row['get'] . '</div></td>';
+                    echo '	<td><div class="postget_wrap">' .  (($row['post'] != "") ? $row['post'] : '/') . '</div></td>';
+
+                    echo '</tr>';
+                    $count++;
+                }
             }
         }
 

admin/survey/classes/tracking/UserTrackingClass.php

@@ -43,10 +43,10 @@ class UserTrackingClass
         echo '<legend>' . $lang['srv_survey_archives_tracking'] . '</legend>';
 
         // Izvoz v Excel
-        echo '<p>'.$lang['srv_survey_archives_tracking_last_changes'].'</p>';
+        echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_last_changes'].'</p>';
 
-        echo '<div id="table-tracking-wrapper1">';
+        //echo '<div id="table-horizontal-scroll-wrapper1-userchanges">';
-        echo '<div id="table-tracking-wrapper2">';
+        //echo '<div id="table-horizontal-scroll-wrapper2-userchanges">'; - wrapperja za scroll na mobilnem
 
 
         echo '<table id="tracking">';
@@ -65,23 +65,22 @@ class UserTrackingClass
         while ($row = mysqli_fetch_array($sql)) {
             echo '<tr>';
 
-            echo '	<td>' . datetime($row['datetime']) . '</td>';
+            echo '	<td><div class="no_wrap">' . datetime($row['datetime']) . '</div></td>';
             echo '	<td class="center">' . $row['ip'] . '</td>';
-            echo '	<td>' . $row['get'] . '</td>';
+            echo '	<td><div class="postget_wrap">' . $row['get'] . '</div></td>';
-            echo '	<td>' . $row['post'] . '</td>';
+            echo '	<td><div class="postget_wrap">' . $row['post'] . '</div></td>';
 
             echo '</tr>';
         }
 
         echo '</table>';
 
-        echo '</div>';
+        //echo '</div>';
-        echo '</div>';
+        //echo '</div>'; - wrapperja za scroll na mobilnem
 
         echo '</fieldset>';
         
-        echo '<br class="clr" />';
+        echo '</div>'; 
-        echo '</div>';         
     }
 
     public function csvExport()

admin/survey/css/print.css

@@ -396,6 +396,105 @@ div.dashboard_cell table td{
 	padding: 2px 0px;
 }
 
+.dashboard_boxes{
+    display: flex;
+    flex-wrap: wrap;
+    box-sizing: border-box;
+
+    margin-top: 32px;
+}
+
+.dashboard_box{
+    position: relative;
+    box-sizing: border-box;
+    width: 430px;
+    max-width: 100%;
+
+    padding: 32px 16px;
+    margin: 0 32px 32px 0;
+
+    font-size: 14px;
+
+    border: 1px #e5e5e5 solid;
+}
+.dashboard_box .box_title{
+    position: absolute;
+    top: -10px;
+    left: 16px;
+
+    padding: 0 16px;
+
+    font-size: 14px;
+    font-weight: bold;
+    color: #1E88E5;
+    text-transform: uppercase;
+    line-height: 18px;
+
+    background-color: white;
+}
+
+.dashboard_box .box_top_settings{
+    display: flex;
+    align-items: center;
+
+    margin-bottom: 8px;
+}
+.dashboard_box .box_top_settings span,
+.dashboard_box .box_top_settings label{
+    font-size: 14px;
+}
+
+.dashboard_box .box_top_settings select.dropdown{
+    width: auto;
+    margin: 0 0 0 8px;
+}
+
+.dashboard_box table{
+    width: 100%;
+    margin: 0 0 16px 0;
+
+    
+}
+.dashboard_box table tr{
+    height: auto;
+}
+.dashboard_box table tr.row1 td{
+    padding: 8px 16px 8px 8px;
+    font-weight: 600;
+    background-color: #F8F8F8;
+}
+
+.dashboard_box table tr.row_sum td{
+    font-weight: 600;
+}
+
+.dashboard_box table tr td{
+    padding: 4px 16px 4px 8px;
+
+    font-size: 14px;
+
+    border-top: 1px #E5E5E5 solid;
+    border-bottom: 1px #E5E5E5 solid;
+}
+.dashboard_box table tr td strong{
+    font-weight: 600;
+}
+
+.dashboard_box table tr td span{
+    font-size: 14px;
+}
+.dashboard_box table tr td .graph_db {
+    float: left; 
+    height: 16px;
+    margin-top: 1px;
+
+    background-color: #1E88E5;
+}
+.dashboard_box table tr td .graph_text {
+    margin-left: 8px;
+    font-size: 14px;
+}
+
 #div_statistic_info { }
 #div_statistic_answer_state { }
 #div_statistic_status {}

admin/survey/export/latexclasses/Vprasanja/DatumLatex.php

@@ -64,8 +64,9 @@ class DatumLatex extends LatexSurveyElement
 			$rowVrednost = mysqli_fetch_array($sqlVrednosti);					
 			//$sqlUserAnswer = sisplet_query("SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND vre_id='".$rowVrednost['id']."' AND loop_id $loop_id");
 			//$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND vre_id='".$rowVrednost['id']."' ";
-			$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' ";
+			//$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' ";
-			//echo $sqlUserAnswerString;
+			$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND loop_id = $loop_id";
+			//echo $sqlUserAnswerString."</br>";
 			$sqlUserAnswer = sisplet_query($sqlUserAnswerString);
 			$userAnswer = mysqli_fetch_assoc($sqlUserAnswer);
 			//echo "userAnswer: ".$userAnswer['text']."</br>";

admin/survey/export/latexclasses/class.LatexAnalysisElement.php

@@ -804,7 +804,8 @@ class LatexAnalysisElement{
 		shell_exec($pretvoriPng_v_Pdf);
 		##### ZA TESTIRANJE ureditev pretvorbe slike v pdf - konec
 		
-		$texImageOnly = " \\includegraphics[scale=0.66]{".$this->path2Charts."".$imgName."} ";	//latex za sliko
+		$texImageOnly = " \\includegraphics[width=\linewidth, frame, scale=0.66]{".$this->path2Charts."".$imgName."} ";	//latex za sliko
+		//$texImageOnly = " \\includegraphics[scale=0.66]{".$this->path2Charts."".$imgName."} ";	//latex za sliko
 		//$texImageOnly = " \\includegraphics[scale=0.66, draft=false]{".$this->path2Charts."".$imgName."} ";	//latex za sliko
 		//$texImageOnly = " \\includegraphics[scale=0.85]{".$this->path2Charts."".$imgName."} ";	//latex za sliko
 		//echo "ime slike: $texImageOnly </br>";