Merge branch 'master' of https://git.1ka.si:/git/1ka

admin/survey/SurveyAdmin.php

@@ -375,7 +375,8 @@ class SurveyAdmin
 
         // Loading ikona
         echo '  <div id="loading">';
-        echo '      <span class="faicon spinner fa-spin spaceRight"></span> '.$lang['srv_saving'];
+        echo '      <span class="faicon spinner fa-spin"></span>';
+        echo '      <span class="text">'.$lang['srv_saving'].'</span>';
         echo '  </div> <!-- /loading -->';
 
         echo '  <div id="clipboard">';

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

@@ -836,6 +836,7 @@ class SurveyCrosstabs {
 									$sub_q1 = '<span class="anl_variabla'.$sccFloat.'">';
 									$sub_q1 .= '<a href="/" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $v_first['spr'] . '\'); return false;">';
 									$sub_q1 .= strip_tags($spr1['naslov']);
+
 									if ($show_variables_values == true ) {
 										$sub_q1 .= '<span class="anl_variabla'.$sccFloat.'">';
 										
@@ -843,9 +844,12 @@ class SurveyCrosstabs {
 										
 										$sub_q1 .= '</span>';
 									}
+
 									if ($spr1['tip'] == '16') {
 										$sub_q1 .= '<br/>' . strip_tags($grid1['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($grid1['variable']) . ')' : '');
-									} else {
+									} 
+                                    else {
+                                        if(strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje'])
 										    $sub_q1 .= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : '');
 									}
 									$sub_q1 .= '</a>';
@@ -878,7 +882,9 @@ class SurveyCrosstabs {
 									}
 									if ($spr2['tip'] == '16') {
 										$sub_q2.= '<br/>' . strip_tags($grid2['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($grid2['variable']) . ')' : '');
-									} else {
+									} 
+                                    else {
+                                        if(strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje'])
 										    $sub_q2.= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : '');
 									}
 									$sub_q2 .= '</a>';

lang/1.php

@@ -5232,7 +5232,7 @@ $lang = array (
 	"srv_analiza_archive_note1"					=>	"Arhiv lahko generirate s klikom na ikono <span class=\"faicon arhiv blue\"></span> pri posameznih analizah.",
 	"srv_analiza_archive_list"					=>	"Seznam arhivov analiz",
 	"srv_wait_a_moment"							=>	"Prosimo počakajte trenutek.",
-	"srv_saving"								=>	"Obdelujem...",
+	"srv_saving"								=>	"Nalaganje",
 	"srv_grid_defaults_1_1"						=>	"Sploh ne velja",
 	"srv_grid_defaults_1_2"						=>	"Ne velja",
 	"srv_grid_defaults_1_3"						=>	"Niti niti",

lang/2.php

@@ -5196,7 +5196,7 @@ $lang = array (
 	"srv_analiza_archive_note1"					=>	"You can generate an archive by clicking on the <span class=\"faicon archive blue\"></span> icon for each analysis.",
 	"srv_analiza_archive_list"					=>	"List of analysis archives",
 	"srv_wait_a_moment"							=>	"Please wait a moment.",
-	"srv_saving"								=>	"Processing...",
+	"srv_saving"								=>	"Loading",
 	"srv_grid_defaults_1_1"						=>	"Not true at all",
 	"srv_grid_defaults_1_2"						=>	"Not true",
 	"srv_grid_defaults_1_3"						=>	"Neutral",

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

@@ -562,7 +562,8 @@ span.faicon.minus_orange::before{
 /* Spinner */
 span.faicon.spinner::before{
     font-size: 18px;
-    content: "\f110";
+    //content: "\f110";
+    content: "\f1ce";
 }
 
 

resources/sass/admin_new/components/form/dropdown.scss

@@ -14,6 +14,14 @@ select.dropdown {
 
     background-color: $white;
 
+    option {                
+        color: $black;  
+        
+        &:disabled{
+            color: #A0A0A0;
+        }
+    }
+
     &.large {
         width: 229px;
         height: 40px;
@@ -23,7 +31,6 @@ select.dropdown {
         option {                
             font-size: 16px;
             line-height: 20px;
-            color: $black;
             padding: 0;                
         }
     }
@@ -36,7 +43,6 @@ select.dropdown {
         option {
             font-size: 14px;
             line-height: 18px;             
-            color: $black;               
         }
     }
     &.small {
@@ -48,7 +54,6 @@ select.dropdown {
         option {
             font-size: 14px;
             line-height: 18px;             
-            color: $black;                
         }
     }
 

resources/sass/admin_new/components/popup/loader.scss

@@ -14,10 +14,6 @@ body.waitlong {
         top: 45%;
         left: 50%;
         transform: translateX(-50%);
-
-        padding: 15px 25px;
-
-        border: 1px solid $blue;
 	}
 }
 
@@ -32,16 +28,29 @@ body.waitlong {
     box-sizing: border-box;
     width: 275px;
     height: 38px;
-    padding-left: 16px;
-    
-    line-height: 35px;
-    font-size: 14px;
 
 	background-color: $white;
-	border: 1px solid $blue;
+	border: 1px solid $black;
     border-radius: 2px;
     
-    .spinner::before{
+
+    span.spinner{
+        position: absolute;
+        top: 10px;
+        left: 16px;
+
+        font-size: 14px;
+
+        &::before{
+            font-size: 14px;
+        }
+    }
+
+    span.text{
+        position: absolute;
+        top: 8px;
+        left: 40px;
+
         font-size: 14px;
     }
 }

resources/sass/admin_new/pages/survey_analysis/page_desc.scss

@@ -11,6 +11,10 @@
 
     tr.row_question td{
         background-color: $light-gray2;
+
+        &.cell_value{
+            font-weight: 400;
+        }
     }
 
     tr.row_grid td,