diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index fb3340df6..a94f08ea9 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -4305,8 +4305,8 @@ class SurveyAdminAjax { echo ' '; echo '
'; echo ''; diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php index 9699372ab..8dfa855cd 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php @@ -2166,7 +2166,8 @@ class SurveyMultiCrosstabs { $sql = sisplet_query("SELECT * FROM srv_mc_table WHERE id='$this->table_id' AND ank_id='$this->ank_id' AND usr_id='$global_user_id'"); $current_table = mysqli_fetch_array($sql); - echo ''.$lang['srv_multicrosstabs_tables_rename'].'
'; + echo ''.$lang['srv_multicrosstabs_tables_delete'].'
'; echo ''; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 023eb18cb..69cbd1839 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8066,6 +8066,53 @@ div.setting_holder .setting_item input[type=checkbox][disabled] + label:before { pointer-events: none; } +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.naslov { + margin-bottom: 16px; + padding-bottom: 0; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.naslov p { + font-size: 18px !important; + font-weight: 600; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.naslov p.spremenljivka_info { + color: #777777; + font-size: 14px !important; + font-weight: 400; + margin-top: 16px; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder { + margin-top: 0; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder div.variabla { + padding: 0; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table td { + border: none; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table td.category label { + margin-right: 0; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table td.category textarea { + height: 30px !important; + width: 100% !important; + outline: 1px solid #C4C4C4; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.grid_table tr:nth-child(2n+1) { + background-color: #F8F8F8; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.ranking_table td div.dropzone { + border-top: 1px solid #E5E5E5; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.text_vrednost td div.fotoresults_delete { + margin-left: 27px; + font-size: 14px !important; + color: #777777; + margin-top: 16px; +} +div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.text_vrednost td div input.sig_clear_button { + margin-bottom: 16px; +} + div.qtip_comment { padding: 2px 16px 16px 16px; } @@ -8153,26 +8200,37 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left { width: 50%; } -#div_creport_settings_profiles #creport_profiles { +#div_creport_settings_profiles #creport_profiles, +#div_creport_settings_profiles #mc_tables, +#mc_tables_left #creport_profiles, +#mc_tables_left #mc_tables { cursor: pointer; width: 99%; height: 140px; display: inline-block; border: 1px solid #E5E5E5; } -#div_creport_settings_profiles #creport_profiles .option { +#div_creport_settings_profiles #creport_profiles .option, +#div_creport_settings_profiles #mc_tables .option, +#mc_tables_left #creport_profiles .option, +#mc_tables_left #mc_tables .option { padding: 8px; - border: 1px solid #E5E5E5; + border-bottom: 1px solid #E5E5E5; } -#div_creport_settings_profiles #creport_profiles .active { +#div_creport_settings_profiles #creport_profiles .active, +#div_creport_settings_profiles #mc_tables .active, +#mc_tables_left #creport_profiles .active, +#mc_tables_left #mc_tables .active { background-color: #EAF9FE; color: #1E88E5; } -#div_creport_settings_profiles #creport_settings_profiles_comment textarea { +#div_creport_settings_profiles #creport_settings_profiles_comment textarea, +#mc_tables_left #creport_settings_profiles_comment textarea { width: 100%; height: 80px; } -#div_creport_settings_profiles .button_holder { +#div_creport_settings_profiles .button_holder, +#mc_tables_left .button_holder { display: flex; border-top: 1px solid #E5E5E5; padding-top: 16px !important; @@ -8180,6 +8238,14 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left { justify-content: space-between !important; } +#div_mc_tables { + margin-bottom: 0; +} +#div_mc_tables .button_holder { + border-top: 1px solid #E5E5E5; + padding-top: 16px; +} + #newCReportProfile .text, #renameCReportProfile .text { width: 100%; diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index ae3f19126..82ecd6501 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -129,6 +129,100 @@ div.setting_holder { } } +//Preview spremenljivka +div#fullscreen { + div#preview_spremenljivka { + div#spremenljivka_preview { + div.spremenljivka { + div.naslov { + p { + font-size: 18px !important; + font-weight: $semi-bold; + + //Opomba na vprašanje + &.spremenljivka_info { + color: $very-dark-gray; + font-size: 14px !important; + font-weight: $regular; + margin-top: 16px; + } + } + + margin-bottom: 16px; + padding-bottom: 0; + } + + div.variable_holder { + + margin-top: 0; + + div.variabla { + padding: 0; + } + + table { + td { + border: none; + + &.category { + label { + margin-right: 0; //za centriranje radio buttonov v tabelah + } + + textarea { + height: 30px !important; + width: 100% !important; + outline: 1px solid $dark-gray; + } + } + } + + //Tabele + &.grid_table { + + tr:nth-child(2n+1) { + background-color: $light-gray; + } + + } + + //Razvršanje + &.ranking_table { + + td { + div.dropzone { + border-top: 1px solid $gray; + } + } + + } + + //Fotografiraj + &.text_vrednost { + + td { + div.fotoresults_delete { + margin-left: 27px; + font-size: 14px!important; + color: $very-dark-gray; + margin-top: 16px; + } + + div { + input.sig_clear_button { + margin-bottom: 16px; + } + } + } + + } + } + } + } + } + } +} + //Komentarji div.qtip_comment { @@ -254,9 +348,11 @@ div#div_analiza_archive_name { } } -//Poročila -#div_creport_settings_profiles { - #creport_profiles { +//Poročila in tabele +#div_creport_settings_profiles, +#mc_tables_left { + #creport_profiles, + #mc_tables { cursor: pointer; width: 99%; height: 140px; @@ -264,7 +360,7 @@ div#div_analiza_archive_name { border: 1px solid $gray; .option { padding: 8px; - border: 1px solid $gray; + border-bottom: 1px solid $gray; } .active { background-color: $light-blue; @@ -289,6 +385,14 @@ div#div_analiza_archive_name { } +#div_mc_tables { + .button_holder { + border-top: 1px solid $gray; + padding-top: 16px; + } + margin-bottom: 0; +} + #newCReportProfile, #renameCReportProfile { .text {