Redesign - popravki urejanja vprasanj

admin/survey/Branching.php

@@ -1965,7 +1965,7 @@ class Branching {
 		$row = Cache::srv_spremenljivka($spremenljivka);
 		$row1 = Cache::srv_branching($spremenljivka, 0);
 
-		echo '<li id="branching_'.$spremenljivka.'" class="spr'.' '.($row['tip']==22?' calculation':'').' '.($row['tip']==25?' quota':'').'" '.$zamik.' tip="'.$row['tip'].'" signature="'.$row['signature'].'">';
+		echo '<li id="branching_'.$spremenljivka.'" class="spr spr_tip_'.$row['tip'].' '.($row['tip']==22?' calculation':'').' '.($row['tip']==25?' quota':'').'" '.$zamik.' tip="'.$row['tip'].'" signature="'.$row['signature'].'">';
 		if ($this->expanded) {
 			$this->vprasanje($spremenljivka);
 		} else {
@@ -2644,7 +2644,7 @@ class Branching {
 							//echo '<div class="variabla" id="variabla_'.$row1['id'].'">';
 							echo '<div class="variabla" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'">';
 							// Ikona za upload slike
-							echo ' <span class="sprites image_upload pointer" onclick="vrednost_insert_image(\''.$row1['id'].'\', false); return false;" title="'.$lang['upload_img2'].'"></span>';
+							echo ' <span class="faicon image_upload pointer" onclick="vrednost_insert_image(\''.$row1['id'].'\', false); return false;" title="'.$lang['upload_img2'].'"></span>';
 							
 							echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
 
@@ -2837,7 +2837,7 @@ class Branching {
 							echo '			<div class="variable_inline variable_inline_'.$row['id'].'" '.$show_variable_inline.' contenteditable="'.(!$locked?'true':'false').'" vre_id='.$row1['id'].' tabindex="1">'.$row1['variable'].'</div>';
 							
 							// Ikona za upload slike
-							echo ' <span class="sprites image_upload pointer" onclick="vrednost_insert_image(\''.$row1['id'].'\', false); return false;" title="'.$lang['upload_img2'].'"></span>';
+							echo ' <span class="faicon image_upload pointer" onclick="vrednost_insert_image(\''.$row1['id'].'\', false); return false;" title="'.$lang['upload_img2'].'"></span>';
 
 							// Slika oz. text (brez moznosti editiranja) - samo če je vnesen kaksen text ali slika
 							echo '          <div id="vre_id_' . $row1['id'] . '" vre_id='.$row1['id'].' contenteditable="'.(!$locked?'true':'false').'" class="vrednost_inline '.$missing_warning.'" tabindex="1" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '</div>';
@@ -2903,7 +2903,7 @@ class Branching {
 							echo '          <div class="variable_inline variable_inline_'.$row['id'].'" '.$show_variable_inline.' contenteditable="'.(!$locked?'true':'false').'" vre_id='.$row1['id'].' tabindex="1">'.$row1['variable'].'</div>';
 							
 							// Ikona za upload slike
-							echo ' <span class="sprites image_upload pointer" onclick="vrednost_insert_image(\''.$row1['id'].'\', false); return false;" title="'.$lang['upload_img2'].'"></span>';
+							echo ' <span class="faicon image_upload pointer" onclick="vrednost_insert_image(\''.$row1['id'].'\', false); return false;" title="'.$lang['upload_img2'].'"></span>';
 
 							// Slika oz. text (brez moznosti editiranja) - samo če je vnesen kaksen text ali slika
 							echo '          <div id="vre_id_' . $row1['id'] . '" vre_id='.$row1['id'].' contenteditable="'.(!$locked?'true':'false').'" class="vrednost_inline '.$missing_warning.'" tabindex="1" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '</div>';
@@ -6394,7 +6394,6 @@ class Branching {
 			// <-- 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>';
 
 			echo '<span class="faicon edit-vprasanje icon-as_link display_editor" onclick="inline_load_editor(this); return false;"></span>';
 
@@ -6410,9 +6409,8 @@ class Branching {
 			echo '</div>';
 			// --- Editor teksta vprasanja -->
 
-			echo '<div class="clr"></div>';
+        } 
-
+        else { // urejanje uvoda,zakljucka
-        } else { // urejanje uvoda,zakljucka
 
 			// <-- Zgornja vrstica pri editiranju vprasanj ---
 			echo '<div class="spremenljivka_settings spremenljivka_settings_active">';
@@ -6449,7 +6447,6 @@ class Branching {
 
 			echo '<div id="editor_display_' . $id. '" class="editor_display" >';
 			echo '<div class="faicon edit-vprasanje icon-as_link pointer lightRed" onmouseover="editor_display(\'' . $id . '\'); $(this).parent().hide();" style="width:auto;" title="'.$lang['srv_editor'].'">';
-			//echo '<img src="img_' . $this->skin . '/settings.png" />';
 			echo '<span class="faicon edit-vprasanje icon-as_link"></span>';
 			echo'</div>';
 			echo '</div>';
@@ -6561,8 +6558,6 @@ class Branching {
 		// <-- Editor teksta vprasanja ---
 		echo '<div class="spremenljivka_tekst_form">';
         echo '<div class="naslov naslov_inline">'.$text.'</div>';
-		echo '<div class="clr"></div>';
-
 		echo '</div>';
 		// --- Editor teksta vprasanja -->
 
@@ -11003,7 +10998,7 @@ class Branching {
 				$hotspot_image_button_text = $lang['srv_hot_spot_edit_image'];	//drugace pokazi tekst za urejanje slike
 			}					
 			//echo '<p><span class="title" ><button id="hot_spot_regions_add_image_'.$row['id'].'" type="button" onclick=" hotspot_edit('.$row['id'].')">'.$hotspot_image_button_text.'</button></span></p>';
-			echo '<p><span class="sprites image_upload pointer" onclick=" hotspot_edit('.$row['id'].')"></span></p>';
+			echo '<p><span class="faicon image_upload pointer" onclick=" hotspot_edit('.$row['id'].')"></span></p>';
 			
 			//Slika
 			echo '<div id="hotspot_image_'.$row['id'].'" class="vrednost_inline_hotspot"  contenteditable="false" spr_id="'.$row['id'].'">'.$hotspot_image.'</div>';
@@ -11231,7 +11226,7 @@ class Branching {
 				$hotspot_image_button_text = $lang['srv_hot_spot_edit_image'];	//drugace pokazi tekst za urejanje slike
 			}					
 
-            echo '<p><span class="sprites image_upload pointer" onclick=" hotspot_edit('.$row['id'].')"></span></p>';
+            echo '<p><span class="faicon image_upload pointer" onclick=" hotspot_edit('.$row['id'].')"></span></p>';
 			
 			echo '<div id="hotspot_image_'.$row['id'].'" class="vrednost_inline_hotspot"  contenteditable="false" spr_id="'.$row['id'].'">'.$hotspot_image.'</div>';
 			

admin/survey/Glasovanje.php

@@ -326,7 +326,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,7 +386,7 @@ 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>';
@@ -438,12 +438,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/SurveyAdminSettings.php

@@ -7767,7 +7767,7 @@ class SurveyAdminSettings {
 				else{
 					$spr_id = $element['spr_id'];
 				
-					$sql1 = sisplet_query("SELECT thread, note FROM srv_spremenljivka WHERE id = '$spr_id'");
+					$sql1 = sisplet_query("SELECT tip, thread, note FROM srv_spremenljivka WHERE id = '$spr_id'");
 					$row1 = mysqli_fetch_array($sql1);
 					
 					$orderby = $sortpostorder == 1 ? 'DESC' : 'ASC' ;
@@ -7810,7 +7810,7 @@ class SurveyAdminSettings {
 						
 						echo '<div style="margin: 20px 0">';
 						
-						echo '<li id="branching_'.$spr_id.'" class="spr">';
+						echo '<li id="branching_'.$spr_id.'" class="spr spr_tip_'.$row1['tip'].'">';
 						$b->vprasanje($spr_id);
 						echo '</li>';
 						

admin/survey/script/vprasanjeInline.js

@@ -702,9 +702,9 @@ function inline_nova_vrednost (_this) {
                        
 						// Ikona za hiter upload slike (ce je vklopljena)
 						if($(_this).closest('.variabla').parent().find('.image_upload').length){
-							new_div +=		'<span class="sprites image_upload pointer" onclick="vrednost_insert_image(\''+$(_this).attr('vre_id')+'\', true); return false;" title="'+lang['upload_img2']+'"></span>';
+							new_div +=		'<span class="faicon image_upload pointer" onclick="vrednost_insert_image(\''+$(_this).attr('vre_id')+'\', true); return false;" title="'+lang['upload_img2']+'"></span>';
 							new_div +=		'<div id="vre_id_new" class="vrednost_inline" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
-										' <span class="inline_other pointer" onclick="vrednost_new(\''+spremenljivka+'\', \'1\', \'\'); $(\'#fieldset'+spremenljivka+'\').show();"><span class="faicon add small icon-as_link" title="'+'"></span> '+lang['srv_novavrednost_drugo']+'</span>'+
+										' <span class="inline_other pointer" onclick="vrednost_new(\''+spremenljivka+'\', \'1\', \'\'); $(\'#fieldset'+spremenljivka+'\').show();"><span class="faicon add" title="'+'"></span>'+lang['srv_novavrednost_drugo']+'</span>'+
 										
                                         ' <div class="icons_holder">'+
                                         '   <span class="faicon delete small inline inline_delete" title="'+lang['srv_brisivrednost']+'"></span>'+
@@ -719,7 +719,7 @@ function inline_nova_vrednost (_this) {
 						}
 						else{
 							new_div +=		'<div id="vre_id_new" class="vrednost_inline" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
-										' <span class="inline_other pointer" onclick="vrednost_new(\''+spremenljivka+'\', \'1\', \'\'); $(\'#fieldset'+spremenljivka+'\').show();"><span class="faicon add small icon-as_link" title="'+'"></span> '+lang['srv_novavrednost_drugo']+'</span>'+
+										' <span class="inline_other pointer" onclick="vrednost_new(\''+spremenljivka+'\', \'1\', \'\'); $(\'#fieldset'+spremenljivka+'\').show();"><span class="faicon add" title="'+'"></span>'+lang['srv_novavrednost_drugo']+'</span>'+
 										
                                         ' <div class="icons_holder">'+
                                         '   <span class="faicon delete small inline inline_delete" title="'+lang['srv_brisivrednost']+'"></span>'+
@@ -740,7 +740,7 @@ function inline_nova_vrednost (_this) {
 											'<span class="faicon move_updown inline inline_move" title=""></span>';										
 						
 						new_div +=			'<div id="vre_id_new" class="vrednost_inline" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
-											' <span class="inline_other pointer" onclick="vrednost_new(\''+spremenljivka+'\', \'1\', \'\'); $(\'#fieldset'+spremenljivka+'\').show();"><span class="faicon add small icon-as_link" title="'+'"></span> '+lang['srv_novavrednost_drugo']+'</span>'+
+											' <span class="inline_other pointer" onclick="vrednost_new(\''+spremenljivka+'\', \'1\', \'\'); $(\'#fieldset'+spremenljivka+'\').show();"><span class="faicon add" title="'+'"></span>'+lang['srv_novavrednost_drugo']+'</span>'+
 											' <input id="foo_new" type="'+(tip==1?'radio':'checkbox')+'" value="" name="foo_new" />'+
                                             
                                             ' <div class="icons_holder">'+
@@ -759,7 +759,7 @@ function inline_nova_vrednost (_this) {
 						var new_div = 	'<div id="variabla_new" class="variabla after_'+$(_this).attr('vre_id')+'">';
 						
 						if($(_this).closest('.variabla').parent().find('.image_upload').length){
-							new_div +=	'<span class="sprites image_upload pointer" onclick="vrednost_insert_image(\''+$(_this).attr('vre_id')+'\', true); return false;" title="'+lang['upload_img2']+'"></span>'+
+							new_div +=	'<span class="faicon image_upload pointer" onclick="vrednost_insert_image(\''+$(_this).attr('vre_id')+'\', true); return false;" title="'+lang['upload_img2']+'"></span>'+
 										'<span class="faicon move_updown inline inline_move" title=""></span>'+
 										
                                         ' <div class="icons_holder">'+
@@ -875,7 +875,7 @@ function inline_nova_vrednost (_this) {
 				new_div.find('span.red').remove();
 				
 				// dodamo opcijo za drugo
-				new_div.find('td:first-child').append(' <span class="inline_other pointer" onclick="vrednost_new(\''+$(_this).closest('.spremenljivka_content').attr('spr_id')+'\', \'1\', \'\');"><span class="faicon add small icon-as_link" title="'+'"></span> '+lang['srv_novavrednost_drugo']+'</span>');
+				new_div.find('td:first-child').append(' <span class="inline_other pointer" onclick="vrednost_new(\''+$(_this).closest('.spremenljivka_content').attr('spr_id')+'\', \'1\', \'\');"><span class="faicon add" title="'+'"></span>'+lang['srv_novavrednost_drugo']+'</span>');
 				
 				if (new_div.find('div').length > 1){
 					//new_div.find('div:last').attr('id', 'vre_id_new_2').attr('vre_id', 'new_2').html('');

resources/sass/admin_new/basic/icons/question_edit.scss

@@ -117,3 +117,8 @@ a.faicon.unhide_icon::before{
 		color: $dark-blue;
         content: "\f338";
 }
+
+.faicon.image_upload::before{
+    content: "\f03e";
+    font-weight: 400;
+}

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

@@ -29,7 +29,7 @@
         flex-direction: column;
 
         box-sizing: border-box;
-        width: 305px;
+        width: 325px;
 
         border: 1px solid $blue;
         background-color: $white;
@@ -119,9 +119,16 @@
             }
         }
 
+        .tab{
+            padding: 0 16px;
+        }
+
         // Glavna vsebina
         #vprasanje_edit {
-            margin: 0 16px;
+            max-height: calc(100vh - 250px);
+            overflow-y: auto;
+
+            margin: 0;
 
             background-color: white;
         }

resources/sass/admin_new/pages/survey_edit/questions/grids.scss

@@ -1,14 +1,45 @@
 /*
-To change this license header, choose License Headers in Project Properties.
+    Tabele v urejanju vprasanja - vrednosti pri tabelah
-To change this template file, choose Tools | Templates
-and open the template in the editor.
-*/
-/* 
-    Created on : 07-Aug-2018, 13:00:32
-    Author     : podkrizniku
 */
 
-.spremenljivka_content[tip="24"] {
+li.spr_tip_6,
+li.spr_tip_16,
+li.spr_tip_19,
+li.spr_tip_20,
+li.spr_tip_24{ 
+
+    .variable_holder{
+
+        table{
+
+            tr{
+
+                th,
+                td{
+                    border: 0;
+
+                    .vrednost_inline,
+                    .grid_inline{
+                        box-sizing: border-box;
+        
+                        padding: 4px 6px;
+                        font-size: 14px;
+        
+                        p{
+                            padding: 0;
+                            font-size: 16px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+
+
+/*.spremenljivka_content[tip="24"] {
 	.variable_holder {
 		overflow-x: auto;
 	}
@@ -182,4 +213,4 @@ table.trak_inline_nadnaslov {
 	td {
 		text-align: center !important;
 	}
-}
+}*/

resources/sass/admin_new/pages/survey_edit/questions/question_box.scss

@@ -1,67 +1,19 @@
 /*
-    Branching element z vprasanjem
+    Branching element z vprasanjem - splosna osnova
 */
 
 
-.editor_display {
-	width: 98%;
-	background-color: #eee;
-	border: 1px solid #cccccc;
-	border-bottom: 0;
-}
-.editor_display_small {
-	padding-left: 5px;
-}
-.spremenljivka {
-	width: 100%;
-}
-.add-variable-mobile {
-    display: none;
-}
-.add-variable {
-	display: none;
-	position: absolute;
-	left: 59px;
-	bottom: 4px;
-	span {
-		position: relative;
-		top: 1px;
-		margin-right: 5px !important;
-	}
-	a {
-		//color: $grey_normal;
-		color: $blue;
-		&:hover{
-			color: $yellow;
-		} 
-	}
-        .tip_6 {
-                left: 52px;
-        }
-        .tip_16 {
-                left: 52px;
-        }
-        .tip_19 {
-                left: 52px;
-        }
-        .tip_20 {
-                left: 52px;
-        }
-}
-.locked {
-	.add-variable {
-		display: none !important;
-	}
-}
 
-.icons_holder{
-    margin-top: 3px;
-}
-
-// Neaktiven element
 li.spr{
     color: $black;
 
+    &:hover {
+        .spr_edit {
+            display: block;
+        }
+    }
+
+
     // Nastavitve v naslovu vprasanja ki se prikazejo na hover
     .spr_edit{
         cursor: pointer;
@@ -73,7 +25,7 @@ li.spr{
         right: 0;
 
 		color: $blue;
-        padding: 10px 16px;
+        padding: 10px 12px;
 
 		a{
 			display: inline-block;
@@ -150,11 +102,6 @@ li.spr{
 		}
     }
 
-    &:hover {
-        .spr_edit {
-            display: block;
-        }
-    }
 
 
     .spremenljivka_content{
@@ -177,17 +124,8 @@ li.spr{
             .add-variable {
                 display: block;
             }
-
-            /*.spremenljivka_settings {
-                background-color: $white !important;
-                border-bottom: 1px $gray solid;
         }
 
-            // komentarji na dnu
-            .comment_container_inline{
-                background-color: $white;
-            }*/
-        }
 
         // Glava v vprasanju
         .spremenljivka_settings{
@@ -199,7 +137,7 @@ li.spr{
 
             box-sizing: border-box;
             height: 45px;
-            padding-left: 14px;
+            padding-left: 12px;
 
             background-color: $light-gray;
 
@@ -238,63 +176,360 @@ li.spr{
             }
         }
 
+
         // Vsebina pod glavo
-        .content_div_normalmode {
+        .content_div_normalmode,
+        .spremenljivka_tekst_form{
             position: relative;
-            padding: 24px 32px 32px 32px;
+            padding: 16px 12px 24px 12px;
             overflow: hidden;
 
+            
+            // Ikona za editor v naslovu
+            .display_editor {
+                cursor: pointer;
+                visibility: hidden;
+    
+                position: absolute;
+                right: 40px;
+                top: 25px;     
+            }
+
+
+            // Naslov vprasanja
             .naslov {
                 display: block;
 
+                box-sizing: border-box;
                 width: 100%;
                 min-width: 100px;
-            }
+                padding: 4px 16px;
 
-            .variable_holder{
+                font-size: 14px;
-                display: flex;
-                flex-direction: column;
 
-                margin: 0px;
+                p{
-                padding: 0px;
-
-                .variabla {
                     padding: 0;
-                    min-height: 20px;
+                    font-size: 16px;
-                    margin: 8px 0 0 0;
+                }
-                   
-                    .move_updown_orange {
-                        margin-top: 5px;
             }
 
-                    input {
+            // Info vprasanja
+            .info_inline{
+                box-sizing: border-box;
+                padding: 4px 16px;
+                margin-top: 4px;
+
+                font-size: 11px;
+                color: #A9A9A9;
+
+                p{
+                    padding: 0;
+                    font-size: 11px;   
+                }
+            }
+
+
+            // Variable vprasanja
+            .variable_holder{
+
+                .inline_move {
+                    cursor: pointer;
+
+                    margin: -2px 8px 0 0;
+                }
+
+                .enka-checkbox-radio{
+                    &:before{
+                        margin-right: 16px;
+                        padding: 0 !important;
+                        letter-spacing: 0 !important;
+                    }
+                }
+
+                span.inline {
+                    visibility: hidden;
+                    cursor: pointer;
                     float: left;
-                        margin-top: 5px;
                 }
     
+                .icons_holder{
+    
+                    .faicon{
+                        &:before{
+                            color: rgba(30, 136, 229, 0.5);
                         }
 
-                .vrednost_inline {
+                        &:hover:before{
-                    float: left;
+                            color: $blue;
-
+                        }
-                    width: calc(100% - 190px);
+                    }
-                    /*max-width: 80%;
+
-                    min-width: 160px;*/
+                    span.inline_edit {
-                }
+                        float: right;
-
+                        margin: 0 0 0 8px;
-                select {
+                    }
-                    margin-top: 5px;
+                    span.inline_delete {
-                }
+                        float: right;
-
+                        margin: 0 0 0 8px;
-                .variabla_limit{
+                    }
-                    width:auto !important; 
+                    span.inline_if_not {
+                        float: right;
+                        margin: 0 0 0 8px;
+                    }
+                    span.inline_if_follow {
+                        float: right;
+                        margin: 0 0 0 8px;
+                    }
+                    span.inline_hidden {
+                        float: right;
+                        margin: 0 0 0 8px;
+                    }
+                    span.correct {
+                        float: right;
+                        margin: 0 0 0 8px;
+                    }
+                }
+    
+                .variable_inline {
+                    display: none;
+    
+                    box-sizing: border-box;
+                    margin-right: 4px;
+                    padding: 4px 6px;
+    
+                    font-size: 14px;
+                    font-weight: bold;
+                }
+    
+                .image_upload {
+                    margin-right: 4px;
+    
+                    &:before{
                         color: $blue;
-                    margin-top: 6px;
-                    display:inline-block;
                     }
                 }
             }
 
+            // Editiranje texta
+            div[contenteditable] {
+                cursor: text;
+                min-height: 26px;
+
+                transition: 0.1s;
+            }
+            div[contenteditable=true] {
+                border: 1px solid transparent;
+                border-radius: 4px;
+    
+                &:hover {
+                    background-color: $white;
+                    border: 1px solid $blue;
+                    outline: 0;
+                }
+                &:focus {
+                    background-color: $white;
+                    border: 1px solid $blue;
+                    outline: 0;
+                }
+            }
+
+
+            // Dodajanje variable na dnu
+            .add-variable-mobile {
+                display: none;
+            }
+            .add-variable {
+                display: none;
+                position: absolute;
+                left: 59px;
+                bottom: 4px;
+
+                span {
+                    position: relative;
+                    top: 1px;
+                    margin-right: 5px !important;
+                }
+
+                a {
+                    color: $blue;
+
+                    &:hover{
+                        color: $yellow;
+                    } 
+                }
+                    .tip_6 {
+                            left: 52px;
+                    }
+                    .tip_16 {
+                            left: 52px;
+                    }
+                    .tip_19 {
+                            left: 52px;
+                    }
+                    .tip_20 {
+                            left: 52px;
+                    }
+            }
+        }
+
+
+        // komentarji na dnu
+        .comment_container_inline{
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+
+            height: 32px;
+            margin: 0px;
+            padding: 0 16px;
+
+            background-color: $light-gray;
+            border-top: 1px solid $gray;
+
+            button{
+                margin-left: 8px;
+            }
+        }
+    }
+
+
+}
+
+
+
+// Aktiven box
+li.spr_editing{
+
+    .spr_edit {
+        display: block;
+    }
+
+    .spremenljivka_content {
+        background-color: white;
+        border: 1px solid $blue;
+        box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.07);
+
+        .spremenljivka_settings {
+
+            background-color: $white !important;
+            border-bottom: 1px $gray solid;
+        }
+
+        .add-variable {
+			display: none;
+		}
+
+        // komentarji na dnu
+        .comment_container_inline{
+            background-color: $white;
+        }
+    }
+
+	.content_div_normalmode {
+		padding-bottom: 10px;
+	}
+	.grid-plus-minus {
+		visibility: visible;
+	}
+	.sub-table {
+		display: table-row;
+	}
+	div[contenteditable][default="1"] {
+		color: $black;
+	}
+
+
+    div.spremenljivka_content.orientation_ob {
+		.variable_holder {
+			clear: both;
+		}
+		div.variabla {
+			clear: both;
+		}
+	}
+	div.preview_mode {
+		display: none;
+	}
+	div.edit_mode {
+		display: block;
+	}
+	td.preview_mode {
+		display: none;
+	}
+	thead.edit_mode {
+		display: table-header-group;
+	}
+	.editingOnly {
+		visibility: visible;
+	}
+	div.spremenljivka_content.orientation_pod {
+		div.variabla {
+			clear: both;
+		}
+	}
+	div.stolpci {
+		float: none;
+		width: auto !important;
+		span.inline_delete {
+			display: block;
+		}
+		span.inline_edit {
+			display: block;
+		}
+	}
+
+    div.spremenljivka_content {
+        div.variabla {
+            span.inline {
+                visibility: visible !important;
+            }
+        }
+    }
+    table.grid_header_table tr td{
+        span.inline {
+            visibility: visible !important;
+        }
+    }
+
+}
+
+
+
+
+/*
+.editor_display {
+	width: 98%;
+	background-color: #eee;
+	border: 1px solid #cccccc;
+	border-bottom: 0;
+}
+.editor_display_small {
+	padding-left: 5px;
+}
+.spremenljivka {
+	width: 100%;
+}
+
+.locked {
+	.add-variable {
+		display: none !important;
+	}
+}
+
+.icons_holder{
+    margin-top: 3px;
+}
+
+// Neaktiven element
+li.spr{
+    
+    
+
+    .spremenljivka_content{
+        
+
+        
+
         // Vsebina - uvod in zakljucek
         .spremenljivka_tekst_form {
             position: relative;
@@ -339,7 +574,7 @@ li.spr{
         .info_inline{
             box-sizing: border-box;
 
-            padding: 4px 8px;
+            padding: 4px 6px;
             font-size: 14px;
 
             p{
@@ -354,99 +589,21 @@ li.spr{
                     font-size: 11px;
                 }
             }
-        }
 
-        div[contenteditable] {
+            &.naslov{
-            cursor: text;
+                padding: 4px 16px;
-            min-height: 26px;
-        }
-        
-        div[contenteditable=true] {
-            border: 1px solid transparent;
-            border-radius: 4px;
-
-            &:hover {
-                background-color: $white;
-                border: 1px solid $gray;
-            }
-            &:focus {
-                background-color: $white;
-                border: 1px solid $gray;
-            }
-        }
-
-        .display_editor {
-            cursor: pointer;
-            visibility: hidden;
-
-            position: absolute;
-            right: 40px;
-            top: 25px;     
-        }
-
-        // komentarji na dnu
-        .comment_container_inline{
-            display: flex;
-            align-items: center;
-            justify-content: flex-end;
-
-            height: 32px;
-            margin: 0px;
-            padding: 0 16px;
-
-            background-color: $light-gray;
-            border-top: 1px solid $gray;
-
-            button{
-                margin-left: 8px;
-            }
-        }
             }
         }
 
         
-// Aktiven element - urejanje vprasanja
-li.spr_editing {
 
-    .spr_edit {
-        display: block;
-    }
         
-    .spremenljivka_content {
-        background-color: white;
-        border: 1px solid $blue;
-        box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.07);
 
-        .spremenljivka_settings {
         
-            background-color: $white !important;
-            border-bottom: 1px $gray solid;
-        }
-
-        .add-variable {
-			display: none;
-		}
-
-        // komentarji na dnu
-        .comment_container_inline{
-            background-color: $white;
     }
 }
 
-	.content_div_normalmode {
-		padding-bottom: 10px;
-	}
-	.grid-plus-minus {
-		visibility: visible;
-	}
-	.sub-table {
-		display: table-row;
-	}
-	div[contenteditable][default="1"] {
-		color: $black;
-	}
 
-}
 
         
 .variable_holder.clr {
@@ -470,76 +627,10 @@ div.spremenljivka_content {
 			margin: 0;
 		}
 	}
-	span.inline {
-		visibility: hidden;
-		cursor: pointer;
-		float: left;
-	}
 
-	span.inline_edit {
-		float: right;
-                margin: 0 3px;
-	}
-	span.inline_delete {
-		float: right;
-                margin: 0 3px;
-	}
-	span.inline_if_not {
-		float: right;
-                margin: 0 3px 0 3px;
-	}
-	span.inline_if_follow {
-		float: right;
-                margin: 0 3px 0 3px;
-	}
-	span.inline_hidden {
-		float: right;
-                margin: 0 3px;
-	}
-	span.correct {
-		float: right;
-                margin: 0 3px;
-	}
 }
 li.spr.spr_editing {
-	div.spremenljivka_content.orientation_ob {
+	
-		.variable_holder {
-			clear: both;
-		}
-		div.variabla {
-			clear: both;
-		}
-	}
-	div.preview_mode {
-		display: none;
-	}
-	div.edit_mode {
-		display: block;
-	}
-	td.preview_mode {
-		display: none;
-	}
-	thead.edit_mode {
-		display: table-header-group;
-	}
-	.editingOnly {
-		visibility: visible;
-	}
-	div.spremenljivka_content.orientation_pod {
-		div.variabla {
-			clear: both;
-		}
-	}
-	div.stolpci {
-		float: none;
-		width: auto !important;
-		span.inline_delete {
-			display: block;
-		}
-		span.inline_edit {
-			display: block;
-		}
-	}
 }
 .spremenljivka_info {
 	font-size: 9px;
@@ -573,20 +664,7 @@ div.spremenljivka_content.orientation_pod {
 		clear: none;
 	}
 }
-li.spr_editing {
+
-	div.spremenljivka_content {
-		div.variabla {
-			span.inline {
-				visibility: visible;
-			}
-		}
-	}
-	table.grid_header_table {
-		span.inline {
-			visibility: visible;
-		}
-	}
-}
 li {
         div.spremenljivka_content {
 		div.variabla {
@@ -620,4 +698,4 @@ table.text_vrednost {
 .variable {
 	color: $gray;
 	font-weight: 500;
-}
+}*/

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

@@ -1,18 +1,14 @@
 /*
-To change this license header, choose License Headers in Project Properties.
+    Box za urejanje posameznega vprasanja
-To change this template file, choose Tools | Templates
-and open the template in the editor.
-*/
-/* 
-    Created on : 07-Aug-2018, 12:54:23
-    Author     : podkrizniku
 */
 
 @import "question_box";
+@import "variable";
+@import "text";
+@import "grids";
 @import "slider";
 @import "calculation";
 @import "quota";
-@import "grids";
 @import "sum";
 @import "hotspot";
 @import "preview";

resources/sass/admin_new/pages/survey_edit/questions/text.scss

@@ -0,0 +1,206 @@
+/*
+    Vrstice v urejanju vprasanja - vrednosti pri textih, stevilih
+*/
+
+li.spr_tip_4,
+li.spr_tip_7,
+li.spr_tip_8,
+li.spr_tip_21{ 
+
+    .variable_holder{
+
+        table{
+
+            tr{
+
+                th{
+                    border: 0;
+                }
+
+                td{
+                    border: 0;
+                }
+
+            }
+        }
+    }
+}
+
+
+
+
+/*.spremenljivka_content[tip="24"] {
+	.variable_holder {
+		overflow-x: auto;
+	}
+}
+.grid_header_table {
+	width: 100%;
+	text-align: center;
+	border-collapse: collapse;
+	
+    thead{
+        tr{
+            td{
+                border: 0;
+
+                &.grid_header {
+                    height: 18px;  
+                }
+            }
+        }
+    }
+    
+	tbody {
+		tr {
+			td {
+				padding-top: 3px;
+				padding-bottom: 3px;
+
+                border: 0;
+			}
+			
+            &:nth-child(odd) {
+				background-color: $light-gray;
+				
+                td {
+					background-color: $light-gray;
+					
+                    div[contenteditable=true] {
+						border: 1px solid transparent;
+					}
+				}
+			}
+		}
+	}
+}
+.grid_header {
+	font-weight: 500;
+}
+.grid_question {
+	width: 20%;
+	text-align: left;
+	padding-right: 1%;
+}
+.col_border {
+	border-left: 1px solid $gray;
+}
+.grid-plus-minus {
+	text-align: right;
+	visibility: hidden;
+}
+.sub-table {
+	display: none;
+}
+div.grid_inline {
+	min-width: 20px;
+	padding: 2px 0;
+}
+div.grid_inline_droppable_title {
+	height: 15px !important;
+	width: 230px;
+	padding: 2px 0 5 0;
+	margin: 0px auto 0px auto;
+	border-top: 1px black dashed !important;
+	border-left: 1px black dashed !important;
+	border-right: 1px black dashed !important;
+	text-align: center;
+}
+div.grid_inline_droppable_title_box {
+	height: 15px !important;
+	width: 230px;
+	padding: 2px 0 5 0;
+	margin: 0px auto 0px auto;
+	text-align: center;
+}
+li {
+	table.grid_header_table {
+		span.inline.show {
+			visibility: visible;
+		}
+	}
+}
+@mixin inlineMove {
+        span.inline_move {
+		position: absolute;
+		left: 30px;
+	}
+}
+div.spremenljivka_content[tip="6"] {
+	@include inlineMove;
+}
+div.spremenljivka_content[tip="16"] {
+	@include inlineMove;
+}
+div.spremenljivka_content[tip="19"] {
+	@include inlineMove;
+}
+div.spremenljivka_content[tip="20"] {
+	@include inlineMove;
+}
+div.spremenljivka_content[tip="24"] {
+	@include inlineMove;
+}
+table.grid_header_table {
+	span.inline_delete {
+		position: absolute;
+		visibility: hidden;
+		right: 5px;
+		margin-right: 57px;
+		margin-right: 0px;
+	}
+	span.inline_edit {
+		position: absolute;
+		visibility: hidden;
+		right: 7px;
+		margin-right: 57px;
+	}
+	span.inline_if_not {
+		position: absolute;
+		visibility: hidden;
+		right: 7px;
+		margin-right: 57px;
+		margin-right: 32px;
+	}
+	span.inline_if_follow {
+		position: absolute;
+		visibility: hidden;
+		right: 7px;
+		margin-right: 57px;
+	}
+	span.inline_hidden {
+		position: absolute;
+		visibility: hidden;
+		right: 7px;
+		margin-right: 57px;
+		margin-right: 14px;
+	}
+	span.correct {
+		position: absolute;
+		visibility: hidden;
+		right: 7px;
+		margin-right: 57px;
+	}
+}
+.trak_class {
+	border: 1px solid $gray;
+	cursor: pointer;
+	background: white !important;
+}
+.trak_class_input {
+	visibility: hidden !important;
+	display: block;
+	z-index: -1;
+}
+.radio-button-label {
+	cursor: pointer !important;
+	z-index: -2;
+}
+.trak_container_bg {
+	background-color: $gray !important;
+}
+table.trak_inline_nadnaslov {
+	td {
+		text-align: center !important;
+	}
+}*/

resources/sass/admin_new/pages/survey_edit/questions/variable.scss

@@ -0,0 +1,71 @@
+/*
+    Vrstice v urejanju vprasanja - vrednosti pri radio, checkboxu
+*/
+
+
+li.spr{ 
+    
+    .variable_holder{
+        display: flex;
+        flex-direction: column;
+
+        margin: 8px 0 0 0;
+        padding: 0px;
+
+        div.variabla {
+            display: flex;
+            align-items: center;
+
+            padding: 0;
+            min-height: 20px;
+            margin: 0 0 4px 0;
+        
+            .vrednost_inline{
+                box-sizing: border-box;
+                flex-grow: 1;
+
+                padding: 4px 6px;
+                font-size: 14px;
+
+                p{
+                    padding: 0;
+                    font-size: 16px;
+                }
+            }
+
+            // Vrstica za nov odgovor na dnu
+            &#variabla_new{
+                
+                .vrednost_inline{
+                    color: #A9A9A9;
+                }
+
+                .inline_other{
+                    margin: 0 32px 0 16px;
+                    padding-left: 16px;
+
+                    color: $blue;
+                    font-size: 14px;
+
+                    border-left: 1px $gray solid;
+
+                    .faicon{
+                        margin-right: 4px;
+
+                        color: $blue;
+                        font-size: 14px;
+                    }
+
+                    &:hover{
+                        color: $dark-blue;
+
+                        .faicon:before{
+                            color: $dark-blue;
+                        }
+                    }
+                }
+            }
+            
+        }        
+    }
+}