diff --git a/admin/survey/classes/class.SurveyMissingProfiles.php b/admin/survey/classes/class.SurveyMissingProfiles.php index 5bdc28d7b..23cdc1783 100644 --- a/admin/survey/classes/class.SurveyMissingProfiles.php +++ b/admin/survey/classes/class.SurveyMissingProfiles.php @@ -170,7 +170,9 @@ class SurveyMissingProfiles $_tpes_array = array(MISSING_TYPE_DESCRIPTOR=>$lang['srv_analiza_arhiviraj_type_'.MISSING_TYPE_DESCRIPTOR],MISSING_TYPE_FREQUENCY=>$lang['srv_analiza_arhiviraj_type_'.MISSING_TYPE_FREQUENCY],MISSING_TYPE_CROSSTAB=>$lang['srv_analiza_arhiviraj_type_'.MISSING_TYPE_CROSSTAB]); $_sys_missings = self::$smv->GetMissingValuesForSurvey(); $_sys_unset = self::$smv->GetUnsetValuesForSurvey(); - echo '
' . $lang['srv_missing_profile_title1'] . '
'; + + echo '
' . $lang['srv_missing_profile_title1'] . '
'; + echo '
'.NEW_LINE; echo '
'.NEW_LINE; diff --git a/admin/survey/classes/class.SurveyStatusProfiles.php b/admin/survey/classes/class.SurveyStatusProfiles.php index 8bd3d7552..c00a00006 100644 --- a/admin/survey/classes/class.SurveyStatusProfiles.php +++ b/admin/survey/classes/class.SurveyStatusProfiles.php @@ -197,23 +197,30 @@ class SurveyStatusProfiles #vsebino shranimo v buffer ob_start(); - if ( self::$currentProfileId != SSP_DEFAULT_PROFILE ) { - echo '
'; - echo $lang['srv_not_default_setting']; - echo '

