may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Popravki mobile admina

Browse Source
This commit is contained in:
pero1203 2021-05-24 11:48:27 +02:00
parent 2b7ad96af1
commit 1da68d9f17
12 changed files with 270 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/survey/classes/class.SurveyList.php
View File

@ -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

10
admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
View File

@ -8207,10 +8207,10 @@ class SurveyInvitationsNew {
// Dostop brez kode
echo '<p>';
echo '<label for="usercode_skip_0" class="lbl_email_setting">'.$lang['srv_user_base_access_check'].' '.Help::display('srv_inv_no_code').'</label>';
echo '<p><label for="usercode_skip_0" class="lbl_email_setting">';
echo $lang['srv_user_base_access_check'].' '.Help::display('srv_inv_no_code');
echo '<input type="checkbox" name="usercode_skip_checkbox" value="0" id="usercode_skip_0"'.($row['usercode_skip'] != 0 ? ' checked="checked"' : '').' '.$voting_disabled.' onChange="surveyBaseSettingRadio(\'usercode_skip\',true);" />';
echo '</p>';
echo '</label></p>';
if($row['usercode_skip'] > 0){
echo '<div style="float: left; margin: -10px 0 0 15px;">';
echo '<label class="lbl_email_setting">'.$lang['srv_user_base_access'].Help::display('usercode_skip').' </label>';
@ -10425,7 +10425,7 @@ class SurveyInvitationsNew {
#autentikacija
echo '<p>';
echo $lang['srv_email_setting_autentication'];
echo '<input type="radio" name="SMTPAuth2" value="0" '.((int)$enkaSettings['SMTPAuth'] != 1 ? 'checked ="checked" ' : '').'>';
echo '<label><input type="radio" name="SMTPAuth2" value="0" '.((int)$enkaSettings['SMTPAuth'] != 1 ? 'checked ="checked" ' : '').'>';
echo $lang['srv_email_setting_no'].'</label>';
echo '<label><input type="radio" name="SMTPAuth2" value="1" '.((int)$enkaSettings['SMTPAuth'] == 1 ? 'checked ="checked" ' : '').'>';
echo $lang['srv_email_setting_yes'].'</label>';
@ -10433,7 +10433,7 @@ class SurveyInvitationsNew {
#Varnost SMTPSecure
echo '<p>';
echo $lang['srv_email_setting_encryption'];
echo '<input type="radio" name="SMTPSecure2" value="0" '.((int)$enkaSettings['SMTPSecure'] == 0 ? 'checked ="checked" ' : '').'>';
echo '<label><input type="radio" name="SMTPSecure2" value="0" '.((int)$enkaSettings['SMTPSecure'] == 0 ? 'checked ="checked" ' : '').'>';
echo $lang['srv_email_setting_encryption_none'].'</label>';
echo '<label><input type="radio" name="SMTPSecure2" value="ssl" '.($enkaSettings['SMTPSecure'] == 'ssl' ? 'checked ="checked" ' : '').'>';
echo $lang['srv_email_setting_encryption_ssl'].'</label>';

175
public/css/admin.css
View File

@ -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%;

3
resources/sass/admin/mobile/basic.scss
View File

@ -34,7 +34,8 @@ fieldset {
select,
.select2-container,
input[type="text"]{
input[type="text"],
textarea{
width: 100% !important;
box-sizing: border-box;
}

2
resources/sass/admin/mobile/pages/analysis.scss
View File

@ -16,6 +16,8 @@
min-height: auto;
float: none;
pointer-events: none;
img {
width: 100%;
}

5
resources/sass/admin/mobile/pages/branching.scss
View File

@ -64,6 +64,11 @@
top: 187px;
}
// Knjiznice ni nikoli
#toolbox_library{
display: none !important;
}
// Urejanje vprasanja popup
#vprasanje_float_editing{

5
resources/sass/admin/mobile/pages/data.scss
View File

@ -45,6 +45,11 @@
#dataTableScroller {
display: none;
}
#tableContainer{
overflow-y: hidden;
padding-bottom: 20px;
}
}
#bottom_data_legend{

2
resources/sass/admin/mobile/pages/my_surveys.scss
View File

@ -16,7 +16,7 @@
#anketa_new_float{
display: flex;
justify-content: center;
justify-content: left;
}
#pagination{

18
resources/sass/admin/mobile/pages/new_survey.scss
View File

@ -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;
}
}
}
}

30
resources/sass/admin/mobile/pages/publish.scss
View File

@ -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;
}
}

27
resources/sass/admin/mobile/pages/survey_settings.scss
View File

@ -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{

51
resources/sass/admin/publish/invitations.scss
View File

@ -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;