';
$this->extra_translation('srv_novaanketa_kratkoime');
- echo '';
+ echo '
';
+ echo '';
@@ -524,10 +537,15 @@ class Prevajanje {
global $lang;
Cache::cache_all_srv_spremenljivka($this->anketa);
- echo '
'.$lang['srv_intro_label'].' ';
- echo '
'.$lang['srv_intro_label'].' ';
+
+ // Naslov prve strani (ime strani)
+ echo '
';
+ echo '
'.$lang['srv_intro_label'].'
';
+ echo '
'.$lang['srv_intro_label'].'
';
+ echo '
';
- $this->urejanje_vprasanje(-1);
+ // Urejanje texta uvoda
+ $this->urejanje_vprasanje(-1, -1);
$gru_id = 0;
@@ -535,19 +553,27 @@ class Prevajanje {
while ($row = mysqli_fetch_array($sql)) {
if ($gru_id != $row['gru_id']) {
- echo '
'.$lang['srv_stran'].' '.$row['vrstni_red'].' ';
- echo '
'.$lang['srv_stran'].' '.$row['vrstni_red'].' ';
-
+
+ // Naslov vmesne strani (ime strani)
+ echo '
';
+ echo '
'.$lang['srv_stran'].' '.$row['vrstni_red'].'
';
+ echo '
'.$lang['srv_stran'].' '.$row['vrstni_red'].'
';
+ echo '
';
+
$gru_id = $row['gru_id'];
}
- $this->urejanje_vprasanje($row['id']);
+ $this->urejanje_vprasanje($row['id'], $row['tip']);
}
- echo '
'.$lang['srv_end_label'].' ';
- echo '
'.$lang['srv_end_label'].' ';
+ // Naslov zadnje strani (ime strani)
+ echo '
';
+ echo '
'.$lang['srv_end_label'].'
';
+ echo '
'.$lang['srv_end_label'].'
';
+ echo '
';
- $this->urejanje_vprasanje(-2);
+ // Urejanje texta uvoda
+ $this->urejanje_vprasanje(-2, -2);
}
/**
@@ -555,7 +581,7 @@ class Prevajanje {
*
* @param mixed $spremenljivka
*/
- function urejanje_vprasanje ($spremenljivka) {
+ function urejanje_vprasanje ($spremenljivka, $tip) {
global $lang;
global $lang1;
global $lang2;
@@ -579,6 +605,9 @@ class Prevajanje {
}
+ echo '
';
+
+
// LEVA STRAN PREVAJANJA
echo '
';
@@ -596,7 +625,7 @@ class Prevajanje {
echo '
';
-
+
// DESNA STRAN PREVAJANJA
echo '
';
@@ -613,6 +642,9 @@ class Prevajanje {
$this->Branching->vprasanje($spremenljivka, true); //poklici izris vprasanja za prevajanje (za enkrat je drugi argument pomemben le za slider)
echo '
';
+
+
+ echo '
';
// Nastavimo nazaj originalen jezik vmesnika
diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
index 6587edd87..f72c6a744 100644
--- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
+++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
@@ -517,7 +517,7 @@ class SurveyInvitationsNew {
echo '
';
// Text s podatki o nastavitvah posiljanja
- $settings_text = '
'.$lang['srv_inv_message_type'].': ';
+ $settings_text = '
'.$lang['srv_inv_message_type'].': ';
$individual = (int)$this->surveySettings['individual_invitation'];
if($individual == 0){
@@ -553,7 +553,7 @@ class SurveyInvitationsNew {
}
}
- $settings_text .= '
'.$lang['edit4'].' ';
+ $settings_text .= '
';
echo $settings_text;
@@ -657,23 +657,35 @@ class SurveyInvitationsNew {
list($sysUserToAdd) = mysqli_fetch_row($sysUserToAddQuery);
}
- echo '
'.$lang['srv_inv_recipiens_from_list'].' ';
- echo '
'.$lang['srv_inv_recipiens_from_file'].' ';
- echo '
'.$lang['srv_inv_recipiens_from_system']
- .($sysUserToAdd > 0 ? ' ('.$sysUserToAdd.')' : '').' ';
-
- echo Help::display('inv_recipiens_from_system');
+ echo '
';
+
+ echo '
'.$lang['srv_inv_recipiens_from'].' '.Help::display('inv_recipiens_from_system').':
';
+
+ echo '
';
+ echo ' '.$lang['srv_inv_recipiens_from_list'].' ';
+ echo '
';
+ echo '
';
+ echo ' '.$lang['srv_inv_recipiens_from_file'].' ';
+ echo '
';
+ echo '
';
+ echo ' '.$lang['srv_inv_recipiens_from_system'].($sysUserToAdd > 0 ? ' ('.$sysUserToAdd.')' : '').' ';
+ echo '
';
+
+ echo '
';
+
+
if ($import_type == 3) {
- $this->createSystemVariablesMapping();
+ $this->createSystemVariablesMapping();
}
else {
-
- # sporočilo za personalizirana e-vabila in respondente iz baze
- echo '
'.$lang['srv_inv_recipiens_field_note'].' ';
-
- echo '
';
+
+ # sporočilo za personalizirana e-vabila in respondente iz baze
+ echo '
';
+ echo ''.$lang['srv_inv_recipiens_field_note'].' ';
+ echo '
';
+
echo '
';
@@ -704,57 +716,65 @@ class SurveyInvitationsNew {
}
echo '';
echo '
';
-
- echo '
';
echo '';
- # iz seznama
- echo '
' ;
- echo '
'.$lang['srv_inv_recipiens_email_note'];
- echo '';
- echo $lang['srv_inv_recipiens_sample'].' ';
- echo $lang['srv_inv_recipiens_sample1'];
- echo ' ';
- echo ' ';
- echo '
'.$lang['srv_inv_recipiens_fields'].'
';
+
+ # IZ SEZNAMA
+ echo '' ;
+
+ echo '
'.$lang['srv_inv_recipiens_email_note'].'
';
+
+ echo '
';
+ echo '
'.$lang['srv_inv_recipiens_sample'].'
';
+ echo $lang['srv_inv_recipiens_sample1'];
+ echo '
';
+
+ echo '
';
+ echo $lang['srv_inv_recipiens_fields'].' ';
echo implode(',',$field_lang);
- echo ' ';
+ echo '
';
// Opozorilo za limit znakov pri passwordu (20)
- echo '
';
- echo '';
echo $lang['srv_inv_recipiens_pass_warning'];
- echo '';
-
- echo '
';
+
// delimiter
- echo $lang['srv_inv_recipient_list_delimiter']
- .' ';
-
- echo '
';
-
- echo '
';
-
- echo '
';
-
-
- #podatki o profilu
- echo '
';
+ echo ' ';
+ echo '
';
+ echo ' '.$lang['srv_invitation_recipients_add_type4'].' ';
+ echo '
';
+
+
+ echo '';
+ $this->saveRecipientListName();
+ echo '
';
+
+
+ # podatki o profilu
$ppid = isset($_POST['pid']) ? (int)$_POST['pid'] : -1;
- echo '';
+ echo '';
if ((int)$ppid > 0) {
# polovimo podatke profila
$sql_string = "SELECT rp.*, u.name, u.surname FROM srv_invitations_recipients_profiles AS rp LEFT JOIN users AS u ON rp.uid = u.id WHERE rp.pid = '".(int)$ppid."'";
@@ -779,41 +799,34 @@ class SurveyInvitationsNew {
} else {
echo '
'.$lang['srv_inv_recipiens_temporary_list'].'
';
}
- echo '';
-
- echo '
';
-
- echo '
';
- echo '
';
-
- echo '
';
- $this->saveRecipientListName();
echo '
';
- echo '
';
-
- echo '
';
# če že imamo prejemnike v bazi ponudimo gumb naprej
- echo '
'.$lang['srv_invitation_forward'].' ';
- echo '
';
+ echo '
';
+ echo ' '.$lang['srv_invitation_forward'].' ';
+ echo '
';
echo '
';
+ echo '';
+
// Text s podatki o nastavitvah posiljanja
- $settings_text = '
'.$lang['srv_inv_message_type'].': ';
+ $settings_text = '
'.$lang['srv_inv_message_type'].': ';
$individual = (int)$this->surveySettings['individual_invitation'];
if($individual == 0){
@@ -1420,11 +1444,13 @@ class SurveyInvitationsNew {
}
}
- $settings_text .= '
'.$lang['edit4'].' ';
+ $settings_text .= '
';
echo $settings_text;
- echo '';
+
+ echo '
';
}
- if ($count_all > 0 ) {
- # dodamo filtriranje
+ # dodamo filtriranje
+ if ($count_all > 0 ) {
echo '';
echo ' ';
-
- } else {
- echo $lang['srv_inv_list_no_recipients_filtred'].'
';
+ }
+ else {
+ echo '
'.$lang['srv_inv_list_no_recipients_filtred'].' ';
}
+
echo '';
- } else {
- echo $lang['srv_inv_list_no_recipients'].'
';
+ }
+ else {
+ echo '
'.$lang['srv_inv_list_no_recipients'].' ';
}
}
@@ -2018,7 +2058,7 @@ class SurveyInvitationsNew {
//echo '
'.$lang['srv_inv_message_draft_settings'].' ';
echo '
';
- echo '
';
+ echo '
';
echo '
';
echo '
';
echo ''.$lang['srv_inv_message_draft_content_from'].': ';
@@ -2216,7 +2256,7 @@ class SurveyInvitationsNew {
//echo ''.$lang['srv_inv_message_draft_settings'].'
';
+ echo '
';
echo '';
echo '
';
echo ''.$lang['srv_inv_message_draft_content_subject'].': ';
@@ -4007,6 +4047,7 @@ class SurveyInvitationsNew {
private function sendMailToUsers($sql_recipients_query, $sending_data){
global $global_user_id;
global $site_url;
+ global $lang;
// Preverimo ce je vklopljen modul za volitve
@@ -4709,7 +4750,7 @@ class SurveyInvitationsNew {
$sql_query = sisplet_query($sql_string);
$sql_row = mysqli_fetch_assoc($sql_query);
- echo '
';
+ echo '
';
echo '';
@@ -4965,34 +5006,37 @@ class SurveyInvitationsNew {
while ($sql_row = mysqli_fetch_assoc($sql_query)) {
$array_profiles[$sql_row['pid']] = array('name' => $sql_row['name']);
}
+
+
echo '';
echo '
';
foreach ($array_profiles AS $_pid => $profile) {
- echo '';
- echo $profile['name'];
+ echo ' ';
+
+ echo ''.$profile['name'].' ';
+
+ if ((int)$ppid > 0 && $ppid === $_pid) {
+ # polovimo še ostale porfile
+ $sql_query = sisplet_query("SELECT * FROM srv_invitations_recipients_profiles WHERE pid='".(int)$ppid."' AND from_survey ='".$this->sid."' ");
+
+ if (mysqli_num_rows($sql_query) > 0) {
+
+ echo '';
+
+ # če je iz iste ankete, potem lahko urejamo
+ echo '
';
+ echo '
';
+
+ echo '
';
}
echo ' ';
+
echo '
'.$lang['srv_inv_recipients_delete_profile'].' '.$lang['srv_inv_recipients_edit_profile'].' ';
- echo '
';
+ echo '
';
echo '
';
echo ''.$lang['srv_inv_recipient_list_name'].' ';
@@ -5440,7 +5484,7 @@ class SurveyInvitationsNew {
$sql_query = sisplet_query($sql_string);
$sql_row = mysqli_fetch_assoc($sql_query);
- echo '
';
+ echo '
';
echo '';
@@ -6346,68 +6390,58 @@ class SurveyInvitationsNew {
# current nastavimo na zadnji element
if ( $all > 1) {
- echo '