Redesign - popravki napak - vpogled, sn

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

@@ -1110,6 +1110,7 @@ class SurveyDataDisplay{
 	public static function displayVnosiHTML() {
 		global $lang;
 		global $site_path;
+		global $site_url;
 		global $global_user_id;
 
 
@@ -1120,6 +1121,17 @@ class SurveyDataDisplay{
             echo '<div class="data_table_top_holder">';
 
             
+            // SN preklop - ego alter (ce je vklopljen modul)
+            if(self::$is_social_network){
+                echo '<div class="dataFullscreen">';    
+
+                echo '  <a href="'.$site_url.'admin/survey/index.php?anketa='.self::$sid.'&a='.A_COLLECT_DATA.'&m='.self::$subAction.self::getVars(VAR_CIRCLES, '0').'"><button id="data_fullscreen_0" class="small white-blue '.((int)self::$_VARS[VAR_CIRCLES]==0 ? 'active' : '').'">'.$lang['srv_lnk_ego'].'</button></a>';
+                echo '  <a href="'.$site_url.'admin/survey/index.php?anketa='.self::$sid.'&a='.A_COLLECT_DATA.'&m='.self::$subAction.self::getVars(VAR_CIRCLES, '1').'"><button id="data_fullscreen_1" class="small white-blue '.((int)self::$_VARS[VAR_CIRCLES]==1 ? 'active' : '').'">'.$lang['srv_lnk_alter'].'</button></a>';
+
+                echo '</div>';
+            }
+
+
             // Navaden pogled / fullscreen
 			echo '<div class="dataFullscreen">';    
 
@@ -1304,8 +1316,7 @@ class SurveyDataDisplay{
                     else {
                         # imamo SN omrežje
                         if (self::$_VARS[VAR_CIRCLES] == 0) {
-                        self::DisplaySnLinks();
+                            self::DisplayDataTable();
-                        self::DisplayDataTable();
                         }
                     }
                 }
@@ -1321,7 +1332,6 @@ class SurveyDataDisplay{
             
         if (self :: $is_social_network ) {
             if (self::$SSNDF != null && self::$_VARS[VAR_CIRCLES] == 1) {
-                self::DisplaySnLinks();
                 self::$SSNDF->outputSNDataFile();
             }
         }
@@ -3001,7 +3011,7 @@ class SurveyDataDisplay{
         }
 		
 		// status
-		echo '<tr><td class="left">'.$lang['status'].':</td>';
+		echo '<tr><td class="left">'.$lang['status'].'</td>';
 		echo '<td class="right">'.($rowu['last_status'] ? $rowu['last_status'] : '&nbsp;').'</td></tr>';
 		
 		// lurker
@@ -3469,25 +3479,7 @@ class SurveyDataDisplay{
 			SurveyAnalysisHelper::getInstance()->displayMissingLegend();
 		}
 	}
-	
-	static function DisplaySnLinks() {
-		global $lang, $site_url;
 		
-		echo '<div id="data_sn_buttons">';
-		
-		// Gumb za preklop na EGO
-		echo '<span>';
-		echo '<a href="'.$site_url.'admin/survey/index.php?anketa='.self::$sid.'&a='.A_COLLECT_DATA.'&m='.self::$subAction.self::getVars(VAR_CIRCLES, '0').'"'.((int)self::$_VARS[VAR_CIRCLES]==0?' class="red"':'').'>'.$lang['srv_lnk_ego'].'</a>';
-		echo '</span>';
-		
-		// Gumb za preklop na ALTER
-		echo '<span>';
-		echo '<a href="'.$site_url.'admin/survey/index.php?anketa='.self::$sid.'&a='.A_COLLECT_DATA.'&m='.self::$subAction.self::getVars(VAR_CIRCLES, '1').'"'.((int)self::$_VARS[VAR_CIRCLES]==1?' class="red"':'').'>'.$lang['srv_lnk_alter'].'</a>';
-		echo '</span>';
-		
-		echo '</div>';	
-	}	
-	
 	static function setSnDisplayFullTableCheckbox() {
 	
 		session_start();

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

public/css/admin_new.css

@@ -23976,6 +23976,10 @@ body #main_holder #main .page_invitations .invitation_lists .right_holder .info_
   cursor: pointer;
   background-color: #F8F8F8;
 }
+#div_vnosi_data #tableContainer .sn_title {
+  font-size: 16px;
+  font-weight: 400;
+}
 
 body.data_fullscreen header #top_line,
 body.data_fullscreen header #surveyNavigation,
@@ -25108,6 +25112,7 @@ ul#merge li {
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka input[type=text], .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka textarea, .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka select {
   margin: 0;
   padding: 5px 7px;
+  min-width: 100px;
   border-radius: 3px;
   border: 1px #3e3e3e solid;
   background-color: #fff;

resources/sass/admin_new/pages/survey_data/data_table.scss

@@ -4,7 +4,7 @@
 
     #tableContainer{
         overflow-x: auto;
-    
+
         // Puscice za scroll
         #dataTableScroller{
             opacity: 0;
@@ -246,6 +246,12 @@
                 }
             }
         }
+
+        // Socialna omrezja naslov
+        .sn_title{
+            font-size: 16px;
+            font-weight: 400;
+        }
     }
 }
 

resources/sass/admin_new/pages/survey_data/quick_edit.scss

@@ -266,6 +266,7 @@
                 input[type="text"], textarea, select{
                     margin: 0;
                     padding: 5px 7px;
+                    min-width: 100px;
                     
                     border-radius: 3px;
                     border: 1px #3e3e3e solid;