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:
pero1203 2021-12-12 12:05:06 +01:00
commit 9328a4d0e0
20 changed files with 1767 additions and 1755 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
admin/survey/SurveyAdminSettings.php
View File

@ -106,20 +106,20 @@ class SurveyAdminSettings {
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<label for="anketa_polnoIme">'.$lang['srv_novaanketa_polnoime'].':</label>'; echo '<label for="anketa_polnoIme">'.$lang['srv_novaanketa_polnoime'].':</label>';
echo '<input type="text" class="large" id="anketa_polnoIme" name="anketa_polnoIme" value="' . $row['naslov'] . '" onblur="edit_anketa_naslov(\'' . $row['id'] . '\');" maxlength="'.ANKETA_NASLOV_MAXLENGTH.'" style="width:400px;"/>'; echo '<input type="text" class="large" id="anketa_polnoIme" name="anketa_polnoIme" value="' . $row['naslov'] . '" onblur="edit_anketa_naslov(\'' . $row['id'] . '\');" maxlength="'.ANKETA_NASLOV_MAXLENGTH.'"/>';
echo '<span class="charalimit" id="anketa_polnoIme_chars" style="width:400px;">' . strlen($row['naslov']) . '/'.ANKETA_NASLOV_MAXLENGTH.'</span>'; echo '<span class="charalimit" id="anketa_polnoIme_chars">' . strlen($row['naslov']) . '/'.ANKETA_NASLOV_MAXLENGTH.'</span>';
echo '</div>'; echo '</div>';
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<label for="anketa_akronim">'.$lang['srv_novaanketa_kratkoime'].':</label>'; echo '<label for="anketa_akronim">'.$lang['srv_novaanketa_kratkoime'].':</label>';
echo '<input type="text" class="large" id="anketa_akronim" name="anketa_akronim" value="' . $row['akronim'] . '" onblur="edit_anketa_akronim(\'' . $row['id'] . '\');" maxlength="'.ANKETA_AKRONIM_MAXLENGTH.'" style="width:800px;"/>'; echo '<input type="text" class="large" id="anketa_akronim" name="anketa_akronim" value="' . $row['akronim'] . '" onblur="edit_anketa_akronim(\'' . $row['id'] . '\');" maxlength="'.ANKETA_AKRONIM_MAXLENGTH.'"/>';
echo '<span class="charalimit" id="anketa_akronim_chars" style="width:800px;">' . strlen($row['akronim']) . '/'.ANKETA_AKRONIM_MAXLENGTH.'</span>'; echo '<span class="charalimit" id="anketa_akronim_chars">' . strlen($row['akronim']) . '/'.ANKETA_AKRONIM_MAXLENGTH.'</span>';
echo '</div>'; echo '</div>';
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<label for="anketa_note">'.$lang['srv_note'].':</label>'; echo '<label for="anketa_note">'.$lang['srv_note'].':</label>';
echo '<textarea id="anketa_note" name="anketa_note" onblur="edit_anketa_note(\'' . $row['id'] . '\');" maxlength="'.ANKETA_NOTE_MAXLENGTH.'" style="width:800px;height:120px;">' . $row['intro_opomba'] . '</textarea>'; echo '<textarea id="anketa_note" name="anketa_note" onblur="edit_anketa_note(\'' . $row['id'] . '\');" maxlength="'.ANKETA_NOTE_MAXLENGTH.'">' . $row['intro_opomba'] . '</textarea>';
echo '<span class="charalimit" id="anketa_note_chars" style="width:800px;">' . strlen($row['intro_opomba']) . '/'.ANKETA_NOTE_MAXLENGTH.'</span>'; echo '<span class="charalimit" id="anketa_note_chars";">' . strlen($row['intro_opomba']) . '/'.ANKETA_NOTE_MAXLENGTH.'</span>';
echo '</div>'; echo '</div>';
// Ce ima uporabnik mape, lahko izbere v katero mapo se anketa uvrsti // Ce ima uporabnik mape, lahko izbere v katero mapo se anketa uvrsti
@ -1743,7 +1743,7 @@ class SurveyAdminSettings {
if(SurveyInfo::getInstance()->checkSurveyModule('voting')){ if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
$voting_disabled = ' disabled'; $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">'; echo '<div class="setting_holder">';
@ -1798,48 +1798,48 @@ class SurveyAdminSettings {
echo '<legend>'.$lang['srv_sledenje_ip_title'].'</legend>'; echo '<legend>'.$lang['srv_sledenje_ip_title'].'</legend>';
if($ip == 0 && $ip_show != 1) { //Shranjuj IP naslov respondenta
echo '<div class="setting_holder">'; echo '<div class="setting_holder '.(($ip == 0) ? '' : ' no_margin').'" id="save_IP">';
echo '<p class="red">'.$lang['srv_sledenje_ip_alert'].'</p>';
echo '</div>';
}
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_sledenje_ip'].':</span>'; echo '<span class="setting_title">'.$lang['srv_sledenje_ip'].':</span>';
echo '<div class="setting_item">'; 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 '<label for="survey_ip_1">'.$lang['no'].'</label>';
echo '</div>'; echo '</div>';
echo '<div class="setting_item">'; 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 '<label for="survey_ip_0">'.$lang['yes'].'</label>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
if($ip == 0 && ($admin_type == 0 || $admin_type == 1)){ 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
if ($admin_type == 0 || $admin_type == 1){
echo '<div class="'.(($ip == 0) ? '' : ' displayNone').'" id="connect_IP">';
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_show_ip'].':</span>'; echo '<span class="setting_title">'.$lang['srv_show_ip'].':</span>';
echo '<div class="setting_item">'; 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 '<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 '<label for="survey_show_ip_0">'.$lang['no'].'</label>';
echo '</div>'; echo '</div>';
echo '<div class="setting_item">'; 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 '<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 '<label for="survey_show_ip_1">'.$lang['yes'].'</label>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
if($ip_show == 1) { echo '<div class=" '.(($ip_show == 1) ? '' : ' displayNone').'" id="connect_IP_warning">';
echo '<div class="setting_holder">';
echo '<p class="red">'.$lang['srv_show_ip_alert'].'</p>'; echo '<p class="red">'.$lang['srv_show_ip_alert'].'</p>';
echo '</div>'; echo '</div>';
}
echo '</div>';
} }
echo '</fieldset>'; echo '</fieldset>';
@ -1854,21 +1854,19 @@ class SurveyAdminSettings {
echo '<span class="setting_title">'.$lang['srv_sledenje_identifikatorji'].':</span>'; echo '<span class="setting_title">'.$lang['srv_sledenje_identifikatorji'].':</span>';
echo '<div class="setting_item">'; 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 '<label for="show_email_0">'.$lang['no'].'</label>';
echo '</div>'; echo '</div>';
echo '<div class="setting_item">'; 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 '<label for="show_email_1">'.$lang['yes'].'</label>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
if($row['show_email'] == 1) { echo '<div class="setting_holder '.(($row['show_email'] == 1) ? '' : ' displayNone').'" id="connect_identifier_warning">';
echo '<div class="setting_holder">'; echo '<p class="red">'.$lang['srv_show_mail_with_data3'].'.</p>';
echo '<p class="red">'.$lang['srv_show_mail_with_data3'].'</p>';
echo '</div>'; echo '</div>';
}
echo '</fieldset>'; echo '</fieldset>';
} }
@ -8627,17 +8625,15 @@ class SurveyAdminSettings {
echo '<legend>'.$lang['srv_activate_duration_2'].' '.Help::display('srv_activity_quotas').'</legend>'; echo '<legend>'.$lang['srv_activate_duration_2'].' '.Help::display('srv_activity_quotas').'</legend>';
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_from'].'</span>'; echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_from'].'</span>';
echo '<div class="mock-input-holder">'; echo '<div class="icon_holder">';
echo '<input id="startsManual1" type="text" class="large borderless" readonly="true" name="durationStarts" value="' . $starts . '" autocomplete="off"/>'; echo '<input id="startsManual1" type="text" class="large" readonly="true" name="durationStarts" value="' . $starts . '" autocomplete="off"/>';
echo '<a id="datepicker-trigger-starts"><span class="faicon calendar_icon normal"></span></a>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_to'].'</span>'; echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_to'].'</span>';
echo '<div class="mock-input-holder">'; echo '<div class="icon_holder">';
echo '<input id="expireManual1" type="text" class="large borderless" readonly="true" name="durationExpire" value="' . $expire . '" autocomplete="off"/>'; echo '<input id="expireManual1" type="text" class="large" readonly="true" name="durationExpire" value="' . $expire . '" autocomplete="off"/>';
echo '<a id="datepicker-trigger-expire"><span class="faicon calendar_icon normal"></span></a>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -8651,16 +8647,11 @@ class SurveyAdminSettings {
echo ' echo '
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$("#startsManual1").datepicker(); datepicker("#startsManual1");
$("#datepicker-trigger-starts").click(function(){ datepicker("#expireManual1");
$("#startsManual1").datepicker("show");
});
$("#expireManual1").datepicker();
$("#datepicker-trigger-expire").click(function(){
$("#expireManual1").datepicker("show");
});
}); });
</script>'; </script>';
} }
function DisplayNastavitveMaxGlasov() { function DisplayNastavitveMaxGlasov() {

171
admin/survey/classes/class.GDPR.php
View File

@ -122,41 +122,55 @@ class GDPR{
echo ' <fieldset><legend>'.$lang['srv_gdpr_user_settings_title'].'</legend>'; echo ' <fieldset><legend>'.$lang['srv_gdpr_user_settings_title'].'</legend>';
echo '<p class="italic">'.$lang['srv_gdpr_user_settings_desc1'].'<br />'; echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_desc1'].'</p>';
echo $lang['srv_gdpr_user_settings_desc2'].'<br /><br />'; echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_desc2'].'</p>';
echo $lang['srv_gdpr_user_settings_desc3'].'</p>'; echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_desc3'].'</p>';
// PODATKI AVTORJA // PODATKI AVTORJA
// Opozorilo za obvezna polja // Opozorilo za obvezna polja
if($user_settings['firstname'] == '' || $user_settings['lastname'] == '' || $user_settings['email'] == '') if($user_settings['firstname'] == '' || $user_settings['lastname'] == '' || $user_settings['email'] == '')
echo '<p><span class="red bold">'.$lang['srv_gdpr_user_settings_err'].'</span></p>'; echo '<p class="red setting_text">'.$lang['srv_gdpr_user_settings_err'].'</p>';
else
echo '<br />';
echo ' <div class="setting '.($user_settings['firstname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_firstname'].':</label></span> '; echo '<div class="setting_horizontal_wrapper">';
echo ' <input class="text" name="firstname" value="'.$user_settings['firstname'].'" type="text"></div>';
echo ' <div class="setting '.($user_settings['lastname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_lastname'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['firstname'] == '' ? ' red' : '').'">';
echo ' <input class="text" name="lastname" value="'.$user_settings['lastname'].'" type="text"></div>'; echo '<label for="firstname">'.$lang['srv_gdpr_user_settings_firstname'].'*:</label>';
echo '<input class="large w200" id="firstname" name="firstname" value="'.$user_settings['firstname'].'" type="text">';
echo '</div>';
echo '<div class="setting_holder '.($user_settings['lastname'] == '' ? ' red' : '').'">';
echo '<label for="lastname">'.$lang['srv_gdpr_user_settings_lastname'].'*:</label>';
echo '<input class="large w200" id="lastname" name="lastname" value="'.$user_settings['lastname'].'" type="text">';
echo '</div>';
echo '</div>';
echo '<div class="setting_horizontal_wrapper">';
$email = ($user_settings['email'] == '') ? User::getInstance()->primaryEmail() : $user_settings['email']; $email = ($user_settings['email'] == '') ? User::getInstance()->primaryEmail() : $user_settings['email'];
echo ' <div class="setting '.($user_settings['email'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_email'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['email'] == '' ? ' red' : '').'">';
echo ' <input class="text '.(isset($error['email']) ? ' red' : '').'" name="email" value="'.$email.'" type="text"> '.(isset($error['email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '').'</div>'; echo '<label for="email">'.$lang['srv_gdpr_user_settings_email'].'*:</label>';
echo '<input class="large w200 '.(isset($error['email']) ? ' red' : '').'" id="email" name="email" value="'.$email.'" type="text"> '.(isset($error['email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '');
echo '</div>';
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_phone'].':</label></span> '; echo '<div class="setting_holder">';
echo ' <input class="text" name="phone" value="'.$user_settings['phone'].'" type="text"></div>'; echo '<label>'.$lang['srv_gdpr_user_settings_phone'].':</label>';
echo '<input class="large w200" name="phone" value="'.$user_settings['phone'].'" type="text">';
echo '</div>';
echo ' <br />'; echo '</div>';
echo '<div class="setting_horizontal_wrapper">';
// Naslov in drzava // Naslov in drzava
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_address'].':</label></span> '; echo '<div class="setting_holder">';
echo ' <input class="text" name="address" value="'.$user_settings['address'].'" type="text"></div>'; echo '<label for="address">'.$lang['srv_gdpr_user_settings_address'].':</label>';
echo '<input class="large w200" name="address" value="'.$user_settings['address'].'" type="text">';
echo '</div>';
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_country'].':</label></span> '; echo '<div class="setting_holder">';
echo '<label for="country">'.$lang['srv_gdpr_user_settings_country'].':</label>';
echo ' <select name="country" onChange="editGDPRAuthority(this.value); return false;">'; echo '<select class="dropdown large w200" id="country" name="country" onChange="editGDPRAuthority(this.value); return false;">';
//echo ' <option value="" '.($user_settings['country'] == '' ? ' selected="selected"' : '').'>'.$lang['srv_gdpr_user_settings_country_select'].'</option>';
$country_filter = array(); $country_filter = array();
foreach(self::$authorities as $authority){ foreach(self::$authorities as $authority){
@ -174,77 +188,110 @@ class GDPR{
echo '</select>'; echo '</select>';
echo '</div>'; echo '</div>';
echo ' <br />';
// ORGANIZACIJA ALI ZASEBNIK
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_type'].':</label></span> ';
echo ' <label for="type_0"><input class="radio" name="type" id="type_0" value="0" type="radio" '.($user_settings['type'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();"> '.$lang['srv_gdpr_user_settings_type_0'].'</label>';
echo ' <label for="type_1"><input class="radio" name="type" id="type_1" value="1" type="radio" '.($user_settings['type'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();"> '.$lang['srv_gdpr_user_settings_type_1'].'</label>';
echo '</div>'; echo '</div>';
// ORGANIZACIJA ALI ZASEBNIK
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_gdpr_user_settings_type'].':</span> ';
echo '<div class="setting_item">';
echo '<input class="radio" name="type" id="type_0" value="0" type="radio" '.($user_settings['type'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();">';
echo '<label for="type_0"> '.$lang['srv_gdpr_user_settings_type_0'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input class="radio" name="type" id="type_1" value="1" type="radio" '.($user_settings['type'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();">';
echo '<label for="type_1"> '.$lang['srv_gdpr_user_settings_type_1'].'</label>';
echo '</div>';
echo '</div>';
// PODATKI PODJETJA // PODATKI PODJETJA
echo ' <div id="gdpr_organization" '.($user_settings['type'] != '1' ? ' style="display:none;"' : '').'>'; echo ' <div id="gdpr_organization" '.($user_settings['type'] != '1' ? ' class="displayNone"' : '').'>';
// Opozorilo za obvezna polja // Opozorilo za obvezna polja
if($user_settings['organization'] == '' || $user_settings['organization_maticna'] == '') if($user_settings['organization'] == '' || $user_settings['organization_maticna'] == '')
echo '<p><span class="red bold">'.$lang['srv_gdpr_user_settings_err2'].'</span></p>'; echo '<p class="red setting_text">'.$lang['srv_gdpr_user_settings_err'].'</p>';
echo ' <div class="setting '.($user_settings['organization'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_organization'].':</label></span> '; echo '<div class="setting_horizontal_wrapper">';
echo ' <input class="text" name="organization" value="'.$user_settings['organization'].'" type="text"></div>';
echo ' <div class="setting '.($user_settings['organization_maticna'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_organization_maticna'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['organization'] == '' ? 'red' : '').'">';
echo ' <input class="text" name="organization_maticna" value="'.$user_settings['organization_maticna'].'" type="text"></div>'; echo '<label for="organization">'.$lang['srv_gdpr_user_settings_organization'].'*:</label>';
echo '<input class="large w200" id="organization" name="organization" value="'.$user_settings['organization'].'" type="text">';
echo '</div>';
/*echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_organization_davcna'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['organization_maticna'] == '' ? 'red' : '').'">';
echo ' <input class="text" name="organization_davcna" value="'.$user_settings['organization_davcna'].'" type="text"></div>';*/ echo '<label for="organization_maticna">'.$lang['srv_gdpr_user_settings_organization_maticna'].'*:</label>';
echo '<input class="large w200" id="organization_maticna" name="organization_maticna" value="'.$user_settings['organization_maticna'].'" type="text">';
echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>';
// IMA DPO // IMA DPO
echo ' <div id="gdpr_has_dpo" '.($user_settings['type'] != '0' ? ' style="display:none;"' : '').'>'; echo '<div id="gdpr_has_dpo" '.($user_settings['type'] != '0' ? ' class="displayNone"' : '').'>';
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_has_dpo'].':</label></span> '; echo '<div class="setting_holder">';
echo ' <label for="has_dpo_0"><input class="radio" name="has_dpo" id="has_dpo_0" value="0" type="radio" '.($user_settings['has_dpo'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();"> '.$lang['no'].'</label>'; echo '<span class="setting_title">'.$lang['srv_gdpr_user_settings_has_dpo'].':</span>';
echo ' <label for="has_dpo_1"><input class="radio" name="has_dpo" id="has_dpo_1" value="1" type="radio" '.($user_settings['has_dpo'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();"> '.$lang['yes'].'</label>';
echo '<div class="setting_item">';
echo '<input class="radio" name="has_dpo" id="has_dpo_0" value="0" type="radio" '.($user_settings['has_dpo'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();">';
echo '<label for="has_dpo_0"> '.$lang['no'].'</label>';
echo '</div>'; echo '</div>';
echo '<br /><br />'; echo '<div class="setting_item">';
echo '<input class="radio" name="has_dpo" id="has_dpo_1" value="1" type="radio" '.($user_settings['has_dpo'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();">';
echo '<label for="has_dpo_1"> '.$lang['yes'].'</label>';
echo '</div>';
echo '</div>';
echo '</div>'; echo '</div>';
// DPO // DPO
echo ' <div id="gdpr_dpo" '.($user_settings['type'] != '1' && $user_settings['has_dpo'] != '1' ? ' style="display:none;"' : '').'>';
echo ' <p class="bold">'.$lang['srv_gdpr_user_settings_dpo'].':</p>'; echo '<div id="gdpr_dpo" '.($user_settings['type'] != '1' && $user_settings['has_dpo'] != '1' ? ' class="displayNone"' : '').'>';
echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_dpo'].':</p>';
// Opozorilo za obvezna polja // Opozorilo za obvezna polja
if($user_settings['dpo_firstname'] == '' || $user_settings['dpo_lastname'] == '' || $user_settings['dpo_email'] == '') if($user_settings['dpo_firstname'] == '' || $user_settings['dpo_lastname'] == '' || $user_settings['dpo_email'] == '')
echo '<p><span class="red bold">'.$lang['srv_gdpr_user_settings_err'].'</span></p>'; echo '<p class="red setting_text">'.$lang['srv_gdpr_user_settings_err'].'</p>';
else
echo '<br />';
echo ' <div class="setting '.($user_settings['dpo_firstname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_firstname'].':</label></span> '; echo '<div class="setting_horizontal_wrapper">';
echo ' <input class="text" name="dpo_firstname" value="'.$user_settings['dpo_firstname'].'" type="text"></div>';
echo ' <div class="setting '.($user_settings['dpo_lastname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_lastname'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['dpo_firstname'] == '' ? ' red' : '').'">';
echo ' <input class="text" name="dpo_lastname" value="'.$user_settings['dpo_lastname'].'" type="text"></div>'; echo '<label for="dpo_firstname">'.$lang['srv_gdpr_user_settings_dpo_firstname'].':</label>';
echo '<input class="large w200" id="dpo_firstname" name="dpo_firstname" value="'.$user_settings['dpo_firstname'].'" type="text">';
echo '</div>';
echo ' <div class="setting '.($user_settings['dpo_email'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_email'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['dpo_lastname'] == '' ? ' red' : '').'">';
echo ' <input class="text '.(isset($error['dpo_email']) ? ' red' : '').'" name="dpo_email" value="'.$user_settings['dpo_email'].'" type="text"> '.(isset($error['dpo_email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '').'</div>'; echo '<label for="dpo_lastname">'.$lang['srv_gdpr_user_settings_dpo_lastname'].':</label>';
echo '<input class="large w200" id="dpo_lastname" name="dpo_lastname" value="'.$user_settings['dpo_lastname'].'" type="text">';
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_phone'].':</label></span> '; echo '</div>';
echo ' <input class="text" name="dpo_phone" value="'.$user_settings['dpo_phone'].'" type="text"></div>';
echo '</div>'; echo '</div>';
echo '<div class="setting_horizontal_wrapper">';
echo '<div class="setting_holder '.($user_settings['dpo_email'] == '' ? ' red' : '').'">';
echo '<label for="dpo_email">'.$lang['srv_gdpr_user_settings_dpo_email'].':</label>';
echo '<input class="large w200 '.(isset($error['dpo_email']) ? ' red' : '').'" id="dpo_email" name="dpo_email" value="'.$user_settings['dpo_email'].'" type="text"> '.(isset($error['dpo_email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '');
echo '</div>';
echo '<div class="setting_holder ">';
echo '<label>'.$lang['srv_gdpr_user_settings_dpo_phone'].':</label>';
echo '<input class="large w200" name="dpo_phone" value="'.$user_settings['dpo_phone'].'" type="text">';
echo '</div>';
echo '</div>';
echo '</div>';
// Podatki trenutne avtoritete // Podatki trenutne avtoritete
echo '<div id="gdpr_authority_info">'; echo '<div class="setting_holder" id="gdpr_authority_info">';
self::displayGDPRAuthority($user_settings['country']); self::displayGDPRAuthority($user_settings['country']);
echo '</div>'; echo '</div>';
@ -252,7 +299,10 @@ class GDPR{
// Gumb shrani // Gumb shrani
echo '<div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="editGDPRProfile(); return false;"><span>'.$lang['edit1337'].'</span></a></div>'; echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="window.location='.$preklici_url.';return false;">'.$lang['edit1338'].'</button>';
echo '<button class="medium blue" onclick="editGDPRProfile(); return false;">'.$lang['edit1337'].'</button>';
echo '</div>';
// div za prikaz uspešnosti shranjevanja // div za prikaz uspešnosti shranjevanja
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
@ -280,7 +330,7 @@ class GDPR{
$current_authorities[] = $authority; $current_authorities[] = $authority;
} }
echo '<p class="bold">'.$lang['srv_gdpr_user_settings_authority'].':</p>'; echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_authority'].':</p>';
// Prikazemo podatke za vse avtoritete (lahko jih je vec na drzavo) // Prikazemo podatke za vse avtoritete (lahko jih je vec na drzavo)
foreach ($current_authorities as $authority) { foreach ($current_authorities as $authority) {
@ -1155,6 +1205,8 @@ class GDPR{
global $lang; global $lang;
global $site_url; global $site_url;
echo '<fieldset><legend>DPA</legend>';
echo '<p>'.$lang['srv_gdpr_dpa_text'].'</p>'; echo '<p>'.$lang['srv_gdpr_dpa_text'].'</p>';
echo '<ul>'; echo '<ul>';
echo ' <li><a href="'.$site_url.'uploadi/dokumenti/DPA_SLO.pdf">'.$lang['srv_gdpr_dpa_slo'].'</a>,</li>'; echo ' <li><a href="'.$site_url.'uploadi/dokumenti/DPA_SLO.pdf">'.$lang['srv_gdpr_dpa_slo'].'</a>,</li>';
@ -1162,6 +1214,7 @@ class GDPR{
echo '</ul>'; echo '</ul>';
echo '<p>'.$lang['srv_gdpr_dpa_info'].'</p>'; echo '<p>'.$lang['srv_gdpr_dpa_info'].'</p>';
echo '</fieldset>';
} }

22
admin/survey/classes/class.SurveyCopy.php
View File

@ -680,28 +680,6 @@ class SurveyCopy {
$new_missing_values_ids = self::preformCopyTable('srv_missing_values', null, $arr_src['srv_missing_values'], $pre_set); $new_missing_values_ids = self::preformCopyTable('srv_missing_values', null, $arr_src['srv_missing_values'], $pre_set);
// vrednosti - prestavljeno pod srv_if da se ne porusijo notranji pogoji! Patrik - zakaj je bilo to prestavljeno višje??
/*$new_vrednosti_ids = array();
if ( count($new_spremenljivke_ids) > 0) {
foreach( $new_spremenljivke_ids AS $old_spremenljivka_id => $new_spremenljivka_id) {
// vrednosti, tabela srv_vrednost
$src_srv_vrednost = self::arrayfilter($arr_src['srv_vrednost'], 'spr_id', $old_spremenljivka_id);
$pre_set = array('id' => "NULL",
'spr_id' => array('field'=>'spr_id', 'from'=>$new_spremenljivke_ids),
'vre_id' => array('field'=>'vre_id', 'from'=>$new_vrednosti_ids));
$tmp_vrednosti_ids = self :: preformCopyTable('srv_vrednost', 'id', $src_srv_vrednost, $pre_set);
// shranimo stare in nove id-je spremenljivk
if ( count($tmp_vrednosti_ids) > 0 )
foreach ($tmp_vrednosti_ids as $key => $value){
$new_vrednosti_ids[$key] = $value;
}
}
}*/
// splosne nastavitve ankete, tabela srv_survey_misc // splosne nastavitve ankete, tabela srv_survey_misc
$pre_set = array('sid' => "'".$new_survey_id."'"); $pre_set = array('sid' => "'".$new_survey_id."'");
$new_misc_ids = self :: preformCopyTable('srv_survey_misc', null, $arr_src['srv_survey_misc'], $pre_set); $new_misc_ids = self :: preformCopyTable('srv_survey_misc', null, $arr_src['srv_survey_misc'], $pre_set);

138
admin/survey/classes/class.SurveyDataSettingProfiles.php
View File

@ -923,13 +923,6 @@ class SurveyDataSettingProfiles {
(($cp['chartFP']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; (($cp['chartFP']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_chart_frontpage'] ; echo $lang['srv_chart_frontpage'] ;
echo '</label>'; echo '</label>';
// prikaz textovnih odgovorov (vec)
/*echo '<br />';
echo '<label>';
echo '<input id="chartTableMore" name="chartTableMore" type="checkbox" ' .
(($cp['chartTableMore']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_chart_table_more'] ;
echo '</label>';*/
// prikaz nicelnih vrednosti v kroznih grafih // prikaz nicelnih vrednosti v kroznih grafih
echo '<br />'; echo '<br />';
echo '<label>'; echo '<label>';
@ -938,125 +931,6 @@ class SurveyDataSettingProfiles {
echo $lang['srv_chart_pieZeros'] ; echo $lang['srv_chart_pieZeros'] ;
echo '</label>'; echo '</label>';
echo '</fieldset>'; echo '</fieldset>';
# echo '<label>'.$lang['srv_displaydata_showIcon'].'</label>';
# echo '&nbsp;<input id="dataShowIcons0" name="dataShowIcons" type="radio" value="0"' .
# (($cp['dataShowIcons'] != 1) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
# echo '<label for="dataShowIcons0">'.$lang['no'].'</label>';
#
# echo '&nbsp;<input id="dataShowIcons1" name="dataShowIcons" type="radio" value="1"' .
# (($cp['dataShowIcons'] == 1) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
# echo '<label for="dataShowIcons1">'.$lang['yes'].'</label>';
# echo '<br/>';
#Nastavitve za izvoz podatkov - PRESTAVLJENO V SPLOSNE NASTAVITVE ANKETE
/*echo '<fieldset style="width: 43%; float: left;">';
echo '<legend>'.$lang['srv_export_results_settings'].'</legend>';
echo '<label>' . $lang['srv_displaydata_type'] . ': </label>';
echo '<select name="dataPdfType" id="dataPdfType" >';
echo ' <option value="0"'.((int)$cp['dataPdfType'] == 0 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type0'] . '</option>';
echo ' <option value="1"'.((int)$cp['dataPdfType'] == 1 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type1'] . '</option>';
echo ' <option value="2"'.((int)$cp['dataPdfType'] == 2 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type2'] . '</option>';
echo '</select>';
echo Help :: display('displaydata_pdftype');
// ostevilcevanje vprasanj pri izvozih
echo '<br />';
echo '<label>';
echo '<input id="exportDataNumbering" name="exportDataNumbering" type="checkbox" ' .
(($cp['exportDataNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_nastavitveStevilcenje'];
echo '</label>';
// prikaz recnumov respondentov pri izvozih
echo '<br />';
echo '<label>';
echo '<input id="exportDataShowRecnum" name="exportDataShowRecnum" type="checkbox" ' .
(($cp['exportDataShowRecnum']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_export_show_recnum'];
echo '</label>';
// page break med posameznimi respondenti
echo '<br />';
echo '<label>';
echo '<input id="exportDataPB" name="exportDataPB" type="checkbox" ' .
(($cp['exportDataPB']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_export_pagebreak'];
echo '</label>';
// izpusti vprasanja brez odgovora
echo '<br />';
echo '<label>';
echo '<input id="exportDataSkipEmpty" name="exportDataSkipEmpty" type="checkbox" ' .
(($cp['exportDataSkipEmpty']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_export_skip_empty'];
echo '</label>';
// izpusti podvprasanja brez odgovora
echo '<br />';
echo '<label>';
echo '<input id="exportDataSkipEmptySub" name="exportDataSkipEmptySub" type="checkbox" ' .
(($cp['exportDataSkipEmptySub']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_export_skip_empty_sub'];
echo '</label>';
// landscape postavitev izvoza - V DELU
echo '<br />';
echo '<label>';
echo '<input id="exportDataLandscape" name="exportDataLandscape" type="checkbox" ' .
(($cp['exportDataLandscape']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_export_landscape'];
echo '</label>';
// prikaz pogojev pri izvozih
echo '<br />';
echo '<label>';
echo '<input id="exportDataShowIf" name="exportDataShowIf" type="checkbox" ' .
(($cp['exportDataShowIf']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_export_if'];
echo '</label>';
// velikost pisave v izvozih
echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
echo '<select name="exportDataFontSize" id="exportDataFontSize" >';
echo ' <option value="8"'.((int)$cp['exportDataFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
echo ' <option value="10"'.((int)$cp['exportDataFontSize'] == 10 ? ' selected="selected"' : '').'>10</option>';
echo ' <option value="12"'.((int)$cp['exportDataFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
echo '</select>';
echo '</fieldset>';
#Nastavitve za izvoz vprasalnika - PRESTAVLJENO V SPLOSNE NASTAVITVE ANKETE
echo '<fieldset style="width: 43%; float: right; margin-bottom: 40px;">';
echo '<legend>'.$lang['srv_export_survey_settings'].'</legend>';
// ostevilcevanje vprasanj pri izvozih
echo '<label>';
echo '<input id="exportNumbering" name="exportNumbering" type="checkbox" ' .
(($cp['exportNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_nastavitveStevilcenje'];
echo '</label>';
// prikaz pogojev pri izvozih
echo '<br />';
echo '<label>';
echo '<input id="exportShowIf" name="exportShowIf" type="checkbox" ' .
(($cp['exportShowIf']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_export_if'];
echo '</label>';
// velikost pisave v izvozih
echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
echo '<select name="exportFontSize" id="exportFontSize" >';
echo ' <option value="8"'.((int)$cp['exportFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
echo ' <option value="10"'.((int)$cp['exportFontSize'] == 10 ? ' selected="selected"' : '').'>10</option>';
echo ' <option value="12"'.((int)$cp['exportFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
echo '</select>';
// prikaz uvoda pri izvozih
echo '<br />';
echo '<label>';
echo '<input id="exportShowIntro" name="exportShowIntro" type="checkbox" ' .
(($cp['exportShowIntro']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_export_intro'];
echo '</label>';
echo '</fieldset>';*/
//echo '<span class="clr"></span>';
} }
public static function ajax() { public static function ajax() {
@ -1093,17 +967,7 @@ class SurveyDataSettingProfiles {
case 'refreshDropdown': case 'refreshDropdown':
self::DisplayLinkDropdown(); self::DisplayLinkDropdown();
break; break;
/*
case 'show_inspectListSpr':
self::showInspectListSpr();
break;
case 'saveInspectListVars':
self::saveInspectListVars();
break;
case 'displayInspectVars':
self::displayInspectVars();
break;
*/
case 'removeKategoriesProfile': case 'removeKategoriesProfile':
self::removeKategoriesProfile(); self::removeKategoriesProfile();
break; break;

12
admin/survey/classes/class.SurveySkupine.php
View File

@ -85,19 +85,19 @@ class SurveySkupine {
} }
if($spr_id != 0){
// izpis skupin za anketo // izpis skupin za anketo
$vrednosti = $this->getVrednosti($spr_id); $vrednosti = $this->getVrednosti($spr_id);
echo '<table id="groups_table">'; echo '<table id="groups_table" '.(($spr_id == 0) ? 'class="displayNone"' : '').'>';
echo '<tr>'; echo '<tr>';
echo '<th></th>'; echo '<th></th>';
echo '<th>'.$lang['group_name'].'</th>'; echo '<th>'.$lang['group_name'].'</th>';
echo '<th>'.$lang['group_URL'].'</th>'; echo '<th>'.$lang['group_URL'].'</th>';
echo '<th>'.$lang['group_answernumber'].'</th>';
echo '</tr>'; echo '</tr>';
if($spr_id != 0){
foreach($vrednosti as $vrednost){ foreach($vrednosti as $vrednost){
echo '<tr>'; echo '<tr>';
@ -109,12 +109,10 @@ class SurveySkupine {
$link = $vrednost['nice_url']; $link = $vrednost['nice_url'];
echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>'; echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
echo '<td class="right">42 - temp</td>';
echo '</tr>'; echo '</tr>';
} }
echo '</table>';
} }
echo '</table>';
echo '</div>'; echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
@ -327,8 +325,6 @@ class SurveySkupine {
$link = $this->getUrl($spr_id, $vre_id); $link = $this->getUrl($spr_id, $vre_id);
echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.stripslashes($naslov_vrednost).'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>'; echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.stripslashes($naslov_vrednost).'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
} }
echo '<td class="right">42 - temp</td>';
echo '</tr>'; echo '</tr>';
} }
} }

16
admin/survey/script/GDPR.js
View File

@ -145,17 +145,17 @@ function toggleGDPRDPO(){
var has_dpo = $('input[name=has_dpo]:checked').val(); var has_dpo = $('input[name=has_dpo]:checked').val();
if(organization == '1' || has_dpo == '1') if(organization == '1' || has_dpo == '1')
$("#gdpr_dpo").show(); $("#gdpr_dpo").removeClass('displayNone');
else else
$("#gdpr_dpo").hide(); $("#gdpr_dpo").addClass('displayNone');
if(organization == '1'){ if(organization == '1'){
$("#gdpr_organization").show(); $("#gdpr_organization").removeClass('displayNone');
$("#gdpr_has_dpo").hide(); $("#gdpr_has_dpo").addClass('displayNone');
} }
else{ else{
$("#gdpr_organization").hide(); $("#gdpr_organization").addClass('displayNone');
$("#gdpr_has_dpo").show(); $("#gdpr_has_dpo").removeClass('displayNone');
} }
} }
// Prikazemo/skrijemo nastavitve organizacije in dpo-ja (ce je zasebnik) // Prikazemo/skrijemo nastavitve organizacije in dpo-ja (ce je zasebnik)
@ -164,9 +164,9 @@ function toggleGDPRHasDPO(){
var has_dpo = $('input[name=has_dpo]:checked').val(); var has_dpo = $('input[name=has_dpo]:checked').val();
if(has_dpo == '1') if(has_dpo == '1')
$("#gdpr_dpo").show(); $("#gdpr_dpo").removeClass('displayNone');
else else
$("#gdpr_dpo").hide(); $("#gdpr_dpo").addClass('displayNone');
} }
// Nastavimo zahtevo za izbris da je opravljena // Nastavimo zahtevo za izbris da je opravljena

6
admin/survey/script/datepicker.js
View File

@ -17,8 +17,6 @@ function datepicker (selector, event_trigger, datetime) {
dateFormat: "dd.mm.yy", dateFormat: "dd.mm.yy",
showAnim: "slideDown", showAnim: "slideDown",
showOn: "button", showOn: "button",
/*buttonImage: srv_site_url + "admin/survey/script/calendar/calendar.gif",
buttonImageOnly: true,*/
buttonText: "", buttonText: "",
controlType: 'select', controlType: 'select',
oneLine: true, oneLine: true,
@ -42,9 +40,7 @@ function datepicker (selector, event_trigger, datetime) {
changeYear: true, changeYear: true,
dateFormat: "dd.mm.yy", dateFormat: "dd.mm.yy",
showAnim: "slideDown", showAnim: "slideDown",
showOn: "button", showOn: "both",
/*buttonImage: srv_site_url + "admin/survey/script/calendar/calendar.gif",*/
/*buttonImageOnly: true,*/
buttonText: "", buttonText: "",
onSelect: function(selected,evnt) { onSelect: function(selected,evnt) {
if (event_trigger) { if (event_trigger) {

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

@ -4420,11 +4420,14 @@ function setExpirePermanent() {
$.post('ajax.php?a=setExpirePermanent', {anketa:srv_meta_anketa_id, makePermanent:makePermanent}, function (data) { $.post('ajax.php?a=setExpirePermanent', {anketa:srv_meta_anketa_id, makePermanent:makePermanent}, function (data) {
data = jQuery.parseJSON(data); data = jQuery.parseJSON(data);
if (data.permanent == '0') { if (data.permanent == '0') {
// pokažemo koledarcek // enablamo polje
$("#expire_img_manual1").show(); $("#expireManual1").removeClass("disabled");
$(".ui-datepicker-trigger").removeClass("displayNone");
} else { } else {
// skrijemo koledarcek // disablamo polje
$("#expire_img_manual1").hide(); $("#expireManual1").addClass("disabled");
$(".ui-datepicker-trigger").addClass("displayNone");
} }
$("#expireManual1").val(data.expire); $("#expireManual1").val(data.expire);
}); });
@ -5562,3 +5565,38 @@ function genericAlertPopupClose(){
$('#fade').fadeOut('slow'); $('#fade').fadeOut('slow');
$('#popup_note').removeClass('popup_orange'); $('#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
admin/survey/script/skupine.js
View File

@ -5,7 +5,7 @@ function add_skupina(skupine){
var text = $('input[name=skupina]').val(); var text = $('input[name=skupina]').val();
$.post('ajax.php?t=skupine&a=add_skupina', {anketa: srv_meta_anketa_id, spr_id:spr_id, text:text, skupine:skupine}, function(response){ $.post('ajax.php?t=skupine&a=add_skupina', {anketa: srv_meta_anketa_id, spr_id:spr_id, text:text, skupine:skupine}, function(response){
window.location.reload(); $('#groups_table').removeClass('displayNone');
$('#groups_table tr:last').after(response); $('#groups_table tr:last').after(response);
$('input[name=skupina]').val('').focus(); $('input[name=skupina]').val('').focus();
}); });

5
lang/1.php
View File

@ -1144,7 +1144,6 @@ $lang = array (
"group_new" => "Nova skupina", "group_new" => "Nova skupina",
"group_name" => "Ime skupine", "group_name" => "Ime skupine",
"group_URL" => "URL Povezava", "group_URL" => "URL Povezava",
"group_answernumber" => "Število odgovorov",
"admin_edit_groups" => "Urejanje skupin za", "admin_edit_groups" => "Urejanje skupin za",
"admin_edit_groups_no" => "Ni skupin. Dodajte jih.", "admin_edit_groups_no" => "Ni skupin. Dodajte jih.",
"mass_select_group" => "Izberite skupino(e) uporabnikov", "mass_select_group" => "Izberite skupino(e) uporabnikov",
@ -7709,11 +7708,11 @@ $lang = array (
'srv_gdpr_general_settings' => "Splošne GDPR nastavitve", 'srv_gdpr_general_settings' => "Splošne GDPR nastavitve",
'srv_gdpr_general_settings_warning' => "Prosimo izpolnite osebne podatke GDPR profila!", 'srv_gdpr_general_settings_warning' => "Prosimo izpolnite osebne podatke GDPR profila!",
'srv_gdpr_user_settings' => "Splošne nastavitve", 'srv_gdpr_user_settings' => "Splošne nastavitve",
'srv_gdpr_user_settings_title' => "GDPR nastavitve profila", 'srv_gdpr_user_settings_title' => "Splošne GDPR nastavitve",
'srv_gdpr_user_settings_desc1' => "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.", 'srv_gdpr_user_settings_desc1' => "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.",
'srv_gdpr_user_settings_desc2' => "V skladu s tem je na vaši strani, kot izvajalcu ankete in s tem upravljalcu osebnih podatkov, <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">odgovornost</span></a>, da izvršite omenjene zahteve, ki jih na vaših anketah podajo respondenti (zahteva za izbris, vpogled ali spremembo osebnih in/ali anketnih podatkov).", 'srv_gdpr_user_settings_desc2' => "V skladu s tem je na vaši strani, kot izvajalcu ankete in s tem upravljalcu osebnih podatkov, <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">odgovornost</span></a>, da izvršite omenjene zahteve, ki jih na vaših anketah podajo respondenti (zahteva za izbris, vpogled ali spremembo osebnih in/ali anketnih podatkov).",
'srv_gdpr_user_settings_desc3' => "Prosimo vas, da izpolnite spodnji obrazec s svojimi podatki. Podatke potrebujemo za pripravo informacij, ki morajo biti v skladu z GDPR na voljo posamezniku (respondentu). Če gre za organizacijo, vnesite tudi podatke o pooblaščeni osebi za varstvo osebnih podatkov (<a href=\"https://www.uradni-list.si/e-bilten/novica/pooblascena-oseba-za-varstvo-podatkov\" target=\"_blank\"><span class=\"bold\">DPO</span></a>). Vnesene podatke bomo uporabili zgolj za namene procesiranja zahtevkov.", 'srv_gdpr_user_settings_desc3' => "Prosimo vas, da izpolnite spodnji obrazec s svojimi podatki. Podatke potrebujemo za pripravo informacij, ki morajo biti v skladu z GDPR na voljo posamezniku (respondentu). Če gre za organizacijo, vnesite tudi podatke o pooblaščeni osebi za varstvo osebnih podatkov (<a href=\"https://www.uradni-list.si/e-bilten/novica/pooblascena-oseba-za-varstvo-podatkov\" target=\"_blank\"><span class=\"bold\">DPO</span></a>). Vnesene podatke bomo uporabili zgolj za namene procesiranja zahtevkov.",
'srv_gdpr_user_settings_err' => "Polja \"Ime\", \"Priimek\" in \"E-pošta\" so obvezna!", 'srv_gdpr_user_settings_err' => "Polja označena z * so obvezna.",
'srv_gdpr_user_settings_err2' => "Polji \"Ime organizacije\" in \"Matična številka\" sta obvezni!", 'srv_gdpr_user_settings_err2' => "Polji \"Ime organizacije\" in \"Matična številka\" sta obvezni!",
'srv_gdpr_user_settings_type' => "Organizacija ali zasebnik", 'srv_gdpr_user_settings_type' => "Organizacija ali zasebnik",
'srv_gdpr_user_settings_type_0' => "Zasebnik", 'srv_gdpr_user_settings_type_0' => "Zasebnik",

5
lang/2.php
View File

@ -1127,7 +1127,6 @@ $lang = array (
"group_new" => "New group", "group_new" => "New group",
"group_name" => "Group name", "group_name" => "Group name",
"group_URL" => "URL Address", "group_URL" => "URL Address",
"group_answernumber" => "Number of answers",
"admin_edit_groups" => "Editing groups for", "admin_edit_groups" => "Editing groups for",
"admin_edit_groups_no" => "There are no groups. You should add some", "admin_edit_groups_no" => "There are no groups. You should add some",
"mass_select_group" => "Select group(s) of users", "mass_select_group" => "Select group(s) of users",
@ -7596,11 +7595,11 @@ $lang = array (
'srv_gdpr_general_settings' => "General GDPR settings", 'srv_gdpr_general_settings' => "General GDPR settings",
'srv_gdpr_general_settings_warning' => "Please fill in your personal data in your GDPR profile!", 'srv_gdpr_general_settings_warning' => "Please fill in your personal data in your GDPR profile!",
'srv_gdpr_user_settings' => "General settings", 'srv_gdpr_user_settings' => "General settings",
'srv_gdpr_user_settings_title' => "GDPR profile settings", 'srv_gdpr_user_settings_title' => "General GDPR settings",
'srv_gdpr_user_settings_desc1' => "Since May 25th, 2018, a new regulation on the protection of personal data (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>) is in force. New regulation also defines the method of collecting data and provides options for respondents, such as deletion, insight and modifying collected personal and/or survey data.", 'srv_gdpr_user_settings_desc1' => "Since May 25th, 2018, a new regulation on the protection of personal data (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>) is in force. New regulation also defines the method of collecting data and provides options for respondents, such as deletion, insight and modifying collected personal and/or survey data.",
'srv_gdpr_user_settings_desc2' => "Accordingly, it is your <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">responsibility</span></a> to comply with these requirements, which respondents provide in your surveys (request for the deletion, insight or modification of personal and/or survey data).", 'srv_gdpr_user_settings_desc2' => "Accordingly, it is your <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">responsibility</span></a> to comply with these requirements, which respondents provide in your surveys (request for the deletion, insight or modification of personal and/or survey data).",
'srv_gdpr_user_settings_desc3' => "Please fill in the form below with your details. We need the data to produce the information that must be made available to the individual (respondent) in accordance with the GDPR. In case you are an organization, enter also the data about the data protection officer (<a href=\"https://edps.europa.eu/data-protection/data-protection/reference-library/data-protection-officer-dpo_en\" target=\"_blank\"><span class=\"bold\">DPO</span></a>), authorized person for the protection of personal data. We will only use the data entered for the purpose of processing requests.", 'srv_gdpr_user_settings_desc3' => "Please fill in the form below with your details. We need the data to produce the information that must be made available to the individual (respondent) in accordance with the GDPR. In case you are an organization, enter also the data about the data protection officer (<a href=\"https://edps.europa.eu/data-protection/data-protection/reference-library/data-protection-officer-dpo_en\" target=\"_blank\"><span class=\"bold\">DPO</span></a>), authorized person for the protection of personal data. We will only use the data entered for the purpose of processing requests.",
'srv_gdpr_user_settings_err' => "Fields \"Name\" and \"Registration numbe\" are mandatory!", 'srv_gdpr_user_settings_err' => "Fields marked with * are mandatory.",
'srv_gdpr_user_settings_err2' => "Fields \"Organization name\" \"Surname\" and \"Email\" are mandatory!", 'srv_gdpr_user_settings_err2' => "Fields \"Organization name\" \"Surname\" and \"Email\" are mandatory!",
'srv_gdpr_user_settings_type' => "Organization or individual", 'srv_gdpr_user_settings_type' => "Organization or individual",
'srv_gdpr_user_settings_type_0' => "Individual", 'srv_gdpr_user_settings_type_0' => "Individual",

2807
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

15
resources/sass/admin_new/basic/icons/icons.scss
View File

@ -50,6 +50,21 @@ a.faicon{
} }
} }
//Wrapper (za ikone desno ob elementih)
div.icon_holder {
display: flex;
flex-direction: row;
box-sizing: border-box;
align-items: center;
span.faicon,
a.faicon,
button.ui-datepicker-trigger{
margin-left: 12px;
}
}
@import "radio"; @import "radio";
@import "standard"; @import "standard";

14
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -596,17 +596,3 @@ span.faicon.minus_circle::before{
span.faicon.calendar_icon::before{ span.faicon.calendar_icon::before{
content: "\f073"; content: "\f073";
} }
//Wrapper (za ikone desno ob elementih)
div.icon_holder {
display: flex;
flex-direction: row;
box-sizing: border-box;
align-items: center;
span.faicon,
a.faicon{
margin-left: 12px;
}
}

4
resources/sass/admin_new/basic/typography.scss
View File

@ -12,4 +12,8 @@ p,span {
&.italic { &.italic {
font-style: italic; font-style: italic;
} }
&.bold {
font-weight: $extra-bold;
}
} }

14
resources/sass/admin_new/components/form/button.scss
View File

@ -112,3 +112,17 @@ div.button_holder {
} }
} }
} }
//Trigger button za koledar
button.ui-datepicker-trigger {
cursor: pointer;
transition: 0.3s;
min-width: auto;
color: $blue;
&:hover {
color: darken($blue, 3%);
}
border: none;
background: none;
padding: 0;
}

4
resources/sass/admin_new/components/form/dropdown.scss
View File

@ -48,6 +48,10 @@ select.dropdown {
} }
} }
&.w200 {
width: 200px;
}
&:focus { &:focus {
outline-style: none; outline-style: none;
box-shadow: none; box-shadow: none;

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

@ -17,6 +17,19 @@ fieldset{
text-transform: uppercase; text-transform: uppercase;
} }
p.setting_text {
margin-bottom: 16px;
}
.setting_horizontal_wrapper {
display: flex;
flex-direction: row;
.setting_holder {
margin-right: 17px;
}
}
.setting_holder { .setting_holder {
margin-bottom: 16px; margin-bottom: 16px;
display: flex; display: flex;
@ -26,7 +39,8 @@ fieldset{
margin-top: 0; margin-top: 0;
} }
&:last-of-type{ &:last-of-type,
&.no_margin{
margin-bottom: 0; margin-bottom: 0;
} }
@ -39,10 +53,38 @@ fieldset{
line-height: 15px; line-height: 15px;
color: $very-dark-gray; color: $very-dark-gray;
text-align: right; text-align: right;
&#anketa_polnoIme_chars{
width: 400px;
}
&#anketa_akronim_chars,
&#anketa_note_chars{
width: 800px;
}
} }
&.indent { &.indent {
margin-left: 27px; margin-left: 27px;
} }
&.red {
label {
color: red;
}
input {
&[type="text"] {
border: 1px solid red;
}
}
}
}
}
div#gdpr_nastavitve {
display:flex;
justify-content: center;
fieldset {
width: 1060px;
} }
} }

35
resources/sass/admin_new/components/form/input.scss
View File

@ -14,15 +14,19 @@ input {
&[type="text"] { &[type="text"] {
border: 1px solid $dark-gray; border: 1px solid $dark-gray;
&.borderless {
border: none;
border-radius: 0;
margin-top: 0;
}
box-sizing: border-box; box-sizing: border-box;
border-radius: 2px; border-radius: 2px;
width: 245px; width: 245px;
&#anketa_polnoIme{
width: 400px;
}
&#anketa_akronim{
width: 800px;
}
&.w200 {
width: 200px;
}
margin-top: 4px; margin-top: 4px;
font-family: $font_family; font-family: $font_family;
@ -120,22 +124,3 @@ input {
pointer-events: none; pointer-events: none;
} }
} }
// Za prikaz ikon "v" input polju
div.mock-input-holder {
display: flex;
flex-direction: row;
box-sizing: border-box;
align-items: center;
border: 1px solid $dark-gray;
margin-top: 4px;
border-radius: 2px;
width: 245px;
span.faicon,
a.faicon{
margin: 0 8px;
}
}

5
resources/sass/admin_new/components/form/textarea.scss
View File

@ -28,4 +28,9 @@ textarea {
border-color: $blue; border-color: $blue;
} }
&#anketa_note{
width: 800px;
height: 120px;
}
} }