'; - } echo ''; - echo '
'; + + if ( self::$currentProfileId != SSP_DEFAULT_PROFILE ) { + echo ''; + } + + + echo ''; @@ -263,44 +268,28 @@ class SurveyStatusProfiles #dodamo vsebino $popUp->setContent($content); - /* - if ($pid < 0) { #Imamo sejo, lahko poženemo samo kot sejo - $run_lbl = $lang['srv_run_as_session_profile']; - echo ''.$run_lbl.''; - } else { - # shrani - pozeni - $run_lbl = $lang['srv_run_profile']; - echo ''.$run_lbl.''; - $run_lbl = $lang['srv_run_as_session_profile']; - echo ''.$run_lbl.''; - - } - */ - $button = new PopUpButton($lang['srv_choose_profile']); - $button -> setFloat('right') - ->setButtonColor('orange') - -> addAction('onClick','statusProfileAction(\'choose\'); return false;'); + + # dodamo gumb Prekliči + $button = new PopUpCancelButton(); $popUp->addButton($button); #dodamo gumb shrani - if (self::$profiles[$pid]['system'] != 1 && $pid != -1) - { + if (self::$profiles[$pid]['system'] != 1 && $pid != -1){ $button = new PopUpButton($lang['srv_save_profile']); - $button -> setFloat('right') - -> addAction('onClick','statusProfileAction(\'save\'); return false;'); + $button -> addAction('onClick','statusProfileAction(\'save\'); return false;'); $popUp->addButton($button); } $button = new PopUpButton($lang['srv_new_profile_name']); - $button -> setFloat('right') - -> addAction('onClick','statusProfileAction(\'newName\'); return false;'); + $button -> addAction('onClick','statusProfileAction(\'newName\'); return false;'); $popUp->addButton($button); - - # dodamo gumb Prekliči - $button = new PopUpCancelButton(); - $button -> setFloat('right'); + + $button = new PopUpButton($lang['srv_choose_profile']); + $button ->setButtonColor('orange') + -> addAction('onClick','statusProfileAction(\'choose\'); return false;'); $popUp->addButton($button); + echo $popUp; } @@ -418,15 +407,18 @@ class SurveyStatusProfiles $_sql_qry = sisplet_query($_sql_string); $_sql_row = mysqli_fetch_assoc($_sql_qry); - echo '
'; + echo '
'; + foreach ( self::$profiles as $key => $profile ) { if ($key != 1 || ($key == 1 && (int)$_sql_row['collect_all_status'] > 0 )) { - echo '
'; + echo '
'; echo $profile['name']; if($profile['id'] == $pid){ + echo '
'; + #dodamo gumb izbriši if (self::$profiles[$pid]['system'] != 1 ){ echo ' '."\n"; @@ -435,6 +427,8 @@ class SurveyStatusProfiles if (self::$profiles[$pid]['system'] != 1 && $pid != -1){ echo ' '."\n"; } + + echo '
'; } echo '
'; @@ -443,9 +437,7 @@ class SurveyStatusProfiles echo '
'; echo ''; } diff --git a/admin/survey/classes/class.SurveyTimeProfiles.php b/admin/survey/classes/class.SurveyTimeProfiles.php index 01094f446..5c25c1931 100644 --- a/admin/survey/classes/class.SurveyTimeProfiles.php +++ b/admin/survey/classes/class.SurveyTimeProfiles.php @@ -386,25 +386,30 @@ class SurveyTimeProfiles { $currentFilterProfile = $_all_profiles[$current_pid]; if ( $current_pid != STP_DEFAULT_PROFILE ) { - echo '
'; + echo '
'; + echo '
'; } - echo '
'; - echo '
'; - # zlistamo vse profile - echo '
'; + echo ''; + + echo ''; + + echo '
'; - echo '
'; - echo '
'; + echo '
'; self::DisplayProfileData($current_pid); echo '
'; // time_profile_content - echo '
'; // time_profile_right + + + echo '
'; - echo '
'; + echo '
'; if ($current_pid == 0) { - echo ''; -# echo ''; - echo ''; - echo ''; - } else if ($current_pid == -1) { - echo ''; - echo ''; - echo ''; - } else { - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + } + else if ($current_pid == -1) { + echo ''; + echo ''; + } + else { + echo ''; + echo ''; + echo ''; } - echo '
'; // time_profile_button_right_holder + echo '
'; // cover Div diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 4c6a04c4e..12020a0b2 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -6857,6 +6857,12 @@ a.help { .divPopUp p { line-height: 20px; } +.divPopUp .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} .divPopUp .popup_main { display: flex; flex-direction: column; @@ -6870,6 +6876,7 @@ a.help { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -7297,6 +7304,12 @@ body.waitlong #loading { #check_pogoji p { line-height: 20px; } +#check_pogoji .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #check_pogoji .popup_main { display: flex; flex-direction: column; @@ -7310,6 +7323,7 @@ body.waitlong #loading { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -7458,6 +7472,12 @@ body.waitlong #loading { #dropped_alert p { line-height: 20px; } +#dropped_alert .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #dropped_alert .popup_main { display: flex; flex-direction: column; @@ -7471,6 +7491,7 @@ body.waitlong #loading { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -7628,6 +7649,12 @@ body.waitlong #loading { #popup_user_access p { line-height: 20px; } +#popup_user_access .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #popup_user_access .popup_main { display: flex; flex-direction: column; @@ -7641,6 +7668,7 @@ body.waitlong #loading { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -13637,6 +13665,12 @@ textarea#addusers, textarea#addusers_note { #vrednost_edit p { line-height: 20px; } +#vrednost_edit .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #vrednost_edit .popup_main { display: flex; flex-direction: column; @@ -13650,6 +13684,7 @@ textarea#addusers, textarea#addusers_note { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -13813,6 +13848,12 @@ textarea#addusers, textarea#addusers_note { #calculation p { line-height: 20px; } +#calculation .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #calculation .popup_main { display: flex; flex-direction: column; @@ -13826,6 +13867,7 @@ textarea#addusers, textarea#addusers_note { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -14036,6 +14078,12 @@ and open the template in the editor. #preview_spremenljivka p { line-height: 20px; } +#preview_spremenljivka .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #preview_spremenljivka .popup_main { display: flex; flex-direction: column; @@ -14049,6 +14097,7 @@ and open the template in the editor. width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -14980,6 +15029,12 @@ dl.arch_email dd { #inv_view_arch_recipients p { line-height: 20px; } +#inv_view_arch_recipients .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #inv_view_arch_recipients .popup_main { display: flex; flex-direction: column; @@ -14993,6 +15048,7 @@ dl.arch_email dd { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -15599,6 +15655,12 @@ and open the template in the editor. #div_export_setting_show p { line-height: 20px; } +#div_export_setting_show .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #div_export_setting_show .popup_main { display: flex; flex-direction: column; @@ -15612,6 +15674,7 @@ and open the template in the editor. width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -18093,6 +18156,12 @@ and open the template in the editor. #dsp_inspect_cover p { line-height: 20px; } +#dsp_inspect_cover .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #dsp_inspect_cover .popup_main { display: flex; flex-direction: column; @@ -18106,6 +18175,7 @@ and open the template in the editor. width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -18322,45 +18392,8 @@ and open the template in the editor. opacity: 0.4; } -fieldset.statusProfileFieldset { - width: 460px; - margin: 0px; - padding: 5px; - border: 0; - border-top: 1px solid #1E88E5; -} -fieldset.statusProfileFieldset legend { - background-color: #FFFFFF; -} - -fieldset#missingProfileFieldset { - width: 470px; - margin: 0px; - padding: 5px; - border: 0; - border-top: 1px solid #1E88E5; -} - -#missingProfileFieldsetHolder1 { - width: 481px; - padding: 4px; - margin-top: 4px; - margin-bottom: 5px; - font-size: 11px; -} - #div_missing_profiles { display: none; - position: relative; - z-index: 90; - width: 730px; -} -#div_missing_profiles fieldset { - border: 0; - border-top: 1px solid #1E88E5; -} -#div_missing_profiles legend { - background-color: #FFFFFF; } .fs_container { @@ -18502,79 +18535,6 @@ fieldset#missingProfileFieldset { background: #cfc; } -.statistic_profile_left_right { - width: auto; - height: 190px; - padding: 5px; -} - -.time_profile_left_right { - width: auto; - height: 200px; - padding: 5px; -} - -.time_profile_left_right.floatRight { - height: 140px; - border: 1px solid #1E88E5; - background-color: #FFFFFF; - float: right; - padding: 10px; - width: 380px; -} - -.statistic_profile_holder { - float: left; - width: 190px; - height: 150px; - color: #1E88E5; -} - -#statistic_profile { - height: 150px; - overflow: auto; - cursor: pointer; - width: 190px; -} -#statistic_profile .option { - padding: 2px 5px; - margin-bottom: 5px; -} -#statistic_profile .active { - padding: 2px 5px; - border: 1px solid #1E88E5; - background-color: #FFFFFF; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; -} - -#time_profile { - height: 150px; - overflow: auto; - cursor: pointer; - width: 190px; -} -#time_profile .option { - padding: 2px 5px; - margin-bottom: 5px; -} -#time_profile .active { - padding: 2px 5px; - border: 1px solid #1E88E5; - background-color: #FFFFFF; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; -} - -#status_casi { - height: 150px; - overflow: auto; - cursor: pointer; - width: 190px; -} - #tbl_color_ersidual { font-size: 11px; line-height: 12px; @@ -18583,44 +18543,6 @@ fieldset#missingProfileFieldset { margin-left: 5px; } -#variableTypeNote { - margin-bottom: 16px; - padding: 8px; - font-size: 14px; - border: 1px #C4C4C4 solid; -} - -#variableProfileNote { - margin-bottom: 16px; - padding: 8px; - font-size: 14px; - border: 1px #C4C4C4 solid; -} -#variableProfileNote div.if_content { - display: inline-block; -} - -#timeProfileDafaultNote { - margin-bottom: 16px; - padding: 8px; - font-size: 14px; - border: 1px #C4C4C4 solid; -} - -#dashboardEmailFilter { - margin-bottom: 16px; - padding: 8px; - font-size: 14px; - border: 1px #C4C4C4 solid; -} - -#not_default_setting { - margin-bottom: 16px; - padding: 8px; - font-size: 14px; - border: 1px #C4C4C4 solid; -} - input#startDate { width: 80px; } @@ -18748,6 +18670,12 @@ input#endDate { .mc_table_settings p { line-height: 20px; } +.mc_table_settings .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} .mc_table_settings .popup_main { display: flex; flex-direction: column; @@ -18761,6 +18689,7 @@ input#endDate { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -18938,6 +18867,12 @@ input#endDate { #newMCTable p { line-height: 20px; } +#newMCTable .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #newMCTable .popup_main { display: flex; flex-direction: column; @@ -18951,6 +18886,7 @@ input#endDate { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -19104,6 +19040,12 @@ input#endDate { #renameMCTable p { line-height: 20px; } +#renameMCTable .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #renameMCTable .popup_main { display: flex; flex-direction: column; @@ -19117,6 +19059,7 @@ input#endDate { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } @@ -19270,6 +19213,12 @@ input#endDate { #deleteMCTable p { line-height: 20px; } +#deleteMCTable .popup_note { + margin-bottom: 16px; + padding: 8px; + font-size: 16px; + border: 1px #C4C4C4 solid; +} #deleteMCTable .popup_main { display: flex; flex-direction: column; @@ -19283,6 +19232,7 @@ input#endDate { width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px #C4C4C4 solid; } diff --git a/resources/sass/admin_new/components/popup/basic.scss b/resources/sass/admin_new/components/popup/basic.scss index ea3a398bf..41d51bcd0 100644 --- a/resources/sass/admin_new/components/popup/basic.scss +++ b/resources/sass/admin_new/components/popup/basic.scss @@ -111,6 +111,15 @@ line-height: 20px; } + .popup_note{ + margin-bottom: 16px; + padding: 8px; + + font-size: 16px; + + border: 1px $dark-gray solid; + } + .popup_main{ display: flex; flex-direction: column; @@ -127,6 +136,7 @@ width: 216px; min-width: 216px; padding-right: 16px; + padding-bottom: 16px; margin-right: 16px; border-right: 1px $dark-gray solid; diff --git a/resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss b/resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss index b737a0e19..746c36137 100644 --- a/resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss +++ b/resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss @@ -135,45 +135,10 @@ and open the template in the editor. background: $white; opacity: .40; } -fieldset.statusProfileFieldset { - width: 460px; - margin: 0px; - padding: 5px; - border: 0; - border-top: 1px solid $blue; - legend { - background-color: $white; - } -} -fieldset#missingProfileFieldset { - width: 470px; - margin: 0px; - padding: 5px; - border: 0; - border-top: 1px solid $blue; -} -#missingProfileFieldsetHolder1 { - width: 481px; - padding: 4px; - margin-top: 4px; - margin-bottom: 5px; - font-size: 11px; -} + #div_missing_profiles { display: none; - position: relative; - z-index: 90; - - width: 730px; - - fieldset { - border: 0; - border-top: 1px solid $blue; - } - legend { - background-color: $white; - } } .fs_container { @@ -311,80 +276,6 @@ fieldset#missingProfileFieldset { } } -.statistic_profile_left_right { - width: auto; - height: 190px; - padding: 5px; -} -.time_profile_left_right { - width: auto; - height: 200px; - padding: 5px; -} -.time_profile_left_right.floatRight { - height: 140px; - border: 1px solid $blue; - background-color: $white; - float: right; - padding: 10px; - width: 380px; -} -.statistic_profile_holder { - float: left; - width: 190px; - height: 150px; - color: $blue; -} -#statistic_profile { - height: 150px; - overflow: auto; - cursor: pointer; - width: 190px; - - .option { - padding: 2px 5px; - margin-bottom: 5px; - } - .active { - padding: 2px 5px; - - border: 1px solid $blue; - background-color: $white; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - } -} -#time_profile { - height: 150px; - overflow: auto; - cursor: pointer; - width: 190px; - - .option { - padding: 2px 5px; - margin-bottom: 5px; - } - .active { - padding: 2px 5px; - - border: 1px solid $blue; - background-color: $white; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - } -} - - - -#status_casi { - height: 150px; - overflow: auto; - cursor: pointer; - width: 190px; -} - #tbl_color_ersidual { font-size: 11px; @@ -394,33 +285,6 @@ fieldset#missingProfileFieldset { margin-left: 5px; } -@mixin profile_note() { - margin-bottom: 16px; - padding: 8px; - - font-size: 14px; - - border: 1px $dark-gray solid; -} - -#variableTypeNote { - @include profile_note(); -} -#variableProfileNote { - @include profile_note(); - div.if_content { - display: inline-block; - } -} -#timeProfileDafaultNote { - @include profile_note(); -} -#dashboardEmailFilter { - @include profile_note(); -} -#not_default_setting { - @include profile_note(); -} input#startDate { width: 80px; }