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

[Redizajn 1KA] Popupi: Analiza > Arhiv - Pošlji arhiv

Browse Source
This commit is contained in:
tejagerjovic 2022-06-07 03:52:25 +02:00
parent 76c9a62429
commit c5330f784d
6 changed files with 138 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
View File

@ -479,32 +479,32 @@ class SurveyAnalysisArchive {
echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>'; echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>'; echo '<h2>'.$lang['srv_export_hover_archive_mail'].'</h2>';
# preverimo obstoj datoteke, in dostop # preverimo obstoj datoteke, in dostop
$CAE = self::CheckArchiveExistance($aid); $CAE = self::CheckArchiveExistance($aid);
if ( $CAE > 0) { if ( $CAE > 0) {
# vsebina emaila in naslovi # vsebina emaila in naslovi
echo '<div class="setting_holder">';
echo '<label for="email_archive_list">'.$lang['srv_analiza_archive_message_emails'].'</label>';
echo '<textarea class="textarea email" name="email_archive_list" id="email_archive_list" ></textarea>';
echo '</div>';
echo '<div class="setting_holder">';
echo '<label for="subject">' . $lang['srv_inv_archive_subject_text'] . ': </label>';
echo '<input type="text" class="text large wauto" name="email_archive_subject" id="email_archive_subject" value="'.$lang['srv_analiza_arhiviraj_mail_subject'].'"/>';
echo '</div>';
echo '<labelfor="email_archive_text">' . $lang['message'] . ':</label>';
echo '<div id="div_archives_email_wrap">'; echo '<div id="div_archives_email_wrap">';
echo '<div id="div_archives_email_left">'; echo '<div id="div_archives_email_left">';
echo '<p>'.$lang['srv_analiza_archive_message_note'].'</p>';
echo '<div ><label for="email_archive_list">'.$lang['srv_analiza_archive_message_emails'].':</label>'."\n";
echo '<textarea name="email_archive_list" rows="4" id="email_archive_list" ></textarea>'."\n";
echo '</div>';
echo '<br>';
echo '<div class="anl_dash_bt">';
echo '<br/><label for="subject">' . $lang['subject'] . ': </label>';
echo '<input type="text" name="email_archive_subject" id="email_archive_subject" value="'.$lang['srv_analiza_arhiviraj_mail_subject'].'" size="90"/></p>';
echo '<p><label for="email_archive_text">' . $lang['text'] . ':</label>'."\n";
$signature = Common::getEmailSignature(); $signature = Common::getEmailSignature();
echo '<textarea name="email_archive_text" id="email_archive_text" rows="2" >' . nl2br($lang['srv_analiza_arhiviraj_mail_text'].$signature). '</textarea>'."\n"; echo '<textarea name="email_archive_text" id="email_archive_text" rows="2" >' . nl2br($lang['srv_analiza_arhiviraj_mail_text'].$signature). '</textarea>'."\n";
echo '</div>';
echo '<script type="text/javascript">'."\n"; echo '<script type="text/javascript">'."\n";
echo 'if ($("#email_archive_text")) {'."\n"; echo 'if ($("#email_archive_text")) {'."\n";
@ -512,46 +512,51 @@ class SurveyAnalysisArchive {
echo '}'."\n"; echo '}'."\n";
echo '</script>'."\n"; echo '</script>'."\n";
echo '</div>'."\n"; echo '</div>'; #left
#gumbi
echo '<div id="div_archives_email_right" >'."\n"; echo '<div id="div_archives_email_right" >'."\n";
echo '<div id="div_archives_email_buttons">'; //Navodila
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_do_send_mail'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="sendEmailArchiveAnaliza(\''.$aid.'\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_do_send_mail'].'</span></a></span></span>'."\n"; echo '<div class="message_instructions">';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
echo '<br class="clr" />'; echo '<p class="bold caps bottom32">'.$lang['srv_alert_instruction1'].'</p>';
echo '<p class="bottom32">'.$lang['srv_alert_instruction1c'].'</p>';
echo '<div class="sistemske">';
echo '<p>'.$lang['srv_alert_instruction_link_archive'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_url_archive'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_name_archive'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_survey'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_date'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_site'].'</p>';
echo '</div>'; echo '</div>';
echo '<div id="div_error">';
# navodila
echo $lang['srv_analiza_arhiviraj_mail_note_0'];
echo '</div>';
echo '<br/>';
echo '<br/>';
echo '<div id="div_error">';
# navodila
echo $lang['srv_analiza_arhiviraj_mail_note_1'];
echo '</div>'; echo '</div>';
echo '</div>'; //right echo '</div>'; //right
echo '</div>'; //wrap echo '</div>'; //wrap
#gumbi
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="cancleArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
echo '<button class="medium blue" onclick="sendEmailArchiveAnaliza(\''.$aid.'\'); return false;">'.$lang['srv_analiza_arhiviraj_do_send_mail'].'</button>';
echo '</div>';
} else { } else {
self::DisplayError($CAE); self::DisplayError($CAE);
} }
echo '</div>'."\n"; // end div_analiza_archive_name echo '</div>'; // end div_analiza_archive_name
} }
static function SendEmailArchive($aid = null, $subject, $text, $emails) { static function SendEmailArchive($aid = null, $subject, $text, $emails) {
global $lang, $site_url, $site_path, $global_user_id; global $lang, $site_url, $site_path, $global_user_id;
echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n"; echo '<div id="div_analiza_archive_name">'."\n";
echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>'; echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>'; echo '<h2>'.$lang['srv_export_hover_archive_mail'].'</h2>';
$CAE = self::CheckArchiveExistance($aid); $CAE = self::CheckArchiveExistance($aid);
if ( $CAE > 0) { if ( $CAE > 0) {
@ -652,13 +657,15 @@ class SurveyAnalysisArchive {
echo 'Pri pošiljanju e-mailov je prišlo do napake!'; echo 'Pri pošiljanju e-mailov je prišlo do napake!';
} }
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n"; echo '<div class="button_holder">';
echo '<br class="clr" />'; echo '<button class="medium blue" onclick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
echo '</div>';
} else { } else {
self::DisplayError($CAE); self::DisplayError($CAE);
} }
echo '</div>'."\n"; // end div_analiza_archive_name echo '</div>'; // end div_analiza_archive_name
} }
static function EditArchive($aid) { static function EditArchive($aid) {
@ -984,8 +991,9 @@ class SurveyAnalysisArchive {
echo '</div>'; echo '</div>';
if ($showButton) { if ($showButton) {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="closeArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n"; echo '<div class="button_holder">';
echo '<br class="clr" />'; echo '<button class="medium blue" onclick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
echo '</div>';
} }
} }

2
admin/survey/script/script_analiza.js
View File

@ -965,7 +965,7 @@ function createArchiveBeforeEmail() {
if (parseInt(response) > 0) { if (parseInt(response) > 0) {
var aid = parseInt(response); var aid = parseInt(response);
$("#fullscreen").load('ajax.php?a=emailArchiveAnaliza', {anketa: srv_meta_anketa_id, podstran: srv_meta_podstran, aid:aid}, function() { $("#fullscreen").load('ajax.php?a=emailArchiveAnaliza', {anketa: srv_meta_anketa_id, podstran: srv_meta_podstran, aid:aid}, function() {
$('#fullscreen').addClass("PopUpNarrow divPopUp").show(); $('#fullscreen').addClass("divPopUp").show();
}); });
} else { } else {
if (parseInt(response) == -1) { if (parseInt(response) == -1) {

8
lang/1.php
View File

@ -3733,8 +3733,12 @@ $lang = array (
"srv_alert_instruction1" => "Navodila za oblikovanje sporočil", "srv_alert_instruction1" => "Navodila za oblikovanje sporočil",
"srv_alert_instruction1a" => "Legenda spremenljivk iz baze", "srv_alert_instruction1a" => "Legenda spremenljivk iz baze",
"srv_alert_instruction1b" => "V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi", "srv_alert_instruction1b" => "V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi",
"srv_alert_instruction1c" => "Uporabite lahko naslednje spremenljivke:",
"srv_alert_instruction2" => " [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ", "srv_alert_instruction2" => " [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ",
"srv_alert_instruction_name" => " [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime", "srv_alert_instruction_name" => " [NAME] - ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime",
"srv_alert_instruction_link_archive" => "[LINK] - HTML povezava do arhiva",
"srv_alert_instruction_name_archive" => "[NAME] - ime uporabnika (iz baze CMS)",
"srv_alert_instruction_URL_archive" => "[URL] - URL povezava do arhiva",
"srv_alert_instruction_survey" => "[SURVEY] - ime ankete", "srv_alert_instruction_survey" => "[SURVEY] - ime ankete",
"srv_alert_instruction_date" => "[DATE] - datum", "srv_alert_instruction_date" => "[DATE] - datum",
"srv_alert_instruction_site" => "[SITE] - povezava do ankete", "srv_alert_instruction_site" => "[SITE] - povezava do ankete",
@ -4099,8 +4103,8 @@ $lang = array (
"srv_analiza_arhiviraj_ime" => "Ime arhiva", "srv_analiza_arhiviraj_ime" => "Ime arhiva",
"srv_analiza_archive_note" => "Opomba", "srv_analiza_archive_note" => "Opomba",
"srv_analiza_archive_access" => "Dostop", "srv_analiza_archive_access" => "Dostop",
"srv_analiza_archive_message_note" => "Sporo&#269;ilo ob kreaciji arhiva ankete", "srv_analiza_archive_message_note" => "Sporočilo ob kreaciji arhiva ankete",
"srv_analiza_archive_message_emails" => "Elektronski naslovi", "srv_analiza_archive_message_emails" => "Vnesite e-poštne naslove prejemnikov (vsak prejemnik naj bo v svoji vrstici):",
"srv_analiza_archive_access_all" => "Vsi", "srv_analiza_archive_access_all" => "Vsi",
"srv_analiza_archive_access_admins" => "Administratorji ankete", "srv_analiza_archive_access_admins" => "Administratorji ankete",
"srv_analiza_archive_access_password" => "Z geslom", "srv_analiza_archive_access_password" => "Z geslom",

6
lang/2.php
View File

@ -3701,8 +3701,12 @@ $lang = array (
"srv_alert_instruction1" => "Instructions for message formatting", "srv_alert_instruction1" => "Instructions for message formatting",
"srv_alert_instruction1a" => "Legend of database variables", "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", "srv_alert_instruction1b" => "You can also use system variables in the message which are currently not in the survey",
"srv_alert_instruction1c" => "You can use the following variables:",
"srv_alert_instruction2" => " [NAME] => user name (from the database (CMS)) or system variable \"name\" <br/> ", "srv_alert_instruction2" => " [NAME] => user name (from the database (CMS)) or system variable \"name\" <br/> ",
"srv_alert_instruction_name" => " [NAME] => user name (from the database (CMS)) or system variable \"name\"", "srv_alert_instruction_name" => " [NAME] => user name (from the database (CMS)) or system variable \"name\"",
"srv_alert_instruction_link_archive" => "[LINK] - HTML link to the archive",
"srv_alert_instruction_URL_archive" => "[URL] - URL link the archive",
"srv_alert_instruction_name_archive" => "[NAME] - username (from the CMS database)",
"srv_alert_instruction_survey" => "[SURVEY] => survey name", "srv_alert_instruction_survey" => "[SURVEY] => survey name",
"srv_alert_instruction_date" => "[DATE] => date", "srv_alert_instruction_date" => "[DATE] => date",
"srv_alert_instruction_site" => "[SITE] => link to survey", "srv_alert_instruction_site" => "[SITE] => link to survey",
@ -4081,7 +4085,7 @@ $lang = array (
"srv_analiza_archive_note" => "Note", "srv_analiza_archive_note" => "Note",
"srv_analiza_archive_access" => "Access", "srv_analiza_archive_access" => "Access",
"srv_analiza_archive_message_note" => "Message on the creation of an survey analysis archive", "srv_analiza_archive_message_note" => "Message on the creation of an survey analysis archive",
"srv_analiza_archive_message_emails" => "Emails", "srv_analiza_archive_message_emails" => "Enter the recipients' email addresses (each email should be in its own line):",
"srv_analiza_archive_access_all" => "All", "srv_analiza_archive_access_all" => "All",
"srv_analiza_archive_access_admins" => "Only admins of survey", "srv_analiza_archive_access_admins" => "Only admins of survey",
"srv_analiza_archive_access_password" => "With password", "srv_analiza_archive_access_password" => "With password",

38
public/css/admin_new.css
View File

@ -8313,14 +8313,6 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
width: 50%; width: 50%;
} }
#div_archives_email_left {
width: 75%;
}
#div_archives_email_right {
width: 25%;
}
#creport_profiles { #creport_profiles {
cursor: pointer; cursor: pointer;
width: 99%; width: 99%;
@ -8594,6 +8586,36 @@ div#mc_table_settings form {
padding: 0; padding: 0;
} }
div#div_analiza_archive_name {
width: 900px !important;
}
div#div_analiza_archive_name div.setting_holder textarea.email {
height: 60px !important;
}
div#div_analiza_archive_name div#div_archives_email_wrap {
display: flex;
flex-direction: row;
gap: 16px;
margin-top: 4px;
}
div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_left {
width: 60%;
}
div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_right {
min-height: 100% !important;
}
div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_right div.message_instructions {
background-color: #F8F8F8;
border: 1px solid #E5E5E5;
box-sizing: border-box;
padding: 16px;
width: 100%;
min-height: 100% !important;
}
div#div_analiza_archive_name div#div_archives_email_wrap div#div_archives_email_right div.message_instructions div.sistemske p {
margin-bottom: 4px;
}
/* /*
Header scss - top line, menu... Header scss - top line, menu...
*/ */

55
resources/sass/admin_new/components/popup/page_specific.scss
View File

@ -223,14 +223,6 @@ div#div_analiza_archive_name {
} }
} }
//Pošji arhiv
#div_archives_email_left {
width: 75%;
}
#div_archives_email_right {
width: 25%;
}
//Poročila //Poročila
#creport_profiles { #creport_profiles {
cursor: pointer; cursor: pointer;
@ -590,3 +582,50 @@ div#mc_table_settings {
padding: 0; padding: 0;
} }
} }
//Pošilji arhiv
div#div_analiza_archive_name {
width: 900px !important;
div.setting_holder {
textarea.email {
height: 60px !important;
}
}
div#div_archives_email_wrap {
display: flex;
flex-direction: row;
gap: 16px;
margin-top: 4px;
div#div_archives_email_left {
width: 60%;
}
div#div_archives_email_right {
min-height: 100% !important;
div.message_instructions {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
padding: 16px;
width: 100%;
min-height: 100% !important;
div.sistemske {
p {
margin-bottom: 4px;
}
}
}
}
}
}