From db023ae8208006220020c5c944c6817aaa0a5c4b Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 25 May 2022 11:11:28 +0200 Subject: [PATCH] Redesign - popravki napak - vpogled, sn --- .../surveyData/class.SurveyDataDisplay.php | 36 ++++++++----------- .../surveyData/class.SurveySNDataFile.php | 6 ++-- public/css/admin_new.css | 5 +++ .../pages/survey_data/data_table.scss | 8 ++++- .../pages/survey_data/quick_edit.scss | 1 + 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php index 34132d1a3..5a907c87b 100644 --- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php +++ b/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 '
'; + // SN preklop - ego alter (ce je vklopljen modul) + if(self::$is_social_network){ + echo '
'; + + echo ' '; + echo ' '; + + echo '
'; + } + + // Navaden pogled / fullscreen echo '
'; @@ -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 ''.$lang['status'].':'; + echo ''.$lang['status'].''; echo ''.($rowu['last_status'] ? $rowu['last_status'] : ' ').''; // lurker @@ -3469,25 +3479,7 @@ class SurveyDataDisplay{ SurveyAnalysisHelper::getInstance()->displayMissingLegend(); } } - - static function DisplaySnLinks() { - global $lang, $site_url; - echo '
'; - - // Gumb za preklop na EGO - echo ''; - echo ''.$lang['srv_lnk_ego'].''; - echo ''; - - // Gumb za preklop na ALTER - echo ''; - echo ''.$lang['srv_lnk_alter'].''; - echo ''; - - echo '
'; - } - static function setSnDisplayFullTableCheckbox() { session_start(); diff --git a/admin/survey/classes/surveyData/class.SurveySNDataFile.php b/admin/survey/classes/surveyData/class.SurveySNDataFile.php index 3a9a9746f..5baa87645 100644 --- a/admin/survey/classes/surveyData/class.SurveySNDataFile.php +++ b/admin/survey/classes/surveyData/class.SurveySNDataFile.php @@ -338,8 +338,10 @@ class SurveySNDataFile { function displayFullTableCheckbox() { global $lang; + session_start(); - echo ''; + + echo 'snCreateFullTable==true?' checked="checked"':'').'>'; } @@ -387,7 +389,7 @@ class SurveySNDataFile { $SN_HEADER = unserialize(file_get_contents($_SN_head_file_name)); echo '
'; - echo '

'.$lang['srv_loop_for_variable'].' ['. $this->sn_loop_data[$lpid]['variable']. '] - '. $this->sn_loop_data[$lpid]['naslov']. ' ('.$lang['srv_loop_antonucci_circle'].' '.$this->sn_loop_data[$lpid]['antonucci'].')

'; + echo '

'.$lang['srv_loop_for_variable'].' ['. $this->sn_loop_data[$lpid]['variable']. '] - '. $this->sn_loop_data[$lpid]['naslov']. ' ('.$lang['srv_loop_antonucci_circle'].' '.$this->sn_loop_data[$lpid]['antonucci'].')

'; // TABELA diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 60d62c87c..dd6862a0e 100644 --- a/public/css/admin_new.css +++ b/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; diff --git a/resources/sass/admin_new/pages/survey_data/data_table.scss b/resources/sass/admin_new/pages/survey_data/data_table.scss index e9a356940..4cbc04684 100644 --- a/resources/sass/admin_new/pages/survey_data/data_table.scss +++ b/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; + } } } diff --git a/resources/sass/admin_new/pages/survey_data/quick_edit.scss b/resources/sass/admin_new/pages/survey_data/quick_edit.scss index 88f168fb4..01db9b58f 100644 --- a/resources/sass/admin_new/pages/survey_data/quick_edit.scss +++ b/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;