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:
urospodkriznik 2022-09-29 19:20:39 +02:00
commit bf71027d5e
12 changed files with 199 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
admin/survey/SurveyAdminSettings.php
View File

@ -117,6 +117,12 @@ class SurveyAdminSettings {
echo '</div>';
echo '<div class="setting_holder">';
echo '<input type="hidden" name="opomba" value="0">';
echo '<input type="checkbox" id="opomba" name="opomba" value="1" '.(isset($row['intro_opomba']) && $row['intro_opomba'] != "" ? ' checked="checked"' : '').' onChange="toggleAnketaOpomba(); return false;">';
echo '<label for="opomba">'.$lang['srv_dodaj_opombo'].'</label> ';
echo '</div>';
echo '<div id="dodaj-opombo" class="setting_holder '.(isset($row['intro_opomba']) && $row['intro_opomba'] != "" ? '' : 'displayNone').'">';
echo ' <label for="anketa_note">'.$lang['srv_note'].':</label>';
echo ' <textarea id="anketa_note" name="intro_opomba" maxlength="'.ANKETA_NOTE_MAXLENGTH.'">' . $row['intro_opomba'] . '</textarea>';
echo ' <span class="charalimit" id="anketa_note_chars";">' . strlen($row['intro_opomba']) . '/'.ANKETA_NOTE_MAXLENGTH.'</span>';
@ -136,7 +142,13 @@ class SurveyAdminSettings {
$sqlF = sisplet_query("SELECT id, naslov FROM srv_mysurvey_folder WHERE usr_id='".$global_user_id."' ORDER BY naslov ASC");
if($show_folders == 1 && mysqli_num_rows($sqlF) > 0){
echo '<div class="setting_holder">';
echo '<div id="anketa-toggle" class="setting_holder '.($selected_folder != 0 ? '' : 'bottom0').'">';
echo '<input type="hidden" name="mapa" value="0">';
echo '<input type="checkbox" id="mapa" name="mapa" value="1" '.($selected_folder != 0 ? ' checked="checked"' : '').' onChange="toggleAnketaMapa(); return false;">';
echo '<label for="mapa">'.$lang['srv_newSurvey_survey_new_folder'].'</label> ';
echo '</div>';
echo '<div id="dodaj-v-mapo" class="setting_holder '.($selected_folder != 0 ? '' : 'displayNone').'">';
echo '<label for="anketa_folder">'. $lang['srv_newSurvey_survey_new_folder'] .Help::display('srv_nova_shrani').':</label>';
echo '<select class="dropdown large w400" name="anketa_folder" id="anketa_folder">';
echo '<option value="0" '.($selected_folder == 0 ? ' selected="selected"' : '').'>'.$lang['srv_newSurvey_survey_new_folder_def'].'</option>';
@ -194,6 +206,7 @@ class SurveyAdminSettings {
echo '</div>';
echo '<div class="setting_horizontal_wrapper">';
echo '<div class="setting_holder">';
echo '<label for="lang_resp">'.$lang['srv_language_respons_1'].':</label>';
@ -204,28 +217,28 @@ class SurveyAdminSettings {
echo '<option value="'.$key.'" '.($key==$lang_resp?' selected':'').'>'.$val.'</option>';
}
echo '</select>';
echo '</div>';
// Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete"
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
$userAccess = UserAccess::getInstance($global_user_id);
if($userAccess->checkUserAccess($what='prevajanje')){
$lang_link = 'window.location.href=\'index.php?anketa='.$this->anketa.'&a=prevajanje\'; return false;';
$color = 'white-blue';
$color = 'white-black';
}
else{
$lang_link = 'popupUserAccess(\'prevajanje\'); return false;';
$color = 'yellow user_access_locked';
}
echo '<div class="button_holder top16 bottom0">';
echo '<div class="button_holder top0 bottom0">';
echo '<button class="medium '.$color.'" onClick="'.$lang_link.'">'.$lang['srv_multi_lang'].'</button>';
echo '</div>';
echo '</div>';
echo '</fieldset>';
// Gumb shrani - vmes
@ -9161,8 +9174,6 @@ class SurveyAdminSettings {
echo '<div id="new_user_option">';
echo '<form class="manager_add_user" name="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">';
echo '<div class="add_user_fields_wrapper">';
echo '<div class="setting_holder horizontal">';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['name'].':</span>';
@ -9192,9 +9203,7 @@ class SurveyAdminSettings {
echo '</div>';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
echo '<div class="button_holder top16">';
echo '<button class="medium blue" onClick="document.manager_add_user.submit();">'.$lang['create_add'].'</button>';
echo '</div>';
echo '</form>';

9
admin/survey/script/script.js
View File

@ -5731,3 +5731,12 @@ function toggleCommentPopupInline ($type) {
$("#comment_inline_add").toggleClass('displayNone');
}
function toggleAnketaOpomba () {
$("#dodaj-opombo").toggleClass('displayNone');
}
function toggleAnketaMapa () {
$("#dodaj-v-mapo").toggleClass('displayNone');
$("#anketa-toggle").toggleClass('bottom0');
}

1
lang/1.php
View File

@ -1854,6 +1854,7 @@ $lang = array (
"srv_osnovniPodatki" => "Osnovni podatki",
"srv_osnovniPodatki2" => "Osnovne nastavitve",
"srv_novaanketa_kratkoime" => "Objavljeno ime ankete",
"srv_dodaj_opombo" => "Dodaj opombo na anketo",
"srv_novaanketa_kratkoime_info" => "(Akronim ankete, do 40 znakov)",
"srv_novaanketa_polnoime" => "Interno ime ankete",
"srv_novaanketa_ime_respondenti"=> "Ime ankete za respondente",

1
lang/2.php
View File

@ -1837,6 +1837,7 @@ $lang = array (
"srv_osnovniPodatki" => "Basic info",
"srv_osnovniPodatki2" => "Basic settings",
"srv_novaanketa_kratkoime" => "Published survey name",
"srv_dodaj_opombo" => "Dodaj opombo na anketo",
"srv_novaanketa_kratkoime_info" => "(40 chars)",
"srv_novaanketa_polnoime" => "Internal survey name",
"srv_novaanketa_ime_respondenti"=> "Survey name for respondents",

18
main/survey/app/Controllers/BodyController.php
View File

@ -2076,6 +2076,16 @@ class BodyController extends Controller
echo '<div id="preview-window">';
echo '<div id="preview_switch">';
// Preklop na celostranski preview
echo '<div id="nacina">';
echo '<span class="bold">'.self::$lang['srv_mode'] . ':</span>';
echo '<span id="normalni" class="'.(get('displayAllPages') ? 'nonactive' : 'active').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, null, array('pages')) . '" title="' . self::$lang['srv_normal_x'] . '">' . self::$lang['srv_normal'] . '</a></span>';
echo '<span id="celostranski" class="'.(get('displayAllPages') ? 'active' : 'nonactive').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, array('pages' => 'all', 'mobile' => '0')) . '" title="' . self::$lang['srv_scrolling_x'] . '">' . self::$lang['srv_scrolling'] . '</a></span>';
echo '</div>';
// Gump za odprtje/zaprtje okna
echo '<div id="preview_open" '.($_GET['testdata'] == 'on' ? ' class="testdata"' : '').'>';
@ -2084,14 +2094,6 @@ class BodyController extends Controller
echo '</div>';
// Preklop na celostranski preview
echo '<div id="preview_switch">';
echo '<span class="bold">'.self::$lang['srv_mode'] . ':</span>';
echo '<span class="'.(get('displayAllPages') ? 'nonactive' : 'active').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, null, array('pages')) . '" title="' . self::$lang['srv_normal_x'] . '">' . self::$lang['srv_normal'] . '</a></span>';
echo '<span class="'.(get('displayAllPages') ? 'active' : 'nonactive').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, array('pages' => 'all', 'mobile' => '0')) . '" title="' . self::$lang['srv_scrolling_x'] . '">' . self::$lang['srv_scrolling'] . '</a></span>';
echo '</div>';

4
main/survey/js/script.js
View File

@ -1247,7 +1247,7 @@ function return_edit_send (site_url, lang_id) {
function preview_popup_close () {
$('#preview-holder, #preview_switch').fadeOut('medium');
$('#preview-holder, #nacina').fadeOut('medium');
$('#preview-window').addClass('closed');
@ -1259,7 +1259,7 @@ function preview_popup_close () {
function preview_popup_open () {
$('#preview-holder, #preview_switch').fadeIn('medium');
$('#preview-holder, #nacina').fadeIn('medium');
$('#preview-window').removeClass('closed');

63
public/css/admin_new.css
View File

@ -9836,9 +9836,18 @@ fieldset legend {
fieldset .setting_horizontal_wrapper {
display: flex;
flex-direction: row;
margin-bottom: 16px;
}
fieldset .setting_horizontal_wrapper .setting_holder {
margin-right: 17px;
margin-right: 16px;
margin-bottom: 0;
}
fieldset .setting_horizontal_wrapper .button_holder {
height: 40px;
align-self: flex-end;
}
fieldset .setting_horizontal_wrapper:last-of-type {
margin-bottom: 0px;
}
fieldset .setting_holder {
margin-bottom: 16px;
@ -11545,55 +11554,41 @@ div.subpage_uporabniki .data_table_top_holder #end {
div.subpage_uporabniki div.users_list_box {
padding: 0 12px;
}
div.subpage_uporabniki div.add_user {
margin-bottom: 32px;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal {
display: flex;
flex-direction: row;
width: fit-content;
align-self: center;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal div#dodajanje_left {
padding-right: 32px;
margin-right: 32px;
border-right: 1px solid #E5E5E5;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.add_user_fields_wrapper {
display: flex;
flex-direction: column;
width: fit-content;
margin-top: 8px;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.button_holder {
margin: 32px 0 0 0;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder {
div.subpage_uporabniki .users_list_box #new_user_option .setting_holder,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder {
margin-bottom: 16px;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder:last-of-type {
div.subpage_uporabniki .users_list_box #new_user_option .setting_holder:last-of-type,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder:last-of-type {
margin-bottom: 0;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal {
div.subpage_uporabniki .users_list_box #new_user_option .setting_holder.horizontal,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.horizontal {
display: flex;
flex-direction: row;
align-items: center;
gap: 16px;
margin-bottom: 0;
margin-bottom: 16;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal .setting_holder {
div.subpage_uporabniki .users_list_box #new_user_option .setting_holder.horizontal .setting_holder,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.horizontal .setting_holder {
display: flex;
flex-direction: column;
margin-bottom: 16px;
margin-bottom: 0;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder select.dropdown {
div.subpage_uporabniki .users_list_box #new_user_option .setting_holder select.dropdown,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder select.dropdown {
width: 500px;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder p.bottom4 {
div.subpage_uporabniki .users_list_box #new_user_option .setting_holder p.bottom4,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder p.bottom4 {
margin-bottom: 4px;
}
table#unconfirmed_mail_user_list {
div.subpage_uporabniki .users_list_box #new_user_option div.button_holder,
div.subpage_uporabniki .users_list_box #existing_user_option div.button_holder {
margin: 32px 0 0 0;
}
div.subpage_uporabniki table#unconfirmed_mail_user_list {
border-left: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5;
}

63
public/css/main.css
View File

@ -7295,16 +7295,14 @@ button.ui-datepicker-trigger::before {
position: fixed;
top: 45px;
right: 10px;
width: 270px;
width: 265px;
min-height: 32px;
font-size: 11px;
font-size: 12px;
background-color: white;
border: 2px #1e88e5 solid;
border-radius: 5px;
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
border-radius: 2px;
}
#preview-window.closed {
top: 47px;
right: 12px;
background-color: transparent;
border: 0;
}
@ -7358,30 +7356,54 @@ button.ui-datepicker-trigger::before {
content: "\f013";
}
#preview-window #preview_open {
position: absolute;
box-sizing: border-box;
width: 30px;
top: 6px;
right: 8px;
text-align: right;
margin-left: auto;
}
#preview-window #preview_switch {
font-family: Open Sans, Arial, Sans-Serif !important;
box-sizing: border-box;
width: 100%;
padding: 8px 15px;
padding: 21px 16px;
font-size: 12px;
border-bottom: 1px #1e88e5 solid;
display: flex;
flex-direction: row;
justify-content: space-between;
}
#preview-window #preview_switch .active a {
padding-left: 15px;
font-weight: 600;
color: #ffa608;
#preview-window #preview_switch #nacina span.bold {
margin-right: 8px;
}
#preview-window #preview_switch .nonactive a {
padding-left: 15px;
font-weight: 600;
color: #1e88e5;
#preview-window #preview_switch #nacina #normalni,
#preview-window #preview_switch #nacina #celostranski {
padding: 4px 8px;
border: 1px solid #E5E5E5;
}
#preview-window #preview_switch #nacina #normalni.active,
#preview-window #preview_switch #nacina #celostranski.active {
background: #EEF7FF;
color: #1E88E5;
border-color: #1E88E5;
}
#preview-window #preview_switch #nacina #normalni a,
#preview-window #preview_switch #nacina #celostranski a {
color: inherit;
}
#preview-window #preview_switch #nacina #normalni {
border-radius: 2px 0 0 2px;
border-right: none;
}
#preview-window #preview_switch #nacina #normalni.active {
border-right: 1px solid;
}
#preview-window #preview_switch #nacina #celostranski {
border-radius: 0 2px 2px 0;
}
#preview-window #preview_switch #nacina #celostranski.active {
border-color: #1E88E5;
}
#preview-window #preview_switch #nacina #celostranski.nonactive {
border-left: none;
}
#preview-window #preview-holder {
font-family: Open Sans, Arial, Sans-Serif !important;
@ -7618,6 +7640,9 @@ span.faicon.empty {
border-color: #1E88E5;
background-color: #EEF7FF;
}
#comments_bottom_line a {
margin-left: auto;
}
#comments_bottom_line a #comment_settings {
display: flex;
flex-direction: row;

13
resources/sass/admin_new/components/form/fieldset.scss
View File

@ -23,7 +23,18 @@ fieldset{
flex-direction: row;
.setting_holder {
margin-right: 17px;
margin-right: 16px;
margin-bottom: 0;
}
.button_holder {
height: 40px;
align-self: flex-end;
}
margin-bottom: 16px;
&:last-of-type {
margin-bottom: 0px;
}
}

41
resources/sass/admin_new/pages/settings/uporabniki.scss
View File

@ -86,32 +86,10 @@ div.subpage_uporabniki {
// Dodajanje
div.add_user {
margin-bottom: 32px;
.users_list_box {
div#dodajanje_horizontal {
display: flex;
flex-direction: row;
width: fit-content;
align-self: center;
div#dodajanje_left {
padding-right: 32px;
margin-right: 32px;
border-right: 1px solid $gray;
}
div.add_user_fields_wrapper {
display: flex;
flex-direction: column;
width: fit-content;
margin-top: 8px;
}
div.button_holder {
margin: 32px 0 0 0;
}
#new_user_option,
#existing_user_option {
.setting_holder {
margin-bottom: 16px;
@ -124,12 +102,12 @@ div.subpage_uporabniki {
flex-direction: row;
align-items: center;
gap: 16px;
margin-bottom: 0;
margin-bottom: 16;
.setting_holder {
display: flex;
flex-direction: column;
margin-bottom: 16px;
margin-bottom: 0;
}
}
@ -142,12 +120,15 @@ div.subpage_uporabniki {
}
}
div.button_holder {
margin: 32px 0 0 0;
}
}
}
}
table#unconfirmed_mail_user_list {
table#unconfirmed_mail_user_list {
border-left: 1px solid $gray;
border-right: 1px solid $gray;
}
}

