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

[Redizajn 1KA] - Urejanje --> Nastavitve --> Obveščanje o izteku ankete - v1

Browse Source
This commit is contained in:
tejagerjovic 2022-01-05 00:10:30 +01:00
parent d2cb71669c
commit bb575e509e
5 changed files with 105 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
admin/survey/SurveyAdminSettings.php
View File

@ -3362,42 +3362,61 @@ class SurveyAdminSettings {
} else if ($tab == 'expired') {
global $site_path, $global_user_id;
//echo '<h4>' . $lang['srv_alert_expired_title'] . '</h4>'."\n";
//Obveščanje o izteku ankete
echo ' <form name="alertanketa_' . $anketa . '" action="ajax.php?a=editanketaalert&m='.$tab.'" method="post" autocomplete="off">' . "\n";
echo ' <input type="hidden" name="anketa" value="' . $anketa . '" />' . "\n";
echo ' <input type="hidden" name="location" value="' . $_GET['a'] . '" />' . "\n";
echo ' <input type="hidden" name="m" value="' . $_GET['m'] . '" />' . "\n";
echo ' <fieldset>'. "\n";
echo ' <legend>' . $lang['srv_alert_expired_time_title'] . '</legend>'. "\n";
echo $lang['srv_alert_expire_days1'];
echo '<input type="text" id="alert_expire_days" name="alert_expire_days" value="'.$rowAlert['expire_days'].'" size="3" >';
echo $lang['srv_alert_expire_days2'];
echo $lang['srv_alert_expire_expire_at'] . $rowS['expire'].'<span>'.$lang['at'].'00:00</span><br/>';
echo $lang['srv_alert_expire_note_at'] . '<span id="calc_alert_expire">'.$rowAlert['newdate'].'</span><span>'.$lang['at'].'01:00</span><br/>';
echo ' </fieldset>';
echo '<br />';
echo ' <fieldset>'. "\n";
echo ' <legend>' . $lang['srv_alert_prejemnik'] . '</legend>'. "\n";
echo '<p><input type="checkbox" name="alert_expire_author" id="alert_expire_author" value="1" onChange="change_alert_respondent(\'expire_author\', $(this));return false;"' . ($rowAlert['expire_author'] == 1 ? ' checked' : '') . '>';
echo '<span id="label_alert_expire_author">';
$this->display_alert_label('expire_author',($rowAlert['expire_author'] == 1));
echo '</span></p>';
echo '<p><input type="checkbox" name="alert_expire_other" id="alert_expire_other" value="1"' . (($rowAlert['expire_other'] == 1 || ($rowAlert['expire_other_emails'] && $rowAlert['expire_other'] != 0)) ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'expire_other\');"><label for="alert_expire_other">' . $lang['email_prejemniki'] . $lang['email_one_per_line'] . '</label></p>';
echo '<p id="alert_holder_expire_other_emails" '.($rowAlert['expire_other'] == 0 ? 'class="displayNone"' : '' ).'>';
echo '<label for="alert_expire_other_emails">' . $lang['email'] . ':</label>' .
' <textarea name="alert_expire_other_emails" id="alert_expire_other_emails" style="height:100px" >' . $rowAlert['expire_other_emails'] . '</textarea>' .
' </p>';
echo ' </fieldset>';
echo '</fieldset>';
echo '<br />';
echo '<fieldset>';
echo '<legend>' . $lang['srv_alert_oblika'] . '</legend>';
echo '<div style="float:left; width:auto;">';
echo '<p><label for="subject">' . $lang['subject'] . ': <input type="text" id="alert_expire_subject" name="alert_expire_subject" value="' . ($rowAlert['expire_subject'] ? $rowAlert['expire_subject'] : $lang['srv_alert_expire_subject']) . '" size="90"/></label></p>';
echo ' <fieldset>';
echo ' <legend>' . $lang['srv_alert_expired_2'] . '</legend>';
echo '<div class="setting_holder">';
echo '<label for="alert_expire_days">'.$lang['srv_alert_expire_days'].':</label>';
echo '<input type="text" class="large w200" id="alert_expire_days" name="alert_expire_days" value="'.$rowAlert['expire_days'].'" size="3" >';
echo '</div>';
echo '<div class="setting_holder">';
echo '<p class="bold">'. $lang['srv_alert_expire_expire_at'] .'</p>';
echo $rowS['expire'].$lang['at'].'00:00';
echo '</div>';
echo '<div class="setting_holder">';
echo '<p class="bold">'. $lang['srv_alert_expire_note_at'] .'</p>';
echo '<p><span id="calc_alert_expire">'.$rowAlert['newdate'].'</span><span>'.$lang['at'].'01:00</span></p>';
echo '</div>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_alert_expire_prejemniki'].'</span>';
echo '<div class="setting_item" id="label_alert_expire_author">';
echo '<input type="checkbox" name="alert_expire_author" id="alert_expire_author" value="1" onChange="change_alert_respondent(\'expire_author\', $(this));return false;"' . ($rowAlert['expire_author'] == 1 ? ' checked' : '') . '>';
$this->display_alert_label('expire_author',($rowAlert['expire_author'] == 1));
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="checkbox" name="alert_expire_other" id="alert_expire_other" value="1"' . (($rowAlert['expire_other'] == 1 || ($rowAlert['expire_other_emails'] && $rowAlert['expire_other'] != 0)) ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'expire_other\');"><label for="alert_expire_other">' . $lang['email_prejemniki'] .'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<div class="setting_holder alert_other_emails '.($rowAlert['expire_other'] == 0 ? 'displayNone' : '' ).'" id="alert_holder_expire_other_emails">';
echo '<label for="alert_expire_other_emails">' . $lang['email_prejemniki_one_per_line'] . ':</label>';
echo '<textarea class="alert_other_emails" name="alert_expire_other_emails" id="alert_expire_other_emails" >' . $rowAlert['expire_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 class="setting_holder">';
echo '<label for="subject">' . $lang['subject'] . ': </label>';
echo '<input type="text" class="large wauto" id="alert_delete_subject" id="alert_expire_subject" name="alert_expire_subject" value="' . ($rowAlert['expire_subject'] ? $rowAlert['expire_subject'] : $lang['srv_alert_expire_subject']) . '"/>';
echo '</div>';
if ($rowAlert['expire_text'] != ''){
$text = $rowAlert['expire_text'];
@ -3410,28 +3429,41 @@ class SurveyAdminSettings {
}
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
echo ' <p><label for="alert_expire_text">' . $lang['text'] . ':</label>';
echo ' <textarea name="alert_expire_text" id="alert_expire_text" rows="3" >' . $text . '</textarea>';
echo ' </p>';
echo '</div>';
echo '<div style="float:left; width:auto; max-width:550px; margin-left:10px;">';
echo '<div id="div_error">';
echo $lang['srv_alert_instruction1'];
echo $lang['srv_alert_instruction4'];
echo '<div class="setting_holder">';
echo '<label class="bottom4" for="alert_expire_text">' . $lang['message'] . ':</label>';
echo '<textarea name="alert_expire_text" id="alert_expire_text">' . $text . '</textarea>';
echo '</div>';
echo '</div>';
//Navodila na desni
echo '<div id="obvescanje_sidebyside_right">';
echo '<div class="message_instructions">';
echo '<p class="bold caps bottom16">'.$lang['srv_alert_instruction1'].'</p>';
echo '<p class="bold bottom16">'.$lang['srv_alert_instruction1a'].':</p>';
echo '<p class="bottom16">'.$lang['srv_alert_instruction4'].'</p>';
echo '</div>';
echo '</div>';
echo '</div>';
echo '</fieldset>';
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>';
echo '</div>';
echo '</div>';
echo '</fieldset>';
echo '<br />';
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>';
if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>';
}
echo '</form>';
} else if ($tab == 'active') {
}
// Obveščanje o spremembi aktivnosti ankete
else if ($tab == 'active') {
//echo '<h4>' . $lang['srv_alert_active_title'] . '</h4>'."\n";
echo ' <form name="alertanketa_' . $anketa . '" action="ajax.php?a=editanketaalert&m='.$tab.'" method="post" autocomplete="off">' . "\n";
echo ' <input type="hidden" name="anketa" value="' . $anketa . '" />' . "\n";
@ -3535,9 +3567,9 @@ class SurveyAdminSettings {
echo '<div class="setting_item">';
echo '<div class="setting_holder '.($rowAlert['delete_other'] == 0 ? 'displayNone' : '' ).'" id="alert_holder_delete_other_emails">';
echo '<div class="setting_holder alert_other_emails '.($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 '<textarea class="alert_other_emails" name="alert_delete_other_emails" id="alert_delete_other_emails">' . $rowAlert['delete_other_emails'] . '</textarea>';
echo '</div>';
echo '</div>';
@ -3562,11 +3594,12 @@ class SurveyAdminSettings {
$text = nl2br($lang['srv_alert_delete_text'].$signature);
}
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
echo '<div class="setting_holder">';
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 '<textarea name="alert_delete_text" id="alert_delete_text">' . $text . '</textarea>';
echo '</div>';
echo '</div>';
@ -5148,12 +5181,11 @@ class SurveyAdminSettings {
// avtor ankete
if($forma) {
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 || $isChecked) ? ' checked' : '') . '>';
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this));return false;"' . (($isChecked) ? ' checked' : '') . '>';
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_author2'].'</label>';
}
else {
//echo $rowAlert['delete_author'];
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 || $isChecked)? ' checked' : '') . '>';
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this));return false;"' . (($isChecked) ? ' checked' : '') . '>';
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_author'].'</label>';
}
if ($isChecked) {

6
lang/1.php
View File

@ -3605,10 +3605,10 @@ $lang = array (
"srv_alert_active_text0" => "Pozdravljeni,<br/><br/>obveščamo vas, da je bila anketa \"[SURVEY]\" deaktivirana!<br/><br/>Povezava: [URL]",
"srv_alert_active_text1" => "Pozdravljeni,<br/><br/>obveščamo vas, da je bila anketa \"[SURVEY]\" aktivirana!<br/><br/>Povezava: [URL]",
"srv_alert_delete_text" => "Spoštovani,<br/><br/>obveščamo vas, da je bila anketa \"[SURVEY]\" izbrisana!",
"srv_alert_expire_days1" => "Avtomatsko pošlji obvestilo ",
"srv_alert_expire_days2" => " dni pred potekom ankete. Vrednost 0 pomeni, da bo obvestilo bo poslano isti dan.<br/>",
"srv_alert_expire_days" => "Število dni pred potekom ankete, ko je obvestilo o izteku ankete avtomatsko poslano",
"srv_alert_expire_expire_at" => " Anketa poteče: ",
"srv_alert_expire_note_at" => " Obvestilo bo poslano: ",
"srv_alert_expire_prejemniki" => "Obvestilo o izteku ankete prejmejo naslednji prejemniki:",
"srv_alert_instruction1" => "Navodila za oblikovanje sporočil",
"srv_alert_instruction1a" => "Legenda spremenljivk iz baze",
"srv_alert_instruction1b" => "V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi",
@ -3625,7 +3625,7 @@ $lang = array (
"srv_alert_instruction_sample" => "<p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#</p>",
"srv_alert_instruction_available" => "<p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p>",
"srv_alert_instruction3" => "[SURVEY] - ime ankete<br/> [DATE] - datum<br/> [SITE] - URL do ankete<br/> [URL] -> URL do urejanja ankete<br/><br/></p><p class=\"bold\">Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #. </p><p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#<br/></p><p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p><p>",
"srv_alert_instruction4" => "<p> [SURVEY] - ime ankete<br/> [DATE] - datum<br/> [SITE] - URL do ankete<br/> [URL] - URL do urejanja ankete<br/> [DAYS] - &#353;tevilo dni nastavljeno v intervalu<br/><br/></p>",
"srv_alert_instruction4" => "<p> [SURVEY] - ime ankete<br/> [SITE] - povezava do ankete<br/> [URL] - povezava do urejanja ankete<br/> [DAYS] - število dni pred potekom ankete <br/> [DURATION] - čas aktivnosti ankete</p>",
"srv_alert_instruction5" => "[SURVEY] - ime ankete<br/> [DATE] - datum<br/> [SITE] - URL do ankete<br/> [URL] - URL do urejanja ankete",
"srv_alert_instruction5a" => "[SURVEY] - ime ankete<br/> [DATE] - datum",
"versions" => "Verzije",

8
lang/2.php
View File

@ -3575,10 +3575,10 @@ $lang = array (
"srv_alert_active_text0" => "Dear,<br/><br/>We would like to inform you, that survey \"[SURVEY]\" was deactivated!",
"srv_alert_active_text1" => "Dear,<br/><br/>We would like to inform you, that survey \"[SURVEY]\" was activated!",
"srv_alert_delete_text" => "Dear,<br/><br/>We would like to inform you, that survey \"[SURVEY]\" was deleted!",
"srv_alert_expire_days1" => "Automatically send notification ",
"srv_alert_expire_days2" => "days before the survey expires. Value 0 means that the notification will be sent on the same day.<br/>",
"srv_alert_expire_expire_at" => " Survey expire: ",
"srv_alert_expire_note_at" => " Notification will be sent: ",
"srv_alert_expire_days" => "Number of days before the end of the survey when the expiry notification is automatically sent",
"srv_alert_expire_expire_at" => "Survey expires:",
"srv_alert_expire_prejemniki" => "Survey expiration notifications will be sent to the following recipients:",
"srv_alert_instruction1" => "Instructions for message formatting",
"srv_alert_instruction1a" => "Legend of database variables",
"srv_alert_instruction1b" => "You can also use system variables in the message which are currently not in the survey",
@ -3595,7 +3595,7 @@ $lang = array (
"srv_alert_instruction_sample" => "<p>Example:</p><p> If you wish to use the answer which the user entered in the system question email, you simply write #email#. </p>",
"srv_alert_instruction_available" => "<p class=\"bold\">System variables that are already available in the survey:</p>",
"srv_alert_instruction3" => "[SURVEY] - survey name<br/> [DATE] - date<br/> [SITE] - URL of survey<br/><br/></p><p class=\"bold\">Additional system variables from the survey indicate between the two characters #. </p><p>Example:</p><p> if we want to display the answer which the user entered for the system question about email, we will use the #email# <br/></p><p class=\"bold\">System variables that are already available in the survey: </p><p>",
"srv_alert_instruction4" => "<p> [SURVEY] - survey name<br/> [DATE] - date<br/> [SITE] - URL of survey<br/> [URL] - URL to editing of survey<br/> [DAYS] - number of days set in the interval<br/><br/></p>",
"srv_alert_instruction4" => "<p> [SURVEY] - survey name<br/> [SITE] - link to survey<br/> [URL] - link to editing of survey<br/> [DAYS] - number of days before expiration <br/> [DURATION] - survey duration</p>",
"srv_alert_instruction5" => "[SURVEY] - survey name<br/> [DATE] - date<br/> [SITE] - URL of survey<br/> [URL] - URL to editing of survey",
"srv_alert_instruction5a" => "[SURVEY] - survey name<br/> [DATE] - date",
"versions" => "Versions",

6
public/css/admin_new.css
View File

@ -14066,17 +14066,17 @@ fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_left {
fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right {
flex-grow: 1;
}
fieldset #obvescanje_sidebyside_holder .message_instructions {
fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right div.message_instructions {
background-color: #F8F8F8;
border: 1px solid #E5E5E5;
box-sizing: border-box;
padding: 16px;
margin-left: 32px;
}
fieldset .setting_holder#alert_holder_delete_other_emails {
fieldset .setting_holder.alert_other_emails {
margin-left: 24px;
}
fieldset textarea#alert_delete_other_emails {
fieldset textarea.alert_other_emails {
width: 538px;
height: 100px;
}

19
resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss
View File

@ -12,22 +12,23 @@ fieldset{
#obvescanje_sidebyside_right {
flex-grow: 1;
div.message_instructions {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
padding: 16px;
margin-left: 32px;
}
}
.message_instructions {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
padding: 16px;
margin-left: 32px;
}
}
//Box z emaili za dodatne prejemnike - spremeniti v class, ko se redizajna ostale strani za obveščanje @TG
.setting_holder#alert_holder_delete_other_emails {
.setting_holder.alert_other_emails {
margin-left: 24px;
}
textarea#alert_delete_other_emails{
textarea.alert_other_emails{
width: 538px;
height: 100px;
}