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

Dodan editor za obvestila uporabnikom

Browse Source
This commit is contained in:
pero1203 2021-08-26 10:00:13 +02:00
parent 0522fd6f24
commit bd22ffc760
5 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/survey/classes/class.Notifications.php
View File

@ -134,9 +134,12 @@ class Notifications {
// Checkboxa za posiljenje vsem uporabnikoom (slo in ang)
echo '<div style="padding-top:5px;"><input type="checkbox" value="1" name="recipient_all_slo" id="recipient_all_slo" onClick="recipient_all_disable_email();"> <label for="recipient_all_slo"><span class="clr bold">'.$lang['srv_notifications_send_all_slo'].'</span></label></div>';
echo '<div style="padding-top:5px;"><input type="checkbox" value="1" name="recipient_all_ang" id="recipient_all_ang" onClick="recipient_all_disable_email();"> <label for="recipient_all_ang"><span class="clr bold">'.$lang['srv_notifications_send_all_ang'].'</span></label></div><br />';
// Naslov sporocila
echo '<span class="clr bold">'.$lang['srv_notifications_send_title'].': </span><input type="text" name="title"><br /><br />';
echo '<span class="clr bold">'.$lang['srv_notifications_send_text'].': </span><textarea name="notification"></textarea><br />';
// Besedilo sporocila (editor)
echo '<span class="clr bold">'.$lang['srv_notifications_send_text'].': </span><textarea id="notification" name="notification" autocomplete="off"></textarea><br />';
// Avtomatsko prikaži obvestilo po prijavi
echo '<div style="padding-top:5px;"><input type="checkbox" value="1" name="force_show" id="force_show"> <label for="force_show"><span class="clr bold">'.$lang['srv_notifications_force_show'].'</span></label></div><br />';
@ -151,6 +154,9 @@ class Notifications {
}
echo '</div>';
// Inicializiramo editor
echo '<script type="text/javascript">create_editor(\'notification\', false);</script>';
}
@ -333,7 +339,7 @@ class Notifications {
// Prikaz izbranega sporocila
echo '<div id="message">';
echo '<span class="bold">'.$row['title'].' <span class="italic">('.$row['date'].')</span></span>';
echo '<p>'.nl2br($row['text']).'</p>';
echo '<p>'.$row['text'].'</p>';
echo '</div>';
echo '<div class="clr"></div>';
@ -356,7 +362,7 @@ class Notifications {
echo '<span class="bold">'.$row['title'].' <span class="italic">('.$row['date'].')</span></span>';
echo '<br />'.nl2br($row['text']);
echo '<br />'.$row['text'];
echo '</li>';
}

27
admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
View File

@ -2115,32 +2115,11 @@ class SurveyInvitationsNew {
}
// Ce samo dokumentiramo - navadna posta, SMS...
else{
echo '<div id="inv_messages_holder_noEmailing">';
echo $lang['srv_inv_message_noemailing_text'];
// Izbira nacina posiljanja (navadna posta, sms...) - prestavljeno pod nastavitve
/*echo '<div id="inv_select_noMail_type">';
$noEmailingType = SurveySession::get('inv_noEmailing_type');
echo '<span class="bold">'.$lang['srv_inv_message_noemailing_type'].':</span>';
echo '<span class="inv_send_span spaceLeft"><input name="noMailType" id="noMailType1" value="0" type="radio" '.($noEmailingType == 0 ? ' checked="checked"' : '').' onClick="noEmailingType(\'0\');"><label for="noMailType1">' . $lang['srv_inv_message_noemailing_type1'] . '</label></span>';
echo '<span class="inv_send_span spaceLeft"><input name="noMailType" id="noMailType2" value="1" type="radio" '.($noEmailingType == 1 ? ' checked="checked"' : '').' onClick="noEmailingType(\'1\');"><label for="noMailType2">' . $lang['srv_inv_message_noemailing_type2'] . '</label></span>';
echo '<span class="inv_send_span spaceLeft"><input name="noMailType" id="noMailType3" value="2" type="radio" '.($noEmailingType == 2 ? ' checked="checked"' : '').' onClick="noEmailingType(\'2\');"><label for="noMailType3">' . $lang['srv_inv_message_noemailing_type3'] . '</label></span>';
echo '</div>';*/
// Gumb naprej
/*echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['srv_invitation_forward'].'">';
echo '<a class="ovalbutton ovalbutton_orange" href="'.$site_url.'admin/survey/index.php?anketa='.$this->sid.'&a='.A_INVITATIONS.'&m=send_message&noemailing=1"><span>'.$lang['srv_invitation_forward'];
echo '</span></a></span>';
echo '<br class="clr"/>';*/
echo '<div id="inv_messages_holder_noEmailing">';
echo $lang['srv_inv_message_noemailing_text'];
echo '</div>';
echo '<div id="inv_messages_holder">';
if ($this->checkDefaultMessage() == false) {

23
admin/survey/script/notifications.js
View File

@ -1,9 +1,14 @@
// poslje novo sporocilo
function sendNotification() {
if(CKEDITOR.instances['notification']){
CKEDITOR.instances['notification'].destroy();
}
var recipient = $( "input[name='recipient']" ).val();
var title = $( "input[name='title']" ).val();
var notification = $( "textarea[name='notification']" ).val();
//var notification = $( "textarea[name='notification']" ).val();
var notification = $("#notification").val();
if ($( "input[name='recipient_all_slo']" ).is(':checked'))
var recipient_all_slo = 1;
@ -20,7 +25,21 @@ function sendNotification() {
else
var force_show = 0;
$('#notifications').load('ajax.php?t=notifications&a=sendNotification', {anketa:srv_meta_anketa_id, recipient:recipient, recipient_all_slo:recipient_all_slo, recipient_all_ang:recipient_all_ang, title:title, notification:notification, force_show:force_show});
$('#notifications').load('ajax.php?t=notifications&a=sendNotification', {
anketa:srv_meta_anketa_id,
recipient:recipient,
recipient_all_slo:recipient_all_slo,
recipient_all_ang:recipient_all_ang,
title:title,
notification:notification,
force_show:force_show,
function(){
if (!CKEDITOR.instances) {
CKEDITOR.replace['notification'];
}
}
});
}
// prikaze sporocilo in ga oznaci kot viewed

4
public/css/admin.css
View File

@ -13821,12 +13821,12 @@ and open the template in the editor.
width: 500px;
margin: 0 auto;
}
#unread_notifications ul {
#unread_notifications > ul {
padding-left: 0;
margin-bottom: 50px;
line-height: 18px;
}
#unread_notifications ul li {
#unread_notifications > ul > li {
list-style-type: none;
margin: 5px 0;
padding: 5px 8px;

6
resources/sass/admin/notifications.scss
View File

@ -29,7 +29,7 @@ and open the template in the editor.
}
li.unread {
border: 1px $orange solid;
background-color: $orange_very_lighten;
background-color: $orange_very_lighten;
}
}
}
@ -120,13 +120,13 @@ and open the template in the editor.
width: 500px;
margin: 0 auto;
ul {
> ul {
padding-left: 0;
margin-bottom: 50px;
line-height: 18px;
li {
> li {
list-style-type: none;
margin: 5px 0;
padding: 5px 8px;