From 591d27001f5a4a1f053224a5720a269323b9a5f8 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 19 Aug 2020 11:02:38 +0200 Subject: [PATCH 1/4] Popravki popupov --- admin/survey/BranchingAjax.php | 28 +++++++++++-------- admin/survey/SurveyAdmin.php | 5 +--- admin/survey/classes/class.SurveyChart.php | 6 ++-- .../class.SurveyDataSettingProfiles.php | 23 ++++----------- .../classes/class.SurveyPostProcess.php | 4 ++- admin/survey/classes/class.SurveyRecoding.php | 4 ++- .../survey/classes/class.SurveyTableChart.php | 7 ++--- admin/survey/classes/class.Vprasanje.php | 16 ++++++----- public/css/admin.css | 8 +++--- resources/sass/admin/popup/settings.scss | 18 ++++++++---- .../sass/admin/survey_settings/other.scss | 2 -- 11 files changed, 60 insertions(+), 61 deletions(-) diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php index 4f30f407b..0f50220a6 100644 --- a/admin/survey/BranchingAjax.php +++ b/admin/survey/BranchingAjax.php @@ -1633,14 +1633,15 @@ class BranchingAjax { if ($_GET['izpis'] == 'long') { if ($code['type'] == 'if' || $code['type'] == 'podif') - echo '

'.$lang['srv_check_pogoji_not_ok'].'

'; + echo '

'.$lang['srv_check_pogoji_not_ok'].'

'; elseif ($code['type'] == 'loop') - echo '

'.$lang['srv_loop_no_nesting'].'

'; + echo '

'.$lang['srv_loop_no_nesting'].'

'; elseif ($code['type'] == 'question_variable') - echo '

'.$lang['srv_duplicate_question_variable'].'

'; + echo '

'.$lang['srv_duplicate_question_variable'].'

'; elseif ($code['type'] == 'variable') - echo '

'.$lang['srv_duplicate_variables'].'

'; - + echo '

'.$lang['srv_duplicate_variables'].'

'; + + echo '
✕
'; // napaka v ifih if ($code['type'] == 'if') { @@ -1690,14 +1691,18 @@ class BranchingAjax { echo '

'; - echo '

'.$lang['srv_zapri'].'

'; + //echo '

'.$lang['srv_zapri'].'

'; + echo '
'.$lang['srv_zapri'].'
'; } else { - echo '

'.$lang['srv_check_pogoji_not_ok'].'

'; + echo '

'.$lang['srv_check_pogoji_not_ok'].'

'; + echo '
✕
'; + echo '

'.$lang['srv_check_pogoji_not_ok_txt'].'

'; - echo '

'.$lang['srv_zapri'].'

'; - } + //echo '

'.$lang['srv_zapri'].'

'; + echo '
'.$lang['srv_zapri'].'
'; + } } } @@ -2767,9 +2772,8 @@ class BranchingAjax { echo '

'; echo '

'; - echo '
'.$lang['srv_replace'].'
'; - echo '
'.$lang['srv_cancel'].'
'; - + echo '
'.$lang['srv_replace'].'
'; + echo '
'.$lang['srv_cancel'].'
'; } function ajax_find_replace_count() { diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 13bab1f2f..3f1f29f5f 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -432,11 +432,8 @@ class SurveyAdmin echo '
'; // div za setiranje trajanja ankete ob aktiviranju - echo '
'; + echo '
'; echo '
 
'; - echo '
'; - echo ' '; - echo '
'; echo '
'; // urejanje pogojev -- v tem pogledu se uporabi za urejanje vrednosti v editorju diff --git a/admin/survey/classes/class.SurveyChart.php b/admin/survey/classes/class.SurveyChart.php index cf8002ba8..3173b64e9 100644 --- a/admin/survey/classes/class.SurveyChart.php +++ b/admin/survey/classes/class.SurveyChart.php @@ -8966,7 +8966,9 @@ class SurveyChart { $spremenljivka = SurveyAnalysis::$_HEADERS[$spid]; - echo '

'.$spremenljivka['variable'].' - '.$spremenljivka['naslov'].'

'; + echo '

'.$spremenljivka['variable'].' - '.$spremenljivka['naslov'].'

'; + + echo '
✕
'; echo '
'; @@ -9015,7 +9017,7 @@ class SurveyChart { echo ''; echo '
  • '; echo $lang['srv_chart_advanced_recoding']; - echo '
    • '; + echo ''; // Tab za meje numericov if(($spremenljivka['tip'] == 3 && self::checkDropdownNumeric($spid)) || $spremenljivka['tip'] == 7 || $spremenljivka['tip'] == 8 || $spremenljivka['tip'] == 22){ echo '
  • '; diff --git a/admin/survey/classes/class.SurveyDataSettingProfiles.php b/admin/survey/classes/class.SurveyDataSettingProfiles.php index 3f487c8e9..a715a1cfb 100644 --- a/admin/survey/classes/class.SurveyDataSettingProfiles.php +++ b/admin/survey/classes/class.SurveyDataSettingProfiles.php @@ -607,7 +607,9 @@ class SurveyDataSettingProfiles { global $lang; $_all_profiles = self::getProfiles(); - echo '

    '.$lang['srv_analiza_settings'].'

    '; + echo '

    '.$lang['srv_analiza_settings'].'

    '; + + echo '
    ✕
    '; if ($current_pid == null) { $current_pid = self::getCurentProfileId(); @@ -646,20 +648,7 @@ class SurveyDataSettingProfiles { } echo ''; # dataSetting_profile echo ''; # dsp_profiles_holder - - # privzetega profila ne moremo ne zbrisat ne preimenovat - /*echo ''."\n"; // dataSetting_profile_button_left_holder - */ - + echo '
    • '; # dsp_profiles_left echo '
    '."\n"; @@ -718,9 +707,7 @@ class SurveyDataSettingProfiles { echo ''."\n"; echo ''.$lang['srv_delete_profile_yes'].''."\n"; echo ''.$lang['srv_close_profile'].''."\n"; - echo '
    '."\n"; - - + echo '
    '."\n"; } /** Funkcija prikaze osnovnih informacije profila diff --git a/admin/survey/classes/class.SurveyPostProcess.php b/admin/survey/classes/class.SurveyPostProcess.php index 8158f62fe..b1f858090 100644 --- a/admin/survey/classes/class.SurveyPostProcess.php +++ b/admin/survey/classes/class.SurveyPostProcess.php @@ -498,7 +498,9 @@ class SurveyPostProcess { echo '
    '; echo '
    '; - + + echo '
    ✕
    '; + echo ''; echo ''; // workaround, ker se drugace ne poklice onsubmit echo ''; diff --git a/admin/survey/classes/class.SurveyRecoding.php b/admin/survey/classes/class.SurveyRecoding.php index ad4343353..ed65e1f0d 100644 --- a/admin/survey/classes/class.SurveyRecoding.php +++ b/admin/survey/classes/class.SurveyRecoding.php @@ -263,7 +263,9 @@ class SurveyRecoding $qry = sisplet_query($qry_str); $spr_row = mysqli_fetch_assoc($qry); - echo '

    '.$spr_row['variable'].' - '.strip_tags($spr_row['naslov']).'

    '; + echo '

    '.$spr_row['variable'].' - '.strip_tags($spr_row['naslov']).'

    '; + + echo '
    ✕
    '; #echo ''; $vmv = new RecodeValues($this->anketa,$spr_id); diff --git a/admin/survey/classes/class.SurveyTableChart.php b/admin/survey/classes/class.SurveyTableChart.php index 4ef8771ad..c0d21ba86 100644 --- a/admin/survey/classes/class.SurveyTableChart.php +++ b/admin/survey/classes/class.SurveyTableChart.php @@ -2573,7 +2573,9 @@ class SurveyTableChart { global $site_path; global $lang; - echo '

    '.$lang['srv_detail_settings'].'

    '; + echo '

    '.$lang['srv_detail_settings'].'

    '; + + echo '
    ✕
    '; echo ''; @@ -2600,9 +2602,6 @@ class SurveyTableChart { echo '
  • '; echo $lang['srv_chart_advanced_colors']; echo '
    • '; - /*echo '
  • '; - echo $lang['srv_chart_advanced_labels']; - echo '
    • ';*/ echo ''; echo '
    '; diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php index 9b0b484e5..b78318c3a 100644 --- a/admin/survey/classes/class.Vprasanje.php +++ b/admin/survey/classes/class.Vprasanje.php @@ -2969,7 +2969,9 @@ class Vprasanje { function vrednost_fastadd() { global $lang; - echo '

    '.$lang['srv_vrednost_fastadd'].'

    '; + echo '

    '.$lang['srv_vrednost_fastadd'].'

    '; + + echo '
    ✕
    '; echo ''; @@ -2978,15 +2980,15 @@ class Vprasanje { echo '

    '; - echo '

    '.$lang['srv_vrednost_fastadd_txt'].'

    '; - - echo ''; + echo '

    '.$lang['srv_vrednost_fastadd_txt'].'

    '; + + echo ''; echo ''.$lang['srv_potrdi'].''; echo ''; - - echo ''; + + echo ''; echo ''.$lang['srv_close_profile'].''."\n\r"; - echo ''; + echo ''; echo ''; diff --git a/public/css/admin.css b/public/css/admin.css index 391ee4292..3a0854b01 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -8885,7 +8885,7 @@ body.waitlong #loading { height: 300px; padding: 20px; margin: 0 0 40px 0; - background-color: #f5fafe; + background-color: #dfeffb; } #chart_float_editing .chartSettingsArea ul.vrednost_sort li { border: 1px solid grey; @@ -8915,6 +8915,8 @@ body.waitlong #loading { } #chart_float_editing .chartSettingsTabs ul { padding: 0; + margin: 0; + list-style-type: none; } #chart_float_editing .chartSettingsTabs ul li { width: 100%; @@ -8923,7 +8925,7 @@ body.waitlong #loading { cursor: pointer; } #chart_float_editing .chartSettingsTabs ul li.active { - background-color: #f5fafe; + background-color: #dfeffb; } #chart_float_editing .form-item { padding: 3px; @@ -21522,7 +21524,6 @@ and open the template in the editor. border-left: 6px #1e88e5 solid !important; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34); display: none; - left: 250px; width: 500px; } #surveyTrajanje .popup_close { @@ -21621,7 +21622,6 @@ and open the template in the editor. #surveyTrajanje_msg { float: left; - width: 450px; } #surveyTrajanje_close { diff --git a/resources/sass/admin/popup/settings.scss b/resources/sass/admin/popup/settings.scss index 95fb4c1fa..56b228815 100644 --- a/resources/sass/admin/popup/settings.scss +++ b/resources/sass/admin/popup/settings.scss @@ -70,7 +70,7 @@ padding: 20px; margin: 0 0 40px 0; - background-color: $soft_blue_very_lighten; + background-color: $soft_blue_lighten; ul.vrednost_sort { li { @@ -103,20 +103,26 @@ font-size: 13px; font-weight: 500; text-align: center; - background-color: white; + background-color: white; + ul { - padding: 0; + padding: 0; + margin: 0; + list-style-type: none; + li { width: 100%; height: 20px; padding: 10px 0; cursor: pointer; - } + } + li.active { - background-color: $soft_blue_very_lighten; + background-color: $soft_blue_lighten; } } - } + } + .form-item { padding: 3px; width: 200px; diff --git a/resources/sass/admin/survey_settings/other.scss b/resources/sass/admin/survey_settings/other.scss index 190d20040..7d75bb010 100644 --- a/resources/sass/admin/survey_settings/other.scss +++ b/resources/sass/admin/survey_settings/other.scss @@ -36,7 +36,6 @@ and open the template in the editor. display: none; - left: 250px; width: 500px; } #surveyTrajanje_img { @@ -45,7 +44,6 @@ and open the template in the editor. } #surveyTrajanje_msg { float: left; - width: 450px; } #surveyTrajanje_close { position: absolute; From aeebffe2965c5465e7171e7024cc25c254abd9cb Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 19 Aug 2020 12:17:24 +0200 Subject: [PATCH 2/4] Predogled gdpr porocil je na voljo v vseh paketih --- admin/survey/classes/class.GDPR.php | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index 16d2a633d..9530e412d 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -888,15 +888,16 @@ class GDPR{ echo '
    '; + echo ''.$lang['srv_poglejanketo2'].''; + echo '
    '; + // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); if(!$userAccess->checkUserAccess($what='gdpr_export')){ $userAccess->displayNoAccess($what='gdpr_export'); } - else{ - echo ''.$lang['srv_poglejanketo2'].''; - echo '
    '; + else{ echo ' PDF - (Adobe Acrobat)'; echo '
    '; echo ' DOC - (Microsoft Word)'; @@ -916,12 +917,13 @@ class GDPR{ echo '
    '; + echo ''.$lang['srv_poglejanketo2'].''; + echo '
    '; + if(!$userAccess->checkUserAccess($what='gdpr_export')){ $userAccess->displayNoAccess($what='gdpr_export'); } - else{ - echo ''.$lang['srv_poglejanketo2'].''; - echo '
    '; + else{ echo ' PDF - (Adobe Acrobat)'; echo '
    '; echo ' DOC - (Microsoft Word)'; @@ -930,18 +932,6 @@ class GDPR{ echo '

    '; echo ''; - - - - // Prošnje za izbris za posamezno anketo - zaenkrat to ugasnemo - /*echo '
    '; - echo ''.$lang['srv_gdpr_requests'].''; - - echo '
    '; - self::displayGDPRSurveyRequests($ank_id); - echo '
    '; - - echo '
    ';*/ } // Prikazemo vsebino zavihka gdpr - nastavitve posamezne ankete From 90d85320087d6b4a10a9380eb0b6e88f6f7b8714 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 19 Aug 2020 13:50:05 +0200 Subject: [PATCH 3/4] Test avtomatskega updatanja na testu --- frontend/simple/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/simple/index.php b/frontend/simple/index.php index 61c3b6bbf..9c2eada97 100644 --- a/frontend/simple/index.php +++ b/frontend/simple/index.php @@ -36,7 +36,7 @@ /********** BODY **********/ echo ''; - echo '
    '; + echo 'TEST
    '; // Glava From fc1ff59e9ce23d752b5af2cbf2a9f1c3a79f64a2 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 19 Aug 2020 14:00:12 +0200 Subject: [PATCH 4/4] Odstranjeno testiranje cronjoba za git --- frontend/simple/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/simple/index.php b/frontend/simple/index.php index 9c2eada97..61c3b6bbf 100644 --- a/frontend/simple/index.php +++ b/frontend/simple/index.php @@ -36,7 +36,7 @@ /********** BODY **********/ echo ''; - echo 'TEST
    '; + echo '
    '; // Glava