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

Merge branch 'master' of https://git.1ka.si:/git/1ka

Browse Source
This commit is contained in:
tejagerjovic 2022-07-19 10:49:54 +02:00
commit bf524f6f22
3 changed files with 3 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/survey/SurveyAdminAjax.php
View File

@ -6943,17 +6943,6 @@ class SurveyAdminAjax {
echo '</p>';
}
// # Prevod
// echo '<p> <span>Prevod: </span>';
// echo '<span><a href="#">Belarussian</a>, </span>';
// echo '<span><a href="#">Bulgarian</a></span>';
// echo '</p>';
#piškotki
echo '<p><span>'.$lang['srv_cookie'].':</span> <a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie'].'"><span class="qs_data as_link">'.$lang['srv_cookie_'.$row['cookie']].'</span></a></p>';
echo '<p><span>'.$lang['srv_cookie_return'].':</span> <a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie_return'].'"><span class="qs_data as_link">'.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'</span></a></p>';

16
admin/survey/SurveyAdminSettings.php
View File

@ -2797,7 +2797,6 @@ class SurveyAdminSettings {
echo '<div class="more_title">';
echo '<div class="more_title_icon"><span class="faicon inv_sent_1 empty"></span></div>';
echo $lang['srv_publication_invitations'];
// echo '<img class= "mail_yellow" src="/public\img\icons\lock_yellow.svg">';
echo '</div>';
echo $lang['srv_publication_invitations_text'];
echo '</div>';
@ -2924,24 +2923,9 @@ class SurveyAdminSettings {
$link1 = $site_url.'a/'.$row['hash'];
echo '<div class="grouplang">';
echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
// echo '<div class= "lang_span">- English </div>';
echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
echo '</div>';
// $link1 = $site_url.'a/'.$row['hash'];
// echo '<div class="grouplang">';
// echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
// echo '<div class= "lang_span">- Slovenščina </div>';
// echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
// echo '</div>';
// $link1 = $site_url.'a/'.$row['hash'];
// echo '<div class="grouplang">';
// echo '<a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
// echo '<div class= "lang_span">- Italian </div>';
// echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link1.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
// echo '</div>';
// Imamo vec linkov za skupine
$ss = new SurveySkupine($this->anketa);
$spr_id = $ss->hasSkupine();

68
public/css/admin_new.css
View File

@ -29405,15 +29405,15 @@ iframe#ifmcontentstoprint {
}
.rsdl_bck1 {
background-color: #fae2e2 !important;
background-color: rgb(250, 226, 226) !important;
}
.rsdl_bck2 {
background-color: #ff9d9d !important;
background-color: rgb(255, 157, 157) !important;
}
.rsdl_bck3 {
background-color: #f84242 !important;
background-color: rgb(248, 66, 66) !important;
}
.rsdl_bck4 {
@ -32842,24 +32842,19 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
#quick_comments_link.newCss {
display: none;
}
#firstNavigation ol.right-side {
display: none;
}
div.status_advanced {
flex-direction: column;
}
div.status_advanced_box {
width: 100%;
box-sizing: border-box;
}
a.status_advanced_link {
width: 95%;
}
.content_div_normalmode {
overflow-x: auto;
}
@ -32927,7 +32922,6 @@ body #main_holder #main .wide {
width: 100%;
margin: 0;
}
fieldset {
width: 100% !important;
box-sizing: border-box !important;
@ -32957,44 +32951,36 @@ fieldset textarea {
fieldset .setting {
height: auto !important;
}
.setting_horizontal_wrapper {
flex-direction: column !important;
}
#vnosi_paginacija div select {
display: inline-block;
width: fit-content;
margin: 0 5px;
text-align: center;
}
div.breadcrumbs {
display: block;
padding: 15px;
color: #1e88e5;
font-weight: 600;
}
button.small, submit.small {
min-width: auto;
padding: 5px 16px;
}
button.medium, submit.medium {
min-width: auto;
padding: 10px 24px;
}
button.large, submit.large {
min-width: auto;
padding: 12px 32px;
}
.top_note {
padding: 8px 16px;
}
header {
/* Mobile meni */
/* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@ -33250,7 +33236,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
header .mobile_settings .mobile_settings_content a .setting_text {
width: auto;
}
footer#srv_footer {
display: flex;
flex-direction: column;
@ -33272,7 +33257,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
padding: 0;
border: 0;
}
/* Popup za vprasajcke */
.qtip {
position: fixed !important;
@ -33283,7 +33267,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
left: 10% !important;
box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
}
.divPopUp {
width: calc(100% - 32px) !important;
max-width: calc(100% - 32px) !important;
@ -33294,12 +33277,10 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
width: calc(100% - 32px) !important;
max-width: calc(100% - 32px) !important;
}
/* Vse povezano s paketi in placili */
.dt-buttons {
display: none;
}
#main #moje_ankete_edit #anketa_edit {
padding: 0 !important;
}
@ -33377,7 +33358,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
#main #moje_ankete_edit fieldset div.setting {
margin-bottom: 10px;
}
#new_anketa_div {
display: flex;
flex-direction: column;
@ -33461,7 +33441,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
border: 1px solid #c8e3f8 !important;
border-radius: 1px;
}
.dashboard_top_settings {
flex-direction: column;
}
@ -33474,19 +33453,16 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
margin-left: 0;
margin-right: 16px;
}
.dashboard_boxes {
flex-direction: column;
}
.dashboard_boxes .dashboard_box {
margin: 0 0 32px 0;
}
.locked .add-variable-mobile,
.spremenljivka_content .add-variable {
display: none !important;
}
#branching {
width: 100%;
margin: 0;
@ -33591,11 +33567,9 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
margin: 0;
padding: 0 12px;
}
.toolbox_holder {
display: none;
}
.mobile_add_question {
display: block;
position: fixed;
@ -33615,7 +33589,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
line-height: 15px;
font-weight: 600;
}
.mobile_add_question_popup {
z-index: 9999;
position: fixed;
@ -33669,7 +33642,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
font-size: 14px;
font-weight: 500;
}
#vprasanje_float_editing .vprasanje_edit_holder {
position: fixed;
z-index: 99999;
@ -33722,7 +33694,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
margin-left: 0 !important;
text-align: center;
}
#main #anketa #globalSetingsList {
max-width: 100% !important;
width: 100% !important;
@ -33735,7 +33706,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
#main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
width: 100%;
}
/* NASTAVITVE in ARHIVI */
/* OBLIKA */
#main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@ -33751,18 +33721,15 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
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;
@ -33780,7 +33747,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
#main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
width: 100% !important;
}
div.page_tema .theme_list {
flex-wrap: wrap;
}
@ -33807,7 +33773,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
margin-right: 8px;
}
.page_theme-editor #theme-preview {
display: none;
}
@ -33815,7 +33780,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
width: 100% !important;
flex-wrap: wrap;
}
#srv_diagnostic br {
display: none;
}
@ -33836,7 +33800,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
#srv_diagnostic #srv_diagnostic_results_right table td + td {
width: auto !important;
}
.subpage_testnipodatki {
line-height: 20px;
}
@ -33850,7 +33813,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
.subpage_testnipodatki form label input {
vertical-align: bottom;
}
.lastnosti_wrapper {
flex-direction: column !important;
}
@ -33858,7 +33820,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
.lastnosti_wrapper .lastnosti_right {
width: 100% !important;
}
.page_vabila #vabila .button_holder {
flex-direction: column;
align-items: flex-start;
@ -33883,7 +33844,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
.page_vabila #vabila .more_block {
width: 100%;
}
.page_invitations #inv_top_navi {
flex-direction: column;
align-items: flex-start;
@ -33951,7 +33911,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
.page_invitations .button_holder button {
margin-bottom: 8px;
}
#vabila > table,
table.invitations_settings,
#inv_msg_preview table,
@ -34035,7 +33994,6 @@ table.invitations_settings p label input[type=password],
width: 100% !important;
box-sizing: border-box;
}
#surveyInvitationSetting,
#surveyInvitationSettingServer {
min-width: 100% !important;
@ -34043,7 +34001,6 @@ table.invitations_settings p label input[type=password],
margin: 10px 0 !important;
box-sizing: border-box !important;
}
#inv_top_navi {
display: flex;
flex-direction: column;
@ -34082,7 +34039,6 @@ table.invitations_settings p label input[type=password],
#inv_top_navi > #inv_step_nav.yellow .inv_step_space {
display: none;
}
#inv_recipients_profiles_holder,
#inv_import_list_container,
#inv_messages_profiles_holder,
@ -34103,7 +34059,6 @@ table.invitations_settings p label input[type=password],
#inv_select_mail_preview textarea {
width: 100%;
}
#inv_msg_preview table th {
height: auto !important;
width: 100% !important;
@ -34115,7 +34070,6 @@ table.invitations_settings p label input[type=password],
width: 100%;
box-sizing: border-box;
}
.addthis_toolbox {
line-height: 24px;
}
@ -34130,11 +34084,9 @@ table.invitations_settings p label input[type=password],
.addthis_toolbox .addthis_separator {
font-size: 16px;
}
#inv_field_container ul li {
width: 45%;
}
/* grafika ko ni podatkov */
div.no_data_alert img {
width: 100%;
@ -34146,7 +34098,6 @@ table.invitations_settings p label input[type=password],
flex-direction: column;
align-items: center;
}
.page_data .data_table_top_holder {
flex-direction: column;
align-items: flex-start;
@ -34217,11 +34168,9 @@ table.invitations_settings p label input[type=password],
width: 100%;
margin-bottom: 16px;
}
body.data_fullscreen #analiza_data {
top: 68px;
}
.subpage_append .anketa_edit_main,
.subpage_merge .anketa_edit_main,
.subpage_calculation .anketa_edit_main,
@ -34262,7 +34211,6 @@ table.invitations_settings p label input[type=password],
clear: both;
margin: 40px 0 0 0 !important;
}
.subpage_quick_edit #quick_edit_top_line {
flex-direction: column-reverse;
}
@ -34282,7 +34230,6 @@ table.invitations_settings p label input[type=password],
.subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
justify-content: center;
}
.analysis_bottom_settings {
flex-wrap: wrap;
}
@ -34292,16 +34239,13 @@ table.invitations_settings p label input[type=password],
margin: 0 0 16px 0 !important;
border: 0;
}
.div_analiza_icons,
.div_analiza_scale {
opacity: 1 !important;
}
.analysis_icons_holder {
display: none;
}
.chart_holder {
width: 100%;
box-sizing: border-box;
@ -34324,7 +34268,6 @@ table.invitations_settings p label input[type=password],
display: block;
clear: both;
}
table.analysis_reports {
border-spacing: 0px;
}
@ -34341,14 +34284,12 @@ table.analysis_reports > tbody > tr > td {
table.analysis_reports fieldset {
margin-bottom: 0 !important;
}
.reports_holder {
flex-direction: column;
}
.reports_holder fieldset {
width: 100%;
}
.noSurvey_sequence {
padding: 0;
}
@ -34370,13 +34311,11 @@ table.analysis_reports > tbody > tr > td {
.noSurvey_sequence .buttons_holder a .button {
margin: 10px 30px;
}
#table-horizontal-scroll-wrapper1-userchanges {
display: table;
table-layout: fixed;
width: 100%;
}
#table-horizontal-scroll-wrapper2-userchanges {
display: table-cell;
overflow-x: auto;
@ -34387,7 +34326,6 @@ table.analysis_reports > tbody > tr > td {
border-collapse: collapse;
white-space: nowrap;
}
.page_arhivi .anketa_edit_left,
.page_tracking .anketa_edit_left,
.subpage_anal_arch .anketa_edit_left,