From 01747093b15bd2fd1afc5757a1466d4c4bf1dd3d Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 7 Dec 2021 14:38:54 +0100 Subject: [PATCH] Redesign - header - meni, barve... --- admin/survey/SurveyAdmin.php | 338 +++++++----------- admin/survey/classes/class.SurveyList.php | 135 ++----- public/css/admin_new.css | 192 +++------- resources/sass/admin_new/basic/colors.scss | 1 + .../components/header/navigation.scss | 232 +++--------- 5 files changed, 251 insertions(+), 647 deletions(-) diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index c49c0f7ae..810856e20 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -897,16 +897,18 @@ class SurveyAdmin echo '
'; - echo ''; + echo '
    '; + // Moje ankete + echo '
  1. '; + echo ' '; + echo '
    2. '; - echo '
      '; + if ($this->skin == 0 && $this->isAnketar == false) { - if ($this->skin == 0 /*&& $this->checkDostopAktiven()*/ && $this->isAnketar == false) { - - echo '
    1. '; + echo '
    2. '; if ($d->checkDostopSub('dashboard')) echo ''; @@ -933,13 +935,11 @@ class SurveyAdmin echo '
      3. '; } - echo '
    3. '; + echo '
    4. '; if ($d->checkDostopSub('edit') && $hierarhija_type < 5) { echo ''; } - echo '
       
      '; echo '
      ' . $lang['srv_vprasalnik'] . '
      '; - //echo $css_urejanjeRight; if ($d->checkDostopSub('edit') && $hierarhija_type < 5) { echo '      '; } @@ -948,16 +948,14 @@ class SurveyAdmin # testiranje - ne prikazemo v glasovanju if ($this->survey_type != 0 && $this->survey_type != 1) { - echo '
    5. '; + echo '
    6. '; if ($d->checkDostopSub('test')) { echo ''; } echo '
      ' . $lang['srv_testiranje'] . '
      '; - //echo $css_testiranjeRight; if ($d->checkDostopSub('test')) { echo '      '; } - echo '
      7. '; } @@ -970,7 +968,7 @@ class SurveyAdmin $link = A_VABILA; } - echo '
    7. '; + echo '
    8. '; if ($d->checkDostopSub('publish')) { echo ''; } @@ -984,12 +982,11 @@ class SurveyAdmin // Podatki - ne prikazemo v glasovanju if ($this->survey_type != 0) { - echo '
    9. '; + echo '
    10. '; if ($d->checkDostopSub('data')) { echo ''; } echo '
      ' . $lang['srv_results'] . '
      '; - //echo $css_dataRight; if ($d->checkDostopSub('data')) { echo '      '; } @@ -1008,17 +1005,14 @@ class SurveyAdmin $_goto_m = '&m=' . M_ANALYSIS_SUMMARY; } - echo '
    11. '; - + echo '
    12. '; if ($d->checkDostopSub('analyse') && !isset($modules['hierarhija'])) { echo ''; - } elseif ($d->checkDostopSub('analyse') && isset($modules['hierarhija'])) { echo ''; } echo '
      ' . $lang['srv_analiza'] . '
      '; - if ($d->checkDostopSub('analyse')) { echo '      '; } @@ -1029,7 +1023,7 @@ class SurveyAdmin $d = new Dostop(); if ($d->checkDostopAktiven()) { - echo '
        '; + echo '
          '; # Komentarji SurveySetting::getInstance()->Init($this->anketa); @@ -1135,14 +1129,12 @@ class SurveyAdmin # zavhiki dodatnih nastavitev - echo '
            '; + echo '
              '; # MAZA - mobilna aplikacija za anketirance if (isset($modules['maza'])) { $css = ($this->first_action == A_MAZA) ? 'on' : 'off'; - echo '
            1.  
              2. '; - echo '
            2. '; echo ''; echo ''; @@ -1153,8 +1145,6 @@ class SurveyAdmin if (isset($modules['wpn'])) { $css = ($this->first_action == A_WPN) ? 'on' : 'off'; - echo '
            3.  
              4. '; - echo '
            4. '; echo ''; echo ''; @@ -1165,8 +1155,6 @@ class SurveyAdmin if (isset($modules['phone'])) { $css = ($this->first_action == NAVI_PHONE) ? 'on' : 'off'; - echo '
            5.  
              6. '; - echo '
            6. '; # če je navadni user in anketar if ($this->isAnketar) { @@ -1182,8 +1170,6 @@ class SurveyAdmin if (isset($modules['slideshow'])) { $css = ($this->first_action == NAVI_SLIDESHOW) ? 'on' : 'off'; - echo '
            7.  
              8. '; - echo '
            8. '; echo ''; echo ''; @@ -1194,8 +1180,6 @@ class SurveyAdmin if (isset($modules['uporabnost'])) { $css = ($this->first_action == NAVI_UPORABNOST) ? 'on' : 'off'; - echo '
            9.  
              10. '; - echo '
            10. '; echo ''; echo ''; @@ -1206,8 +1190,6 @@ class SurveyAdmin if ($row['user_from_cms'] >= 1) { $css = ($this->first_action == NAVI_VNOS) ? 'on' : 'off'; - echo '
            11.  
              12. '; - echo '
            12. '; echo ''; echo ''; @@ -1218,8 +1200,6 @@ class SurveyAdmin if (isset($modules['social_network'])) { $css = ($this->first_action == NAVI_VNOS) ? 'on' : 'off'; - echo '
            13.  
              14. '; - echo '
            14. '; echo ''; echo ''; @@ -1230,8 +1210,6 @@ class SurveyAdmin if (isset($modules['quiz'])) { $css = ($this->first_action == A_KVIZ) ? 'on' : 'off'; - echo '
            15.  
              16. '; - echo '
            16. '; echo ''; echo ''; @@ -1242,8 +1220,6 @@ class SurveyAdmin if (isset($modules['voting'])) { $css = ($this->first_action == A_VOTING) ? 'on' : 'off'; - echo '
            17.  
              18. '; - echo '
            18. '; echo ''; echo ''; @@ -1254,8 +1230,6 @@ class SurveyAdmin if (isset($modules['advanced_paradata'])) { $css = ($this->first_action == A_ADVANCED_PARADATA) ? 'on' : 'off'; - echo '
            19.  
              20. '; - echo '
            20. '; echo ''; echo ''; @@ -1266,8 +1240,6 @@ class SurveyAdmin if (isset($modules['excell_matrix'])) { $css = ($this->first_action == 'excell_matrix') ? 'on' : 'off'; - echo '
            21.  
              22. '; - echo '
            22. '; echo ''; echo ''; @@ -1278,8 +1250,6 @@ class SurveyAdmin if (isset($modules['chat'])) { $css = ($this->first_action == A_CHAT) ? 'on' : 'off'; - echo '
            23.  
              24. '; - echo '
            24. '; echo ''; echo ''; @@ -1290,8 +1260,6 @@ class SurveyAdmin if (isset($modules['panel'])) { $css = ($this->first_action == A_PANEL) ? 'on' : 'off'; - echo '
            25.  
              26. '; - echo '
            26. '; echo ''; echo ''; @@ -1302,8 +1270,6 @@ class SurveyAdmin if (isset($modules['evoli'])) { $css = ($this->first_action == 'evoli') ? 'on' : 'off'; - echo '
            27.  
              28. '; - echo '
            28. '; echo ''; echo ''; @@ -1314,8 +1280,6 @@ class SurveyAdmin if (isset($modules['evoli_teammeter'])) { $css = ($this->first_action == 'evoli_teammeter') ? 'on' : 'off'; - echo '
            29.  
              30. '; - echo '
            30. '; echo ''; echo ''; @@ -1326,8 +1290,6 @@ class SurveyAdmin if (isset($modules['evoli_quality_climate'])) { $css = ($this->first_action == 'evoli_quality_climate') ? 'on' : 'off'; - echo '
            31.  
              32. '; - echo '
            32. '; echo ''; echo ''; @@ -1338,8 +1300,6 @@ class SurveyAdmin if (isset($modules['evoli_teamship_meter'])) { $css = ($this->first_action == 'evoli_teamship_meter') ? 'on' : 'off'; - echo '
            33.  
              34. '; - echo '
            34. '; echo ''; echo ''; @@ -1350,8 +1310,6 @@ class SurveyAdmin if (isset($modules['evoli_organizational_employeeship_meter'])) { $css = ($this->first_action == 'evoli_organizational_employeeship_meter') ? 'on' : 'off'; - echo '
            35.  
              36. '; - echo '
            36. '; echo ''; echo ''; @@ -1362,8 +1320,6 @@ class SurveyAdmin if (isset($modules['evoli_employmeter'])) { $css = ($this->first_action == 'evoli_employmeter') ? 'on' : 'off'; - echo '
            37.  
              38. '; - echo '
            38. '; echo ''; echo ''; @@ -1374,8 +1330,6 @@ class SurveyAdmin if (isset($modules['mfdps'])) { $css = ($this->first_action == 'mfdps') ? 'on' : 'off'; - echo '
            39.  
              40. '; - echo '
            40. '; echo ''; echo ''; @@ -1386,8 +1340,6 @@ class SurveyAdmin if (isset($modules['borza'])) { $css = ($this->first_action == 'borza') ? 'on' : 'off'; - echo '
            41.  
              42. '; - echo '
            42. '; echo ''; echo ''; @@ -1398,8 +1350,6 @@ class SurveyAdmin if (isset($modules['mju'])) { $css = ($this->first_action == 'mju') ? 'on' : 'off'; - echo '
            43.  
              44. '; - echo '
            44. '; echo ''; echo ''; @@ -1410,8 +1360,6 @@ class SurveyAdmin if (isset($modules['360_stopinj'])) { $css = ($this->first_action == '360_stopinj') ? 'on' : 'off'; - echo '
            45.  
              46. '; - echo '
            46. '; echo ''; echo ''; @@ -1422,8 +1370,6 @@ class SurveyAdmin if (isset($modules['360_stopinj_1ka'])) { $css = ($this->first_action == '360_stopinj_1ka') ? 'on' : 'off'; - echo '
            47.  
              48. '; - echo '
            48. '; echo ''; echo ''; @@ -1433,8 +1379,6 @@ class SurveyAdmin # GDPR $gdpr = new GDPR(); if (true /*$gdpr->isGDPRSurvey($this->anketa)*/) { - - echo '
            49.  
              50. '; echo '
            50. '; echo ''; @@ -1444,7 +1388,6 @@ class SurveyAdmin } # SA - hierarhija if (isset($modules['hierarhija'])) { - echo '
            51.  
              52. '; echo '
            52. '; if($modules['hierarhija'] == 1) { @@ -1469,7 +1412,6 @@ class SurveyAdmin echo '
              53. '; } elseif(UserSetting::getInstance()->getUserSetting('showSAicon') && $admin_type < 3){ - echo '
            53.  
              54. '; echo '
            54. '; echo ''; @@ -1507,77 +1449,66 @@ class SurveyAdmin # podzavihek: urejanje ankete if ($this->first_action == NAVI_UREJANJE) { - echo '