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

[Redizajn 1KA] Urejanje --> Nastavitve --> Obveščanje --> O izbrisu ankete - v2

Browse Source
This commit is contained in:
tejagerjovic 2021-12-23 03:31:10 +01:00
parent dfddffa5ee
commit 0d8ddf5f46
7 changed files with 106 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
admin/survey/SurveyAdminSettings.php
View File

@ -3186,6 +3186,9 @@ class SurveyAdminSettings {
global $admin_type;
$anketa = $this->anketa;
$preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/");
$preklici_url = "'". $site_url . $preklici_url . "'";
/* moznosti:
* 'complete' -> obvsetilo o izpolnjeni anketi (respondent, respondent iz cms, avtor + dostop, dodatn-emaili)
@ -3259,7 +3262,7 @@ class SurveyAdminSettings {
// respondent iz cms ne prikazemo ce gre za volitve
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
echo '<p><input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); chnage_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>';
echo '<p><input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>';
echo '<span id="label_alert_finish_respondent_cms">';
$this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1));
echo '</span></p>'. "\n";
@ -3517,25 +3520,36 @@ class SurveyAdminSettings {
//Obveščanje ob izbrisu ankete
echo '<fieldset>';
echo '<legend>' . $lang['srv_alert_surveydelete'] . '</legend>';
echo '<p>'.$lang['srv_alert_surveydelete_text'].'</p>';
echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . ($rowAlert['delete_author'] == 1 ? ' checked' : '') . '><label for="alert_delete_author"></label>';
echo '<span id="label_alert_delete_author">';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_alert_surveydelete_text'].'</span>';
echo '<div class="setting_item">';
echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . ($rowAlert['delete_author'] == 1 ? ' checked' : '') . '>';
$this->display_alert_label('delete_author',($rowAlert['delete_author'] == 1));
echo '<div class="setting_holder">';
echo '<input type="checkbox" name="alert_delete_other" id="alert_delete_other" value="1"' . (($rowAlert['delete_other'] == 1 || ($rowAlert['delete_other_emails'] && $rowAlert['delete_other'] != 0)) ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'delete_other\');"><label for="alert_delete_other">' . $lang['email_prejemniki'] . $lang['email_one_per_line'] . '</label>';
echo '</div>';
echo '<div class="setting_holder">';
echo '<p id="alert_holder_delete_other_emails" '.($rowAlert['delete_other'] == 0 ? 'class="displayNone"' : '' ).'>';
echo '<label for="alert_delete_other_emails">' . $lang['email'] . ':</label>';
echo '<div class="setting_item">';
echo '<input type="checkbox" name="alert_delete_other" id="alert_delete_other" value="1"' . (($rowAlert['delete_other'] == 1 || ($rowAlert['delete_other_emails'] && $rowAlert['delete_other'] != 0)) ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'delete_other\');"><label for="alert_delete_other">' . $lang['email_prejemniki'] .'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<div class="setting_holder '.($rowAlert['delete_other'] == 0 ? 'displayNone' : '' ).'" id="alert_holder_delete_other_emails">';
echo '<label for="alert_delete_other_emails">' . $lang['email_prejemniki_one_per_line'] . ':</label>';
echo '<textarea name="alert_delete_other_emails" id="alert_delete_other_emails" style="height:100px" >' . $rowAlert['delete_other_emails'] . '</textarea>';
echo '</div>';
echo '</div>';
echo '</div>';
echo '<div id="obvescanje_sidebyside_holder">';
echo '<div id="obvescanje_sidebyside_left">';
echo '<p class="bold caps bottom16">'.$lang['message_content'].'</p>';
echo '<div style="float:left; width:auto;">';
echo '<div class="setting_holder">';
echo '<label for="subject">' . $lang['subject'] . ': </label>';
echo '<input type="text" class="large wauto" id="alert_delete_subject" name="alert_delete_subject" value="' . ($rowAlert['delete_subject'] ? $rowAlert['delete_subject'] : $lang['srv_alert_delete_subject']) . '"/>';
@ -3553,26 +3567,29 @@ class SurveyAdminSettings {
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
echo '<div class="setting_holder">';
echo '<label for="alert_delete_text">' . $lang['message'] . ':</label>';
echo '<label class="bottom4" for="alert_delete_text">' . $lang['message'] . ':</label>';
echo '<textarea name="alert_delete_text" id="alert_delete_text" rows="3" >' . $text . '</textarea>';
echo '</div>';
echo '</div>';
//Navodila na desni
echo '<div style="float:left; width:auto; max-width:550px; margin-left:10px;">';
echo '<div id="obvescanje_sidebyside_right">';
echo '<div class="message_instructions">';
echo $lang['srv_alert_instruction1'];
echo $lang['srv_alert_instruction5'];
echo '</div>';
echo '</div>';
echo '</fieldset>';
echo '</div>';
echo '</fieldset>';
echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="document.alertanketa_' . $rowS['id'] . '.submit(); return false;"><span>';
echo $lang['edit1337'] . '</span></a></div></span>';
echo '<div class="clr"></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="document.alertanketa_' . $rowS['id'] . '.submit(); return false;">'.$lang['edit1337'].'</button>';
echo '</div>';
if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>';

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

@ -2096,9 +2096,9 @@ function toggleStatusAlertOtherCheckbox(element) {
// alert_expire_other
if ( $('#alert_'+element).is(':checked') )
{
$('#alert_holder_'+element+'_emails').show();
$('#alert_holder_'+element+'_emails').removeClass('displayNone');
} else {
$('#alert_holder_'+element+'_emails').hide(); }
$('#alert_holder_'+element+'_emails').addClass('displayNone'); }
}
@ -3250,7 +3250,7 @@ function change_alert_respondent(what,el) {
var checked = $("#alert_"+what).is(':checked');
$("span#label_alert_"+what).load('ajax.php?a=change_alert_respondent', {anketa: srv_meta_anketa_id, checked: checked, what:what});
}
function chnage_alert_instruction(el) {
function change_alert_instruction(el) {
var checked = el.is(':checked');
if (checked) {
$("#alert_respondent_cms_instruction").show();

1
lang/1.php
View File

@ -2593,6 +2593,7 @@ $lang = array (
"e-mail_name_surname" => "e-maile, imena in priimke",
"email_prejemniki" => "Dodatni prejemniki ",
"email_one_per_line" => "<span class=\"red\" >(Vsak e-po&#154;tni naslov vnesite v svojo vrstico.)</span>",
"email_prejemniki_one_per_line" => "E-mail naslovi dodatnih prejemnikov (vsak e-poštni naslov vnesite v svojo vrstico)",
// "email_one_per_line" => "Vnesite e-po&#353;tne naslove, po enega v vrstico.",
"tab_delimited_one_per_line" => "Vnesite e-po&#154;tne naslove, imena, in priimke, lo&#269;ene s tabulatorji (tab-delimited); po eno osebo v vrstico.",
"you_are_on_page" => "Nahaja&#154; se na strani",

1
lang/2.php
View File

@ -2569,6 +2569,7 @@ $lang = array (
"only_e-mails" => "just emails",
"e-mail_name_surname" => "emails, first names and last names",
"email_prejemniki" => "Additional recipients ",
"email_prejemniki_one_per_line" => "E-mail addresses of additional recipients (enter one e-mail address per line)",
"email_one_per_line" => "<span class=\"red\" >(Please enter one email address per line.)</span>",
// "email_one_per_line" => "Please insert e-mails; one per line",
"tab_delimited_one_per_line" => "Please insert tab-delimited emails, first names and last names; one per line",

31
public/css/admin_new.css
View File

@ -7333,22 +7333,41 @@ fieldset .setting_holder span.charalimit#anketa_akronim_chars, fieldset .setting
fieldset .setting_holder.indent {
margin-left: 27px;
}
fieldset .setting_holder#alert_holder_delete_other_emails {
margin-left: 24px;
}
fieldset .setting_holder.red label {
color: red;
}
fieldset .setting_holder.red input[type=text] {
border: 1px solid red;
}
fieldset .message_instructions {
background-color: #F8F8F8;
border: 1px solid #E5E5E5;
box-sizing: border-box;
fieldset label.bottom4 {
margin-bottom: 4px;
}
fieldset ul {
margin-block-start: 0;
margin-block-end: 0;
padding-inline-start: 25px;
}
fieldset #obvescanje_sidebyside_holder {
display: flex;
flex-direction: row;
}
fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_left {
box-sizing: border-box;
flex-shrink: 0;
}
fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right {
flex-grow: 1;
}
fieldset #obvescanje_sidebyside_holder .message_instructions {
background-color: #F8F8F8;
border: 1px solid #E5E5E5;
box-sizing: border-box;
padding: 16px;
margin-left: 32px;
}
select.dropdown {
border: 1px solid #C4C4C4;
@ -7437,6 +7456,10 @@ textarea#anketa_note, textarea#addusers, textarea#addusers_note {
width: 800px;
height: 120px;
}
textarea#alert_delete_other_emails {
width: 538px;
height: 100px;
}
textarea.gdpr_requests_comment {
width: 200px;
height: 60px;

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

@ -93,6 +93,10 @@ fieldset{
margin-left: 27px;
}
&#alert_holder_delete_other_emails {
margin-left: 24px;
}
&.red {
label {
color: red;
@ -103,17 +107,43 @@ fieldset{
}
}
}
}
.message_instructions {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
label {
&.bottom4 {
margin-bottom: 4px;
}
}
ul {
margin-block-start: 0;
margin-block-end: 0;
padding-inline-start: 25px;
}
// Obveščanje
#obvescanje_sidebyside_holder {
display:flex;
flex-direction: row;
#obvescanje_sidebyside_left {
box-sizing: border-box;
flex-shrink: 0;
}
#obvescanje_sidebyside_right {
flex-grow: 1;
}
.message_instructions {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
padding: 16px;
margin-left: 32px;
}
}
}

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

@ -35,6 +35,11 @@ textarea {
height: 120px;
}
&#alert_delete_other_emails{
width: 538px;
height: 100px;
}
&.gdpr_requests_comment {
width: 200px;
height: 60px;