From 75160b12821f7f4299cce7f0b69c83c1502ae071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= <anton@sijanec.eu>
Date: Mon, 27 May 2024 13:08:29 +0200
Subject: 2024-02-19 upstream

---
 admin/survey/classes/class.NewSurvey.php | 508 ++++++++++++++++++-------------
 1 file changed, 288 insertions(+), 220 deletions(-)

(limited to 'admin/survey/classes/class.NewSurvey.php')

diff --git a/admin/survey/classes/class.NewSurvey.php b/admin/survey/classes/class.NewSurvey.php
index e3fefb8..4596541 100644
--- a/admin/survey/classes/class.NewSurvey.php
+++ b/admin/survey/classes/class.NewSurvey.php
@@ -14,7 +14,8 @@ class NewSurvey{
 	private $subpage;				// Podstran na kateri se nahajamo (nova anketa, iz predloge, uvoz)
 	
 	private $template_category;		// Podstran kategorij predlog na kateri se nahajamo (vse predloge, organizacija dogodka...)
-	private $templates;				// Array vseh templatov
+	private $templates = array();	// Array vseh templatov
+
 
 	function __construct(){
 		global $site_url;
@@ -31,14 +32,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
@@ -46,43 +50,39 @@ class NewSurvey{
 		global $lang;
         global $site_url;
         global $site_path;
-        global $virtual_domain;
-        global $debug;
         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 && !$virtual_domain) 
+		if/**((strpos($site_url, 'www.1ka.si') !== false && !isVirtual()) 
 				|| strpos($site_url, 'test.1ka.si')
 				|| strpos($site_url, '1ka.arnes.si')
-				|| $debug == '1'){
+				|| 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>';		
+				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
-		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>';
+		// Uvoz ankete - 1ka format
+		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>';
         }
 	}
 	
@@ -130,22 +130,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 '<span class="label" style="float:left; width:180px;">' . $lang['srv_list_no_data_create'] . ':</span>';
-        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 '<span id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
+        echo '<div class="setting_holder">';
+        echo '<label for="novaanketa_naslov_1">' . $lang['srv_list_no_data_create'] . ':</label>';
+        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 class="charalimit" id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
         echo '</div>';
 
         // Objavljeno ime
-        echo '<div class="setting survey_title_text">';
-        echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_novaanketa_kratkoime'] . ':</span>';
-        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 '<span id="novaanketa_akronim_1_chars">0 / ' . ANKETA_AKRONIM_MAXLENGTH . '</span>';
+        echo '<div class="setting_holder">';
+        echo '<label for="novaanketa_akronim_1"">' . $lang['srv_novaanketa_kratkoime'] . ':</label>';
+        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 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
@@ -153,10 +154,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 '<span class="label" style="float:left; width:180px;">' . $lang['srv_newSurvey_survey_new_folder'] . ':</span>';
+			echo '<div class="setting_holder">';
+			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>';
@@ -181,8 +182,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_text">' . $lang['srv_noSurvey_type_2'] . '</div>';
+		echo '<div class="survey_type_title"><span class="faicon fa-clipboard-list"></span>' . $lang['srv_vrsta_survey_type_2']  . '</div>';
 		echo '</span>';
         echo '</div></label>';
 
@@ -190,8 +190,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_text">' . $lang['srv_noSurvey_type_1'] . '</div>';
+		echo '<div class="survey_type_title"><span class="faicon list-alt empty"></span>' . $lang['srv_vrsta_survey_type_1']  . '</div>';
 		echo '</span>';
 		echo '</div></label>';
 
@@ -199,8 +198,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_text">' . $lang['srv_noSurvey_type_0'] . '</div>';
+		echo '	<div class="survey_type_title"> <span class="faicon vote-yes"></span>' . $lang['srv_vrsta_survey_type_0']  . '</div>';
 		echo '</span>';
 		echo '</div></label>';
 
@@ -216,6 +214,8 @@ class NewSurvey{
 		// Gorenje ima svoj default skin
 		if(Common::checkModule('gorenje'))
 			echo '<input type="hidden" name="skin" id="noSurvey_skin_id" value="GorenjeGroup" /><br /><br />';
+		else if(Common::checkModule('automaticservis'))
+			echo '<input type="hidden" name="skin" id="noSurvey_skin_id" value="Automaticservis" /><br /><br />';
 		else
 			echo '<input type="hidden" name="skin" id="noSurvey_skin_id" value="1kaBlue" /><br /><br />';
 
@@ -272,12 +272,10 @@ class NewSurvey{
 
 
         // 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 '<a href="#" onclick="newAnketaBlank();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
-
-        echo '</div>';
+		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 '<button class="medium blue" onclick="newAnketaBlank();" id="noSurvey_create">'.$lang['next1'].'</button>';
+		echo '</div>';
 	}
 	
 	
@@ -290,27 +288,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 '<span class="label" style="float:left; width:180px;">' . $lang['srv_list_no_data_create'] . ':</span>';
-        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 '<span id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
+        echo '<div class="setting_holder">';
+        echo '<label for="novaanketa_naslov_1">' . $lang['srv_list_no_data_create'] . ':</label>';
+        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 class="charalimit" id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
         echo '</div>';
 
         // Objavljeno ime
-        echo '<div class="setting survey_title_text">';
-        echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_novaanketa_kratkoime'] . ':</span>';
-        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 '<span id="novaanketa_akronim_1_chars">0 / ' . ANKETA_AKRONIM_MAXLENGTH . '</span>';
+        echo '<div class="setting_holder">';
+        echo '<label for="novaanketa_akronim_1"">' . $lang['srv_novaanketa_kratkoime'] . ':</label>';
+        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 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
@@ -318,10 +316,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 '<span class="label" style="float:left; width:180px;">' . $lang['srv_newSurvey_survey_new_folder'] . ':</span>';
+			echo '<div class="setting_holder">';
+			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>';
@@ -338,25 +336,34 @@ 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="">';
-			
+
+        // Mobile dropdown za izbiro tipa predloge
+        echo '<select class="template_type_menu" onchange="location.href=this.value;">';
+        for($i=0; $i<=10; $i++){
+            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 '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
-        echo '<a href="#" onclick="newAnketaTemplate();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
-
-        echo '</div>';
+		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 '<button class="medium blue" onclick="newAnketaTemplate();" id="noSurvey_create" title="' . $lang['srv_create_survey']. '">'.$lang['next1'].'</button>';
+		echo '</div>';
 	}
 	
 	// Pripravimo podatke o vseh predlogah na trenutni strani
@@ -404,43 +411,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>';
 
+		// Predogled
+		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 '<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>';
 	}
 	
 	
-	// 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)){
@@ -448,17 +456,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 '<a href="#" onclick="newAnketaCopy();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
 
-        echo '</div>';
+		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 '<button class="medium blue" onclick="newAnketaCopy();" id="noSurvey_create">'.$lang['next1'].'</button>';
+		echo '</div>';
 	}
 	
 	// Vsebina za uvažanje ankete iz arhiva
@@ -471,42 +479,51 @@ 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 id="info_text_empty" class="bottom8">'.$lang['srv_arhiv_datoteka_save_txt2'].'</p>';
+		echo '<p id="info_text_populated" class="bottom8" style="display: none;">'.$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 '<form id="restorefrm" 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 $lang['srv_arhiv_datoteka_save_txt2'].'.';
+		echo '<input type="file" name="restore" id="restore" style="display: none;" onchange="checkFileExtension1ka();"/>';
+		//custom label
+		echo '<label id="file-input-label-empty" for="restore" class="custom-file-input-label"><span class="faicon publish right8"></span>'.$lang['srv_newSurvey_survey_archive_choosefile'].'</label>';
 		
-		echo '<br /><br />'.$lang['srv_newSurvey_survey_archive_text'].'.';
-			  
+		echo '<span id="file-input-label-clear" class="faicon trash blue right8 pointer" style="display: none;" onclick="clearFileInput();"></span>';
+		echo '<label id="file-input-label-populated" for="restore" class="custom-file-input-label" style="display: none;"></label>';
+
+		//echo $lang['srv_arhiv_datoteka_save_txt2'].'.';
+
+		echo '<br><br><br>';
+
 		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 '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
-        echo '<a href="#" onclick="document.restorefrm.submit();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
+		echo '<p id="1ka_file_approved_text" style="display:none;"><span class="faicon check right8"></span>'.$lang['srv_newSurvey_survey_archive_valid'].'</p>';
+		echo '<p id="1ka_file_not_approved_text" style="display:none;"><span class="faicon xmark-fail right8"></span>'.$lang['srv_newSurvey_survey_archive_error3'].'</p>';
 
-        echo '</div>';
+		
+		// Gumba naprej in preklici
+		echo '<div class="button_holder" style="margin-top:12px;">';
+		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 disabled class="medium blue" onclick="document.restorefrm.submit();" id="noSurvey_create">'.$lang['next1'].'</button>';
+		echo '</div>';
 	}
 
 
@@ -533,7 +550,6 @@ class NewSurvey{
         echo '<div class="setting archive" id="hierarhija-opcije-vklopa">';
 
             if(!empty($_GET['c']) && $_GET['c'] == 'izbira'){
-                global $hierarhija_default_id;
 
                 echo '<h4>'.$lang['srv_hierarchy_intro_select_title'].':</h4>';
                 echo '<div class="izbira">';
@@ -556,7 +572,7 @@ class NewSurvey{
                     echo '</div>';
 
                     echo '<label class="strong block"><input type="radio" id="prevzeta-anketa" name="izberi-anketo" onclick="pridobiKnjiznicoZaHierarhijo(\'privzeta\')" value="prevzeta" /><span class="enka-checkbox-radio"></span>'.$lang['srv_hierarchy_intro_option_default'].'
-                            <a href="/main/survey/index.php?anketa='.$hierarhija_default_id.'&amp;preview=on" target="_blank" title="Predogled ankete">
+                            <a href="/main/survey/index.php?anketa='.AppSettings::getInstance()->getSetting('hierarhija-default_id').'&amp;preview=on" target="_blank" title="Predogled ankete">
                                 <span class="faicon preview"></span>
                             </a>                          
                           </label>';
@@ -598,25 +614,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 '<span class="label" style="float:left; width:180px;">' . $lang['srv_list_no_data_create'] . ':</span>';
-        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 '<span id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
+        echo '<div class="setting_holder">';
+        echo '<label for="novaanketa_naslov_1">' . $lang['srv_list_no_data_create'] . ':</label>';
+        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 class="charalimit" id="novaanketa_naslov_1_chars">0 / ' . ANKETA_NASLOV_MAXLENGTH . '</span>';
         echo '</div>';
 
         // Objavljeno ime
-        echo '<div class="setting survey_title_text">';
-        echo '<span class="label" style="float:left; width:180px;">' . $lang['srv_novaanketa_kratkoime'] . ':</span>';
-        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 '<span id="novaanketa_akronim_1_chars">0 / ' . ANKETA_AKRONIM_MAXLENGTH . '</span>';
+        echo '<div class="setting_holder">';
+        echo '<label for="novaanketa_akronim_1"">' . $lang['srv_novaanketa_kratkoime'] . ':</label>';
+        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 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
@@ -624,10 +643,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 '<span class="label" style="float:left; width:180px;">' . $lang['srv_newSurvey_survey_new_folder'] . ':</span>';
+			echo '<div class="setting_holder">';
+			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>';
@@ -640,13 +659,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="from_text_instructions">' . $lang['srv_newSurvey_survey_from_text_text'] . '</div>';
+		echo '<div class="title">' . $lang['srv_newSurvey_survey_from_text_title'] . ' '.Help::display('srv_create_survey_from_text', "title").'</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">';
@@ -656,19 +678,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 '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
-        echo '<a href="#" onclick="newAnketaFromText();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
-
-        echo '</div>';
+		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 '<button class="medium blue" onclick="newAnketaFromText();" id="noSurvey_create">'.$lang['next1'].'</button>';
+		echo '</div>';
 	}
 	
 	
@@ -680,113 +703,158 @@ class NewSurvey{
         global $lang;
         global $site_url;
         global $site_path;
+		global $global_user_id;
 
         echo '<div class="noSurvey_sequence">';
 
-		// Video
-        if ($_GET['b'] == 'video') {
+        
+        // Prva stran
 
-            echo '<div class="main_holder video">';
+		echo '<div class="main_holder main">';
+            echo '<div id="no_survey">';
 
-            echo '<span class="title">' . $lang['noSurvey_sequence_title'] . '</span>';
+			$sql = sisplet_query("SELECT * FROM users WHERE id='$global_user_id'");
+			$row = mysqli_fetch_array($sql);
 
-            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>';
+			$text = $row['name'] . ' ' . $row['surname'];
+			$text = (strlen($text) > 25) ? substr($text, 0, 25) . '...' : $text;
+			$text = trim($text);
 
+            echo '<div class="no_survey_title">';
+		    echo '<img src="/public/img/images/hand_icon.svg" />';
+			echo $lang['noSurvey_sequence_1'] . $text .'!';
             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>';
+			// Video
+			if (isset($_GET['b']) && $_GET['b'] == 'video') {
 
-            // Desna stran
-            echo '<div class="right_holder">';
-            echo '<img src="/public/img/images/first_survey.jpg">';
-            echo '</div>';
+				echo '<div id="no_survey_video" class="main_holder video">';
+				if($lang['id'] == '1')
+					echo '	<p style="text-align:center;"><iframe width="800" height="450" src="//www.youtube.com/embed/mDd73NSA1xI" frameborder="0" allowfullscreen></iframe></p>';
+				else
+					echo '	<p style="text-align:center;"><iframe width="800" height="450" src="//www.youtube.com/embed/vX-6qe7KtQE" frameborder="0" allowfullscreen></iframe></p>';
+				echo '</div>';
+			}
+
+			// Spisek funkcionalnosti
+			if (isset($_GET['b']) && $_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'];
 
-        // Gumbi na dnu
-        echo '<div class="buttons_holder">';
+			$anketa_url = "'".$site_url.'/admin/survey/index.php?b=new_survey'."'";
 
-        // 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
-        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>';
-        }
+			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>';
 
-        // Gumb ogled funkcionalnosti
-        if($_GET['b'] != 'features'){
-            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
-        if($_GET['b'] == 'features'){
-            $cenik_link = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/cenik' : 'https://www.1ka.si/d/en/services/';
+			// Videovodic box
+			if(!isset($_GET['b']) || $_GET['b'] != 'video'){
 
-            echo '<a href="'.$cenik_link.'" target="_blank">';
-            echo '  <div class="button button_gray">'.$lang['noSurvey_sequence_button_cenik'].'</div>';
-            echo '</a>';
-        }
+				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>';
+			}
 
-        echo '</div>';
+			// Ogled funkcionalnosti box
+			if(!isset($_GET['b']) || $_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>';
     }
@@ -802,7 +870,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
@@ -815,7 +883,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)
@@ -826,27 +894,27 @@ class NewSurvey{
 				);				
 				// Dodamo se textbox ce je samo vprasanje
 				$text = preg_replace(
-					'/(<span class="title">[^<>]+<\/span>)<br \/><br \/>/', 
-	        		'$1<br /><input type="text" /><br /><br />',
+					'/(<span class="variable_title">[^<>]+<\/span>)<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/', 
-					'$1<br /><input type="text" />',
+					'/(<span class="variable_title">[^<>]+<\/span>)\Z/', 
+					'$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 \/>/', 
-					'$1<br /><input type="text" /><br /><br />',
+					'/(<span class="variable_title">[^<>]+<\/span>)<br \/><br \/>/', 
+					'$1<br /><input type="text" class="large" /><br /><br />',
 					$text, 1
 				);				
 			}
-- 
cgit v1.2.3