71
resources/sass/main/main/admin.scss
View File

@ -122,19 +122,17 @@
top: 45px;
right: 10px;
width: 270px;
width: 265px;
min-height: 32px;
font-size: 11px;
font-size: 12px;
background-color: white;
border: 2px #1e88e5 solid;
border-radius: 5px;
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
border-radius: 2px;
&.closed{
top: 47px;
right: 12px;
background-color: transparent;
border: 0;
@ -195,14 +193,11 @@
#preview_open {
position: absolute;
box-sizing: border-box;
width: 30px;
top: 6px;
right: 8px;
text-align: right;
margin-left: auto;
}
#preview_switch {
@ -211,23 +206,59 @@
box-sizing: border-box;
width: 100%;
padding: 8px 15px;
padding: 21px 16px;
font-size: 12px;
border-bottom: 1px #1e88e5 solid;
.active a{
padding-left: 15px;
display:flex;
flex-direction: row;
justify-content: space-between;
font-weight: 600;
color: #ffa608;
#nacina {
span.bold {
margin-right: 8px;
}
.nonactive a{
padding-left: 15px;
font-weight: 600;
color: #1e88e5;
#normalni,
#celostranski {
padding: 4px 8px;
border: 1px solid #E5E5E5;
&.active{
background: #EEF7FF;
color: #1E88E5;
border-color: #1E88E5;
}
a {
color: inherit;
}
}
#normalni{
border-radius: 2px 0 0 2px;
border-right: none;
&.active{
border-right: 1px solid;
}
}
#celostranski{
border-radius: 0 2px 2px 0;
&.active{
border-color: #1E88E5;
}
&.nonactive {
border-left: none;
}
}
}
}

2
resources/sass/main/main/test_survey_comments.scss
View File

@ -102,6 +102,8 @@ $status-blue: #EAF9FE;
}
}
}
margin-left: auto;
}
}