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

[Redizajn 1KA] - Urejanje --> Nastavitve --> Obveščanje o spremembi aktivnosti - v1

Browse Source
This commit is contained in:
tejagerjovic 2022-01-05 00:52:44 +01:00
parent e6b543589c
commit 36a6c1bbda
5 changed files with 1464 additions and 1426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
admin/survey/SurveyAdminSettings.php
View File

@ -3464,34 +3464,46 @@ class SurveyAdminSettings {
// 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";
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_prejemnik'] . '</legend>'. "\n";
echo '<p><input type="checkbox" name="alert_active_author" id="alert_active_author" value="1" onChange="change_alert_respondent(\'active_author\', $(this));return false;"' . ($rowAlert['active_author'] == 1 ? ' checked' : '') . '>';
echo '<span id="label_alert_active_author">';
$this->display_alert_label('active_author',($rowAlert['active_author'] == 1));
echo '</span></p>';
echo '<p><input type="checkbox" name="alert_active_other" id="alert_active_other" value="1"' . (($rowAlert['active_other'] == 1 || ($rowAlert['active_other_emails'] && $rowAlert['active_other'] != 0)) ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'active_other\');"><label for="alert_active_other">' . $lang['email_prejemniki'] . $lang['email_one_per_line'] . '</label></p>';
echo '<p id="alert_holder_active_other_emails" '.($rowAlert['active_other'] == 0 ? 'class="displayNone"' : '' ).'>';
echo '<label for="alert_active_other_emails">' . $lang['email'] . ':</label>';
echo '<textarea name="alert_active_other_emails" id="alert_active_other_emails" style="height:100px" >' . $rowAlert['active_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>' . $lang['srv_alert_oblika_deactivate_note'] . '</p>';
echo '<p><label for="subject">' . $lang['subject'] . ': ';
echo '<input type="text" name="alert_active_subject0" id="alert_active_subject0" value="' . ($rowAlert['active_subject0'] ? $rowAlert['active_subject0'] : $lang['srv_alert_active_subject0']) . '" size="90"/></label></p>';
echo '<legend>' . $lang['srv_alert_active_2'] . '</legend>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_alert_active_prejemniki'].'</span>';
echo '<div class="setting_item" id="label_alert_active_author">';
echo '<input type="checkbox" name="alert_active_author" id="alert_active_author" value="1" onChange="change_alert_respondent(\'active_author\', $(this));return false;"' . ($rowAlert['active_author'] == 1 ? ' checked' : '') . '>';
$this->display_alert_label('active_author',($rowAlert['active_author'] == 1));
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="checkbox" name="alert_active_other" id="alert_active_other" value="1"' . (($rowAlert['active_other'] == 1 || ($rowAlert['active_other_emails'] && $rowAlert['active_other'] != 0)) ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'active_other\');"><label for="alert_active_other">' . $lang['email_prejemniki'] .'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<div class="setting_holder alert_other_emails '.($rowAlert['active_other'] == 0 ? 'displayNone' : '' ).'" id="alert_holder_active_other_emails">';
echo '<label for="alert_active_other_emails">' . $lang['email_prejemniki_one_per_line'] . ':</label>';
echo '<textarea class="alert_other_emails" name="alert_active_other_emails" id="alert_active_other_emails">' . $rowAlert['active_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 '<p class="bold bottom16">'.$lang['srv_alert_oblika_deactivate_note'].'</p>';
echo '<div class="setting_holder">';
echo '<label for="subject">' . $lang['subject'] . ': </label>';
echo '<input type="text" class="large wauto" id="alert_active_subject0" name="alert_active_subject0" value="' . ($rowAlert['active_subject0'] ? $rowAlert['active_subject0'] : $lang['srv_alert_active_subject0']) . '"/>';
echo '</div>';
if ($rowAlert['active_text0'] != '') {
$text0 = $rowAlert['active_text0'];
@ -3502,15 +3514,21 @@ class SurveyAdminSettings {
$text0 = nl2br($lang['srv_alert_active_text0'].$signature);
}
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
echo ' <p><label for="alert_active_text0">' . $lang['text'] . ':</label>';
echo ' <textarea name="alert_active_text0" id="alert_active_text0" rows="3" >' . $text0 . '</textarea>';
echo ' </p>';
echo '<br/>';
echo '<p>' . $lang['srv_alert_oblika_activate_note'] . '</p>';
echo '<p><label for="subject">' . $lang['subject'] . ': ';
echo '<input type="text" name="alert_active_subject1" id="alert_active_subject1" value="' . ($rowAlert['active_subject1'] ? $rowAlert['active_subject1'] : $lang['srv_alert_active_subject1']) . '" size="90"/></label></p>';
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
echo '<div class="setting_holder">';
echo '<label class="bottom4" for="alert_active_text0">' . $lang['message'] . ':</label>';
echo '<textarea name="alert_active_text0" id="alert_active_text0">' . $text . '</textarea>';
echo '</div>';
echo '<p class="bold top32 bottom16">'.$lang['srv_alert_oblika_activate_note'].'</p>';
echo '<div class="setting_holder">';
echo '<label for="subject">' . $lang['subject'] . ': </label>';
echo '<input type="text" class="large wauto" id="alert_active_subject1" name="alert_active_subject1" value="' . ($rowAlert['active_subject1'] ? $rowAlert['active_subject1'] : $lang['srv_alert_active_subject1']) . '"/>';
echo '</div>';
if ($rowAlert['active_text1'] != '') {
$text1 = $rowAlert['active_text1'];
@ -3522,28 +3540,40 @@ class SurveyAdminSettings {
$text1 = nl2br($lang['srv_alert_active_text1'].$signature);
}
echo ' <p><label for="alert_active_text1">' . $lang['text'] . ':</label>';
echo ' <textarea name="alert_active_text1" id="alert_active_text1" rows="3" >' . $text1 . '</textarea>';
echo ' </p>';
echo '<div class="setting_holder">';
echo '<label class="bottom4" for="alert_active_text1">' . $lang['message'] . ':</label>';
echo '<textarea name="alert_active_text1" id="alert_active_text1">' . $text . '</textarea>';
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_instruction5'];
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_instruction5'].'</p>';
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>';
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>';
}
echo '</form>';
} else if ($tab == 'delete') {
}
else if ($tab == 'delete') {
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";

3
lang/1.php
View File

@ -2117,6 +2117,7 @@ $lang = array (
"srv_alert_completed_2" => "Obveščanje o izpolnjeni anketi",
"srv_alert_expired_2" => "Obveščanje o izteku ankete",
"srv_alert_active_2" => "Obveščanje o spremembi aktivnosti",
"srv_alert_active_prejemniki" => "Obvestilo o spremembi aktivnosti prejmejo naslednji prejemniki:",
"srv_alert_delete_2" => "Obveščanje o izbrisu ankete",
"srv_alert_setting" => "Nastavitve",
"srv_alert_turnOn_text" => "Zaradi množičnega izpolnjevanja anket je lahko količina poslanih e-mailov preko 1KA sistema zelo velika. Da bi se izognili temu, da so e-poštna obveščanja o izpolnjenih anketah uvrščena v spam oziroma vsiljeno pošto, je uporaba storitve plačljiva in se obračuna po veljavnem <a href=\"https://www.1ka.si/d/sl/storitve/cenik-metodoloskih-storitev?from1ka=1\" target=\"_blank\"><span class=\"bold\">1KA ceniku</span></a>. Za uporabo storitve je potrebno najprej izpolniti <a href=\"https://www.1ka.si/objava\" target=\"_blank\"><span class=\"bold\">obrazec</span></a>.",
@ -3625,7 +3626,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/> [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_instruction4" => "<p> [SURVEY] - ime ankete<br/> [SITE] - URL do ankete<br/> [URL] - URL 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",

3
lang/2.php
View File

@ -2104,6 +2104,7 @@ $lang = array (
"srv_alert_completed_2" => "Alert about completed survey",
"srv_alert_expired_2" => "Alert about survey expiration",
"srv_alert_active_2" => "Alert about activation changes",
"srv_alert_active_prejemniki" => "Survey activation notifications will be sent to the following recipients:",
"srv_alert_delete_2" => "Alert about survey deletion",
"srv_alert_setting" => "Settings",
"srv_alert_turnOn_text" => "The quantity of e-mails sent via 1KA system could be very high due to the mass survey entries. In order to avoid an e-mail notification of a completed survey to be marked as a spam, the service is payable and charged according to the valid <a href=\"https://www.1ka.si/d/en/services/pricelist-for-methodological-counselling\" target=\"_blank\">1KA price list<a>. To use the service you have to fill out the <a href=\"https://www.1ka.si/objava?language=2\" target=\"_blank\">form</a>.",
@ -3595,7 +3596,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/> [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_instruction4" => "<p> [SURVEY] - survey name<br/> [SITE] - URL to survey<br/> [URL] - URL 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",

2756
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -27,6 +27,10 @@ fieldset{
margin-top: 16px;
}
&.top32 {
margin-top: 32px;
}
&.bottom8 {
margin-bottom: 8px;
}