diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index b99317170..a3ac4ff13 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -267,158 +267,93 @@ class SurveyAdmin global $site_domain; global $aai_instalacija; - $sql = sisplet_query("SELECT email FROM users WHERE id='$global_user_id'"); - $row = mysqli_fetch_assoc($sql); - if ($row['email'] == "test@1ka.si") { - echo '
'.$lang['srv_label'].':
'; - - //echo ''.$lang['srv_datapiping'].': '.Help::display('DataPiping').' '.$lang['srv_datapiping_txt'].'
'; - + echo ''.$lang['srv_label'].':
'; } /** diff --git a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php index d046c6e91..2a13b2888 100644 --- a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php +++ b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php @@ -7,79 +7,686 @@ -class MobileSurveyAdmin extends SurveyAdmin{ +class MobileSurveyAdmin{ - function __construct(){ + var $surveyAdminClass; + + + function __construct($surveyAdminClass){ global $site_url; + $this->surveyAdminClass = $surveyAdminClass; } - // Izris glave z menijem - public function displayMobileHeader(){ + // Izris glave z menijem - znotraj ankete + public function displayHeaderMobile(){ + + echo 'User ID | '; + + echo 'Recnum'./*$lang['recnum'].*/($this->sortField=='recnum' ? $arrow : '').' | '; + echo ''.$lang['srv_usableResp_qcount'].' | '; + + echo ''.$lang['srv_usableResp_exposed'].' | '; + + echo ''.$lang['srv_usableResp_breakoff'].($this->sortField=='breakoff' ? $arrow : '').' | '; + + echo ''.$lang['srv_usableResp_usability'].' | '; + + // ali odstranimo vse stolpce s podrobnimi vrednostmi (-1, -2...) + if ($this->show_details == true) { + foreach ($this->_missings AS $value => $text){ + $cnt_miss++; + echo "{$value} (".$lang['srv_usableResp_'.$text].") | ";
+ }
+ foreach ($this->_unsets AS $value => $text){
+ $cnt_undefined++;
+ echo "{$value} (".$lang['srv_usableResp_'.$text].") | ";
+ }
+ }
+
+ // ali prikazemo podrobne izracune
+ if ($this->show_calculations == true) {
+ echo 'UNL | '; + echo 'UML | '; + echo 'UCL | '; + echo 'UIL | '; + echo 'UAQ | '; + } + + echo ''; + + echo '||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
'.$lang['srv_anl_valid'].($this->sortField=='valid' ? $arrow : '').' | '; + echo ''.$lang['srv_usableResp_nonsubstantive'].($this->sortField=='nonsubstantive' ? $arrow : '').' | '; + echo ''.$lang['srv_usableResp_nonresponse'].($this->sortField=='nonresponse' ? $arrow : '').' | '; + echo ''.$lang['srv_anl_suma1'].' | '; + + echo '%'.($this->sortField=='usable' ? $arrow : '').' | '; + echo 'Status'.($this->sortField=='status' ? $arrow : '').' | '; + echo '|||||||||||||||||
'.$row['id'].' | '; + } + + + echo ''.$user['recnum'].' | '; + + // Vsi + echo ''.$user['all'].' | '; + + // Ustrezni + echo ''.$user['valid'].' | '; + + // Non-substantive + echo ''.$user['nonsubstantive'].' | '; + + // Non-response + echo ''.$user['nonresponse'].' | '; + + // Skupaj + echo ''.($user['valid']+$user['nonsubstantive']+$user['nonresponse']+$user['breakoff']).' | '; + + // Breakoffs + echo ''.$user['breakoff'].' | '; + + // Uporabni + echo ''.$user['usable'].' | '; + echo ''.$user['status'].' | '; + + // ali odstranimo vse stolpce s podrobnimi vrednostmi (-1, -2...) + if ($this->show_details == true) { + echo ''.$user['-1'].' | '; + echo ''.$user['-2'].' | '; + echo ''.$user['-3'].' | '; + echo ''.$user['-4'].' | '; + echo ''.$user['-5'].' | '; + echo ''.$user['-97'].' | '; + echo ''.$user['-98'].' | '; + echo ''.$user['-99'].' | '; + } + + // ali prikazemo podrobne izracune + if ($this->show_calculations == true) { + echo ''.$user['UNL'].' | '; + echo ''.$user['UML'].' | '; + echo ''.$user['UCL'].' | '; + echo ''.$user['UIL'].' | '; + echo ''.$user['UAQ'].' | '; + } + + echo '
'.$user['validPercent'].' | '; + + // Non-substantive + echo ''.$user['nonsubstantivePercent'].' | '; + + // Non-response + echo ''.$user['nonresponsePercent'].' | '; + + // Skupaj + echo '100% | '; + + // Breakoffs + echo ''.$user['breakoffPercent'].' | '; + + // Uporabni + echo ''.$user['usablePercent'].' | '; + + // ali odstranimo vse stolpce s podrobnimi vrednostmi (-1, -2...) + if ($this->show_details == true) { + echo ''.$user['-1_percent'].' | '; + echo ''.$user['-2_percent'].' | '; + echo ''.$user['-3_percent'].' | '; + echo ''.$user['-4_percent'].' | '; + echo ''.$user['-5_percent'].' | '; + echo ''.$user['-97_percent'].' | '; + echo ''.$user['-98_percent'].' | '; + echo ''.$user['-99_percent'].' | '; + } + + echo '
'.$lang['cms_intro_modal_aai_text'].'
+'.$lang['cms_intro_modal_aai_text'].'
'.$lang['cms_intro_modal_1ka_text'].'
-'.$lang['cms_intro_modal_1ka_text'].'
'.$lang['cms_aai_login_redirect_text'].'
'; - for($i=2; $i<5; $i++) { + for($i=2; $i<4; $i++) { $html .= '' . $lang['cms_aai_login_redirect_text_' . $i] . '
@@ -585,8 +576,11 @@ function prijava_1ka_block_view($delta = '') $html .= ''.self::$lang['srv_resevanje_foto_result_title'].'
-'.self::$lang['srv_resevanje_foto_pre_result'].'
'.self::$lang['srv_resevanje_foto_pre_result'].'
+'+lang['srv_resevanje_foto_pre_result']+'
'); + $('#foto_'+inpid).val(''); + + $('#fotoresults_delete_'+inpid).hide(); +} + +// Pobrisemo upload fotografije +function delete_upload_foto(inpid) { + $('#'+inpid).val(null); + + //var reader = new FileReader(); + + //reader.onload = function (e) { + $('#upload_foto_result_'+inpid).css("display", "none"); + $('#upload_foto_result_'+inpid).attr('src', "#"); + //}; + + //reader.readAsDataURL(input.files[0]); + + $('#upload_fotoresults_delete_'+inpid).hide(); +} diff --git a/public/css/admin.css b/public/css/admin.css index dde7ecd32..3bd54b9de 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -253,6 +253,7 @@ iframe { padding: 0; margin: 0; border: 0; + flex-grow: 1; } #main #anketa { border: 0; @@ -5892,6 +5893,10 @@ and open the template in the editor. #enka_nav input[type="text"]:focus { width: 200px; }*/ +.mobile_header { + display: none; +} + #logo { position: absolute; left: 15px; @@ -7506,6 +7511,12 @@ span.faicon.spinner::before { content: ""; } +/* Bars - mobile menu */ +span.faicon.bars::before { + font-size: 26px; + content: ""; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates @@ -13516,6 +13527,7 @@ and open the template in the editor. #globalSetingsLinks ul { padding: 5px; margin: 0px; + list-style: none; } #globalSetingsLinks ul li { padding: 4px 0px 4px 20px; @@ -28444,12 +28456,828 @@ a.addIfIcon { } @media (max-width: 600px) { - table#surveyList_new td { + #main { + margin-top: 70px; + } + #main #anketa_edit { + box-sizing: border-box !important; + padding: 15px !important; + } + #main #placeholder { + width: auto; + } + + fieldset { + width: 100% !important; + box-sizing: border-box !important; + margin-left: 0 !important; + margin-right: 0 !important; + } + fieldset .nastavitveSpan1, +fieldset .nastavitveSpan2, +fieldset .nastavitveSpan3, +fieldset .nastavitveSpan4, +fieldset .nastavitveSpan5, +fieldset .nastavitveSpan6 { + width: auto !important; + display: block !important; + float: none !important; + text-align: left !important; + padding: 15px 0 5px 0 !important; + } + fieldset select, +fieldset .select2-container, +fieldset input[type=text] { + width: 100% !important; + box-sizing: border-box; + } + fieldset .setting { + height: auto !important; + } + + .desktop_header { display: none; } - table#surveyList_new td:nth-child(3), table#surveyList_new td:nth-child(6), table#surveyList_new td:nth-child(7) { + + .mobile_header { + position: fixed; + z-index: 9990; + display: flex; + align-items: center; + width: 100vw; + height: 70px; + border-bottom: 1px solid #efefef; + } + .mobile_header.survey_edit { + color: white; + background-color: #1e88e5; + } + .mobile_header.survey_list { + color: #1e88e5; + background-color: white; + } + .mobile_header .mobile_menu_icon { + width: 60px; + text-align: center; + } + .mobile_header .mobile_menu_icon.mobile_menu_close { + display: none; + } + .mobile_header .mobile_menu_icon.mobile_menu_close span { + font-size: 30px; + font-weight: 600; + line-height: 25px; + } + .mobile_header .mobile_menu_icon span { + cursor: pointer; + } + .mobile_header .mobile_survey_title { + width: calc(100% - 120px); + text-align: center; + font-size: 14px; + font-weight: 500; + } + .mobile_header .mobile_logo { + width: calc(100% - 120px); + } + .mobile_header .mobile_logo #enka_logo { + margin: 0 auto; + } + + /* Mobile meni */ + .mobile_menu { + position: fixed; + z-index: 9995; + display: flex; + flex-direction: column; + top: 71px; + bottom: 0; + width: 85vw; + color: #333; + background-color: #ffffff; + overflow: hidden; + -webkit-overflow-scrolling: touch; + overflow-y: auto; + pointer-events: none; + transform: translateX(-100%); + } + .mobile_menu:not(.no-transition), +.mobile_menu .submenu:not(.no-transition) { + transition: all 250ms; + } + .mobile_menu.opened { + pointer-events: auto; + transform: translateX(0px); + } + .mobile_menu.submenu-opened { + overflow: hidden; + } + .mobile_menu ul { + list-style-type: none; + padding: 0; + padding-left: 0px; + margin: 0; + -webkit-overflow-scrolling: touch; + } + .mobile_menu ul > li { + display: block; + } + .mobile_menu ul > li > a { + position: relative; + display: block; + padding: 18px 20px; + font-size: 14px; + font-weight: 500; + text-decoration: none; + transition: all 150ms; + } + .mobile_menu ul > li > a:hover { + background-color: #c8e3f8; + border-radius: 3px; + } + .mobile_menu ul > li > a .arrow_back { + display: block; + position: absolute; + right: 20px; + top: 18px; + transform: rotate(180deg); + } + .mobile_menu ul > li:not(:last-child) > a { + border-bottom: 1px solid #efefef; + } + .mobile_menu .submenu { + overflow: hidden; + -webkit-overflow-scrolling: touch; + overflow-y: auto; + pointer-events: none; + z-index: 9998; + position: fixed; + bottom: 0; + top: 0; + left: 100%; + width: 100%; + min-height: 100%; + background-color: #ffffff; + } + .mobile_menu .submenu.opened { + left: 0; + pointer-events: auto; + } + .mobile_menu .submenu.opened:not(.current) { + overflow: hidden; + } + .mobile_menu .submenu-header { + cursor: pointer; + position: relative; + display: flex; + border-bottom: solid 1px #efefef; + } + .mobile_menu .submenu-header > a { + display: block; + font-size: 14px; + font-weight: 500; + padding: 18px 20px; + padding-left: 20px; + text-decoration: none; + } + .mobile_menu .submenu-header > label { + display: block; + width: calc(100% - 110px); + margin-bottom: 8px; + margin-top: 20px; + padding-left: 0px; + font-size: 15px; + font-weight: 500; + text-align: center; + opacity: 0.5; + } + .mobile_menu .mobile_menu_user li.has-submenu .arrow_back { + line-height: 30px; + } + .mobile_menu .mobile_menu_user li.has-submenu a { + font-size: 13px; + color: #333; + } + .mobile_menu .mobile_menu_user li.has-submenu a .email { + font-size: 12px; + } + .mobile_menu .mobile_menu_user .submenu_user_content { + display: flex; + flex-direction: column; + padding: 20px; + } + .mobile_menu .mobile_menu_user .submenu_user_content > div { + padding: 5px 0; + } + .mobile_menu .mobile_menu_user .submenu_user_content > div .faicon { + padding-right: 10px; + } + .mobile_menu .mobile_menu_actions { + display: flex; + flex-direction: column; + padding: 20px; + } + .mobile_menu .mobile_menu_actions a { + padding: 0 0 15px 0; + font-size: 13px; + } + .mobile_menu .mobile_menu_actions a .faicon::before { + padding-right: 10px; + font-size: 20px; + } + + #srv_footer { + display: flex; + flex-direction: column; + } + #srv_footer .footer_left { + margin-bottom: 10px; + } + + #main #moje_ankete_edit { + padding: 20px !important; + } + #main #moje_ankete_edit #anketa_edit { + padding: 0 !important; + } + #main #moje_ankete_edit #survey_list { + display: flex; + flex-direction: column; + } + #main #moje_ankete_edit #survey_list > div { + margin: 15px 0 20px 0; + } + #main #moje_ankete_edit #survey_list #anketa_new_float { + display: flex; + justify-content: center; + } + #main #moje_ankete_edit #survey_list #pagination { + margin-left: auto; + margin-right: auto; + transform: none; + display: none; + } + #main #moje_ankete_edit #survey_list #pagination.bottom { + display: block; + } + #main #moje_ankete_edit #survey_list #sortButton, +#main #moje_ankete_edit #survey_list #filterButton, +#main #moje_ankete_edit #survey_list #folderSwitch { + display: none; + } + #main #moje_ankete_edit #survey_list #searchMySurveys { + padding: 0; + } + #main #moje_ankete_edit #survey_list #searchMySurveys form { + display: flex; + justify-content: center; + } + #main #moje_ankete_edit #survey_list #searchMySurveys form input[type=text] { + width: 100%; + padding: 5px 0 5px 7px; + } + #main #moje_ankete_edit #survey_list .div_sl_new { + padding: 20px 0; + } + #main #moje_ankete_edit #survey_list table#surveyList_new td { + display: none; + } + #main #moje_ankete_edit #survey_list table#surveyList_new td:nth-child(3), #main #moje_ankete_edit #survey_list table#surveyList_new td:nth-child(6) { display: table-cell; } + + #new_anketa_div { + display: flex; + flex-direction: column; + min-height: auto; + width: 100%; + } + #new_anketa_div #left_menu, +#new_anketa_div #right_content { + width: 100%; + position: relative; + } + #new_anketa_div #right_content { + box-sizing: border-box; + margin: 20px 0 0 0; + padding: 0; + } + #new_anketa_div #right_content .setting { + width: 100% !important; + margin: 0 !important; + padding: 0 !important; + } + #new_anketa_div #right_content .survey_title_text_holder { + flex-direction: column !important; + } + #new_anketa_div #right_content select { + width: 100% !important; + margin: 0; + } + #new_anketa_div #right_content input { + width: 100% !important; + box-sizing: border-box; + } + #new_anketa_div #right_content .survey_type_holder { + flex-direction: column !important; + } + #new_anketa_div #right_content .survey_type_holder label { + margin-bottom: 15px; + } + #new_anketa_div #right_content .survey_type_holder label > div { + box-sizing: border-box; + padding: 10px !important; + } + #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; + } + + table.dashboard { + border-spacing: 0px; + } + table.dashboard > tbody > tr, +table.dashboard > tbody > tr > td { + display: flex; + flex-direction: column; + width: 100%; + box-sizing: border-box; + } + table.dashboard > tbody > tr > td { + margin: 15px 0; + } + + #branching { + width: 100%; + } + #branching li { + margin: 0 10px 0 20px !important; + } + #branching .spr_edit { + display: none !important; + } + #branching .empty_vrivanje { + padding: 50px 0 !important; + margin: 20px 10px 20px 20px !important; + } + #branching .empty_vrivanje .empty_vrivanje_title { + margin: 0 20px; + font-size: 14px; + } + #branching .empty_vrivanje .empty_vrivanje_subtitle { + margin: 15px 20px 0 15px; + font-size: 13px; + } + #branching #bottom_icons_holder { + display: flex; + flex-direction: column; + } + #branching #bottom_icons_holder .forma_bottom { + display: flex; + flex-direction: column; + align-items: left; + width: 100%; + height: auto; + padding: 30px 10px 20px 20px; + } + #branching #bottom_icons_holder .forma_bottom .forma_bottom_inner { + display: flex; + flex-direction: row; + padding: 0 0 10px 0; + margin: 0; + } + #branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a { + margin: 0 11px 0 2px; + padding: 0; + } + + #toolbox_advanced_settings { + top: 150px; + } + + #toolbox_basic { + top: 187px; + } + + #vprasanje_float_editing { + position: fixed; + z-index: 99999; + width: 100%; + height: 100%; + max-height: 100%; + overflow-y: auto; + overflow-x: hidden; + margin: 0 !important; + top: 0; + right: 0; + left: 0; + box-shadow: 0px 0px 100px 100px #333; + } + #vprasanje_float_editing #vprasanje_edit { + top: 0; + margin-bottom: 55px; + } + #vprasanje_float_editing #vprasanje_tabs { + position: absolute; + top: 42px; + } + #vprasanje_float_editing #vprasanje_tabs a.tab_link { + height: auto; + padding: 10px 9px; + } + #vprasanje_float_editing .tab { + padding-top: 100px; + } + #vprasanje_float_editing .tab h2 { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 42px; + box-sizing: border-box; + padding: 10px; + margin: 0; + } + #vprasanje_float_editing #vprasanje_buttons { + display: flex; + justify-content: space-evenly; + position: relative; + bottom: 30px; + padding: 0 15px; + } + #vprasanje_float_editing #vprasanje_buttons span { + width: 40%; + margin-left: 0 !important; + text-align: center; + } + + #main #anketa #globalSetingsList { + max-width: 100% !important; + width: 100% !important; + } + #main #anketa #globalSetingsList fieldset { + width: 100% !important; + } + + /* NASTAVITVE in ARHIVI */ + #main #anketa #anketa_edit.page_nastavitve { + flex-direction: column-reverse; + } + #main #anketa #anketa_edit.page_nastavitve > div { + width: 100%; + margin: 20px 0; + } + + /* OBLIKA */ + #main #anketa #anketa_edit.page_tema #div_theme_group_holder { + width: 100%; + } + #main #anketa #anketa_edit.page_tema #div_theme_group_holder #div_theme_group div.theme_label { + width: 100%; + box-sizing: border-box; + margin-left: 0; + margin-right: 0; + } + #main #anketa #anketa_edit.page_tema #div_theme_group_holder #div_theme_group div.theme_label img { + width: 100%; + height: auto; + } + + #theme-editor { + width: 100% !important; + float: none !important; + } + + #theme-preview { + width: 100% !important; + float: none !important; + margin-top: 80px !important; + } + + /* ARHIVI */ + #main #anketa #anketa_edit.page_arhivi { + flex-direction: column-reverse; + } + #main #anketa #anketa_edit.page_arhivi > div { + width: 100% !important; + margin: 20px 0; + } + #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset { + width: 100% !important; + box-sizing: border-box !important; + margin-left: 0 !important; + margin-right: 0 !important; + } + #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input { + width: 100% !important; + } + + #srv_diagnostic br { + display: none; + } + #srv_diagnostic #srv_diagnostic_results, +#srv_diagnostic #srv_diagnostic_results_right { + clear: both; + display: block !important; + width: 100% !important; + box-sizing: border-box; + margin: 20px 0 !important; + } + #srv_diagnostic #srv_diagnostic_results table, +#srv_diagnostic #srv_diagnostic_results_right table { + width: 100%; + min-width: 100%; + } + #srv_diagnostic #srv_diagnostic_results table td + td, +#srv_diagnostic #srv_diagnostic_results_right table td + td { + width: auto !important; + } + + #vabila > table, +table.invitations_settings, +#inv_msg_preview table, +#inv_send_mail table { + border-spacing: 0px; + width: 100%; + } + #vabila > table tbody, +table.invitations_settings tbody, +#inv_msg_preview table tbody, +#inv_send_mail table tbody { + display: flex; + flex-direction: column; + width: 100% !important; + } + #vabila > table > tbody > tr, +#vabila > table > tbody > tr > td, +table.invitations_settings > tbody > tr, +table.invitations_settings > tbody > tr > td, +#inv_msg_preview table > tbody > tr, +#inv_msg_preview table > tbody > tr > td, +#inv_send_mail table > tbody > tr, +#inv_send_mail table > tbody > tr > td { + display: flex; + flex-direction: column; + width: 100% !important; + box-sizing: border-box; + } + #vabila > table > tbody > tr > td, +table.invitations_settings > tbody > tr > td, +#inv_msg_preview table > tbody > tr > td, +#inv_send_mail table > tbody > tr > td { + height: auto !important; + margin: 0; + padding: 0 !important; + } + #vabila > table > tbody > tr > td > br, +table.invitations_settings > tbody > tr > td > br, +#inv_msg_preview table > tbody > tr > td > br, +#inv_send_mail table > tbody > tr > td > br { + display: none; + } + #vabila > table > tbody > tr > td > div, +#vabila > table > tbody > tr > td > fieldset, +table.invitations_settings > tbody > tr > td > div, +table.invitations_settings > tbody > tr > td > fieldset, +#inv_msg_preview table > tbody > tr > td > div, +#inv_msg_preview table > tbody > tr > td > fieldset, +#inv_send_mail table > tbody > tr > td > div, +#inv_send_mail table > tbody > tr > td > fieldset { + margin: 15px 0; + } + #vabila > table colgroup, +#vabila > table colgroup col, +table.invitations_settings colgroup, +table.invitations_settings colgroup col, +#inv_msg_preview table colgroup, +#inv_msg_preview table colgroup col, +#inv_send_mail table colgroup, +#inv_send_mail table colgroup col { + width: 100% !important; + } + + #surveyInvitationSetting, +#surveyInvitationSettingServer { + min-width: 100% !important; + width: 100% !important; + box-sizing: border-box !important; + } + + #inv_top_navi { + display: flex; + flex-direction: column; + width: 100%; + padding: 0; + margin: 0; + } + #inv_top_navi .inv_space { + display: none; + } + #inv_top_navi > #inv_step_nav { + width: 100%; + padding: 0; + margin: 0 0 15px 0; + } + #inv_top_navi > #inv_step_nav .inv_step { + height: auto; + padding: 0; + margin: 0; + } + #inv_top_navi > #inv_step_nav span.label { + padding: 0; + } + #inv_top_navi > #inv_step_nav.yellow { + display: flex; + justify-content: space-between; + } + #inv_top_navi > #inv_step_nav.yellow .inv_step span.circle { + width: 18px; + height: 18px; + line-height: 18px; + } + #inv_top_navi > #inv_step_nav.yellow .inv_step span.label { + padding: 0 0 0 3px; + } + #inv_top_navi > #inv_step_nav.yellow .inv_step_space { + display: none; + } + + #inv_recipients_profiles_holder, +#inv_import_list_container, +#inv_messages_profiles_holder, +#inv_msg_preview_hld, +#invitation_profile_notes, +#inv_select_mail_to, +#inv_select_mail_preview { + width: 100%; + box-sizing: border-box; + margin: 15px 0 !important; + } + #inv_recipients_profiles_holder textarea, +#inv_import_list_container textarea, +#inv_messages_profiles_holder textarea, +#inv_msg_preview_hld textarea, +#invitation_profile_notes textarea, +#inv_select_mail_to textarea, +#inv_select_mail_preview textarea { + width: 100%; + } + + #inv_msg_preview table th { + height: auto !important; + width: 100% !important; + margin: 0; + padding: 20px 0 0 0 !important; + text-align: left; + } + #inv_msg_preview table input { + width: 100%; + box-sizing: border-box; + } + + .page_data #vnosi_paginacija { + display: flex; + flex-direction: column; + float: none; + } + .page_data #vnosi_paginacija > div { + margin: 5px 0; + } + .page_data #vnosi_paginacija label { + margin: 0; + padding: 0; + } + .page_data #data_search_filter { + display: flex; + width: 100%; + box-sizing: border-box; + } + .page_data #data_search_filter input { + box-sizing: border-box; + margin-left: 10px; + width: 100%; + } + .page_data .dataSettingsBasic { + width: 100%; + box-sizing: border-box; + margin: 0; + } + .page_data #toggleDataCheckboxes { + display: none; + } + .page_data #div_vnosi_data #dataTableScroller { + display: none; + } + .page_data #bottom_data_legend { + display: block; + float: none; + width: 100%; + box-sizing: border-box; + margin: 5px 0 10px 0; + } + + .subpage_append, +.subpage_merge, +.subpage_calculation, +.subpage_coding_auto, +.subpage_recoding, +.subpage_coding, +.page_export { + flex-direction: column !important; + } + .subpage_append .anketa_edit_left, +.subpage_append .anketa_edit_main, +.subpage_merge .anketa_edit_left, +.subpage_merge .anketa_edit_main, +.subpage_calculation .anketa_edit_left, +.subpage_calculation .anketa_edit_main, +.subpage_coding_auto .anketa_edit_left, +.subpage_coding_auto .anketa_edit_main, +.subpage_recoding .anketa_edit_left, +.subpage_recoding .anketa_edit_main, +.subpage_coding .anketa_edit_left, +.subpage_coding .anketa_edit_main, +.page_export .anketa_edit_left, +.page_export .anketa_edit_main { + width: 100% !important; + box-sizing: border-box; + margin: 20px 0 !important; + } + .subpage_append .anketa_edit_left, +.subpage_merge .anketa_edit_left, +.subpage_calculation .anketa_edit_left, +.subpage_coding_auto .anketa_edit_left, +.subpage_recoding .anketa_edit_left, +.subpage_coding .anketa_edit_left, +.page_export .anketa_edit_left { + margin: 0 !important; + } + .subpage_append textarea, +.subpage_merge textarea, +.subpage_calculation textarea, +.subpage_coding_auto textarea, +.subpage_recoding textarea, +.subpage_coding textarea, +.page_export textarea { + width: 100% !important; + } + .subpage_append #inv_upload_recipients_nosbmt + span, +.subpage_merge #inv_upload_recipients_nosbmt + span, +.subpage_calculation #inv_upload_recipients_nosbmt + span, +.subpage_coding_auto #inv_upload_recipients_nosbmt + span, +.subpage_recoding #inv_upload_recipients_nosbmt + span, +.subpage_coding #inv_upload_recipients_nosbmt + span, +.page_export #inv_upload_recipients_nosbmt + span { + display: block; + clear: both; + margin: 40px 0 0 0 !important; + } + + .analysis_bottom_settings a:first-child { + display: block; + margin: 0 0 20px 0 !important; + } + + .chart_holder { + width: 100%; + box-sizing: border-box; + } + .chart_holder .chart_img { + min-height: auto; + float: none; + } + .chart_holder .chart_img img { + width: 100%; + } + .chart_holder .chart_settings { + display: none; + } + .chart_holder .chart_bottom_settings:first-child { + display: block; + clear: both; + } + + table.analysis_reports { + border-spacing: 0px; + } + table.analysis_reports > tbody > tr, +table.analysis_reports > tbody > tr > td { + display: flex; + flex-direction: column; + width: 100%; + box-sizing: border-box; + } + table.analysis_reports > tbody > tr > td { + margin: 10px 0; + } + table.analysis_reports fieldset { + margin-bottom: 0 !important; + } } /*# sourceMappingURL=admin.css.map */ diff --git a/public/css/main.css b/public/css/main.css index f07eafc25..86f422cd9 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -6864,6 +6864,32 @@ table.trak_inline_nadnaslov td { .fotoresults_div { float: right; } +.fotoresults_div .fotoresults { + display: flex; + justify-content: center; + align-items: center; + width: 320px; + height: 240px; + border: 1px solid; +} + +.fotoresults_delete { + display: none; + cursor: pointer; + margin-top: 5px; + width: 150px; + color: #1e88e5; + text-decoration: none; + cursor: pointer; +} +.fotoresults_delete:hover { + color: #ffa608; + text-decoration: none; +} +.fotoresults_delete.upload_fotoresults_delete { + position: static; + margin: 20px 0 10px 20px; +} .my_camera_div { float: left; diff --git a/public/css/main_mobile.css b/public/css/main_mobile.css index db71d8b3d..2037184bc 100644 --- a/public/css/main_mobile.css +++ b/public/css/main_mobile.css @@ -449,6 +449,11 @@ iframe { margin: 20px 0 0 0 !important; padding: 0 !important; } +#outercontainer #container .grupa .spremenljivka.tip_4 .upload_fotoresults_delete, #outercontainer #container .grupa .spremenljivka.tip_21 .upload_fotoresults_delete, #outercontainer #container .grupa .spremenljivka.tip_7 .upload_fotoresults_delete { + position: absolute; + left: 100px; + margin: 20px 0 10px 0; +} #outercontainer #container .grupa .spremenljivka.tip_8 input[type=text], #outercontainer #container .grupa .spremenljivka.tip_8 input[type=email] { box-sizing: border-box; diff --git a/resources/sass/admin/Settings/navigation.scss b/resources/sass/admin/Settings/navigation.scss index d5a71ee95..7c47cdd96 100644 --- a/resources/sass/admin/Settings/navigation.scss +++ b/resources/sass/admin/Settings/navigation.scss @@ -26,6 +26,9 @@ and open the template in the editor. ul { padding: 5px; margin: 0px; + + list-style: none; + li { padding: 4px 0px 4px 20px; border-bottom: 1px $grey_super_light solid; diff --git a/resources/sass/admin/basic/basic.scss b/resources/sass/admin/basic/basic.scss index 741b0f510..3ef8244dd 100644 --- a/resources/sass/admin/basic/basic.scss +++ b/resources/sass/admin/basic/basic.scss @@ -259,6 +259,8 @@ iframe { margin: 0; border: 0; + flex-grow: 1; + #anketa { border: 0; padding: 0px 0px 0px 0px; diff --git a/resources/sass/admin/header.scss b/resources/sass/admin/header.scss index 22f9d8aee..4a89b93d7 100644 --- a/resources/sass/admin/header.scss +++ b/resources/sass/admin/header.scss @@ -27,6 +27,10 @@ $header_background: #ffffff; width: 200px; }*/ +.mobile_header{ + display: none; +} + #logo { position: absolute; left: 15px; diff --git a/resources/sass/admin/icons/standard.scss b/resources/sass/admin/icons/standard.scss index 2a861f0f1..effbc3b56 100644 --- a/resources/sass/admin/icons/standard.scss +++ b/resources/sass/admin/icons/standard.scss @@ -526,9 +526,15 @@ span.faicon.minus_orange::before{ } - /* Spinner */ span.faicon.spinner::before{ font-size: 18px; content: "\f110"; } + + +/* Bars - mobile menu */ +span.faicon.bars::before{ + font-size: 26px; + content: "\f0c9"; +} diff --git a/resources/sass/admin/mobile/basic.scss b/resources/sass/admin/mobile/basic.scss index 8b1378917..cb27a6f42 100644 --- a/resources/sass/admin/mobile/basic.scss +++ b/resources/sass/admin/mobile/basic.scss @@ -1 +1,46 @@ +#main{ + margin-top: 70px; + + #anketa_edit{ + box-sizing: border-box !important; + padding: 15px !important; + } + + #placeholder{ + width: auto; + } +} + +fieldset { + width: 100% !important; + + box-sizing: border-box !important; + margin-left: 0 !important; + margin-right: 0 !important; + + .nastavitveSpan1, + .nastavitveSpan2, + .nastavitveSpan3, + .nastavitveSpan4, + .nastavitveSpan5, + .nastavitveSpan6{ + width: auto !important; + display: block !important; + float: none !important; + + text-align: left !important; + padding: 15px 0 5px 0 !important; + } + + select, + .select2-container, + input[type="text"]{ + width: 100% !important; + box-sizing: border-box; + } + + .setting{ + height: auto !important; + } +} diff --git a/resources/sass/admin/mobile/footer.scss b/resources/sass/admin/mobile/footer.scss index 8b1378917..951c2cf60 100644 --- a/resources/sass/admin/mobile/footer.scss +++ b/resources/sass/admin/mobile/footer.scss @@ -1 +1,8 @@ +#srv_footer{ + display: flex; + flex-direction: column; + .footer_left{ + margin-bottom: 10px; + } +} diff --git a/resources/sass/admin/mobile/header.scss b/resources/sass/admin/mobile/header.scss index 8b1378917..53b7bce34 100644 --- a/resources/sass/admin/mobile/header.scss +++ b/resources/sass/admin/mobile/header.scss @@ -1 +1,256 @@ +.desktop_header{ + display: none; +} +.mobile_header{ + position: fixed; + z-index: 9990; + + display: flex; + align-items: center; + + width: 100vw; + height: 70px; + + border-bottom: 1px solid $grey_super_light; + + // Znotraj ankete + &.survey_edit{ + color: white; + background-color: $strong_blue; + } + + // Seznam anket + &.survey_list{ + color: $strong_blue; + background-color: white; + } + + + .mobile_menu_icon{ + width: 60px; + text-align: center; + + &.mobile_menu_close{ + display: none; + + span{ + font-size: 30px; + font-weight: 600; + line-height: 25px; + } + } + + span{ + cursor: pointer; + } + } + + .mobile_survey_title{ + width: calc(100% - 120px); + + text-align: center; + font-size: 14px; + font-weight: 500; + } + .mobile_logo{ + width: calc(100% - 120px); + + #enka_logo{ + margin: 0 auto; + } + } +} + + + +/* Mobile meni */ +.mobile_menu{ + position: fixed; + z-index: 9995; + + display: flex; + flex-direction: column; + + top: 71px; + bottom: 0; + width: 85vw; + + color: $main_text; + + background-color: #ffffff; + + overflow: hidden; + -webkit-overflow-scrolling: touch; + overflow-y: auto; + pointer-events: none; + transform: translateX(-100%); + + &:not(.no-transition), + .submenu:not(.no-transition){ + transition: all 250ms; + } + + &.opened{ + pointer-events: auto; + transform: translateX(0px); + } + + &.submenu-opened{ + overflow: hidden; + } + + ul { + list-style-type: none; + padding: 0; + padding-left: 0px; + margin: 0; + + -webkit-overflow-scrolling: touch; + + > li { + display: block; + + > a { + position: relative; + display: block; + + padding: 18px 20px; + + font-size: 14px; + font-weight: 500; + text-decoration: none; + + transition: all 150ms; + + &:hover { + background-color: $soft_blue; + border-radius: 3px; + } + + .arrow_back{ + display: block; + position: absolute; + right: 20px; + top: 18px; + + transform: rotate(180deg); + } + } + + &:not(:last-child) > a { + border-bottom: 1px solid $grey_super_light; + } + } + } + + .submenu{ + overflow: hidden; + -webkit-overflow-scrolling: touch; + overflow-y: auto; + pointer-events: none; + z-index: 9998; + + position: fixed; + bottom: 0; + top: 0; + left: 100%; + + width:100%; + min-height: 100%; + + background-color: #ffffff; + + &.opened{ + left:0; + pointer-events:auto; + } + &.opened:not(.current){ + overflow:hidden; + } + } + + .submenu-header { + cursor: pointer; + position: relative; + display: flex; + + border-bottom: solid 1px $grey_super_light; + + > a { + display: block; + font-size: 14px; + font-weight: 500; + padding: 18px 20px; + padding-left: 20px; + text-decoration: none; + } + + > label { + display: block; + width: calc(100% - 110px); + + margin-bottom: 8px; + margin-top: 20px; + padding-left: 0px; + + font-size: 15px; + font-weight: 500; + text-align: center; + + opacity: .5; + } + } + + .mobile_menu_user{ + + li.has-submenu{ + + .arrow_back{ + line-height: 30px; + } + + a{ + font-size: 13px; + color: $main_text; + + .email{ + font-size: 12px; + } + } + } + + .submenu_user_content{ + display: flex; + flex-direction: column; + + padding: 20px; + + > div{ + padding: 5px 0; + + .faicon{ + padding-right: 10px; + } + } + } + } + + .mobile_menu_actions{ + display: flex; + flex-direction: column; + + padding: 20px; + + a{ + padding: 0 0 15px 0; + + font-size: 13px; + + .faicon::before{ + padding-right: 10px; + font-size: 20px; + } + } + } +} diff --git a/resources/sass/admin/mobile/mobile.scss b/resources/sass/admin/mobile/mobile.scss index 6c524cd3e..0e636fc1a 100644 --- a/resources/sass/admin/mobile/mobile.scss +++ b/resources/sass/admin/mobile/mobile.scss @@ -18,7 +18,12 @@ $breakpoint-mobile: 600px; // Posamezne strani @import "pages/my_surveys"; + @import "pages/new_survey"; + @import "pages/status"; @import "pages/branching"; + @import "pages/survey_settings"; + @import "pages/testing"; + @import "pages/publish"; @import "pages/data"; @import "pages/analysis"; } diff --git a/resources/sass/admin/mobile/pages/analysis.scss b/resources/sass/admin/mobile/pages/analysis.scss index 8b1378917..b41b33772 100644 --- a/resources/sass/admin/mobile/pages/analysis.scss +++ b/resources/sass/admin/mobile/pages/analysis.scss @@ -1 +1,59 @@ +// Tabele +.analysis_bottom_settings a:first-child{ + display: block; + margin: 0 0 20px 0 !important; +} + + + +// Grafi +.chart_holder{ + width: 100%; + box-sizing: border-box; + + .chart_img{ + min-height: auto; + float: none; + + img { + width: 100%; + } + } + + .chart_settings{ + display: none; + } + + .chart_bottom_settings{ + + &:first-child{ + display: block; + clear: both; + } + } +} + + + +// Porocila +table.analysis_reports{ + border-spacing: 0px; + + > tbody > tr, + > tbody > tr > td{ + display: flex; + flex-direction: column; + + width: 100%; + box-sizing: border-box; + } + + > tbody > tr > td{ + margin: 10px 0; + } + + fieldset{ + margin-bottom: 0 !important; + } +} \ No newline at end of file diff --git a/resources/sass/admin/mobile/pages/branching.scss b/resources/sass/admin/mobile/pages/branching.scss index 8b1378917..340ac66b4 100644 --- a/resources/sass/admin/mobile/pages/branching.scss +++ b/resources/sass/admin/mobile/pages/branching.scss @@ -1 +1,131 @@ +#branching{ + width: 100%; + + li{ + margin: 0 10px 0 20px !important; + } + + .spr_edit{ + display: none !important; + } + + + .empty_vrivanje { + padding: 50px 0 !important; + margin: 20px 10px 20px 20px !important; + + .empty_vrivanje_title{ + margin: 0 20px; + font-size: 14px; + } + .empty_vrivanje_subtitle{ + margin: 15px 20px 0 15px; + font-size: 13px; + } + } + + #bottom_icons_holder{ + display: flex; + flex-direction: column; + + .forma_bottom{ + display: flex; + flex-direction: column; + align-items: left; + + width: 100%; + height: auto; + padding: 30px 10px 20px 20px; + + .forma_bottom_inner{ + display: flex; + flex-direction: row; + + padding: 0 0 10px 0; + margin: 0; + + a{ + margin: 0 11px 0 2px; + padding: 0; + } + } + } + + } +} + + +// Toolbox na levi +#toolbox_advanced_settings{ + top: 150px; +} +#toolbox_basic{ + top: 187px; +} + + +// Urejanje vprasanja popup +#vprasanje_float_editing{ + position: fixed; + z-index: 99999; + + width: 100%; + height: 100%; + max-height: 100%; + overflow-y: auto; + overflow-x: hidden; + + margin: 0 !important; + top: 0; + right: 0; + left: 0; + + box-shadow: 0px 0px 100px 100px #333; + + #vprasanje_edit{ + top: 0; + margin-bottom: 55px; + } + + #vprasanje_tabs{ + position: absolute; + top: 42px; + + a.tab_link{ + height: auto; + padding: 10px 9px; + } + } + + .tab{ + padding-top: 100px; + + h2{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 42px; + + box-sizing: border-box; + padding: 10px; + margin: 0; + } + } + + #vprasanje_buttons{ + display: flex; + justify-content: space-evenly; + position: relative; + + bottom: 30px; + padding: 0 15px; + + span{ + width: 40%; + margin-left: 0 !important; + text-align: center; + } + } +} \ No newline at end of file diff --git a/resources/sass/admin/mobile/pages/data.scss b/resources/sass/admin/mobile/pages/data.scss index 8b1378917..d4f5ce8a7 100644 --- a/resources/sass/admin/mobile/pages/data.scss +++ b/resources/sass/admin/mobile/pages/data.scss @@ -1 +1,94 @@ +.page_data{ + + #vnosi_paginacija{ + display: flex; + flex-direction: column; + float: none; + + > div{ + margin: 5px 0; + } + + label{ + margin: 0; + padding: 0; + } + } + + #data_search_filter{ + display: flex; + width: 100%; + box-sizing: border-box; + + input{ + box-sizing: border-box; + margin-left: 10px; + width: 100%; + } + } + + .dataSettingsBasic{ + width: 100%; + box-sizing: border-box; + + margin: 0; + } + + #toggleDataCheckboxes{ + display: none; + } + + + #div_vnosi_data{ + + #dataTableScroller { + display: none; + } + } + + #bottom_data_legend{ + display: block; + float: none; + + width: 100%; + box-sizing: border-box; + + margin: 5px 0 10px 0; + } +} + + + +// Ostale podstrani +.subpage_append, +.subpage_merge, +.subpage_calculation, +.subpage_coding_auto, +.subpage_recoding, +.subpage_coding, +.page_export{ + flex-direction: column !important; + + .anketa_edit_left, + .anketa_edit_main{ + width: 100% !important; + box-sizing: border-box; + + margin: 20px 0 !important; + } + + .anketa_edit_left{ + margin: 0 !important; + } + + textarea{ + width: 100% !important; + } + + #inv_upload_recipients_nosbmt + span{ + display: block; + clear: both; + margin: 40px 0 0 0 !important; + } +} diff --git a/resources/sass/admin/mobile/pages/my_surveys.scss b/resources/sass/admin/mobile/pages/my_surveys.scss index ddb824da7..e63b06f32 100644 --- a/resources/sass/admin/mobile/pages/my_surveys.scss +++ b/resources/sass/admin/mobile/pages/my_surveys.scss @@ -1,19 +1,73 @@ +#main #moje_ankete_edit{ + padding: 20px !important; -// Tabela z mojimi anketami -table#surveyList_new{ - - td{ - display: none; - - &:nth-child(3), - &:nth-child(6), - &:nth-child(7){ - display: table-cell; - } + #anketa_edit{ + padding: 0 !important; } + #survey_list{ + display: flex; + flex-direction: column; + + > div{ + margin: 15px 0 20px 0; + } + + #anketa_new_float{ + display: flex; + justify-content: center; + } + + #pagination{ + margin-left: auto; + margin-right: auto; + transform: none; + display: none; + &.bottom{ + display: block; + } + } + + #sortButton, + #filterButton, + #folderSwitch{ + display: none; + } + + #searchMySurveys{ + padding: 0; + + form{ + display: flex; + justify-content: center; + + input[type="text"]{ + width: 100%; + padding: 5px 0 5px 7px; + } + } + } + + .div_sl_new { + padding: 20px 0; + } + + // Tabela z mojimi anketami + table#surveyList_new{ + + td{ + display: none; + + &:nth-child(3), + &:nth-child(6){ + display: table-cell; + } + } + } + } } + diff --git a/resources/sass/admin/mobile/pages/new_survey.scss b/resources/sass/admin/mobile/pages/new_survey.scss new file mode 100644 index 000000000..9ce4ae300 --- /dev/null +++ b/resources/sass/admin/mobile/pages/new_survey.scss @@ -0,0 +1,65 @@ + +#new_anketa_div{ + display: flex; + flex-direction: column; + + min-height: auto; + width: 100%; + + + #left_menu, + #right_content{ + width: 100%; + position: relative; + } + + #right_content{ + box-sizing: border-box; + + margin: 20px 0 0 0; + padding: 0; + + .setting{ + width: 100% !important; + margin: 0 !important; + padding: 0 !important; + } + + .survey_title_text_holder{ + flex-direction: column !important; + } + + select{ + width: 100% !important; + margin: 0; + } + input{ + width: 100% !important; + box-sizing: border-box; + } + + .survey_type_holder{ + flex-direction: column !important; + + label{ + margin-bottom: 15px; + + > div{ + box-sizing: border-box; + padding: 10px !important; + } + } + } + } + + #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; + } +} diff --git a/resources/sass/admin/mobile/pages/publish.scss b/resources/sass/admin/mobile/pages/publish.scss new file mode 100644 index 000000000..e8d82eb86 --- /dev/null +++ b/resources/sass/admin/mobile/pages/publish.scss @@ -0,0 +1,140 @@ + +#vabila > table, +table.invitations_settings, +#inv_msg_preview table, +#inv_send_mail table{ + border-spacing: 0px; + width: 100%; + + tbody{ + display: flex; + flex-direction: column; + width: 100% !important; + } + + > tbody > tr, + > tbody > tr > td{ + display: flex; + flex-direction: column; + + width: 100% !important; + box-sizing: border-box; + } + + > tbody > tr > td{ + height: auto !important; + margin: 0; + padding: 0 !important; + + > br{ + display: none; + } + + > div, + > fieldset{ + margin: 15px 0; + } + } + + colgroup, + colgroup col{ + width: 100% !important; + } +} + +#surveyInvitationSetting, +#surveyInvitationSettingServer{ + min-width: 100% !important; + width: 100% !important; + + box-sizing: border-box !important; +} + +// Navigacija v vabilih +#inv_top_navi{ + display: flex; + flex-direction: column; + + width: 100%; + padding: 0; + margin: 0; + + .inv_space{ + display: none; + } + + > #inv_step_nav{ + width: 100%; + + padding: 0; + margin: 0 0 15px 0; + + .inv_step{ + height: auto; + padding: 0; + margin: 0; + } + span.label{ + padding: 0; + } + } + + > #inv_step_nav.yellow{ + display: flex; + justify-content: space-between; + + + .inv_step{ + + span.circle{ + width: 18px; + height: 18px; + line-height: 18px; + } + + span.label{ + padding: 0 0 0 3px; + } + } + + .inv_step_space{ + display: none; + } + } +} + + +// VABILA podstrani +#inv_recipients_profiles_holder, +#inv_import_list_container, +#inv_messages_profiles_holder, +#inv_msg_preview_hld, +#invitation_profile_notes, +#inv_select_mail_to, +#inv_select_mail_preview{ + width: 100%; + box-sizing: border-box; + + margin: 15px 0 !important; + + textarea{ + width: 100%; + } +} + +#inv_msg_preview table{ + + th{ + height: auto !important; + width: 100% !important; + margin: 0; + padding: 20px 0 0 0 !important; + + text-align: left; + } + + input{ + width: 100%; + box-sizing: border-box; + } +} diff --git a/resources/sass/admin/mobile/pages/status.scss b/resources/sass/admin/mobile/pages/status.scss new file mode 100644 index 000000000..814032937 --- /dev/null +++ b/resources/sass/admin/mobile/pages/status.scss @@ -0,0 +1,16 @@ +table.dashboard{ + border-spacing: 0px; + + > tbody > tr, + > tbody > tr > td{ + display: flex; + flex-direction: column; + + width: 100%; + box-sizing: border-box; + } + + > tbody > tr > td{ + margin: 15px 0; + } +} diff --git a/resources/sass/admin/mobile/pages/survey_settings.scss b/resources/sass/admin/mobile/pages/survey_settings.scss new file mode 100644 index 000000000..94102d7f7 --- /dev/null +++ b/resources/sass/admin/mobile/pages/survey_settings.scss @@ -0,0 +1,79 @@ + +#main #anketa #globalSetingsList { + max-width: 100% !important; + width: 100% !important; + + fieldset{ + width: 100% !important; + } +} + + +/* NASTAVITVE in ARHIVI */ +#main #anketa #anketa_edit.page_nastavitve{ + flex-direction: column-reverse; + + > div{ + width: 100%; + margin: 20px 0; + } +} + + +/* OBLIKA */ +#main #anketa #anketa_edit.page_tema{ + + #div_theme_group_holder{ + width: 100%; + + #div_theme_group div.theme_label{ + width: 100%; + box-sizing: border-box; + margin-left: 0; + margin-right: 0; + + img{ + width: 100%; + height: auto; + } + } + } +} + +#theme-editor{ + width: 100% !important; + float: none !important; +} + +#theme-preview{ + width: 100% !important; + float: none !important; + + margin-top: 80px !important; +} + + + +/* ARHIVI */ +#main #anketa #anketa_edit.page_arhivi{ + flex-direction: column-reverse; + + > div{ + width: 100% !important; + margin: 20px 0; + } + + #div_archive_content fieldset { + width: 100% !important; + + box-sizing: border-box !important; + margin-left: 0 !important; + margin-right: 0 !important; + + input{ + width: 100% !important; + } + } +} + + diff --git a/resources/sass/admin/mobile/pages/testing.scss b/resources/sass/admin/mobile/pages/testing.scss new file mode 100644 index 000000000..16f3529e1 --- /dev/null +++ b/resources/sass/admin/mobile/pages/testing.scss @@ -0,0 +1,26 @@ + +#srv_diagnostic{ + + br{ + display: none; + } + + #srv_diagnostic_results, + #srv_diagnostic_results_right{ + clear: both; + display: block !important; + width: 100% !important; + + box-sizing: border-box; + margin: 20px 0 !important; + + table{ + width: 100%; + min-width: 100%; + + td + td { + width: auto !important; + } + } + } +} diff --git a/resources/sass/main/main/content.scss b/resources/sass/main/main/content.scss index a46af11e3..a49ab9d38 100644 --- a/resources/sass/main/main/content.scss +++ b/resources/sass/main/main/content.scss @@ -1495,6 +1495,41 @@ table.trak_inline_nadnaslov td { /* Osnovne zadeve za prikaz okenc in slik za fotografiranje*/ .fotoresults_div { float: right; + + .fotoresults{ + display: flex; + justify-content: center; + align-items: center; + + width: 320px; + height: 240px; + + border: 1px solid; + + + } +} + +.fotoresults_delete{ + display: none; + + cursor: pointer; + margin-top: 5px; + width: 150px; + + color: #1e88e5; + text-decoration: none; + cursor: pointer; + + &:hover { + color: #ffa608; + text-decoration: none; + } + + &.upload_fotoresults_delete{ + position: static; + margin: 20px 0 10px 20px; + } } .my_camera_div { diff --git a/resources/sass/main/main_mobile/content.scss b/resources/sass/main/main_mobile/content.scss index 96e581674..d59aa4e40 100644 --- a/resources/sass/main/main_mobile/content.scss +++ b/resources/sass/main/main_mobile/content.scss @@ -412,6 +412,12 @@ iframe{ margin: 20px 0 0 0 !important; padding: 0 !important; } + + .upload_fotoresults_delete{ + position: absolute; + left: 100px; + margin: 20px 0 10px 0; + } } /* END TIP TEXT, NUMBER */ diff --git a/uploadi/downloadApp.php b/uploadi/downloadApp.php index 6bf86cda7..251b4ad07 100644 --- a/uploadi/downloadApp.php +++ b/uploadi/downloadApp.php @@ -4,7 +4,7 @@ if($_GET['type'] == 'install') - header("location: https://www.1ka.si/uploadi/1ka_install_20-10-2019.zip"); + header("location: https://www.1ka.si/uploadi/1ka_install_7-5-2021.zip"); elseif($_GET['type'] == 'offline') header("location: https://www.1ka.si/uploadi/1ka_install_offline_23-11-2018.zip"); diff --git a/utils/Docker/Dockerfile b/utils/Docker/Dockerfile index a09a9037b..72e519b75 100644 --- a/utils/Docker/Dockerfile +++ b/utils/Docker/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update -y \ libxml2-dev \ zlib1g-dev \ texlive-full \ - latex2rtf \ + latex2rtf \ libzip-dev \ zip \ && apt-get clean \ diff --git a/utils/Docker/docker-compose.yml b/utils/Docker/docker-compose.yml index 765186a45..d27f4f299 100644 --- a/utils/Docker/docker-compose.yml +++ b/utils/Docker/docker-compose.yml @@ -23,7 +23,7 @@ services: mysql: container_name: mysql_1ka - image: mysql:5.6.40 + image: mariadb:10.3 ports: - "3306:3306" volumes: diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 77635b59a..efc88386d 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -684,7 +684,7 @@ return array( 'Sonata\\GoogleAuthenticator\\GoogleQrUrl' => $vendorDir . '/sonata-project/google-authenticator/src/GoogleQrUrl.php', 'Sonata\\GoogleAuthenticator\\RuntimeException' => $vendorDir . '/sonata-project/google-authenticator/src/RuntimeException.php', 'SpremenljivkaSkala' => $baseDir . '/admin/survey/classes/objects/obj.SpremenljivkaSkala.php', - 'SqualoApi' => $baseDir . '/admin/survey/modules/mod_squalo/class.SqualoApi.php', + 'SqualoApi' => $baseDir . '/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php', 'SteviloLatex' => $baseDir . '/admin/survey/export/latexclasses/Vprasanja/SteviloLatex.php', 'SteviloXml' => $baseDir . '/admin/survey/export/xmlClasses/Vprasanja/SteviloXml.php', 'Stripe\\Account' => $vendorDir . '/stripe/stripe-php/lib/Account.php', @@ -948,8 +948,9 @@ return array( 'SurveyInfo' => $baseDir . '/admin/survey/classes/class.SurveyInfo.php', 'SurveyInspect' => $baseDir . '/admin/survey/classes/class.SurveyInpect.php', 'SurveyInvitationsNew' => $baseDir . '/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php', - 'SurveyInvitationsSqualo' => $baseDir . '/admin/survey/modules/mod_squalo/class.SurveyInvitationsSqualo.php', + 'SurveyInvitationsSqualo' => $baseDir . '/admin/survey/classes/surveyEmails/squalo/class.SurveyInvitationsSqualo.php', 'SurveyJsonSurveyData' => $baseDir . '/admin/survey/modules/mod_json_survey_export/class.SurveyJsonSurveyData.php', + 'SurveyKakovost' => $baseDir . '/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php', 'SurveyLanguageTechnology' => $baseDir . '/admin/survey/classes/class.SurveyLanguageTechnology.php', 'SurveyList' => $baseDir . '/admin/survey/classes/class.SurveyList.php', 'SurveyLog' => $baseDir . '/admin/survey/classes/log/class.SurveyLog.php', diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index e7e999702..fd450d20d 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -11,8 +11,8 @@ return array( 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', 'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php', 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', - 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', '3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php', + 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', '2bf0564df058fbe21b5554296cc8571a' => $baseDir . '/main/survey/class.EvalvacijaMain.php', '5bc35216aa4f6cb823ce4a5cec52fdce' => $baseDir . '/main/survey/mobile-detect/Mobile_Detect.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index c3e8b10a2..9b4ee9136 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -12,8 +12,8 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779 'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php', 'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php', 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', - 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', '3109cb1a231dcd04bee1f9f620d46975' => __DIR__ . '/..' . '/paragonie/sodium_compat/autoload.php', + 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', '2bf0564df058fbe21b5554296cc8571a' => __DIR__ . '/../..' . '/main/survey/class.EvalvacijaMain.php', '5bc35216aa4f6cb823ce4a5cec52fdce' => __DIR__ . '/../..' . '/main/survey/mobile-detect/Mobile_Detect.php', @@ -888,7 +888,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779 'Sonata\\GoogleAuthenticator\\GoogleQrUrl' => __DIR__ . '/..' . '/sonata-project/google-authenticator/src/GoogleQrUrl.php', 'Sonata\\GoogleAuthenticator\\RuntimeException' => __DIR__ . '/..' . '/sonata-project/google-authenticator/src/RuntimeException.php', 'SpremenljivkaSkala' => __DIR__ . '/../..' . '/admin/survey/classes/objects/obj.SpremenljivkaSkala.php', - 'SqualoApi' => __DIR__ . '/../..' . '/admin/survey/modules/mod_squalo/class.SqualoApi.php', + 'SqualoApi' => __DIR__ . '/../..' . '/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php', 'SteviloLatex' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/Vprasanja/SteviloLatex.php', 'SteviloXml' => __DIR__ . '/../..' . '/admin/survey/export/xmlClasses/Vprasanja/SteviloXml.php', 'Stripe\\Account' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Account.php', @@ -1152,8 +1152,9 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779 'SurveyInfo' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyInfo.php', 'SurveyInspect' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyInpect.php', 'SurveyInvitationsNew' => __DIR__ . '/../..' . '/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php', - 'SurveyInvitationsSqualo' => __DIR__ . '/../..' . '/admin/survey/modules/mod_squalo/class.SurveyInvitationsSqualo.php', + 'SurveyInvitationsSqualo' => __DIR__ . '/../..' . '/admin/survey/classes/surveyEmails/squalo/class.SurveyInvitationsSqualo.php', 'SurveyJsonSurveyData' => __DIR__ . '/../..' . '/admin/survey/modules/mod_json_survey_export/class.SurveyJsonSurveyData.php', + 'SurveyKakovost' => __DIR__ . '/../..' . '/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php', 'SurveyLanguageTechnology' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyLanguageTechnology.php', 'SurveyList' => __DIR__ . '/../..' . '/admin/survey/classes/class.SurveyList.php', 'SurveyLog' => __DIR__ . '/../..' . '/admin/survey/classes/log/class.SurveyLog.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 491de3572..6a4d8008f 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -182,79 +182,6 @@ "url" ] }, - { - "name": "fgrosse/phpasn1", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", - "source": { - "type": "git", - "url": "https://github.com/fgrosse/PHPASN1.git", - "reference": "d1978f7abd580f3fc33561e7f71d4c12c7531fad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/d1978f7abd580f3fc33561e7f71d4c12c7531fad", - "reference": "d1978f7abd580f3fc33561e7f71d4c12c7531fad", - "shasum": "" - }, - "require": { - "php": ">=7.0.0" - }, - "require-dev": { - "phpunit/phpunit": "~6.3", - "satooshi/php-coveralls": "~2.0" - }, - "suggest": { - "ext-bcmath": "BCmath is the fallback extension for big integer calculations", - "ext-curl": "For loading OID information from the web if they have not bee defined statically", - "ext-gmp": "GMP is the preferred extension for big integer calculations", - "phpseclib/bcmath_compat": "BCmath polyfill for servers where neither GMP nor BCmath is available" - }, - "time": "2020-10-11 16:28:18", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "FG\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Friedrich Große", - "email": "friedrich.grosse@gmail.com", - "homepage": "https://github.com/FGrosse", - "role": "Author" - }, - { - "name": "All contributors", - "homepage": "https://github.com/FGrosse/PHPASN1/contributors" - } - ], - "description": "A PHP Framework that allows you to encode and decode arbitrary ASN.1 structures using the ITU-T X.690 Encoding Rules.", - "homepage": "https://github.com/FGrosse/PHPASN1", - "keywords": [ - "DER", - "asn.1", - "asn1", - "ber", - "binary", - "decoding", - "encoding", - "x.509", - "x.690", - "x509", - "x690" - ] - }, { "name": "web-token/jwt-core", "version": "v1.3.10", @@ -1615,147 +1542,6 @@ "promise" ] }, - { - "name": "phpmailer/phpmailer", - "version": "v6.4.0", - "version_normalized": "6.4.0.0", - "source": { - "type": "git", - "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "050d430203105c27c30efd1dce7aa421ad882d01" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/050d430203105c27c30efd1dce7aa421ad882d01", - "reference": "050d430203105c27c30efd1dce7aa421ad882d01", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-filter": "*", - "ext-hash": "*", - "php": ">=5.5.0" - }, - "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "doctrine/annotations": "^1.2", - "phpcompatibility/php-compatibility": "^9.3.5", - "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.5.6", - "yoast/phpunit-polyfills": "^0.2.0" - }, - "suggest": { - "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses", - "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", - "league/oauth2-google": "Needed for Google XOAUTH2 authentication", - "psr/log": "For optional PSR-3 debug logging", - "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", - "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" - }, - "time": "2021-03-31 20:06:42", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "PHPMailer\\PHPMailer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-2.1-only" - ], - "authors": [ - { - "name": "Marcus Bointon", - "email": "phpmailer@synchromedia.co.uk" - }, - { - "name": "Jim Jagielski", - "email": "jimjag@gmail.com" - }, - { - "name": "Andy Prevost", - "email": "codeworxtech@users.sourceforge.net" - }, - { - "name": "Brent R. Matzelle" - } - ], - "description": "PHPMailer is a full-featured email creation and transfer class for PHP" - }, - { - "name": "guzzlehttp/psr7", - "version": "1.8.1", - "version_normalized": "1.8.1.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1", - "shasum": "" - }, - "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" - }, - "suggest": { - "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" - }, - "time": "2021-03-21 16:25:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Tobias Schultze", - "homepage": "https://github.com/Tobion" - } - ], - "description": "PSR-7 message implementation that also provides common utility methods", - "keywords": [ - "http", - "message", - "psr-7", - "request", - "response", - "stream", - "uri", - "url" - ] - }, { "name": "stripe/stripe-php", "version": "v7.77.0", @@ -1961,5 +1747,219 @@ "secret-key cryptography", "side-channel resistant" ] + }, + { + "name": "phpmailer/phpmailer", + "version": "v6.4.1", + "version_normalized": "6.4.1.0", + "source": { + "type": "git", + "url": "https://github.com/PHPMailer/PHPMailer.git", + "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9256f12d8fb0cd0500f93b19e18c356906cbed3d", + "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-filter": "*", + "ext-hash": "*", + "php": ">=5.5.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "doctrine/annotations": "^1.2", + "phpcompatibility/php-compatibility": "^9.3.5", + "roave/security-advisories": "dev-latest", + "squizlabs/php_codesniffer": "^3.5.6", + "yoast/phpunit-polyfills": "^0.2.0" + }, + "suggest": { + "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses", + "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", + "league/oauth2-google": "Needed for Google XOAUTH2 authentication", + "psr/log": "For optional PSR-3 debug logging", + "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", + "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" + }, + "time": "2021-04-29 12:25:04", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "PHPMailer\\PHPMailer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1-only" + ], + "authors": [ + { + "name": "Marcus Bointon", + "email": "phpmailer@synchromedia.co.uk" + }, + { + "name": "Jim Jagielski", + "email": "jimjag@gmail.com" + }, + { + "name": "Andy Prevost", + "email": "codeworxtech@users.sourceforge.net" + }, + { + "name": "Brent R. Matzelle" + } + ], + "description": "PHPMailer is a full-featured email creation and transfer class for PHP" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.8.2", + "version_normalized": "1.8.2.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "dc960a912984efb74d0a90222870c72c87f10c91" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", + "reference": "dc960a912984efb74d0a90222870c72c87f10c91", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "ext-zlib": "*", + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" + }, + "suggest": { + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + }, + "time": "2021-04-26 09:17:50", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Schultze", + "homepage": "https://github.com/Tobion" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" + ] + }, + { + "name": "fgrosse/phpasn1", + "version": "v2.3.0", + "version_normalized": "2.3.0.0", + "source": { + "type": "git", + "url": "https://github.com/fgrosse/PHPASN1.git", + "reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/20299033c35f4300eb656e7e8e88cf52d1d6694e", + "reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~6.3", + "satooshi/php-coveralls": "~2.0" + }, + "suggest": { + "ext-bcmath": "BCmath is the fallback extension for big integer calculations", + "ext-curl": "For loading OID information from the web if they have not bee defined statically", + "ext-gmp": "GMP is the preferred extension for big integer calculations", + "phpseclib/bcmath_compat": "BCmath polyfill for servers where neither GMP nor BCmath is available" + }, + "time": "2021-04-24 19:01:55", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "FG\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Friedrich Große", + "email": "friedrich.grosse@gmail.com", + "homepage": "https://github.com/FGrosse", + "role": "Author" + }, + { + "name": "All contributors", + "homepage": "https://github.com/FGrosse/PHPASN1/contributors" + } + ], + "description": "A PHP Framework that allows you to encode and decode arbitrary ASN.1 structures using the ITU-T X.690 Encoding Rules.", + "homepage": "https://github.com/FGrosse/PHPASN1", + "keywords": [ + "DER", + "asn.1", + "asn1", + "ber", + "binary", + "decoding", + "encoding", + "x.509", + "x.690", + "x509", + "x690" + ] } ] diff --git a/vendor/fgrosse/phpasn1/CHANGELOG.md b/vendor/fgrosse/phpasn1/CHANGELOG.md index 25426e4c4..5a5f5caee 100644 --- a/vendor/fgrosse/phpasn1/CHANGELOG.md +++ b/vendor/fgrosse/phpasn1/CHANGELOG.md @@ -1,3 +1,7 @@ +#### v2.3.0 (2021-04) +* Allow creating an unsigned CSR and adding the signature later + https://github.com/fgrosse/PHPASN1/pull/82 + #### v2.2.0 (2020-08) * support polyfills for bcmath and gmp, and add a composer.json suggestion for the `phpseclib/bcmath_polyfill` for servers unable diff --git a/vendor/fgrosse/phpasn1/lib/ASN1/OID.php b/vendor/fgrosse/phpasn1/lib/ASN1/OID.php index 61ab01e15..7d331b0a7 100644 --- a/vendor/fgrosse/phpasn1/lib/ASN1/OID.php +++ b/vendor/fgrosse/phpasn1/lib/ASN1/OID.php @@ -15,6 +15,7 @@ class OID const RSA_ENCRYPTION = '1.2.840.113549.1.1.1'; const MD5_WITH_RSA_ENCRYPTION = '1.2.840.113549.1.1.4'; const SHA1_WITH_RSA_SIGNATURE = '1.2.840.113549.1.1.5'; + const SHA256_WITH_RSA_SIGNATURE = '1.2.840.113549.1.1.11'; const PKCS9_EMAIL = '1.2.840.113549.1.9.1'; const PKCS9_UNSTRUCTURED_NAME = '1.2.840.113549.1.9.2'; const PKCS9_CONTENT_TYPE = '1.2.840.113549.1.9.3'; diff --git a/vendor/fgrosse/phpasn1/lib/X509/CSR/CSR.php b/vendor/fgrosse/phpasn1/lib/X509/CSR/CSR.php index 69decdbb5..8f2a31970 100644 --- a/vendor/fgrosse/phpasn1/lib/X509/CSR/CSR.php +++ b/vendor/fgrosse/phpasn1/lib/X509/CSR/CSR.php @@ -41,7 +41,7 @@ class CSR extends Sequence * @param string $signature * @param string $signatureAlgorithm */ - public function __construct($commonName, $email, $organization, $locality, $state, $country, $organizationalUnit, $publicKey, $signature, $signatureAlgorithm = OID::SHA1_WITH_RSA_SIGNATURE) + public function __construct($commonName, $email, $organization, $locality, $state, $country, $organizationalUnit, $publicKey, $signature = null, $signatureAlgorithm = OID::SHA1_WITH_RSA_SIGNATURE) { $this->subject = new CertificateSubject( $commonName, @@ -56,7 +56,9 @@ class CSR extends Sequence $this->signature = $signature; $this->signatureAlgorithm = $signatureAlgorithm; - $this->createCSRSequence(); + if (isset($signature)) { + $this->createCSRSequence(); + } } protected function createCSRSequence() @@ -68,11 +70,31 @@ class CSR extends Sequence $certRequestInfo = new Sequence($versionNr, $this->subject, $publicKey); + // Clear the underlying Construct + $this->rewind(); + $this->children = []; $this->addChild($certRequestInfo); $this->addChild($signatureAlgorithm); $this->addChild($signature); } + public function getSignatureSubject() + { + $versionNr = new Integer(self::CSR_VERSION_NR); + $publicKey = new PublicKey($this->publicKey); + + $certRequestInfo = new Sequence($versionNr, $this->subject, $publicKey); + return $certRequestInfo->getBinary(); + } + + public function setSignature($signature, $signatureAlgorithm = OID::SHA1_WITH_RSA_SIGNATURE) + { + $this->signature = $signature; + $this->signatureAlgorithm = $signatureAlgorithm; + + $this->createCSRSequence(); + } + public function __toString() { $tmp = base64_encode($this->getBinary()); diff --git a/vendor/guzzlehttp/psr7/.github/workflows/static.yml b/vendor/guzzlehttp/psr7/.github/workflows/static.yml new file mode 100644 index 000000000..ab4d68ba3 --- /dev/null +++ b/vendor/guzzlehttp/psr7/.github/workflows/static.yml @@ -0,0 +1,29 @@ +name: Static analysis + +on: + pull_request: + +jobs: + php-cs-fixer: + name: PHP-CS-Fixer + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '7.4' + coverage: none + extensions: mbstring + + - name: Download dependencies + run: composer update --no-interaction --no-progress + + - name: Download PHP CS Fixer + run: composer require "friendsofphp/php-cs-fixer:2.18.4" + + - name: Execute PHP CS Fixer + run: vendor/bin/php-cs-fixer fix --diff-format udiff --dry-run diff --git a/vendor/guzzlehttp/psr7/CHANGELOG.md b/vendor/guzzlehttp/psr7/CHANGELOG.md index a608aa419..6a6b7bf98 100644 --- a/vendor/guzzlehttp/psr7/CHANGELOG.md +++ b/vendor/guzzlehttp/psr7/CHANGELOG.md @@ -7,16 +7,22 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] +## Unreleased -## [1.8.1] - 2021-03-21 +## 1.8.2 - 2021-04-26 + +### Fixed + +- Handle possibly unset `url` in `stream_get_meta_data` + +## 1.8.1 - 2021-03-21 ### Fixed - Issue parsing IPv6 URLs - Issue modifying ServerRequest lost all its attributes -## [1.8.0] - 2021-03-21 +## 1.8.0 - 2021-03-21 ### Added @@ -28,7 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Issue when creating stream from `php://input` and curl-ext is not installed - Broken `Utils::tryFopen()` on PHP 8 -## [1.7.0] - 2020-09-30 +## 1.7.0 - 2020-09-30 ### Added @@ -272,7 +278,6 @@ Currently unsupported: -[Unreleased]: https://github.com/guzzle/psr7/compare/1.6.0...HEAD [1.6.0]: https://github.com/guzzle/psr7/compare/1.5.2...1.6.0 [1.5.2]: https://github.com/guzzle/psr7/compare/1.5.1...1.5.2 [1.5.1]: https://github.com/guzzle/psr7/compare/1.5.0...1.5.1 diff --git a/vendor/guzzlehttp/psr7/src/Uri.php b/vendor/guzzlehttp/psr7/src/Uri.php index ab201c1d1..0f9f020d3 100644 --- a/vendor/guzzlehttp/psr7/src/Uri.php +++ b/vendor/guzzlehttp/psr7/src/Uri.php @@ -109,7 +109,7 @@ class Uri implements UriInterface $url ); - $result = parse_url($prefix.$encodedUrl); + $result = parse_url($prefix . $encodedUrl); if ($result === false) { return false; diff --git a/vendor/guzzlehttp/psr7/src/Utils.php b/vendor/guzzlehttp/psr7/src/Utils.php index 7c7cc3eb6..6b6c8cced 100644 --- a/vendor/guzzlehttp/psr7/src/Utils.php +++ b/vendor/guzzlehttp/psr7/src/Utils.php @@ -217,7 +217,7 @@ final class Utils ->withQueryParams($request->getQueryParams()) ->withCookieParams($request->getCookieParams()) ->withUploadedFiles($request->getUploadedFiles()); - + foreach ($request->getAttributes() as $key => $value) { $new = $new->withAttribute($key, $value); } @@ -317,7 +317,8 @@ final class Utils * The 'php://input' is a special stream with quirks and inconsistencies. * We avoid using that stream by reading it into php://temp */ - if (\stream_get_meta_data($resource)['uri'] === 'php://input') { + $metaData = \stream_get_meta_data($resource); + if (isset($metaData['uri']) && $metaData['uri'] === 'php://input') { $stream = self::tryFopen('php://temp', 'w+'); fwrite($stream, stream_get_contents($resource)); fseek($stream, 0); diff --git a/vendor/phpmailer/phpmailer/SECURITY.md b/vendor/phpmailer/phpmailer/SECURITY.md index 2552df8a3..5a6a8f41c 100644 --- a/vendor/phpmailer/phpmailer/SECURITY.md +++ b/vendor/phpmailer/phpmailer/SECURITY.md @@ -2,6 +2,8 @@ Please disclose any security issues or vulnerabilities found through [Tidelift's coordinated disclosure system](https://tidelift.com/security) or to the maintainers privately. +PHPMailer versions between 6.1.8 and 6.4.0 contain a regression of the earlier CVE-2018-19296 object injection vulnerability as a result of [a fix for Windows UNC paths in 6.1.8](https://github.com/PHPMailer/PHPMailer/commit/e2e07a355ee8ff36aba21d0242c5950c56e4c6f9). Recorded as [CVE-2020-36326](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-36326). Reported by Fariskhi Vidyan via Tidelift. 6.4.1 fixes this issue, and also enforces stricter checks for URL schemes in local path contexts. + PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs in `Content-Type` and `Content-Disposition` when filenames passed into `addAttachment` and other methods that accept attachment names contain double quote characters, in contravention of RFC822 3.4.1. No specific vulnerability has been found relating to this, but it could allow file attachments to bypass attachment filters that are based on matching filename extensions. Recorded as [CVE-2020-13625](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13625). Reported by Elar Lang of Clarified Security. PHPMailer versions prior to 6.0.6 and 5.2.27 are vulnerable to an object injection attack by passing `phar://` paths into `addAttachment()` and other functions that may receive unfiltered local paths, possibly leading to RCE. Recorded as [CVE-2018-19296](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-19296). See [this article](https://knasmueller.net/5-answers-about-php-phar-exploitation) for more info on this type of vulnerability. Mitigated by blocking the use of paths containing URL-protocol style prefixes such as `phar://`. Reported by Sehun Oh of cyberone.kr. diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION index c0be8a799..306894a15 100644 --- a/vendor/phpmailer/phpmailer/VERSION +++ b/vendor/phpmailer/phpmailer/VERSION @@ -1 +1 @@ -6.4.0 \ No newline at end of file +6.4.1 \ No newline at end of file diff --git a/vendor/phpmailer/phpmailer/composer.json b/vendor/phpmailer/phpmailer/composer.json index b8aa5cfcc..58393b2cd 100644 --- a/vendor/phpmailer/phpmailer/composer.json +++ b/vendor/phpmailer/phpmailer/composer.json @@ -57,5 +57,9 @@ "PHPMailer\\Test\\": "test/" } }, - "license": "LGPL-2.1-only" + "license": "LGPL-2.1-only", + "scripts": { + "check": "./vendor/bin/phpcs", + "test": "./vendor/bin/phpunit" + } } diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php index 9fa60cf19..3dea055bb 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php @@ -16,11 +16,11 @@ $PHPMAILER_LANG['file_access'] = 'Немає доступу до фай $PHPMAILER_LANG['file_open'] = 'Помилка файлової системи: не вдається відкрити файл: '; $PHPMAILER_LANG['from_failed'] = 'Невірна адреса відправника: '; $PHPMAILER_LANG['instantiate'] = 'Неможливо запустити функцію mail().'; -$PHPMAILER_LANG['provide_address'] = 'Будь-ласка, введіть хоча б одну email-адресу отримувача.'; +$PHPMAILER_LANG['provide_address'] = 'Будь ласка, введіть хоча б одну email-адресу отримувача.'; $PHPMAILER_LANG['mailer_not_supported'] = ' - поштовий сервер не підтримується.'; $PHPMAILER_LANG['recipients_failed'] = 'Помилка SMTP: не вдалося відправлення для таких отримувачів: '; $PHPMAILER_LANG['empty_message'] = 'Пусте повідомлення'; -$PHPMAILER_LANG['invalid_address'] = 'Не відправлено через невірний формат email-адреси: '; +$PHPMAILER_LANG['invalid_address'] = 'Не відправлено через неправильний формат email-адреси: '; $PHPMAILER_LANG['signing'] = 'Помилка підпису: '; $PHPMAILER_LANG['smtp_connect_failed'] = 'Помилка з\'єднання з SMTP-сервером'; $PHPMAILER_LANG['smtp_error'] = 'Помилка SMTP-сервера: '; diff --git a/vendor/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php index 1a65cfd8d..2d16116a8 100644 --- a/vendor/phpmailer/phpmailer/src/PHPMailer.php +++ b/vendor/phpmailer/phpmailer/src/PHPMailer.php @@ -748,7 +748,7 @@ class PHPMailer * * @var string */ - const VERSION = '6.4.0'; + const VERSION = '6.4.1'; /** * Error severity: message only, continue processing. @@ -1721,9 +1721,10 @@ class PHPMailer fwrite($mail, $header); fwrite($mail, $body); $result = pclose($mail); + $addrinfo = static::parseAddresses($toAddr); $this->doCallback( ($result === 0), - [$toAddr], + [[$addrinfo['address'], $addrinfo['name']]], $this->cc, $this->bcc, $this->Subject, @@ -1810,7 +1811,8 @@ class PHPMailer */ protected static function isPermittedPath($path) { - return !preg_match('#^[a-z]+://#i', $path); + //Matches scheme definition from https://tools.ietf.org/html/rfc3986#section-3.1 + return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path); } /** @@ -1822,12 +1824,15 @@ class PHPMailer */ protected static function fileIsAccessible($path) { + if (!static::isPermittedPath($path)) { + return false; + } $readable = file_exists($path); //If not a UNC path (expected to start with \\), check read permission, see #2069 if (strpos($path, '\\\\') !== 0) { $readable = $readable && is_readable($path); } - return static::isPermittedPath($path) && $readable; + return $readable; } /** @@ -1876,7 +1881,17 @@ class PHPMailer if ($this->SingleTo && count($toArr) > 1) { foreach ($toArr as $toAddr) { $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params); - $this->doCallback($result, [$toAddr], $this->cc, $this->bcc, $this->Subject, $body, $this->From, []); + $addrinfo = static::parseAddresses($toAddr); + $this->doCallback( + $result, + [[$addrinfo['address'], $addrinfo['name']]], + $this->cc, + $this->bcc, + $this->Subject, + $body, + $this->From, + [] + ); } } else { $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params); @@ -1965,7 +1980,7 @@ class PHPMailer $isSent = true; } - $callbacks[] = ['issent' => $isSent, 'to' => $to[0]]; + $callbacks[] = ['issent' => $isSent, 'to' => $to[0], 'name' => $to[1]]; } } @@ -1986,7 +2001,7 @@ class PHPMailer foreach ($callbacks as $cb) { $this->doCallback( $cb['issent'], - [$cb['to']], + [[$cb['to'], $cb['name']]], [], [], $this->Subject, diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php index 9bd319865..a39f4803c 100644 --- a/vendor/phpmailer/phpmailer/src/POP3.php +++ b/vendor/phpmailer/phpmailer/src/POP3.php @@ -46,7 +46,7 @@ class POP3 * * @var string */ - const VERSION = '6.4.0'; + const VERSION = '6.4.1'; /** * Default POP3 port number. diff --git a/vendor/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php index 9d85929dd..0e7f53df5 100644 --- a/vendor/phpmailer/phpmailer/src/SMTP.php +++ b/vendor/phpmailer/phpmailer/src/SMTP.php @@ -35,7 +35,7 @@ class SMTP * * @var string */ - const VERSION = '6.4.0'; + const VERSION = '6.4.1'; /** * SMTP line break constant.