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

[Redizajn 1KA] - Urejanje --> Nastavitve --> Parapodatki - v2

Browse Source 
js za prikazovanje nastavitev in opozoril
This commit is contained in:
tejagerjovic 2021-12-10 05:55:27 +01:00
parent c24d6f9eab
commit 631275af48
4 changed files with 73 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
admin/survey/SurveyAdminSettings.php
View File

@ -1743,7 +1743,7 @@ class SurveyAdminSettings {
if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
$voting_disabled = ' disabled';
echo '<p class="red">'.$lang['srv_voting_warning_paradata'].'</p>';
echo '<p class="red">'.$lang['srv_voting_warning_paradata'].'</p><br>';
}
echo '<div class="setting_holder">';
@ -1798,49 +1798,49 @@ class SurveyAdminSettings {
echo '<legend>'.$lang['srv_sledenje_ip_title'].'</legend>';
if($ip == 0 && $ip_show != 1) {
echo '<div class="setting_holder">';
echo '<p class="red">'.$lang['srv_sledenje_ip_alert'].'</p>';
echo '</div>';
}
echo '<div class="setting_holder">';
//Shranjuj IP naslov respondenta
echo '<div class="setting_holder '.(($ip == 0) ? '' : ' no_margin').'" id="save_IP">';
echo '<span class="setting_title">'.$lang['srv_sledenje_ip'].':</span>';
echo '<div class="setting_item">';
echo '<input type="radio" name="survey_ip" id="survey_ip_1" value="1"'.($ip==1?' checked':'').' '.$voting_disabled.'>';
echo '<input type="radio" name="survey_ip" id="survey_ip_1" value="1"'.($ip==1?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
echo '<label for="survey_ip_1">'.$lang['no'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="survey_ip" id="survey_ip_0" value="0"'.($ip==0?' checked':'').' '.$voting_disabled.'>';
echo '<input type="radio" name="survey_ip" id="survey_ip_0" value="0"'.($ip==0?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
echo '<label for="survey_ip_0">'.$lang['yes'].'</label>';
echo '</div>';
echo '</div>';
echo '<div class=" '.(($ip == 1 && $ip_show == 0) ? 'displayNone' : '').'" id="save_IP_warning">';
echo '<p class="red">'.$lang['srv_sledenje_ip_alert'].'</p><br>';
echo '</div>';
//Poveži IP v bazi s podatki
echo '<div class="'.(($admin_type == 0 || $admin_type == 1) ? '' : ' displayNone').'">';
echo '<div class="'.(($ip == 0) ? '' : ' displayNone').'" id="connect_IP">';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_show_ip'].':</span>';
echo '<div class="setting_item">';
echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_0" value="0"'.($ip_show==0?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
echo '<label for="survey_show_ip_0">'.$lang['no'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_1" value="1"'.($ip_show==1?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
echo '<label for="survey_show_ip_1">'.$lang['yes'].'</label>';
echo '</div>';
if($ip == 0 && ($admin_type == 0 || $admin_type == 1)){
echo '</div>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_show_ip'].':</span>';
echo '<div class=" '.(($ip_show == 1) ? '' : ' displayNone').'" id="connect_IP_warning">';
echo '<p class="red">'.$lang['srv_show_ip_alert'].'</p>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_0" value="0"'.($ip_show==0?' checked':'').' '.$voting_disabled.'>';
echo '<label for="survey_show_ip_0">'.$lang['no'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_1" value="1"'.($ip_show==1?' checked':'').' '.$voting_disabled.'>';
echo '<label for="survey_show_ip_1">'.$lang['yes'].'</label>';
echo '</div>';
echo '</div>';
if($ip_show == 1) {
echo '<div class="setting_holder">';
echo '<p class="red">'.$lang['srv_show_ip_alert'].'</p>';
echo '</div>';
}
}
echo '</div>';
echo '</div>';
echo '</fieldset>';
@ -1854,21 +1854,19 @@ class SurveyAdminSettings {
echo '<span class="setting_title">'.$lang['srv_sledenje_identifikatorji'].':</span>';
echo '<div class="setting_item">';
echo '<input type="radio" name="show_email" id="show_email_0" value="0"'.($row['show_email']==0?' checked':'').' '.$voting_disabled.'>';
echo '<input type="radio" name="show_email" id="show_email_0" value="0"'.($row['show_email']==0?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
echo '<label for="show_email_0">'.$lang['no'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="show_email" id="show_email_1" value="1"'.($row['show_email']==1?' checked':'').' '.$voting_disabled.'>';
echo '<input type="radio" name="show_email" id="show_email_1" value="1"'.($row['show_email']==1?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
echo '<label for="show_email_1">'.$lang['yes'].'</label>';
echo '</div>';
echo '</div>';
if($row['show_email'] == 1) {
echo '<div class="setting_holder">';
echo '<p class="red">'.$lang['srv_show_mail_with_data3'].'</p>';
echo '<div class="setting_holder '.(($row['show_email'] == 1) ? '' : ' displayNone').'" id="connect_identifier_warning">';
echo '<p class="red">'.$lang['srv_show_mail_with_data3'].'.</p>';
echo '</div>';
}
echo '</fieldset>';
}

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

@ -5565,3 +5565,38 @@ function genericAlertPopupClose(){
$('#fade').fadeOut('slow');
$('#popup_note').removeClass('popup_orange');
}
//Toggle za prikaz nastavitev in opozoril v parapodatkih
function toggleParapodatki(){
var survey_ip = $('input[name=survey_ip]:checked').val();
var survey_show_ip = $('input[name=survey_show_ip ]:checked').val();
var show_email = $('input[name=show_email ]:checked').val();
if(survey_ip == '0') {
$("#save_IP_warning").removeClass('displayNone');
$("#save_IP").removeClass('no_margin');
$("#connect_IP").removeClass('displayNone');
}
else {
$("#save_IP_warning").addClass('displayNone');
$("#save_IP").addClass('no_margin');
$("#connect_IP").addClass('displayNone');
}
if(survey_show_ip == '1')
$("#connect_IP_warning").removeClass('displayNone');
else
$("#connect_IP_warning").addClass('displayNone');
if(show_email == '1')
$("#connect_identifier_warning").removeClass('displayNone');
else
$("#connect_identifier_warning").addClass('displayNone');
}

2
public/css/admin_new.css
View File

@ -7229,7 +7229,7 @@ fieldset .setting_holder {
fieldset .setting_holder:first-of-type {
margin-top: 0;
}
fieldset .setting_holder:last-of-type {
fieldset .setting_holder:last-of-type, fieldset .setting_holder.no_margin {
margin-bottom: 0;
}
fieldset .setting_holder .setting_item {

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

@ -39,7 +39,8 @@ fieldset{
margin-top: 0;
}
&:last-of-type{
&:last-of-type,
&.no_margin{
margin-bottom: 0;
}