';
@@ -2600,21 +2600,20 @@ class SurveyAdminSettings {
echo $lang['srv_anketa_href_count_text'];
echo '
';
- //Delite s prijatelji
- echo '';
+ //QR koda
+ echo '
';
echo '
';
echo '
';
echo $lang['srv_anketa_href_friends'];
echo '
';
echo $lang['srv_anketa_href_friends_text'];
- echo '
friend share';
echo '
';
// iFrame - js
echo '
';
echo '
';
echo '
';
- echo $lang['srv_anketa_href_ijs'].Help :: display('srv_embed_js');
+ echo $lang['srv_anketa_href_ijs'];
echo '
';
echo $lang['srv_anketa_href_ijs_text'];
echo '
';
@@ -2623,7 +2622,7 @@ class SurveyAdminSettings {
echo '
';
echo '
';
echo '
';
- echo $lang['srv_anketa_href_inojs'].Help :: display('srv_embed_fixed');
+ echo $lang['srv_anketa_href_inojs'];
echo '
';
echo $lang['srv_anketa_href_inojs_text'];
echo '
';
diff --git a/admin/survey/classes/class.Notifications.php b/admin/survey/classes/class.Notifications.php
index 34c81c273..46404e3b6 100644
--- a/admin/survey/classes/class.Notifications.php
+++ b/admin/survey/classes/class.Notifications.php
@@ -18,21 +18,32 @@ class Notifications {
public function display($tab=0){
global $admin_type, $global_user_id, $lang;
-
+
// Prikazemo poslana sporocila
if((isset($_GET['t']) && $_GET['t']=='sent') || $tab == 1){
-
+
+ echo '
';
+ echo '
';
+ echo '
'.$lang['srv_notifications_sent'].'
';
+ echo '
';
+
+ echo '
';
+
// Izpis vseh poslanih sporocil
if($admin_type == 0){
+ echo '
';
echo '
';
$this->displaySentMessages();
echo '
';
+ echo '
';
// obrazec za posiljanje sporocil
$this->sendMessageForm();
}
else
- echo $lang['srv_notifications_admin_alert'];
+ echo $lang['srv_notifications_admin_alert'];
+
+ echo '
';
}
// Prikazemo prejeta sporocila
else{
@@ -42,8 +53,6 @@ class Notifications {
echo '
';
}
-
- echo '
';
}
private function displayRecievedMessages($active=0){
@@ -85,9 +94,7 @@ class Notifications {
private function displaySentMessages(){
global $admin_type, $global_user_id, $lang;
-
- echo '
'.$lang['srv_notifications_sent'].':';
-
+
// Napolnimo array poslanih sporocil
$sentMessages = array();
@@ -103,11 +110,20 @@ class Notifications {
foreach($sentMessages as $message_id => $message){
//echo '
';
echo '';
+
+ echo ''; //sem noter pride v 2. fazi še oznaka, če je obvestilo ali sporočilo
+ echo '
';
+ echo $message['title'];
+ echo '
';
+ echo '
';
+ echo $message['date'];
+ echo '
';
+ echo '
'.$text;
+ $text = strip_tags((strlen($message['text']) > 60) ? substr($message['text'], 0, 60).'...' : $message['text']);
+ echo '';
+ echo $text;
+ echo '
';
// Gumb da se sporocilo razresi vsem (kot da so ga pregledali)
$sqlN = sisplet_query("SELECT message_id FROM srv_notifications WHERE message_id='".$message_id."' AND viewed='0'");
diff --git a/admin/survey/classes/class.SurveyAktivnost.php b/admin/survey/classes/class.SurveyAktivnost.php
index 483648ba9..209b35e3a 100644
--- a/admin/survey/classes/class.SurveyAktivnost.php
+++ b/admin/survey/classes/class.SurveyAktivnost.php
@@ -166,7 +166,6 @@ class SurveyAktivnost{
echo '