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

Redesign - priprava strukture za prevajanje, popravki vabil

Browse Source
This commit is contained in:
pero1203 2022-04-08 11:21:34 +02:00
parent 32a7f752d6
commit 9b47dd8ce6
11 changed files with 2363 additions and 1736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
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) {
if (mysqli_num_rows($sql) == 0) {
//$this->dodaj_jezik(1);
} else {
}
elseif ($rowa['multilang'] == 1) {
if ($rowa['multilang'] == 1) {
$this->urejanje();
?><script> var srv_meta_lang_id = <?=$this->lang_id?>; </script><?
}
$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 '<fieldset class="lang_set_left">';
echo '<div class="jezik_row">';
// 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();
@ -344,8 +346,8 @@ class Prevajanje {
$this->dodaj_jezik();
echo '</fieldset>';
echo '</div>';
echo '</div>';
}
/**
@ -406,12 +408,14 @@ class Prevajanje {
function urejanje () {
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,28 +424,33 @@ 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>';
echo ' <span class="title semi-bold">'.$lang_array[$this->lang_id].'</span>';
echo ' </span>';
echo '</div>';
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();
</script><?
@ -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 '<strong>';
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 '<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>';
// 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>';
$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 '<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">';
@ -596,7 +625,7 @@ class Prevajanje {
echo '</div>';
// DESNA STRAN PREVAJANJA
echo '<div class="jezik_right vprlang" id="vprlang_'.$spremenljivka.'">';
@ -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 '</div>';
echo '</div>';
// Nastavimo nazaj originalen jezik vmesnika

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

@ -657,23 +657,35 @@ 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) {
$this->createSystemVariablesMapping();
$this->createSystemVariablesMapping();
}
else {
# sporočilo za personalizirana e-vabila in respondente iz baze
echo '<span class="inv_note">'.$lang['srv_inv_recipiens_field_note'].'</span>';
echo '<br >';
# sporočilo za personalizirana e-vabila in respondente iz baze
echo '<div class="setting_holder">';
echo '<span>'.$lang['srv_inv_recipiens_field_note'].'</span>';
echo '</div>';
echo '<div id="inv_field_container">';

5
lang/1.php
View File

@ -4902,8 +4902,8 @@ $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:",
@ -4961,6 +4961,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",

7
lang/2.php
View File

@ -4872,8 +4872,8 @@ $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: ",
@ -4930,7 +4930,8 @@ $lang = array (
'srv_inv_recipiens_add_invalid_upload_note' => "Check the addresses in the file!",
'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_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",

3717
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -1,81 +1,120 @@
div.prevajanje_holder {
display: flex;
flex-direction: row;
gap: 32px;
width: 100%;
box-sizing: border-box;
padding: 0 32px;
//Nastavite zgoraj
fieldset {
width: 50%;
box-sizing: border-box;
margin-bottom: 8px;
// 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;
&.lang_set_left{
min-height: 100% !important;
}
box-sizing: border-box;
width: 50%;
max-width: 50%;
div.lang_name {
font-size: 20px;
margin-bottom: 14px;
a {
text-decoration: none;
&.jezik_left{
margin-right: 16px;
}
}
}
div.lang_content {
display: flex;
flex-direction: row;
gap: 82px;
margin-bottom: 32px;
div.lang_column {
display: flex;
flex-direction: column;
// Segment z zgornjimi nastavitvami
&.jezik_top_settings{
div.lang_item {
span.faicon {
margin-right: 8px;
color: $blue !important;
}
span.faicon.pdf::before,
span.faicon.rtf::before{
color: $blue !important;
}
fieldset {
width: 50%;
&.jezik_left{
min-height: 100% !important;
}
div.lang_name {
font-size: 20px;
margin-bottom: 14px;
a {
text-decoration: none;
}
margin-bottom: 16px;
&:last-of-type {
margin-bottom: 0;
}
div.lang_content {
display: flex;
flex-direction: row;
gap: 82px;
margin-bottom: 32px;
div.lang_column {
display: flex;
flex-direction: column;
div.lang_item {
span.faicon {
margin-right: 8px;
color: $blue !important;
}
span.faicon.pdf::before,
span.faicon.rtf::before{
color: $blue !important;
}
a {
text-decoration: none;
}
margin-bottom: 16px;
&:last-of-type {
margin-bottom: 0;
}
}
}
}
&.jezik_right{
button {
margin-top: 8px;
}
}
}
}
&.lang_set_right{
button {
margin-top: 8px;
// Segment z dodatnimi nastavitvami
&.jezik_additional_settings{
}
// Segment s naslovom ankete
&.jezik_texti{
}
// Segment z vprasanji
&.jezik_vprasanja{
.jezik_row{
margin-bottom: 32px;
// Vrstica z naslovom strani
&.page{
font-size: 20px;
font-weight: 600;
}
// Urejanje vprasanja
&.question{
}
// Urejanje uvoda, zakljucka
&.tip_-1,
&.tip_-2{
}
}
}
}
}
//Prevajanje
div.jezik_left,
div.jezik_right {
width: 50%;
span.title {
font-size: 20px;
margin-bottom: 16px;
}
}
}
}

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;

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

@ -287,10 +287,10 @@ $background_color_26: #ffe6d6;
}
}
}
/*#tbl_recipients_list {
#tbl_recipients_list {
@include recepient_list();
clear: both;
}*/
}
#tbl_archive_list {
@include recepient_list();
}
@ -518,6 +518,8 @@ textarea#inv_recipients_list {
}
}
#inv_field_list {
color: $gray;
font-style: italic;
}
#inv_recipiens_added {
font-size: 12px;