From 1da68d9f1789b795376502706ab1a7075e2ab507 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Mon, 24 May 2021 11:48:27 +0200 Subject: [PATCH] Popravki mobile admina --- admin/survey/classes/class.SurveyList.php | 3 +- .../class.SurveyInvitationsNew.php | 10 +- public/css/admin.css | 175 ++++++++++++++---- resources/sass/admin/mobile/basic.scss | 3 +- .../sass/admin/mobile/pages/analysis.scss | 2 + .../sass/admin/mobile/pages/branching.scss | 5 + resources/sass/admin/mobile/pages/data.scss | 5 + .../sass/admin/mobile/pages/my_surveys.scss | 2 +- .../sass/admin/mobile/pages/new_survey.scss | 18 +- .../sass/admin/mobile/pages/publish.scss | 30 +++ .../admin/mobile/pages/survey_settings.scss | 27 ++- resources/sass/admin/publish/invitations.scss | 51 +++-- 12 files changed, 270 insertions(+), 61 deletions(-) diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index a7e362a58..12560465c 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -168,7 +168,8 @@ class SurveyList { // Ali prikazujemo folderje ali ne $userAccess = UserAccess::getInstance($global_user_id); - if($userAccess->checkUserAccess('my_survey_folders')) + $detect = New Mobile_Detect(); + if($userAccess->checkUserAccess('my_survey_folders') && !$detect->isMobile() && !$detect->isTablet()) $this->show_folders = UserSetting::getInstance()->getUserSetting('survey_list_folders'); # koliko zapisov prikazujemo na stran diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php index dd82a7504..86be026c2 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php @@ -8207,10 +8207,10 @@ class SurveyInvitationsNew { // Dostop brez kode - echo '

'; - echo ''; + echo '

'; + echo '

'; if($row['usercode_skip'] > 0){ echo '
'; echo ''; @@ -10425,7 +10425,7 @@ class SurveyInvitationsNew { #autentikacija echo '

'; echo $lang['srv_email_setting_autentication']; - echo ''; + echo ''; echo ''; @@ -10433,7 +10433,7 @@ class SurveyInvitationsNew { #Varnost SMTPSecure echo '

'; echo $lang['srv_email_setting_encryption']; - echo ''; + echo ''; echo ''; diff --git a/public/css/admin.css b/public/css/admin.css index 3bd54b9de..331975830 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -17703,6 +17703,9 @@ and open the template in the editor. line-height: 16px; display: inline-block; } +.lbl_email_setting #usercode_skip_0 { + margin: 5px 0 0 2px; +} #srv_invitation_note { display: inline-block; @@ -18086,44 +18089,42 @@ and open the template in the editor. } #inv_field_container { - font-size: 11px; display: block !important; margin: 0px !important; padding: 0px !important; clear: both; + font-size: 11px; -moz-user-select: none; -webkit-user-select: none; user-select: none; -ms-user-select: none; } #inv_field_container ul { - font-size: 11px; - display: block !important; + display: flex !important; + flex-wrap: wrap; margin: 0px !important; padding: 0px !important; clear: both; + list-style-type: none; + font-size: 11px; + border: grey; -moz-user-select: none; -webkit-user-select: none; user-select: none; -ms-user-select: none; - list-style-type: none; - margin: 0px; - width: auto; - border: grey; } #inv_field_container ul li { cursor: pointer; - height: 18px; - width: 80px; - width: auto; - display: inline-block; - padding: 1px 0px 2px 0px; + min-height: 24px; + width: 45%; + box-sizing: border-box; + padding: 2px 0px 2px 0px; margin: 5px; color: #1e88e5; + text-align: left; + vertical-align: middle; background-color: #f0f7fd; border: 1px solid #1e88e5; - text-align: center; - vertical-align: middle; border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -18142,44 +18143,42 @@ and open the template in the editor. } #inv_sys_container { - font-size: 11px; display: block !important; margin: 0px !important; padding: 0px !important; clear: both; + font-size: 11px; -moz-user-select: none; -webkit-user-select: none; user-select: none; -ms-user-select: none; } #inv_sys_container ul { - font-size: 11px; - display: block !important; + display: flex !important; + flex-wrap: wrap; margin: 0px !important; padding: 0px !important; clear: both; + list-style-type: none; + font-size: 11px; + border: grey; -moz-user-select: none; -webkit-user-select: none; user-select: none; -ms-user-select: none; - list-style-type: none; - margin: 0px; - width: auto; - border: grey; } #inv_sys_container ul li { cursor: pointer; - height: 18px; - width: 80px; - width: auto; - display: inline-block; - padding: 1px 0px 2px 0px; + min-height: 24px; + width: 45%; + box-sizing: border-box; + padding: 2px 0px 2px 0px; margin: 5px; color: #1e88e5; + text-align: left; + vertical-align: middle; background-color: #f0f7fd; border: 1px solid #1e88e5; - text-align: center; - vertical-align: middle; border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -28487,7 +28486,8 @@ fieldset .nastavitveSpan6 { } fieldset select, fieldset .select2-container, -fieldset input[type=text] { +fieldset input[type=text], +fieldset textarea { width: 100% !important; box-sizing: border-box; } @@ -28709,7 +28709,7 @@ fieldset input[type=text] { } #main #moje_ankete_edit #survey_list #anketa_new_float { display: flex; - justify-content: center; + justify-content: left; } #main #moje_ankete_edit #survey_list #pagination { margin-left: auto; @@ -28791,12 +28791,25 @@ fieldset input[type=text] { #new_anketa_div #input_field_holder, #new_anketa_div #preview_field_holder { width: 100% !important; - width: 300px !important; float: none; box-sizing: border-box; margin: 0 !important; padding: 10px 0 !important; } + #new_anketa_div .from_text_instructions { + line-height: 20px !important; + } + #new_anketa_div .fieldset.noSurvey_template { + display: flex; + flex-direction: column; + } + #new_anketa_div .fieldset.noSurvey_template .template { + align-self: center; + width: auto !important; + } + #new_anketa_div .fieldset.noSurvey_template .template .template_preview { + margin-right: 10px !important; + } table.dashboard { border-spacing: 0px; @@ -28864,6 +28877,10 @@ table.dashboard > tbody > tr > td { top: 187px; } + #toolbox_library { + display: none !important; + } + #vprasanje_float_editing { position: fixed; z-index: 99999; @@ -28925,10 +28942,60 @@ table.dashboard > tbody > tr > td { } /* NASTAVITVE in ARHIVI */ - #main #anketa #anketa_edit.page_nastavitve { + #main #anketa #anketa_edit.page_nastavitve, +#main #anketa #anketa_edit.page_osn_pod, +#main #anketa #anketa_edit.page_mobile_settings, +#main #anketa #anketa_edit.page_jezik, +#main #anketa #anketa_edit.page_dostop, +#main #anketa #anketa_edit.page_piskot, +#main #anketa #anketa_edit.page_alert, +#main #anketa #anketa_edit.page_trajanje, +#main #anketa #anketa_edit.page_skupine, +#main #anketa #anketa_edit.page_urejanje, +#main #anketa #anketa_edit.page_prikaz, +#main #anketa #anketa_edit.page_metadata, +#main #anketa #anketa_edit.page_missing, +#main #anketa #anketa_edit.page_export_settings, +#main #anketa #anketa_edit.page_gdpr_settings, +#main #anketa #anketa_edit.page_uporabnost, +#main #anketa #anketa_edit.page_kviz, +#main #anketa #anketa_edit.page_voting, +#main #anketa #anketa_edit.page_social_network, +#main #anketa #anketa_edit.page_slideshow, +#main #anketa #anketa_edit.page_telephone, +#main #anketa #anketa_edit.page_chat, +#main #anketa #anketa_edit.page_panel, +#main #anketa #anketa_edit.page_advanced_paradata, +#main #anketa #anketa_edit.page_json_survey_export, +#main #anketa #anketa_edit.page_fieldwork { flex-direction: column-reverse; } - #main #anketa #anketa_edit.page_nastavitve > div { + #main #anketa #anketa_edit.page_nastavitve > div, +#main #anketa #anketa_edit.page_osn_pod > div, +#main #anketa #anketa_edit.page_mobile_settings > div, +#main #anketa #anketa_edit.page_jezik > div, +#main #anketa #anketa_edit.page_dostop > div, +#main #anketa #anketa_edit.page_piskot > div, +#main #anketa #anketa_edit.page_alert > div, +#main #anketa #anketa_edit.page_trajanje > div, +#main #anketa #anketa_edit.page_skupine > div, +#main #anketa #anketa_edit.page_urejanje > div, +#main #anketa #anketa_edit.page_prikaz > div, +#main #anketa #anketa_edit.page_metadata > div, +#main #anketa #anketa_edit.page_missing > div, +#main #anketa #anketa_edit.page_export_settings > div, +#main #anketa #anketa_edit.page_gdpr_settings > div, +#main #anketa #anketa_edit.page_uporabnost > div, +#main #anketa #anketa_edit.page_kviz > div, +#main #anketa #anketa_edit.page_voting > div, +#main #anketa #anketa_edit.page_social_network > div, +#main #anketa #anketa_edit.page_slideshow > div, +#main #anketa #anketa_edit.page_telephone > div, +#main #anketa #anketa_edit.page_chat > div, +#main #anketa #anketa_edit.page_panel > div, +#main #anketa #anketa_edit.page_advanced_paradata > div, +#main #anketa #anketa_edit.page_json_survey_export > div, +#main #anketa #anketa_edit.page_fieldwork > div { width: 100%; margin: 20px 0; } @@ -29060,11 +29127,33 @@ table.invitations_settings colgroup col, #inv_send_mail table colgroup col { width: 100% !important; } + #vabila > table p label, +table.invitations_settings p label, +#inv_msg_preview table p label, +#inv_send_mail table p label { + width: 100%; + } + #vabila > table p label input[type=text], +#vabila > table p label input[type=number], +#vabila > table p label input[type=password], +table.invitations_settings p label input[type=text], +table.invitations_settings p label input[type=number], +table.invitations_settings p label input[type=password], +#inv_msg_preview table p label input[type=text], +#inv_msg_preview table p label input[type=number], +#inv_msg_preview table p label input[type=password], +#inv_send_mail table p label input[type=text], +#inv_send_mail table p label input[type=number], +#inv_send_mail table p label input[type=password] { + width: 100% !important; + box-sizing: border-box; + } #surveyInvitationSetting, #surveyInvitationSettingServer { min-width: 100% !important; width: 100% !important; + margin: 10px 0 !important; box-sizing: border-box !important; } @@ -29140,6 +29229,21 @@ table.invitations_settings colgroup col, box-sizing: border-box; } + .addthis_toolbox { + line-height: 24px; + } + .addthis_toolbox .at-icon-wrapper { + height: 24px !important; + width: 24px !important; + } + .addthis_toolbox .at-icon-wrapper svg { + height: 24px !important; + width: 24px !important; + } + .addthis_toolbox .addthis_separator { + font-size: 16px; + } + .page_data #vnosi_paginacija { display: flex; flex-direction: column; @@ -29173,6 +29277,10 @@ table.invitations_settings colgroup col, .page_data #div_vnosi_data #dataTableScroller { display: none; } + .page_data #div_vnosi_data #tableContainer { + overflow-y: hidden; + padding-bottom: 20px; + } .page_data #bottom_data_legend { display: block; float: none; @@ -29250,6 +29358,7 @@ table.invitations_settings colgroup col, .chart_holder .chart_img { min-height: auto; float: none; + pointer-events: none; } .chart_holder .chart_img img { width: 100%; diff --git a/resources/sass/admin/mobile/basic.scss b/resources/sass/admin/mobile/basic.scss index cb27a6f42..2e7e1a5a6 100644 --- a/resources/sass/admin/mobile/basic.scss +++ b/resources/sass/admin/mobile/basic.scss @@ -34,7 +34,8 @@ fieldset { select, .select2-container, - input[type="text"]{ + input[type="text"], + textarea{ width: 100% !important; box-sizing: border-box; } diff --git a/resources/sass/admin/mobile/pages/analysis.scss b/resources/sass/admin/mobile/pages/analysis.scss index b41b33772..785e2065d 100644 --- a/resources/sass/admin/mobile/pages/analysis.scss +++ b/resources/sass/admin/mobile/pages/analysis.scss @@ -16,6 +16,8 @@ min-height: auto; float: none; + pointer-events: none; + img { width: 100%; } diff --git a/resources/sass/admin/mobile/pages/branching.scss b/resources/sass/admin/mobile/pages/branching.scss index 340ac66b4..dc4f75e15 100644 --- a/resources/sass/admin/mobile/pages/branching.scss +++ b/resources/sass/admin/mobile/pages/branching.scss @@ -64,6 +64,11 @@ top: 187px; } +// Knjiznice ni nikoli +#toolbox_library{ + display: none !important; +} + // Urejanje vprasanja popup #vprasanje_float_editing{ diff --git a/resources/sass/admin/mobile/pages/data.scss b/resources/sass/admin/mobile/pages/data.scss index d4f5ce8a7..9d38a020c 100644 --- a/resources/sass/admin/mobile/pages/data.scss +++ b/resources/sass/admin/mobile/pages/data.scss @@ -45,6 +45,11 @@ #dataTableScroller { display: none; } + + #tableContainer{ + overflow-y: hidden; + padding-bottom: 20px; + } } #bottom_data_legend{ diff --git a/resources/sass/admin/mobile/pages/my_surveys.scss b/resources/sass/admin/mobile/pages/my_surveys.scss index e63b06f32..66efa8c9d 100644 --- a/resources/sass/admin/mobile/pages/my_surveys.scss +++ b/resources/sass/admin/mobile/pages/my_surveys.scss @@ -16,7 +16,7 @@ #anketa_new_float{ display: flex; - justify-content: center; + justify-content: left; } #pagination{ diff --git a/resources/sass/admin/mobile/pages/new_survey.scss b/resources/sass/admin/mobile/pages/new_survey.scss index 9ce4ae300..89cd38a96 100644 --- a/resources/sass/admin/mobile/pages/new_survey.scss +++ b/resources/sass/admin/mobile/pages/new_survey.scss @@ -55,11 +55,27 @@ #input_field_holder, #preview_field_holder{ width: 100% !important; - width: 300px !important; float: none; box-sizing: border-box; margin: 0 !important; padding: 10px 0 !important; } + .from_text_instructions{ + line-height: 20px !important; + } + + .fieldset.noSurvey_template{ + display: flex; + flex-direction: column; + + .template{ + align-self: center; + width: auto !important; + + .template_preview { + margin-right: 10px !important; + } + } + } } diff --git a/resources/sass/admin/mobile/pages/publish.scss b/resources/sass/admin/mobile/pages/publish.scss index e8d82eb86..fe4e42d1b 100644 --- a/resources/sass/admin/mobile/pages/publish.scss +++ b/resources/sass/admin/mobile/pages/publish.scss @@ -40,6 +40,17 @@ table.invitations_settings, colgroup col{ width: 100% !important; } + + p label{ + width: 100%; + + input[type="text"], + input[type="number"], + input[type="password"]{ + width: 100% !important; + box-sizing: border-box; + } + } } #surveyInvitationSetting, @@ -47,6 +58,7 @@ table.invitations_settings, min-width: 100% !important; width: 100% !important; + margin: 10px 0 !important; box-sizing: border-box !important; } @@ -138,3 +150,21 @@ table.invitations_settings, box-sizing: border-box; } } + +.addthis_toolbox{ + line-height: 24px; + + .at-icon-wrapper{ + height: 24px !important; + width: 24px !important; + + svg{ + height: 24px !important; + width: 24px !important; + } + } + + .addthis_separator{ + font-size: 16px; + } +} diff --git a/resources/sass/admin/mobile/pages/survey_settings.scss b/resources/sass/admin/mobile/pages/survey_settings.scss index 94102d7f7..d739bbcb5 100644 --- a/resources/sass/admin/mobile/pages/survey_settings.scss +++ b/resources/sass/admin/mobile/pages/survey_settings.scss @@ -10,7 +10,32 @@ /* NASTAVITVE in ARHIVI */ -#main #anketa #anketa_edit.page_nastavitve{ +#main #anketa #anketa_edit.page_nastavitve, +#main #anketa #anketa_edit.page_osn_pod, +#main #anketa #anketa_edit.page_mobile_settings, +#main #anketa #anketa_edit.page_jezik, +#main #anketa #anketa_edit.page_dostop, +#main #anketa #anketa_edit.page_piskot, +#main #anketa #anketa_edit.page_alert, +#main #anketa #anketa_edit.page_trajanje, +#main #anketa #anketa_edit.page_skupine, +#main #anketa #anketa_edit.page_urejanje, +#main #anketa #anketa_edit.page_prikaz, +#main #anketa #anketa_edit.page_metadata, +#main #anketa #anketa_edit.page_missing, +#main #anketa #anketa_edit.page_export_settings, +#main #anketa #anketa_edit.page_gdpr_settings, +#main #anketa #anketa_edit.page_uporabnost, +#main #anketa #anketa_edit.page_kviz, +#main #anketa #anketa_edit.page_voting, +#main #anketa #anketa_edit.page_social_network, +#main #anketa #anketa_edit.page_slideshow, +#main #anketa #anketa_edit.page_telephone, +#main #anketa #anketa_edit.page_chat, +#main #anketa #anketa_edit.page_panel, +#main #anketa #anketa_edit.page_advanced_paradata, +#main #anketa #anketa_edit.page_json_survey_export, +#main #anketa #anketa_edit.page_fieldwork{ flex-direction: column-reverse; > div{ diff --git a/resources/sass/admin/publish/invitations.scss b/resources/sass/admin/publish/invitations.scss index eb50fcfa4..2be7d6d3f 100644 --- a/resources/sass/admin/publish/invitations.scss +++ b/resources/sass/admin/publish/invitations.scss @@ -12,6 +12,10 @@ and open the template in the editor. vertical-align: top; line-height: 16px; display: inline-block; + + #usercode_skip_0{ + margin: 5px 0 0 2px; + } } #srv_invitation_note { display: inline-block; @@ -226,42 +230,53 @@ $background_color_26: #ffe6d6; margin-bottom: 10px; } @mixin inv_button_field_container(){ - font-size: 11px; - display: block !important; + display: block !important; margin: 0px !important; padding: 0px !important; clear: both; - -moz-user-select: none; + + font-size: 11px; + + -moz-user-select: none; -webkit-user-select: none; user-select: none; -ms-user-select: none; - ul { - font-size: 11px; - display: block !important; + + ul { + display: flex !important; + flex-wrap: wrap; + //width: ; + margin: 0px !important; padding: 0px !important; clear: both; + + list-style-type: none; + font-size: 11px; + + border: $grey_normal; + -moz-user-select: none; -webkit-user-select: none; user-select: none; -ms-user-select: none; - list-style-type: none; - margin: 0px; - width: auto; - border: $grey_normal; + li { cursor: pointer; - height: 18px; - width: 80px; - width: auto; - display: inline-block; - padding: 1px 0px 2px 0px; + min-height: 24px; + width: 45%; + + box-sizing: border-box; + padding: 2px 0px 2px 0px; margin: 5px; + color: $strong_blue; - background-color: $strong_blue_super_light; - border: 1px solid $strong_blue; - text-align: center; + text-align: left; vertical-align: middle; + + background-color: $strong_blue_super_light; + + border: 1px solid $strong_blue; border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px;