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

Merge branch 'master' of https://git.1ka.si:/git/1ka

Browse Source
This commit is contained in:
tejagerjovic 2022-04-12 01:39:50 +02:00
commit e6fa47843e
12 changed files with 3912 additions and 3889 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
admin/survey/classes/class.Prevajanje.php
View File

@ -131,22 +131,27 @@ class Prevajanje {
}
echo '<div class="prevajanje_holder">';
// Segment z zgornjimi nastavitvami
echo '<div class="section jezik_top_settings">';
$this->top_settings();
echo '</div>';
$sql = sisplet_query("SELECT * FROM srv_language WHERE ank_id = '$this->anketa'");
if (mysqli_num_rows($sql) == 0) {
//$this->dodaj_jezik(1);
} else {
if ($rowa['multilang'] == 1) {
}
elseif ($rowa['multilang'] == 1) {
$this->urejanje();
?><script> var srv_meta_lang_id = <?=$this->lang_id?>; </script><?
}
}
echo '</div>';
}
/**
@ -166,6 +171,7 @@ class Prevajanje {
$lang_admin = $row['lang_admin'];
$lang_resp = $row['lang_resp'];
$lang_array = array();
// Preberemo razpoložljive jezikovne datoteke
if ($dir = opendir($site_path . 'lang')) {
while (($file = readdir($dir)) !== false) {
@ -188,13 +194,11 @@ class Prevajanje {
@include($file);
}
echo '<div class="prevajanje_holder">';
/**
* Leva stran nastavitev
*/
echo '<div class="jezik_row">';
echo '<fieldset class="lang_set_left">';
// Leva stran nastavitev
echo '<fieldset class="jezik_left">';
if ($this->user_dostop_edit == 1) {
@ -270,10 +274,8 @@ class Prevajanje {
echo '</fieldset>';
/**
* Desna stran
*/
echo '<fieldset class="lang_set_right"><legend>'.$lang['srv_multilang'].'</legend>';
// Desna stran
echo '<fieldset class="jezik_right"><legend>'.$lang['srv_multilang'].'</legend>';
if ($this->lang_id != 0) {
$lang_array = $this->get_all_translation_langs();
@ -407,11 +409,13 @@ class Prevajanje {
global $lang;
global $lang1;
echo '<div class="prevajanje_holder">';
/**
* Leva stran
*/
// Segment z zgornjimi nastavitvami
echo '<div class="section jezik_additional_settings">';
echo '<div class="jezik_row">';
// Leva stran
echo '<div class="jezik_left">';
echo '<span class="title">'.$lang['srv_base_lang'].': <span class="title semi-bold">'.$lang1['language'];
echo '</span></span>';
@ -420,27 +424,32 @@ class Prevajanje {
echo ' - '.$lang['srv_edit_in_edit'].' <a href="index.php?anketa='.$this->anketa.'">'.$lang['srv_social_settings_text6'].'</a>';
echo '</div>';
/**
* Desna stran
*/
// Desna stran
echo '<div class="jezik_right">';
echo '<span class="title">'.$lang['srv_trans_lang'].': ';
echo ' <span class="title">'.$lang['srv_trans_lang'].': ';
$lang_array = $this->get_all_translation_langs();
echo '<span class="title semi-bold">'.$lang_array[$this->lang_id].'</span>';
echo ' <span class="title semi-bold">'.$lang_array[$this->lang_id].'</span>';
echo '</span>';
echo ' </span>';
echo '</div>';
echo '</div>';
echo '</div>';
// Prevajanje imena ankete
echo '<div class="section jezik_texti">';
$this->urejanje_texti();
echo '</div>';
// Prevajanje vprasanj
echo '<div class="section jezik_vprasanja">';
$this->urejanje_vprasanja();
echo '</div>';
?><script>
prevajanje_bind_click();
@ -454,14 +463,18 @@ class Prevajanje {
function urejanje_texti () {
global $lang;
echo '<div class="jezik_left noborder"><h2 class="jezik_page">'.$lang['srv_novaanketa_kratkoime'].'</h2></div>';
echo '<div class="jezik_right noborder"><h2 class="jezik_page">'.$lang['srv_novaanketa_kratkoime'].'</h2></div>';
echo '<div class="jezik_row">';
echo ' <div class="jezik_left">'.$lang['srv_novaanketa_kratkoime'].'</div>';
echo ' <div class="jezik_right">'.$lang['srv_novaanketa_kratkoime'].'</div>';
echo '</div>';
echo '<strong>';
echo '<div class="jezik_row">';
$this->extra_translation('srv_novaanketa_kratkoime');
echo '</strong>';
echo '</div>';
echo '<div class="jezik_row">';
$this->extra_translation('srv_anketa_opomba');
echo '</div>';
}
/**
@ -487,7 +500,7 @@ class Prevajanje {
}
echo '<div class="jezik_left">';
echo '<p style="margin-left:10px">'.$value.'</p>';
echo '<span>'.$value.'</span>';
echo '</div>';
echo '<div class="jezik_right srvlang" id="srvlang_'.$text.'">';
@ -524,10 +537,15 @@ class Prevajanje {
global $lang;
Cache::cache_all_srv_spremenljivka($this->anketa);
echo '<div class="jezik_left noborder"><h2 class=" jezik_page">'.$lang['srv_intro_label'].'</h2></div>';
echo '<div class="jezik_right noborder"><h2 class=" jezik_page">'.$lang['srv_intro_label'].'</h2></div>';
$this->urejanje_vprasanje(-1);
// Naslov prve strani (ime strani)
echo '<div class="jezik_row page">';
echo ' <div class="jezik_left">'.$lang['srv_intro_label'].'</div>';
echo ' <div class="jezik_right">'.$lang['srv_intro_label'].'</div>';
echo '</div>';
// 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 '<div class="jezik_left noborder"><h2 class=" jezik_page">'.$lang['srv_stran'].' '.$row['vrstni_red'].'</h2></div>';
echo '<div class="jezik_right noborder"><h2 class=" jezik_page">'.$lang['srv_stran'].' '.$row['vrstni_red'].'</h2></div>';
// Naslov vmesne strani (ime strani)
echo '<div class="jezik_row page">';
echo ' <div class="jezik_left">'.$lang['srv_stran'].' '.$row['vrstni_red'].'</div>';
echo ' <div class="jezik_right">'.$lang['srv_stran'].' '.$row['vrstni_red'].'</div>';
echo '</div>';
$gru_id = $row['gru_id'];
}
$this->urejanje_vprasanje($row['id']);
$this->urejanje_vprasanje($row['id'], $row['tip']);
}
echo '<div class="jezik_left noborder"><h2 class=" jezik_page">'.$lang['srv_end_label'].'</h2></div>';
echo '<div class="jezik_right noborder"><h2 class=" jezik_page">'.$lang['srv_end_label'].'</h2></div>';
// Naslov zadnje strani (ime strani)
echo '<div class="jezik_row page">';
echo ' <div class="jezik_left">'.$lang['srv_end_label'].'</div>';
echo ' <div class="jezik_right">'.$lang['srv_end_label'].'</div>';
echo '</div>';
$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 '<div class="jezik_row question tip_'.$tip.'">';
// LEVA STRAN PREVAJANJA
echo '<div class="jezik_left">';
@ -615,6 +644,9 @@ class Prevajanje {
echo '</div>';
echo '</div>';
// Nastavimo nazaj originalen jezik vmesnika
$lang = $lang_bck;
}

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

@ -517,7 +517,7 @@ class SurveyInvitationsNew {
echo '<div class="invitations_top_settings">';
// Text s podatki o nastavitvah posiljanja
$settings_text = '<span class="bold spaceRight">'.$lang['srv_inv_message_type'].':</span>';
$settings_text = '<span>'.$lang['srv_inv_message_type'].': </span>';
$individual = (int)$this->surveySettings['individual_invitation'];
if($individual == 0){
@ -553,7 +553,7 @@ class SurveyInvitationsNew {
}
}
$settings_text .= '<span class="spaceLeft"> <a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&a=invitations&m=inv_settings">'.$lang['edit4'].'</a></span>';
$settings_text .= ' <a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&a=invitations&m=inv_settings"><span class="faicon edit"></span></a>';
echo $settings_text;
@ -657,12 +657,23 @@ class SurveyInvitationsNew {
list($sysUserToAdd) = mysqli_fetch_row($sysUserToAddQuery);
}
echo '<span><input name="inv_import_type" id="inv_import_type2" type="radio" value="2" onclick="inv_change_import_type();"'.($import_type == 2 ? ' checked="checked"' : '').' autocomplete="off"><label for="inv_import_type2">'.$lang['srv_inv_recipiens_from_list'].'</label></span>';
echo '<span><input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="inv_change_import_type();"'.($import_type == 1 ? ' checked="checked"' : '').' autocomplete="off"><label for="inv_import_type1">'.$lang['srv_inv_recipiens_from_file'].'</label></span>';
echo '<span><input name="inv_import_type" id="inv_import_type3" type="radio" value="3" onclick="inv_change_import_type();"'.($import_type == 3 ? ' checked="checked"' : '').' autocomplete="off"><label for="inv_import_type3">'.$lang['srv_inv_recipiens_from_system']
.($sysUserToAdd > 0 ? ' ('.$sysUserToAdd.')' : '').'</label></span>';
echo Help::display('inv_recipiens_from_system');
echo '<div class="setting_holder">';
echo '<div class="setting_title">'.$lang['srv_inv_recipiens_from'].' '.Help::display('inv_recipiens_from_system').':</div>';
echo '<div class="setting_item">';
echo ' <input name="inv_import_type" id="inv_import_type2" type="radio" value="2" onclick="inv_change_import_type();"'.($import_type == 2 ? ' checked="checked"' : '').' autocomplete="off"><label for="inv_import_type2">'.$lang['srv_inv_recipiens_from_list'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo ' <input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="inv_change_import_type();"'.($import_type == 1 ? ' checked="checked"' : '').' autocomplete="off"><label for="inv_import_type1">'.$lang['srv_inv_recipiens_from_file'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo ' <input name="inv_import_type" id="inv_import_type3" type="radio" value="3" onclick="inv_change_import_type();"'.($import_type == 3 ? ' checked="checked"' : '').' autocomplete="off"><label for="inv_import_type3">'.$lang['srv_inv_recipiens_from_system'].($sysUserToAdd > 0 ? ' ('.$sysUserToAdd.')' : '').'</label>';
echo '</div>';
echo '</div>';
if ($import_type == 3) {
@ -671,9 +682,10 @@ class SurveyInvitationsNew {
else {
# sporočilo za personalizirana e-vabila in respondente iz baze
echo '<span class="inv_note">'.$lang['srv_inv_recipiens_field_note'].'</span>';
echo '<div class="setting_holder">';
echo '<span>'.$lang['srv_inv_recipiens_field_note'].'</span>';
echo '</div>';
echo '<br >';
echo '<div id="inv_field_container">';
@ -705,56 +717,64 @@ class SurveyInvitationsNew {
echo '</ul>';
echo '</div>';
echo '<br class="clr" />';
echo '<script type="text/javascript">initInvitationsConnectedSortable();</script>';
# iz seznama
echo '<div id="inv_import_list"'.($import_type != 1 ? '' : ' class="hidden"').'>' ;
echo '<span class="inv_note">'.$lang['srv_inv_recipiens_email_note'];
echo '<br class="clr" /><span class="inv_sample" >';
echo $lang['srv_inv_recipiens_sample'].'&nbsp;</span><span class="inv_sample">';
# IZ SEZNAMA
echo '<div id="inv_import_list" '.($import_type != 1 ? '' : 'class="displayNone"').'>' ;
echo '<div class="setting_line inv_note">'.$lang['srv_inv_recipiens_email_note'].'</div>';
echo '<div class="setting_line inv_sample">';
echo '<div class="semi-bold">'.$lang['srv_inv_recipiens_sample'].'</div>';
echo $lang['srv_inv_recipiens_sample1'];
echo '</span>';
echo '<br class="clr" />';
echo '</span>';
echo '<br class="clr" />'.$lang['srv_inv_recipiens_fields'].' <span id="inv_field_list" class="inv_type_0">';
echo '</div>';
echo '<div class="setting_line">';
echo $lang['srv_inv_recipiens_fields'].' <span id="inv_field_list" class="inv_type_0">';
echo implode(',',$field_lang);
echo '</span>';
echo '</div>';
// Opozorilo za limit znakov pri passwordu (20)
echo '<span id="inv_field_list_warning" class="red" style="display:none;">';
echo '<br class="clr" /><br class="clr" />';
echo '<div id="inv_field_list_warning" class="setting_line red" style="display:none;">';
echo $lang['srv_inv_recipiens_pass_warning'];
echo '</span>';
echo '<br class="clr" /><br class="clr" />';
echo '</div>';
// delimiter
echo $lang['srv_inv_recipient_list_delimiter']
.'<label for="recipientsDelimiter1"><input id="recipientsDelimiter1" type="radio" ' .(!isset ($_POST['recipientsDelimiter']) || $_POST['recipientsDelimiter']==","?'checked="checked"':'') .' value="," name="recipientsDelimiter">' .$lang['srv_inv_recipient_delimiter_comma'] .' (,)</label>&nbsp;&nbsp;&nbsp;'
.'<label for="recipientsDelimiter4"><input id="recipientsDelimiter4" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']=="|~|"?'checked="checked"':'') .' value="|~|" name="recipientsDelimiter">' .$lang['srv_inv_recipient_delimiter_1KA'] .' (|~|)</label>&nbsp;&nbsp;&nbsp;'
.'<label for="recipientsDelimiter2"><input id="recipientsDelimiter2" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']==";"?'checked="checked"':'') .' value=";" name="recipientsDelimiter">' .$lang['srv_inv_recipient_delimiter_semicolon'] .' (;) </label>&nbsp;&nbsp;&nbsp;'
.'<label for="recipientsDelimiter3"><input id="recipientsDelimiter3" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']=="|"?'checked="checked"':'') .' value="|" name="recipientsDelimiter">' .$lang['srv_inv_recipient_delimiter_pipe'] .' (|)</label>&nbsp;&nbsp;&nbsp;';
echo '<div class="setting_line">';
echo ' <label>'.$lang['srv_inv_recipient_list_delimiter'].'</label>';
echo ' <input id="recipientsDelimiter1" type="radio" ' .(!isset ($_POST['recipientsDelimiter']) || $_POST['recipientsDelimiter']==","?'checked="checked"':'') .' value="," name="recipientsDelimiter"><label for="recipientsDelimiter1">' .$lang['srv_inv_recipient_delimiter_comma'] .' (,)</label>';
echo ' <input id="recipientsDelimiter4" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']=="|~|"?'checked="checked"':'') .' value="|~|" name="recipientsDelimiter"><label for="recipientsDelimiter4">' .$lang['srv_inv_recipient_delimiter_1KA'] .' (|~|)</label>';
echo ' <input id="recipientsDelimiter2" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']==";"?'checked="checked"':'') .' value=";" name="recipientsDelimiter"><label for="recipientsDelimiter2">' .$lang['srv_inv_recipient_delimiter_semicolon'] .' (;) </label>';
echo ' <input id="recipientsDelimiter3" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']=="|"?'checked="checked"':'') .' value="|" name="recipientsDelimiter"><label for="recipientsDelimiter3">' .$lang['srv_inv_recipient_delimiter_pipe'] .' (|)</label>';
echo '</div>';
echo '</span>';
echo '<br class="clr" /><br class="clr" />';
echo '<textarea id="inv_recipients_list" cols="50" rows="9" name="inv_recipients_list">';
// Vnosno polje
echo '<div class="setting_line">';
echo ' <label for="inv_recipients_list">'.$lang['srv_inv_recipiens_insert'].':</label>';
echo ' <textarea id="inv_recipients_list" name="inv_recipients_list">';
if (is_array($recipients_list) && count($recipients_list) > 0 ) {
echo implode("\n",$recipients_list);
}
echo '</textarea>';
echo '<br class="clr"/>';
echo ' </textarea>';
echo '</div>';
#podatki o profilu
echo '<br class="clr"/>';
// Checkbox dodaj seznam v anketo
echo '<div class="setting_line">';
echo ' <input type="checkbox" id="inv_recipients_add" value="1" checked="checked"><label for="inv_recipients_add">'.$lang['srv_invitation_recipients_add_type4'].'</label>';
echo '</div>';
echo '<div id="div_inv_recipients_rename_list_type" class="displayNone setting_line">';
$this->saveRecipientListName();
echo '</div>';
# podatki o profilu
$ppid = isset($_POST['pid']) ? (int)$_POST['pid'] : -1;
echo '<span class="floatLeft" style="min-width:200px;">';
echo '<div class="setting_line">';
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 '<div class="gray">'.$lang['srv_inv_recipiens_temporary_list'].'</div>';
}
echo '</span>';
echo '<div class="floatLeft spaceLeft">';
echo '<div>';
echo '<label class="spaceRight"><input type="checkbox" id="inv_recipients_add" value="1" checked="checked">'.$lang['srv_invitation_recipients_add_type4'].'</label>';
echo '</div>';
echo '<div id="div_inv_recipients_rename_list_type" class="displayNone">';
$this->saveRecipientListName();
echo '</div>';
echo '</div>';
echo '<br />';
# če že imamo prejemnike v bazi ponudimo gumb naprej
echo '<span class="buttonwrapper floatRight spaceLeft spaceRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="invRecipientsForward(); return false;"><span>'.$lang['srv_invitation_forward'].'</span></a></span>';
echo '<br /><br />';
echo '<div class="button_holder below float-right">';
echo ' <button class="blue medium" onclick="invRecipientsForward(); return false;">'.$lang['srv_invitation_forward'].'</button>';
echo '</div>';
echo '</div>'; # id=inv_import_list
# iz datoteke
echo '<div id="inv_import_file"'.($import_type == 1 ? '' : ' class="hidden"').'>' ;
# IZ DATOTEKE
echo '<div id="inv_import_file"'.($import_type == 1 ? '' : ' class="displayNone"').'>' ;
echo '<form id="inv_recipients_upload_form" name="resp_uploader" method="post" enctype="multipart/form-data" action="'.$site_url.'admin/survey/index.php?anketa='.$this->sid.'&a='.A_INVITATIONS.'&m=upload_recipients" autocomplete="off">';
echo '<input type="hidden" name="fields" id="inv_recipients_upoad_fields" value="'.implode(',',$fields).'" />';
echo '<input type="hidden" name="posted" value="1" />';
echo '<span class="inv_note">'.$lang['srv_inv_recipiens_file_note_1'].'</span>';
echo '<br class="clr" />'.$lang['srv_inv_recipiens_fields'].' <span id="inv_field_list" class="inv_type_1">';
echo implode(',',$field_lang);
echo '</span>';
echo '<br class="clr" />';
echo '<div class="setting_line inv_note">'.$lang['srv_inv_recipiens_file_note_1'].'</div>';
echo '<div class="setting_line">';
echo $lang['srv_inv_recipiens_fields'];
echo ' <span id="inv_field_list" class="inv_type_1">'.implode(',',$field_lang).'</span>';
echo '</div>';
echo '<div class="setting_line">';
echo $lang['srv_mailing_upload_list'];
echo '<input type="file" name="recipientsFile" id="recipientsFile" size="42" >';
echo '<br><input type="file" name="recipientsFile" id="recipientsFile" size="42">';
if (count($errors) > 0) {
echo '<br class="clr" />';
echo '<span class="inv_error_note">';
@ -822,18 +835,28 @@ class SurveyInvitationsNew {
}
echo '</span>';
}
echo '<br/><br/><label>'.$lang['srv_inv_recipient_import_file_delimiter'].'</label> <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter1" value="," checked><label for="recipientsDelimiter1">'.$lang['srv_inv_recipient_delimiter_comma'].' (,)</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <label>'.$lang['srv_inv_recipient_import_file_delimiter'].'</label>';
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter1" value="," checked><label for="recipientsDelimiter1">'.$lang['srv_inv_recipient_delimiter_comma'].' (,)</label>';
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter2" value=";"><label for="recipientsDelimiter2">'.$lang['srv_inv_recipient_delimiter_semicolon'].' (;)</label>';
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter3" value="|"><label for="recipientsDelimiter3">'.$lang['srv_inv_recipient_delimiter_pipe'].' (|)</label>';
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter4" value="|~|"><label for="recipientsDelimiter4">'.$lang['srv_inv_recipient_delimiter_1KA'].' (|~|)</label>';
echo '</div>';
echo '</form>';
echo '<br class="clr" /><span class="inv_sample" >';
echo $lang['srv_inv_recipiens_sample'].'&nbsp;</span><span class="inv_sample">';
echo '<div class="setting_line inv_sample">';
echo ' <div class="semi-bold">'.$lang['srv_inv_recipiens_sample'].'</div>';
echo $lang['srv_inv_recipiens_sample1'];
echo '</span>';
echo '<br class="clr" />';
echo '<br class="clr" />';
echo '<span id="inv_upload_recipients" class="buttonwrapper floatLeft spaceLeft" ><a class="ovalbutton ovalbutton_orange" ><span>'.$lang['srv_inv_btn_add_recipients_add'].'</span></a></span>';
echo '</div>';
echo '<div class="button_holder below float-right">';
echo ' <button id="inv_upload_recipients" class="blue medium">'.$lang['srv_inv_btn_add_recipients_add'].'</button>';
echo '</div>';
echo '</div>'; # id=inv_import_file
}
@ -1382,9 +1405,10 @@ class SurveyInvitationsNew {
$row = $this->surveySettings;
echo '<h2 style="margin-left: 15px; color:#333 !important;">';
echo '<div class="invitations_top_settings">';
// Text s podatki o nastavitvah posiljanja
$settings_text = '<span class="bold spaceRight">'.$lang['srv_inv_message_type'].':</span>';
$settings_text = '<span>'.$lang['srv_inv_message_type'].': </span>';
$individual = (int)$this->surveySettings['individual_invitation'];
if($individual == 0){
@ -1420,10 +1444,12 @@ class SurveyInvitationsNew {
}
}
$settings_text .= '<span class="spaceLeft"> <a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&a=invitations&m=inv_settings">'.$lang['edit4'].'</a></span>';
$settings_text .= ' <a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&a=invitations&m=inv_settings"><span class="faicon edit"></span></a>';
echo $settings_text;
echo '</h2>';
echo '</div>';
#polovimo prejemnike ki ne želijo prejemati obvestil
@ -1505,7 +1531,7 @@ class SurveyInvitationsNew {
// Volitve nimajo nekaterih polj
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
$default_fields['responded'] = 1;
//$default_fields['responded'] = 1;
$default_fields['unsubscribed'] = 1;
$default_fields['password'] = 1;
}
@ -1643,135 +1669,138 @@ class SurveyInvitationsNew {
echo '</span>';
}
if ($count_all > 0 ) {
# dodamo filtriranje
if ($count_all > 0 ) {
echo '<div id="inv_rec_filter">';
echo '<label>'.$lang['srv_invitation_recipients_filter'].'</label> <input id="inv_rec_filter_value" type="text" onchange="inv_filter_recipients(); return false;" value="'.$_SESSION['inv_filter']['value'].'">';
echo '&nbsp;&nbsp;&nbsp;<label><input id="inv_rec_filter_on" type="checkbox" onchange="inv_filter_recipients(); return false;"'.(isset($_SESSION['inv_filter_on']) && $_SESSION['inv_filter_on'] == true ? ' checked="true"' : '').'>';
echo $lang['srv_invitation_recipients_filter_advanced'].'</label>';
echo '<div class="setting">';
echo ' <label for="inv_rec_filter_value">'.$lang['srv_invitation_recipients_filter'].':</label><input id="inv_rec_filter_value" class="small" type="text" onchange="inv_filter_recipients(); return false;" value="'.$_SESSION['inv_filter']['value'].'">';
echo '</div>';
echo '<div class="setting">';
echo ' <input id="inv_rec_filter_on" type="checkbox" onchange="inv_filter_recipients(); return false;"'.(isset($_SESSION['inv_filter_on']) && $_SESSION['inv_filter_on'] == true ? ' checked="true"' : '').'>';
echo ' <label for="inv_rec_filter_on">'.$lang['srv_invitation_recipients_filter_advanced'].'</label>';
echo '</div>';
if (isset($_SESSION['inv_filter_on']) && $_SESSION['inv_filter_on'] == true ) {
echo '&nbsp;';
echo '&nbsp;';
echo '<label>'.$lang['srv_invitation_recipients_filter_sent'];
echo '<div class="setting">';
echo ' <label for="inv_rec_filter_send">'.$lang['srv_invitation_recipients_filter_sent'].'</label>';
$selected = (int)(isset($_SESSION['inv_filter']['send']) ? (int)$_SESSION['inv_filter']['send'] : 0);
echo ' <select id="inv_rec_filter_send" onchange="inv_filter_recipients();">';
echo '<option value="0"'.((int)$selected == 0 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter0'].'</option>';
echo '<option value="1"'.((int)$selected == 1 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter1'].'</option>';
echo '<option value="2"'.((int)$selected == 2 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter2'].'</option>';
echo '</select></label>';
echo ' <select id="inv_rec_filter_send" class="dropdown small" onchange="inv_filter_recipients();">';
echo ' <option value="0"'.((int)$selected == 0 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter0'].'</option>';
echo ' <option value="1"'.((int)$selected == 1 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter1'].'</option>';
echo ' <option value="2"'.((int)$selected == 2 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter2'].'</option>';
echo ' </select>';
echo '</div>';
echo '&nbsp;';
echo '<label>'.$lang['srv_invitation_recipients_filter_answered'];
echo '<div class="setting">';
echo ' <label for="inv_rec_filter_respondet">'.$lang['srv_invitation_recipients_filter_answered'].'</label>';
$selected = (int)(isset($_SESSION['inv_filter']['respondet']) ? (int)$_SESSION['inv_filter']['respondet'] : 0);
echo ' <select id="inv_rec_filter_respondet" onchange="inv_filter_recipients();">';
echo '<option value="0"'.((int)$selected == 0 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter0'].'</option>';
echo '<option value="1"'.((int)$selected == 1 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter1'].'</option>';
echo '<option value="2"'.((int)$selected == 2 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter2'].'</option>';
echo '</select></label>';
echo ' <select id="inv_rec_filter_respondet" class="dropdown small" onchange="inv_filter_recipients();">';
echo ' <option value="0"'.((int)$selected == 0 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter0'].'</option>';
echo ' <option value="1"'.((int)$selected == 1 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter1'].'</option>';
echo ' <option value="2"'.((int)$selected == 2 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter2'].'</option>';
echo ' </select>';
echo '</div>';
echo '&nbsp;';
echo '<label>'.$lang['srv_invitation_recipients_filter_unsubscribed'];
echo '<div class="setting">';
echo ' <label for="inv_rec_filter_unsubscribed">'.$lang['srv_invitation_recipients_filter_unsubscribed'].'</label>';
$selected = (int)(isset($_SESSION['inv_filter']['unsubscribed']) ? (int)$_SESSION['inv_filter']['unsubscribed'] : 0);
echo ' <select id="inv_rec_filter_unsubscribed" onchange="inv_filter_recipients();">';
echo '<option value="0"'.((int)$selected == 0 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter0'].'</option>';
echo '<option value="1"'.((int)$selected == 1 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter1'].'</option>';
echo '<option value="2"'.((int)$selected == 2 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter2'].'</option>';
echo '</select></label>';
echo ' <select id="inv_rec_filter_unsubscribed" class="dropdown small" onchange="inv_filter_recipients();">';
echo ' <option value="0"'.((int)$selected == 0 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter0'].'</option>';
echo ' <option value="1"'.((int)$selected == 1 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter1'].'</option>';
echo ' <option value="2"'.((int)$selected == 2 ? ' selected="selected"' : '').'>'.$lang['srv_invitation_filter2'].'</option>';
echo ' </select>';
echo '</div>';
$this->listCondition();
$this->advancedCondition();
}
echo '</div>';
echo '<form id="frm_inv_rec_export" name="resp_uploader" method="post" autocomplete="off">';
echo '<input type="hidden" name="anketa" id="anketa" value="'.$this->sid.'">';
echo '<input type="hidden" name="noNavi" id="noNavi" value="true">';
echo '<br class="clr"/>';
if ($filter != '') {
echo '<span class="red strong">';
printf($lang['srv_inv_list_no_recipients_filter'],$filter);
#Podatki so filtrirani: "'.$filter.'"<br/>';
echo '</span>';
echo '<div class="filter_note">';
printf($lang['srv_inv_list_no_recipients_filter'], $filter);
echo '</div>';
}
echo '<div id="srv_invitation_note">';
if ($count_all > 0 && mysqli_num_rows($sql_query_filterd) != $count_all ) {
echo '<div id="srv_invitation_note" class="floatLeft spaceRight">';
echo $lang['srv_invitation_num_respondents_filtred'].(int)mysqli_num_rows($sql_query_filterd);
echo '</div>';
} else {
echo '<div id="srv_invitation_note" class="floatLeft spaceRight">';
echo $lang['srv_invitation_num_respondents'].(int)$this->count_all;
echo '</div>';
echo '<span>'.$lang['srv_invitation_num_respondents_filtred'].(int)mysqli_num_rows($sql_query_filterd).'</span>';
}
else {
echo '<span>'.$lang['srv_invitation_num_respondents'].(int)$this->count_all.'</span>';
}
# duplicated
echo '<label><input type="checkbox" id="inv_rec_filter_duplicates" onchange="inv_filter_recipients(); return false" '. ($filter_duplicated ?' checked="checked"':'') .'>' . $lang['srv_inv_recipient_show_only_duplicates'] .'</label><br class="clr"/>';
echo '<input type="checkbox" id="inv_rec_filter_duplicates" onchange="inv_filter_recipients(); return false" '. ($filter_duplicated ?' checked="checked"':'') .'><label for="inv_rec_filter_duplicates">'.$lang['srv_inv_recipient_show_only_duplicates'] .'</label>';
echo '</div>';
if (mysqli_num_rows($sql_query_filterd) > 0 && $count_all > 0) {
echo '<br class="clr"/>';
$this->displayPagination($filtred_all);
echo '<br class="clr"/>';
echo '<div style="display:inline-block; margin-right: 20px;">';
# če že imamo prejemnike v bazi več kot 20 ponudimo gumb naprej tudi zgoraj
if ($this->count_all > 20) {
echo '<span class="buttonwrapper floatRight spaceLeft" style="margin-bottom:10px;"><a class="ovalbutton ovalbutton_orange" href="'.$this->addUrl('view_message').'"><span>'.$lang['srv_invitation_forward'].'</span></a></span>';
}
// Izvoz vseh v excel
echo '<span class="floatLeft" style="line-height:45px; padding-left:10px;">';
echo '<a onclick="inv_recipients_form_action(\'export_all\');" href="#">';
echo '<span class="faicon xls" title="'.$lang['srv_invitation_recipients_export_all'].'" style="height:14px; width:16px;"></span>';
echo ' '.$lang['srv_invitation_recipients_export_all'];
echo '</a>';
echo '</span>';
echo '<div class="excel_export">';
echo ' <a href="#" class="noline" title="'.$lang['srv_invitation_recipients_export_all'].'" onclick="inv_recipients_form_action(\'export_all\');">';
echo ' <span class="faicon xls"></span>'.$lang['srv_invitation_recipients_export_all'];
echo ' </a>';
echo '</div>';
echo '<div class="table_holder">';
echo '<table id="tbl_recipients_list">';
echo '<tr>';
# checkbox
echo '<th class="tbl_icon" colspan="'.($this->surveySettings['show_email']==1?'4':'3').'" >&nbsp;</th>';
echo '<th class="tbl_icon" colspan="'.($this->surveySettings['show_email'] == 1 ? '4' : '3').'">';
echo ' <input type="checkbox" id="inv_switch" onClick="inv_selectAll(this);"><label for="inv_switch"></label>';
echo '</th>';
foreach ($fields AS $fkey =>$field) {
if ($field == 1) {
if ($fkey == 'sent' || $fkey == 'responded' || $fkey == 'unsubscribed' ) {
#echo '<th class="anl_ac tbl_icon_'.$fkey.' inv_'.$fkey.'_1" title="'.$lang['srv_inv_recipients_'.$fkey].'">&nbsp;</th>';
echo '<th'.$this->addSortField($fkey).' class="anl_ac pointer tbl_icon_'.$fkey.'" title="'.$lang['srv_inv_recipients_'.$fkey].'">'.$lang['srv_inv_recipients_'.$fkey].$this->addSortIcon($fkey).'</th>';
} else if ($fkey == 'last_status' ) {
}
else if ($fkey == 'last_status' ) {
echo '<th'.$this->addSortField($fkey).' class="anl_ac pointer" title="'.$lang['srv_inv_recipients_'.$fkey].'">'.$lang['srv_inv_recipients_'.$fkey].$this->addSortIcon($fkey).'</th>';
} else {
}
else {
echo '<th'.$this->addSortField($fkey).' class="pointer" title="'.$lang['srv_inv_recipients_'.$fkey].'">'.$lang['srv_inv_recipients_'.$fkey].$this->addSortIcon($fkey).'</th>';
}
}
}
echo '</tr>';
while ($sql_row = mysqli_fetch_assoc($sql_query_filterd)) {
echo '<tr>';
# checkbox
echo '<td><input type="checkbox" name="inv_rids[]" value="'.$sql_row['id'].'"></td>';
# checkbox
echo '<td><input type="checkbox" id="inv_rids'.$sql_row['id'].'" name="inv_rids[]" value="'.$sql_row['id'].'"><label for="inv_rids'.$sql_row['id'].'"></label></td>';
#izbriši
#echo '<td class="tbl_inv_left"><span class="as_link rec_delete_confirm" inv_rid="'.$sql_row['id'].'">'.$lang['srv_inv_list_profiles_delete'].'</span></td>';
echo '<td class="tbl_inv_left"><span class="faicon delete_circle icon-orange_link" onclick="deleteRecipient_confirm(\''.$sql_row['id'].'\'); return false;" title="'.$lang['srv_inv_list_profiles_delete'].'"></span></td>';
#uredi
#echo '<td class="tbl_inv_left"><span class="as_link rec_edit" inv_rid="'.$sql_row['id'].'">'.$lang['srv_inv_list_profiles_edit'].'</span></td>';
echo '<td class="tbl_inv_left"><span class="faicon edit smaller icon-as_link" onclick="editRecipient(\''.$sql_row['id'].'\'); return false;" title="'.$lang['srv_inv_list_profiles_edit'].'"></span></td>';
// Skoci na urejanje odgovorov - ce imamo identifikatorje povezane s podatki
@ -1782,18 +1811,18 @@ class SurveyInvitationsNew {
if ($field == 1) {
switch ($fkey) {
case 'sent':
echo '<td class="anl_ac pointer" onclick="showRecipientTracking(\''.$sql_row['id'].'\'); return false;">';
echo '<span class="faicon '.((int)$sql_row['sent'] == 1 ? ('inv_sent_1') : 'inv_sent_0').' icon-as_link" title="'.((int)$sql_row['sent'] == 1 ? $lang['sent'] : $lang['not_sent']).'"></span>';
echo '<td class="pointer" onclick="showRecipientTracking(\''.$sql_row['id'].'\'); return false;">';
echo ((int)$sql_row['sent'] == 1 ? $lang['sent'] : $lang['not_sent']);
echo '</td>';
break;
case 'responded':
echo '<td class="anl_ac">';
echo '<td class="">';
echo '<span class="faicon '.((int)$sql_row['responded'] == 1 ? ('inv_responded_1') : 'inv_responded_0').' icon-orange"></span>';
echo '</td>';
break;
case 'unsubscribed':
echo '<td class="anl_ac ">';
echo '<span class="faicon '.((int)$sql_row['unsubscribed'] == 1 ? ('inv_unsubscribed_1') : 'inv_unsubscribed_0').'"></span>';
echo '<td class="">';
echo ((int)$sql_row['unsubscribed'] == 1 ? $lang['unsubscribed'] : $lang['not_unsubscribed']);
echo '</td>';
break;
case 'last_status':
@ -1838,37 +1867,48 @@ class SurveyInvitationsNew {
}
}
echo '</tr>';
@ob_flush();
}
echo '</table>';
echo '</div>';
echo '<div id="inv_bottom_edit">';
echo '<span class="faicon arrow_up"></span> ';
echo '<span id="inv_switch_on"><a href="javascript:inv_selectAll(true);">'.$lang['srv_select_all'].'</a></span>';
echo '<span id="inv_switch_off" style="display:none;"><a href="javascript:inv_selectAll(false);">'.$lang['srv_deselect_all'].'</a></span>';
echo '&nbsp;&nbsp;<a href="#" onClick="inv_recipients_form_action(\'delete\');"><span class="faicon delete_circle icon-orange" title="'.$lang['srv_invitation_recipients_delete_selected'].'"></span>&nbsp;'.$lang['srv_invitation_recipients_delete_selected'].'</a>';
echo '&nbsp;&nbsp;<a href="#" onClick="inv_recipients_form_action(\'export\');"><span class="faicon xls delete" style="height:14px; width:16px;" title="'.$lang['srv_invitation_recipients_export_selected'].'"></span>&nbsp;'.$lang['srv_invitation_recipients_export_selected'].'</a>';
echo '&nbsp;&nbsp;<a href="#" onClick="inv_recipients_form_action(\'add\');">&nbsp;'.$lang['srv_invitation_recipients_activate3'].'</a>';
echo '<div class="bottom_actions">';
echo ' <a href="#" class="noline" class="noline" onClick="inv_recipients_form_action(\'delete\');"><span class="faicon delete" title="'.$lang['srv_invitation_recipients_delete_selected'].'"></span>'.$lang['srv_invitation_recipients_delete_selected'].'</a>';
echo ' <a href="#" class="noline" onClick="inv_recipients_form_action(\'export\');"><span class="faicon xls" title="'.$lang['srv_invitation_recipients_export_selected'].'"></span>'.$lang['srv_invitation_recipients_export_selected'].'</a>';
echo ' <a href="#" class="noline" onClick="inv_recipients_form_action(\'add\');">'.$lang['srv_invitation_recipients_activate3'].'</a>';
echo '</div>';
// Aktivira vse v seznamu (jih doda v podatke, kot da so poslani)
echo '<br /><span style="line-height:40px;"><a href="#" onclick="inv_add_rec_to_db(); return false;" target="_blank">'.$lang['srv_invitation_recipients_activate2'].'</a></span>';
echo '<div class="bottom_activate">';
echo ' <a href="#" class="noline" onclick="inv_add_rec_to_db(); return false;" target="_blank">'.$lang['srv_invitation_recipients_activate2'].'</a>';
echo '</div>';
echo '</div>';
# če že imamo prejemnike v bazi ponudimo gumb naprej
if ($count_all > 0) {
echo '<div class="buttonwrapper floatRight spaceLeft" style="margin-top:-30px;"><a class="ovalbutton ovalbutton_orange" href="'.$this->addUrl('view_message').'"><span>'.$lang['srv_invitation_forward'].'</span></a></div>';
echo '<br class="clr"/><br>';
}
echo '<div class="button_holder below float-right">';
echo ' <a href="'.$this->addUrl('view_message').'"><button type="button" class="medium blue">'.$lang['srv_invitation_forward'].'</div></a>';
echo '</div>';
} else {
echo $lang['srv_inv_list_no_recipients_filtred'].'<br class="clr">';
}
}
else {
echo '<span>'.$lang['srv_inv_list_no_recipients_filtred'].'</span>';
}
echo '</form>';
} else {
echo $lang['srv_inv_list_no_recipients'].'<br class="clr">';
}
else {
echo '<span>'.$lang['srv_inv_list_no_recipients'].'</span>';
}
}
@ -2018,7 +2058,7 @@ class SurveyInvitationsNew {
//echo '<span class="spaceRight floatRight"><a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&a=invitations&m=inv_server&show_back=true">'.$lang['srv_inv_message_draft_settings'].'</a></span>';
echo '<br class="clr"/>';
echo '<div id="inv_error_note" class="hidden"></div>';
echo '<div id="inv_error_note" class="displayNone"></div>';
echo '<div id="inv_msg_preview">';
echo '<table>';
echo '<tr><th>'.$lang['srv_inv_message_draft_content_from'].':</th>';
@ -2216,7 +2256,7 @@ class SurveyInvitationsNew {
//echo '<span class="spaceRight floatRight"><a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&a=invitations&m=inv_server&show_back=true">'.$lang['srv_inv_message_draft_settings'].'</a></span>';
echo '<br class="clr"/>';
echo '<div id="inv_error_note" class="hidden"></div>';
echo '<div id="inv_error_note" class="displayNone"></div>';
echo '<div id="inv_msg_preview">';
echo '<table>';
echo '<tr><th>'.$lang['srv_inv_message_draft_content_subject'].':</th>';
@ -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 '<div id="inv_error_note" class="hidden"/>';
echo '<div id="inv_error_note" class="displayNone"/>';
echo '<input type="hidden" id="inv_rid" value="'.$sql_row['id'].'">';
echo '<table id="inv_edit_recipient">';
@ -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 '<div id="inv_import_list_profiles">';
echo '<ol>';
foreach ($array_profiles AS $_pid => $profile) {
echo '<li pid="'.$_pid.'" class="'
# .($_pid['isdefault'] == 1 ? ' strong' : '')
.($ppid === $_pid ? ' active' : '')
.'">';
echo $profile['name'];
echo '<li pid="'.$_pid.'" class="'.($ppid === $_pid ? ' active' : '').'">';
echo '<span>'.$profile['name'].'</span>';
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 '<div class="icons">';
# če je iz iste ankete, potem lahko urejamo
echo '<a href="#" onclick="inv_del_rec_profile();" title="'.$lang['srv_inv_recipients_delete_profile'].'"><span class="faicon delete_circle"></span></a>';
echo '<a href="#" onclick="inv_edit_rec_profile();" title="'.$lang['srv_inv_recipients_edit_profile'].'"><span class="faicon edit"></span></a>';
echo '</div>';
}
}
echo '</li>';
}
echo '</ol>';
echo '</div>';
echo '<br class="clr" />';
if ((int)$ppid > 0) {
# polovimo še ostale porfile
$sql_string = "SELECT * FROM srv_invitations_recipients_profiles WHERE pid='".(int)$ppid."' AND from_survey ='".$this->sid."' ";
$sql_query = sisplet_query($sql_string);
if (mysqli_num_rows($sql_query) > 0) {
# če je iz iste ankete, potem lahko urejamo
echo '<a href="#" onclick="inv_del_rec_profile();" title="'.$lang['srv_inv_recipients_delete_profile'].'">'.$lang['srv_inv_recipients_delete_profile'].'</a><br/>';
echo '<a href="#" onclick="inv_edit_rec_profile();" title="'.$lang['srv_inv_recipients_edit_profile'].'">'.$lang['srv_inv_recipients_edit_profile'].'</a><br/>';
echo '<br class="clr"/>';
}
}
echo '<br class="clr" />';
}
function getRecipientsProfile($pid) {
@ -5301,7 +5345,7 @@ class SurveyInvitationsNew {
echo '<div id="inv_recipients_profile_name">';
echo '<div id="inv_error_note" class="hidden"></div>';
echo '<div id="inv_error_note" class="displayNone"></div>';
echo '<table>';
echo '<tr><td class="bold">'.$lang['srv_inv_recipient_list_name'].'</td>';
@ -5440,7 +5484,7 @@ class SurveyInvitationsNew {
$sql_query = sisplet_query($sql_string);
$sql_row = mysqli_fetch_assoc($sql_query);
echo '<div id="inv_error_note" class="hidden"/>';
echo '<div id="inv_error_note" class="displayNone"/>';
echo '<input type="hidden" id="inv_rid" value="'.$sql_row['id'].'">';
echo '<table id="inv_edit_recipient">';
@ -6346,68 +6390,58 @@ class SurveyInvitationsNew {
# current nastavimo na zadnji element
if ( $all > 1) {
echo '<div id="pagination">';
$baseUrl = $site_url.'admin/survey/index.php?anketa='.$this->sid.'&a='.A_INVITATIONS.'&m=view_recipients&page=';
echo '<div class="pagination_holder">';
# povezava -10
if ($all > 10) {
if ($current - 10 >= 0) {
echo('<div><a href="'.$baseUrl.($current - 10).'">-10</a></div>');
} else {
# brez href povezave
echo('<div class="disabledPage">-10</div>');
}
}
echo '<div id="pagination">';
$baseUrl = $site_url.'admin/survey/index.php?anketa='.$this->sid.'&a='.A_INVITATIONS.'&m=view_recipients&page=';
# povezava na prejšnjo stran
$prev_page = $current - 1 ? $current - 1 :$current;
if( ($current - 1) >= 1) {
echo('<div><a href="'.$baseUrl.$prev_page.'">'.$lang['previous_page_short'].'</a></div>');
} else {
echo '<a href="'.$baseUrl.$prev_page.'" title="'.$lang['previous_page_short'].'"><div class="arrow left"><span class="faicon pagination_left"></span></div></a>';
}
else {
# brez href povezave
echo('<div class="disabledPage">'.$lang['previous_page_short'].'</div>');
echo '<div class="arrow left disabledPage"><span class="faicon pagination_left"></span></div>';
}
# povezave za vmesne strani
$middle = $all / 2;
$skipped = false;
for($a = 1; $a <= $all; $a++) {
if ($all < ((GROUP_PAGINATE+1) * 2) || $a <= GROUP_PAGINATE || $a > ($all-GROUP_PAGINATE)
|| ( abs($a-$current) < GROUP_PAGINATE)) {
if ($all < ((GROUP_PAGINATE+1) * 2) || $a <= GROUP_PAGINATE || $a > ($all-GROUP_PAGINATE) || ( abs($a-$current) < GROUP_PAGINATE)){
if ($skipped == true) {
echo '<div class="spacePage">.&nbsp;.&nbsp;.</div>';
echo '<div class="page_space">...</div>';
$skipped = false;
}
if($a == $current) {
# brez href povezave
echo('<div class="currentPage">'.($a).'</div>');
} else {
echo('<div><a href="'.$baseUrl.$a.'">'.($a).'</a></div>');
echo '<div class="page_number currentPage">'.$a.'</div>';
}
} else {
else {
echo '<a href="'.$baseUrl.$a.'"><div class="page_number">'.$a.'</div></a>';
}
}
else {
$skipped = true;
}
}
# povezava na naslednjo stran
$next_page = ($current + 1) ? ($current + 1) : $current;
if(($current ) < $all) {
echo('<div><a href="'.$baseUrl.$next_page.'">'.$lang['next_page_short'].'</a></div>');
} else {
# brez href povezave
echo('<div class="disabledPage">'.$lang['next_page_short'].'</div>');
echo '<a href="'.$baseUrl.$next_page.'" title="'.$lang['next_page_short'].'"><div class="arrow right"><span class="faicon pagination_right"></span></div></a>';
}
if ($all > 10) {
if ($current + 10 < $all) {
echo('<div><a href="'.$baseUrl.($current + 10).'">+10</a></div>');
} else {
else {
# brez href povezave
echo('<div class="disabledPage">+10</div>');
}
echo '<div class="arrow right disabledPage"><span class="faicon pagination_right"></span></div>';
}
$rec_on_page = $all != $current ? REC_ON_PAGE : ( $all_records - ($all-1)*REC_ON_PAGE);
echo '<div class="justtext">'.$lang['srv_inv_pagination_shown'].$rec_on_page.$lang['srv_inv_pagination_shown_records'].'</div>';
echo '</div>';
echo '</div>';
}
}
@ -9857,14 +9891,14 @@ class SurveyInvitationsNew {
return array();
}
function advancedCondition()
{
function advancedCondition(){
global $lang;
echo '<span id="conditionProfileNote" class="simple">';
echo '<div id="conditionProfileNote" class="setting">';
echo $lang['srv_inv_condition_filter'].' ';
if ((int)$this->invitationAdvancedConditionId > 0)
{
if ((int)$this->invitationAdvancedConditionId > 0){
$scp = new SurveyCondition($this->sid);
echo ' <strong>'.$scp->getConditionName((int)$this->invitationAdvancedConditionId).'</strong> ';
$this->user_inv_ids = $this->getConditionUserIds($this->invitationAdvancedConditionId);
@ -9879,29 +9913,32 @@ class SurveyInvitationsNew {
echo '<span class="as_link spaceLeft" onclick="showInvitationAdvancedConditions(\''.(int)$this->invitationAdvancedConditionId.'\'); return false;">'.$lang['srv_profile_edit'].'</span>';
echo '<span class="as_link spaceLeft" onclick="invitationSetCondition(\'0\'); return false;">'.$lang['srv_profile_remove'].'</span>';
}
else
{
echo '<strong>'.$lang['srv_inv_condition_no_filter'].'</strong>';
echo '<a href="#" class="faicon if_add" onclick="showInvitationAdvancedConditions(); return false;" data-cid="'.(int)$this->invitationAdvancedConditionId.'">&nbsp;</a>';
}
echo '</span>';
else{
echo '<span>'.$lang['srv_inv_condition_no_filter'].'</span>';
echo '<a href="#" class="faicon if_add" onclick="showInvitationAdvancedConditions(); return false;" data-cid="'.(int)$this->invitationAdvancedConditionId.'"></a>';
}
function listCondition()
{
echo '</div>';
}
function listCondition(){
global $lang;
# get all lists
$lists = $this->getSurveyInvitationLists(true);
$selected = (int)(isset($_SESSION['inv_filter']['list']) ? (int)$_SESSION['inv_filter']['list'] : -2);
echo '&nbsp;';
echo '<label>'.$lang['srv_invitation_recipients_filter_list'];
echo '<select id="inv_rec_filter_list" onchange="inv_filter_recipients();">';
foreach ($lists AS $list_id => $list)
{
echo '<div class="setting">';
echo '<label>'.$lang['srv_invitation_recipients_filter_list'].'</label>';
echo '<select id="inv_rec_filter_list" class="dropdown small" onchange="inv_filter_recipients();">';
foreach ($lists AS $list_id => $list){
echo '<option value="'.$list_id.'"'.((int)$selected == $list_id ? ' selected="selected"' : '').'>'.$list['name'].'</option>';
}
echo '</select></label>';
echo '</select>';
echo '</div>';
}
function getSurveyInvitationLists($add_all = false)

39
admin/survey/script/invitations.js
View File

@ -129,7 +129,7 @@ function inv_update_rec_profile() {
var pid = $('#inv_recipients_profile_name').find('#rec_profile_pid').val();
var profile_name = $('#inv_recipients_profile_name').find('#rec_profile_name').val();
$("#inv_error_note").addClass('hidden');
$("#inv_error_note").addClass('displayNone');
$.post('ajax.php?t=invitations&a=update_rec_profile', {anketa:srv_meta_anketa_id, pid:pid, profile_name:profile_name, noNavi:'true'}, function(data) {
data = jQuery.parseJSON(data);
@ -141,7 +141,7 @@ function inv_update_rec_profile() {
} else {
$("#inv_error_note").html(data.msg);
$("#inv_error_note").show();
$("#inv_error_note").removeClass('hidden');
$("#inv_error_note").removeClass('displayNone');
}
});
}
@ -210,7 +210,7 @@ function inv_save_recipient() {
// prikažemo obvestilo o napaki
$("#inv_error_note").html(data.msg);
$("#inv_error_note").show();
$("#inv_error_note").removeClass('hidden');
$("#inv_error_note").removeClass('displayNone');
if (data.error_email == '1') {
$("#rec_email").addClass('inv_input_error');
}
@ -471,8 +471,7 @@ function invitations_init() {
// izbira obstoječega profila prejemnikov
$("#inv_import_list_profiles ol li").live('click', function(event) {
var target = $(event.target);
var pid = $(target).attr('pid');
var pid = $(this).attr('pid');
if (pid != 'undefined') {
$("#anketa_edit").load('ajax.php?t=invitations&a=use_recipients_list', {anketa:srv_meta_anketa_id, pid:pid });
}
@ -588,7 +587,7 @@ function inv_message_save_forward(mid) {
'border' : 'none'
});
$("#inv_error_note").addClass('hidden');
$("#inv_error_note").addClass('displayNone');
$.post(
'ajax.php?t=invitations&a=message_save_forward',
{
@ -612,7 +611,7 @@ function inv_message_save_forward(mid) {
}
// prikažemo obvestilo o napaki
$("#inv_error_note").html(data.msg);
$("#inv_error_note").removeClass('hidden');
$("#inv_error_note").removeClass('displayNone');
if (data.inv_message_replyto == '1') {
$("#inv_¸ge_replyto").css({
'border' : '1px solid red'
@ -653,7 +652,7 @@ function inv_message_save_forward_noEmail(mid) {
'border' : 'none'
});
$("#inv_error_note").addClass('hidden');
$("#inv_error_note").addClass('displayNone');
$.post(
'ajax.php?t=invitations&a=message_save_forward_noEmail',
{
@ -676,7 +675,7 @@ function inv_message_save_forward_noEmail(mid) {
}
// prikažemo obvestilo o napaki
$("#inv_error_note").html(data.msg);
$("#inv_error_note").removeClass('hidden');
$("#inv_error_note").removeClass('displayNone');
if (data.inv_message_subject == '1') {
$("#inv_message_subject").css({
'border' : '1px solid red'
@ -714,7 +713,7 @@ function inv_message_save_simple(mid) {
'border' : 'none'
});
$("#inv_error_note").addClass('hidden');
$("#inv_error_note").addClass('displayNone');
$.post(
'ajax.php?t=invitations&a=save_message_simple',
{
@ -735,7 +734,7 @@ function inv_message_save_simple(mid) {
// skrijemo okno in
// prikažemo obvestilo o napaki
$("#inv_error_note").html(data.msg);
$("#inv_error_note").removeClass('hidden');
$("#inv_error_note").removeClass('displayNone');
if (data.inv_message_replyto == '1') {
$("#inv_messge_replyto").css({
'border' : '1px solid red'
@ -775,7 +774,7 @@ function inv_message_save_simple_noEmail(mid) {
'border' : 'none'
});
$("#inv_error_note").addClass('hidden');
$("#inv_error_note").addClass('displayNone');
$.post(
'ajax.php?t=invitations&a=save_message_simple_noEmail',
{
@ -795,7 +794,7 @@ function inv_message_save_simple_noEmail(mid) {
// skrijemo okno in
// prikažemo obvestilo o napaki
$("#inv_error_note").html(data.msg);
$("#inv_error_note").removeClass('hidden');
$("#inv_error_note").removeClass('displayNone');
if (data.inv_message_subject == '1') {
$("#inv_message_subject").css({
'border' : '1px solid red'
@ -972,7 +971,10 @@ function invTogleSend(what) {
}
}
function inv_selectAll(val){
function inv_selectAll(checkbox){
val = $(checkbox).is(':checked');
// oznacimo vse checkboxe
$('#tbl_recipients_list tr td input[type="checkbox"]').each(function() {
$(this).attr("checked", val);
@ -981,7 +983,8 @@ function inv_selectAll(val){
if(val == true){
$("#inv_switch_on").hide();
$("#inv_switch_off").show();
} else{
}
else{
$("#inv_switch_off").hide();
$("#inv_switch_on").show();
}
@ -1150,7 +1153,7 @@ function edit_message_save(mid) {
'border' : 'none'
});
$("#inv_error_note").addClass('hidden');
$("#inv_error_note").addClass('displayNone');
$.post(
'ajax.php?t=invitations&a=save_message',
@ -1179,7 +1182,7 @@ function edit_message_save(mid) {
$('#fullscreen').fadeOut('slow').html('')
// prikažemo obvestilo o napaki
$("#inv_error_note").html(data.msg);
$("#inv_error_note").removeClass('hidden');
$("#inv_error_note").removeClass('displayNone');
if (data.inv_message_replyto == '1') {
$("#inv_message_replyto").css({
'border' : '1px solid red'
@ -1559,6 +1562,8 @@ function invRecipientsForward() {
{
// shranimo seznam ali dodamo respondente ali oboje
$("#anketa_edit").load('ajax.php?t=invitations&a=recipientsAddForward', {anketa:srv_meta_anketa_id, doAdd:doAdd, doSave:doSave, recipients_list:recipients_list, fields:fields, profile_name:profile_name, profile_comment:profile_comment, profile_id:profile_id, recipientsDelimiter: recipientsDelimiter});
/*$.post('ajax.php?t=invitations&a=recipientsAddForward', {anketa:srv_meta_anketa_id, doAdd:doAdd, doSave:doSave, recipients_list:recipients_list, fields:fields, profile_name:profile_name, profile_comment:profile_comment, profile_id:profile_id, recipientsDelimiter: recipientsDelimiter});
window.location = 'index.php?anketa='+srv_meta_anketa_id+'&a=invitations&m=view_recipients';*/
}
else
{

10
lang/1.php
View File

@ -117,6 +117,8 @@ $lang = array (
"app_aai_installation_text" => "<b>Z orodjem 1KA lahko na enostaven način izdelate spletni vprašalnik, izvedete spletno anketo, urejate in analizirate podatke, s kar najmanjšim številom klikov.</b><br /><br />Za uporabo orodja 1KA se lahko registrirate oziroma prijavite z vašim Arnes AAI-računom.<br /><br />Kliknite na spodnji gumb in sledite navodilom za prijavo v AAI.",
"sent" => "Poslano",
"not_sent" => "Ni poslano",
"unsubscribed" => "Odjavljen",
"not_unsubscribed" => "Ni odjavljen",
"check_and" => "Preverite in",
"submit" => "potrdite spremembe",
"dontwant" => "Ne elim ve&#269; prejemati on-line novic",
@ -4902,14 +4904,15 @@ $lang = array (
'srv_inv_settings_code_1' => "ročni vnos kode",
'srv_inv_settings_code_2' => "brez kode",
'srv_inv_add_recipients_heading' => "Dodaj respondente",
'srv_inv_recipiens_field_note' => "<span class=\"bold\">Izberite podatke, ki jih boste vnesli.</span> Dodatne spremenljivke lahko dodate v urejanju. S premikanjem lahko določite vrstni red:",
'srv_inv_recipiens_email_note' => "<span class=\"bold\">Vpišite ali kopirajte seznam prejemnikov, vsakega prejemnika dodajte v svojo vrstico.</span> Če uvažate tudi dodatna polja, jih ločite z vejico in jih dodajte v enakem vrstnem redu, kot ste označili polja zgoraj. Podvojeni zapisi bodo odstranjeni.",
'srv_inv_recipiens_field_note' => "<span class=\"semi-bold\">Izberite polja, ki jih boste vnesli.</span> Dodatne spremenljivke lahko dodate v zavihku 'urejanje'. S premikanjem lahko določite vrstni red spremenljivk:",
'srv_inv_recipiens_email_note' => "<span class=\"semi-bold\">Vpišite ali kopirajte seznam prejemnikov, vsakega prejemnika dodajte v svojo vrstico.</span> Če uvažate tudi dodatna polja, jih ločite z vejico in jih dodajte v enakem vrstnem redu, kot ste označili polja zgoraj. Podvojeni zapisi bodo odstranjeni.",
'srv_inv_recipiens_email_note_append' => "Vpišite ali kopirajte podatke v tekstovni obliki, vsak zapis dodajte v svojo vrstico. Če dodajate več polj, jih ločite s spodaj izbranim ločilnikom in jih dodajte v enakem vrstnem redu kot ste označili polja zgoraj.",
'srv_inv_recipiens_pass_warning' => "Opozorilo! Maksimalna dolžina znakov za polje <i>PASSWORD</i> je 20 znakov.",
'srv_inv_recipiens_fields' => "Vnesite podatke respondentov po sledečem vrstnem redu:",
'srv_inv_recipiens_sample' => "Primer:",
'srv_inv_recipiens_sample1' => "janez.novak@example.com,Janez,Novak,g.<br/>janja.novak@example.com,,,ga.",
"srv_inv_recipiens_sample2" => "<span class=\"bold\">Primer</span> - vnos podatkov za primer, ko želimo za dva respondenta vnesti podatke za njuno telefonsko številko, ime in priimek:",
"srv_inv_recipiens_insert" => "Vnesite prejemnike",
'srv_inv_edit_recipients_heading' => "Vpogled in urejanje prejemnikov",
'srv_inv_recipients_email' => "EMAIL", #"Email",
'srv_inv_recipients_password' => "PASSWORD", #"Geslo",
@ -4961,6 +4964,7 @@ $lang = array (
'srv_inv_recipiens_upload_error' => "Uporabnikov ne morem dodati, prosim odpravite spodnje napake!",
'srv_inv_recipiens_upload_error_no_fields' => "Nobeno polje ni izbrano!",
'srv_inv_recipiens_onlyThisSurvey' => "Samo ta anketa",
'srv_inv_recipiens_from' => "Vnos prejemnikov",
'srv_inv_recipiens_from_list' => "Ročni vnos",
'srv_inv_recipiens_from_file' => "Datoteke (csv)",
'srv_inv_recipiens_from_system' => "Iz obstoječe spremenljivke",
@ -5061,7 +5065,7 @@ $lang = array (
'srv_inv_potencial_respondents' => "Sporočilo bo poslano na spodnje naslove:",
'srv_inv_potencial_respondents_limit' => "Vabilo želite poslati več kot 5000 respondentom. Prosimo, če nas pred pošiljanjem o tem obvestite na <a href=\"mailto:info@1ka.si\">info@1ka.si</a>!",
'srv_inv_btn_add_recipients_add' => "Dodaj",
'srv_inv_recipiens_file_note_1' => "Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici. Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.",
'srv_inv_recipiens_file_note_1' => "<span class=\"semi-bold\">Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici.</span> Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.",
'srv_inv_archive_heading' => "Arhivi pošiljanja",
'srv_inv_archive_date_send' => "Datum pošiljanja",
'srv_inv_archive_hour_send' => "Ura pošiljanja",

10
lang/2.php
View File

@ -105,6 +105,8 @@ $lang = array (
"app_aai_installation_text" => "<b>With the 1KA tool, you can easily create an online questionnaire, conduct an online survey, edit and analyze data with as few clicks as possible.</b><br /><br />You can register or login into 1KA application with your Arnes AAI-account.<br /><br />Click bottom button and follow instructions for AAI login.",
"sent" => "Sent",
"not_sent" => "Not sent",
"unsubscribed" => "Unsubscribed",
"not_unsubscribed" => "Not unsubscribed",
"check_and" => "Check and",
"submit" => "submit",
"dontwant" => "I don't want to receive any more e-mail",
@ -4872,14 +4874,15 @@ $lang = array (
'srv_inv_settings_code_1' => "Manual code input",
'srv_inv_settings_code_2' => "Without code",
'srv_inv_add_recipients_heading' => "Add respondents",
'srv_inv_recipiens_field_note' => "<span class=\"bold\">Select data which you would like to enter.</span> Additional variables can be added in the editing section. You can determine the order of the variables:",
'srv_inv_recipiens_email_note' => "<span class=\"bold\">Enter or copy the data in text form; add each record in a new row.</span> If you import additional fields, separate them with a comma and add them in the same order as above. Duplicate entries will be removed automatically.",
'srv_inv_recipiens_field_note' => "<span class=\"semi-bold\">Select fields which you would like to enter.</span> Additional variables can be added in the editing section. You can determine the order of the variables:",
'srv_inv_recipiens_email_note' => "<span class=\"semi-bold\">Enter or copy the data in text form; add each record in a new row.</span> If you import additional fields, separate them with a comma and add them in the same order as above. Duplicate entries will be removed automatically.",
'srv_inv_recipiens_email_note_append' => "Enter or copy the data in text form; add each record in a new row. If you import additional fields, separate them by a comma and add them in the same order as above. Duplicate entries will be removed automatically.",
'srv_inv_recipiens_pass_warning' => "Warning! Maximum length of field <i>PASSWORD</i> is 20 characters.",
'srv_inv_recipiens_fields' => "Enter the respondents' details in the following order: ",
'srv_inv_recipiens_sample' => "Example:",
'srv_inv_recipiens_sample1' => "john.smith@gmail.com,John,Smith,Mr.<br/>johana.smith@gmail.com,,,mrs.",
"srv_inv_recipiens_sample2" => "<span class=\"bold\">Example</span> - data entry for if you want to enter the phone number, surname and name of two respondents:",
"srv_inv_recipiens_insert" => "Insert recipients",
'srv_inv_edit_recipients_heading' => "Preview and edit recipients:",
'srv_inv_recipients_email' => "Email",
'srv_inv_recipients_password' => "Password",
@ -4931,6 +4934,7 @@ $lang = array (
'srv_inv_recipiens_upload_error' => "Users cannot be added, please fix the errors below!",
'srv_inv_recipiens_upload_error_no_fields' => "No one field is selected!",
'srv_inv_recipiens_onlyThisSurvey' => "Only this survey",
'srv_inv_recipiens_from' => "Recipients entry",
'srv_inv_recipiens_from_list' => "Manual entry",
'srv_inv_recipiens_from_file' => "From an external file (csv)",
'srv_inv_recipiens_from_system' => "From system variables",
@ -5029,7 +5033,7 @@ $lang = array (
'srv_inv_potencial_respondents' => "The number of potential recipients:",
'srv_inv_potencial_respondents_limit' => "You are trying to send an invitation to more than 5000 respondents. Please contact us before sending on <a href=\"mailto:info@1ka.si\">info@1ka.si</a>!",
'srv_inv_btn_add_recipients_add' => "Add",
'srv_inv_recipiens_file_note_1' => "Select a file with e-mail addresses. Each recipient must be in a separate line. If you import additional personalization fields, separated them by commas. Fields in the file must be in the same order as you have ticked above. Duplicate entries will not be added.",
'srv_inv_recipiens_file_note_1' => "<span class=\"semi-bold\">Select a file with e-mail addresses. Each recipient must be in a separate line.</span> If you import additional personalization fields, separated them by commas. Fields in the file must be in the same order as you have ticked above. Duplicate entries will not be added.",
'srv_inv_archive_heading' => "Sending Archive:",
'srv_inv_archive_date_send' => "Sending date",
'srv_inv_archive_hour_send' => "Sending time",

5715
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

73
resources/sass/admin_new/pages/survey_edit/jezik.scss
View File

@ -1,18 +1,35 @@
div.prevajanje_holder {
display: flex;
flex-direction: row;
gap: 32px;
width: 100%;
box-sizing: border-box;
padding: 0 32px;
//Nastavite zgoraj
// Posamezna sekcija (nastavitve, prevod imena, vprasanja)
.section{
margin: 0 16px 16px 16px;
.jezik_row{
display: flex;
width: 100%;
// Leva in desna stran
.jezik_left,
.jezik_right{
overflow-x: auto;
box-sizing: border-box;
width: 50%;
max-width: 50%;
&.jezik_left{
margin-right: 16px;
}
}
}
// Segment z zgornjimi nastavitvami
&.jezik_top_settings{
fieldset {
width: 50%;
box-sizing: border-box;
margin-bottom: 8px;
&.lang_set_left{
&.jezik_left{
min-height: 100% !important;
}
@ -57,25 +74,47 @@ div.prevajanje_holder {
}
}
&.lang_set_right{
&.jezik_right{
button {
margin-top: 8px;
}
}
}
}
//Prevajanje
// Segment z dodatnimi nastavitvami
&.jezik_additional_settings{
div.jezik_left,
div.jezik_right {
width: 50%;
}
span.title {
// Segment s naslovom ankete
&.jezik_texti{
}
// Segment z vprasanji
&.jezik_vprasanja{
.jezik_row{
margin-bottom: 32px;
// Vrstica z naslovom strani
&.page{
font-size: 20px;
margin-bottom: 16px;
font-weight: 600;
}
// Urejanje vprasanja
&.question{
}
// Urejanje uvoda, zakljucka
&.tip_-1,
&.tip_-2{
}
}
}
}
}

7
resources/sass/admin_new/pages/survey_edit/questions/grids.scss
View File

@ -11,7 +11,12 @@ div.spr_tip_6,
div.spr_tip_16,
div.spr_tip_19,
div.spr_tip_20,
div.spr_tip_24{
div.spr_tip_24,
div.jezik_row.tip_6,
div.jezik_row.tip_16,
div.jezik_row.tip_19,
div.jezik_row.tip_20,
div.jezik_row.tip_24{
.spremenljivka_content .content_div_normalmode .variable_holder{
overflow-x: auto;

3
resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
View File

@ -5,7 +5,8 @@
li.spr,
div.spr{
div.spr,
.jezik_row{
color: $black;
&:hover {

3
resources/sass/admin_new/pages/survey_edit/questions/ranking.scss
View File

@ -11,7 +11,8 @@ and open the template in the editor.
li.spr_tip_17,
div.spr_tip_17{
div.spr_tip_17,
div.jezik_row.tip_17{
.variable_holder .ranking_holder{

6
resources/sass/admin_new/pages/survey_edit/questions/text.scss
View File

@ -9,7 +9,11 @@ li.spr_tip_21,
div.spr_tip_4,
div.spr_tip_7,
div.spr_tip_8,
div.spr_tip_21{
div.spr_tip_21,
div.div.jezik_row.tip_4,
div.div.jezik_row.tip_7,
div.div.jezik_row.tip_8,
div.div.jezik_row.tip_21{
.variable_holder{
display: flex;

286
resources/sass/admin_new/pages/survey_objava/vabila_main.scss
View File

@ -30,6 +30,15 @@ body #main_holder #main .page_invitations{
margin-bottom: 16px;
font-weight: 600;
.faicon{
margin-left: 16px;
}
#srv_invitation_note{
margin-top: 8px;
font-weight: 400;
}
}
@ -59,6 +68,7 @@ body #main_holder #main .page_invitations{
display: flex;
align-items: center;
justify-content: space-between;
height: 35px;
padding: 0px 8px;
@ -77,10 +87,17 @@ body #main_holder #main .page_invitations{
&:hover {
background-color: $medium-blue2;
}
}
}
}
.faicon{
margin-left: 8px;
&:before{
font-size: 16px;
}
}
}
}
}
// 2 - Dodaj - leva stran
@ -111,11 +128,240 @@ body #main_holder #main .page_invitations{
vertical-align: bottom;
}
}
.setting_line{
margin-bottom: 16px;
textarea{
width: 100%;
}
}
}
// 3 - Preglej prejemnike
// Search
#inv_rec_filter {
display: flex;
align-items: center;
height: 40px;
box-sizing: border-box;
margin-bottom: 16px;
padding: 0 16px;
background: $light-gray;
border: 1px solid $gray;
border-radius: 2px;
.setting{
margin-right: 16px;
&#conditionProfileNote{
display: flex;
align-items: center;
padding: 4px 8px;
background-color: $gray;
span{
margin-left: 8px;
}
a{
margin-left: 4px;
}
}
label{
margin: 0;
font-size: 14px;
}
input[type="text"]{
width: 160px;
margin: 0 0 0 8px;
}
select{
width: 90px;
margin: 0 0 0 8px;
}
}
}
.filter_note{
margin-bottom: 16px;
color: $red;
font-size: 14px;
font-weight: 600;
}
#srv_invitation_note{
margin-bottom: 16px;
span{
margin-right: 16px;
font-size: 14px;
}
label{
font-size: 14px;
}
}
.excel_export{
font-size: 14px;
.faicon{
margin-right: 8px;
}
}
.pagination_holder{
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 16px;
#pagination{
display: flex;
justify-content: center;
align-items: center;
width: auto;
padding: 4px;
background: $light-gray;
border-radius: 2px;
a{
color: $black;
text-decoration: none;
}
.page_number{
display: flex;
justify-content: center;
align-items: center;
width: 24px;
height: 24px;
margin: 0 4px;
border-radius: 2px;
transition: 0.2s;
&:hover{
background-color: $gray;
}
&.currentPage{
color: $white;
background-color: $blue;
}
}
.arrow{
margin: 0 4px;
transition: 0.2s;
&.disabledPage{
color: $very-dark-gray;
}
}
}
}
// Tabela prejemnikov
.table_holder{
overflow-x: auto;
margin: 8px 0;
table#tbl_recipients_list{
margin: 0;
tr{
th{
position: relative;
min-height: 40px;
padding: 10px 16px;
font-size: 14px;
.sort_descending,
.sort_ascending{
position: absolute;
right: 0;
top: 20px;
}
input[type="checkbox"] + label::before{
font-weight: 400;
}
input[type="checkbox"]:checked + label::before{
font-weight: 600;
}
}
td{
white-space: nowrap;
min-height: 40px;
padding: 10px 16px;
font-size: 14px;
}
}
}
}
#inv_bottom_edit{
.bottom_actions{
display: flex;
align-items: center;
margin-bottom: 16px;
a{
margin-right: 16px;
font-size: 14px;
.faicon{
margin-right: 8px;
&:before{
font-size: 16px;
}
}
}
}
.bottom_activate{
a{
font-size: 14px;
.faicon{
margin-right: 8px;
}
}
}
}
// 3-
// 4 - Sporocilo
#invitation_messages {
@include inv_left_list();
}
@ -130,7 +376,7 @@ body #main_holder #main .page_invitations{
/*
.lbl_email_setting {
vertical-align: top;
line-height: 16px;
@ -206,15 +452,6 @@ $background_color_26: #ffe6d6;
#inv_recipient_edit {
@include popup_general();
/*span.h2 {
float: left;
display: inline-block;
padding: 5px 0 10px 0;
font-size: 14px;
font-weight: 600;
color: $blue;
}*/
height: auto;
div#inv_error_note {
@ -287,10 +524,10 @@ $background_color_26: #ffe6d6;
}
}
}
/*#tbl_recipients_list {
#tbl_recipients_list {
@include recepient_list();
clear: both;
}*/
}
#tbl_archive_list {
@include recepient_list();
}
@ -518,6 +755,8 @@ textarea#inv_recipients_list {
}
}
#inv_field_list {
color: $gray;
font-style: italic;
}
#inv_recipiens_added {
font-size: 12px;
@ -877,14 +1116,7 @@ div.inv_step.active {
.inv_input_error {
border: 1px solid $red;
}
#inv_rec_filter {
float: left;
width: auto;
margin-right: 5px;
margin-bottom: 10px;
padding: 8px;
border: 1px solid $gray;
}
#inv_rec_cehckboxes {
float: left;
width: auto !important;
@ -1118,8 +1350,6 @@ span.span_list_archive {
padding-top: 10px;
}
span.inv_sort_ascending {
/*background-repeat: no-repeat;
background-image: url(../../../admin/survey/img_0/sprites.png);*/
display: inline-block;
height: 5px;
width: 9px;
@ -1129,8 +1359,6 @@ span.inv_sort_ascending {
background-position: -225px -98px;
}
span.inv_sort_descending {
/*background-repeat: no-repeat;
background-image: url(../../../admin/survey/img_0/sprites.png);*/
display: inline-block;
height: 5px;
width: 9px;
@ -1183,3 +1411,5 @@ span.inv_sort_descending {
#inv_send_mail_btn {
height: 30px;
}
*/