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

[Redizajn 1KA] - Urejanje --> Jezik - v4

Browse Source
This commit is contained in:
tejagerjovic 2022-04-28 21:02:17 +02:00
parent cb039cfae6
commit 67ca1504b5
7 changed files with 1584 additions and 1456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,12 +261,13 @@ class Prevajanje {
else { else {
echo '<a href="index.php?anketa='.$this->anketa.'" style="position:absolute; top:0px; right:10px">'.$lang['srv_back_edit'].'</a>'; echo '<a href="index.php?anketa='.$this->anketa.'" style="position:absolute; top:0px; right:10px">'.$lang['srv_back_edit'].'</a>';
} }
//Standardne besede
echo '<p class="top16">'.$lang['srv_language_std_bes1'].'<a href="index.php?anketa='.$this->anketa.'&a=jezik">'.$lang['srv_language_std_bes2'].'</a>.</p>';
// Jezik administrativnega vmesnika //Jezik administrativnega vmesnika
//echo '<div style="position:absolute; right:20px; bottom:10px;"><span class="bold">'; echo '<p class="bottom16 top16">'.$lang['srv_language_admin_surveyA'].'<a href="index.php?anketa='.$this->anketa.'&a=nastavitve">'.$lang['srv_language_admin_survey'].'</a>'.$lang['srv_language_admin_surveyB'].'</p>';
//printf ($lang['srv_language_admin_survey2'], 'index.php?anketa='.$this->anketa.'&a=nastavitve');
//echo '<a href="index.php?anketa='.$this->anketa.'&a=nastavitve">'.$lang['srv_language_admin_survey'].'</a>';
//echo '</span></div>';
echo '</form>'; echo '</form>';
} }
@ -281,13 +282,25 @@ class Prevajanje {
$lang_array = $this->get_all_translation_langs(); $lang_array = $this->get_all_translation_langs();
foreach ($lang_array AS $key => $l) { foreach ($lang_array AS $key => $l) {
$bold = '';
$display = 'displayNone';
$active_urejanje = '';
if ($this->lang_id == $key) {
$bold = 'semi-bold';
$display = '';
$active_urejanje = '<div class="active_urejanje">'.$lang['edit2'].'</div>';
}
echo '<p>'; echo '<p>';
echo '<div class="lang_name '.($this->lang_id==$key?' semi-bold':'').'">'; echo '<div class="lang_name '.$bold.'">';
echo '<a href="index.php?anketa='.$this->anketa.'&a=prevajanje&lang_id='.$key.'">'.$l.'</a> '; echo '<a href="index.php?anketa='.$this->anketa.'&a=prevajanje&lang_id='.$key.'">'.$l.'</a> ';
echo $active_urejanje;
echo '</div>'; echo '</div>';
echo '<div class="lang_content">'; echo '<div class="lang_content '.$display.'">';
echo '<div class="lang_column">'; echo '<div class="lang_column">';
echo '<div class="lang_item">'; echo '<div class="lang_item">';
@ -469,8 +482,8 @@ class Prevajanje {
echo '</div>'; echo '</div>';
echo '<div class="jezik_row">'; echo '<div class="jezik_row">';
echo ' <div class="jezik_left">'.$lang['srv_novaanketa_kratkoime'].'</div>'; echo ' <div class="jezik_left semi-bold bottom16">'.$lang['srv_novaanketa_kratkoime'].':</div>';
echo ' <div class="jezik_right">'.$lang['srv_novaanketa_kratkoime'].':</div>'; echo ' <div class="jezik_right semi-bold">'.$lang['srv_novaanketa_kratkoime'].':</div>';
echo '</div>'; echo '</div>';
echo '<div class="jezik_row">'; echo '<div class="jezik_row">';
@ -505,6 +518,9 @@ class Prevajanje {
} }
echo '<div class="jezik_left">'; echo '<div class="jezik_left">';
if ($value == $row['intro_opomba']) {
echo '<p class="jezik_left semi-bold bottom16">'.$lang['note'].' ('.$lang['srv_internal'].'):</p>';
}
echo '<span>'.$value.'</span>'; echo '<span>'.$value.'</span>';
echo '</div>'; echo '</div>';
@ -527,7 +543,7 @@ class Prevajanje {
//if ($text == 'srv_novaanketa_kratkoime') //if ($text == 'srv_novaanketa_kratkoime')
// echo $lang['srv_naslov'].': '; // echo $lang['srv_naslov'].': ';
if ($text == 'srv_anketa_opomba') if ($text == 'srv_anketa_opomba')
echo '<p class="top16">'.$lang['note'].' ('.$lang['srv_internal'].'): </p>'; echo '<p class="top16 semi-bold">'.$lang['note'].' ('.$lang['srv_internal'].'): </p>';
echo '<p class="editable" id="srvlang_'.$text.'_'.$this->lang_id.'" contenteditable="true" onblur="extra_translation_save(\''.$text.'\');">'.$value1.'</p>'; echo '<p class="editable" id="srvlang_'.$text.'_'.$this->lang_id.'" contenteditable="true" onblur="extra_translation_save(\''.$text.'\');">'.$value1.'</p>';
} }

6
lang/1.php
View File

@ -3682,7 +3682,11 @@ $lang = array (
"srv_language_admin" => "Jezik za urednike", "srv_language_admin" => "Jezik za urednike",
"srv_language_admin_0" => "Jezik", "srv_language_admin_0" => "Jezik",
"srv_language_admin_1" => "Osnovni jezik", "srv_language_admin_1" => "Osnovni jezik",
"srv_language_admin_survey" => "Jezik administrativnega vmesnika", "srv_language_admin_survey" => "jezik administrativnega vmesnika",
"srv_language_admin_surveyA" => "Trenutni ",
"srv_language_admin_surveyB" => " je Slovenščina.",
"srv_language_std_bes1" => "Standardne besede lahko urejate v ",
"srv_language_std_bes2" => "nastavitvah vprašalnika",
"srv_language_admin_survey2" => "Jezik administrativnega vmesnika lahko urejate <a href=\"%s\"><span class=\"bold\">tukaj</span></a>", "srv_language_admin_survey2" => "Jezik administrativnega vmesnika lahko urejate <a href=\"%s\"><span class=\"bold\">tukaj</span></a>",
"srv_language_respons" => "Osnovni jezik vpra&#353;alnika za respondente", "srv_language_respons" => "Osnovni jezik vpra&#353;alnika za respondente",
"srv_language_respons_1" => "Osnovni jezik za respondente", "srv_language_respons_1" => "Osnovni jezik za respondente",

6
lang/2.php
View File

@ -3650,7 +3650,11 @@ $lang = array (
"srv_language_admin" => "Language for editors", "srv_language_admin" => "Language for editors",
"srv_language_admin_0" => "Language", "srv_language_admin_0" => "Language",
"srv_language_admin_1" => "Basic language for ", "srv_language_admin_1" => "Basic language for ",
"srv_language_admin_survey" => "Language for survey editors", "srv_language_admin_survey" => "language for survey editors",
"srv_language_admin_surveyA" => "The current ",
"srv_language_admin_surveyB" => " is English.",
"srv_language_std_bes1" => "Standard words can be edited in the ",
"srv_language_std_bes2" => "questionnaire settings.",
"srv_language_admin_survey2" => "You can edit language for survey editors <a href=\"%s\"><span class=\"bold\">here</span></a>", "srv_language_admin_survey2" => "You can edit language for survey editors <a href=\"%s\"><span class=\"bold\">here</span></a>",
"srv_language_respons" => "Basic language for respondents", "srv_language_respons" => "Basic language for respondents",
"srv_language_respons_1" => "Basic language for respondents", "srv_language_respons_1" => "Basic language for respondents",

2901
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

1
resources/sass/admin_new/basic/colors.scss
View File

@ -27,6 +27,7 @@ $yellow: #FFC700;
$red: #FF0000; $red: #FF0000;
$light-red: #FFEFEF; $light-red: #FFEFEF;
$dark-green: #00752F;
$green: #00C437; $green: #00C437;
$light-green: #a8eea8; $light-green: #a8eea8;
$light-green2: #E3F6DE; $light-green2: #E3F6DE;

34
resources/sass/admin_new/basic/typography.scss
View File

@ -3,31 +3,31 @@ p,span {
font-size: 16px; font-size: 16px;
margin-block-start: 0; margin-block-start: 0;
margin-block-end: 0; margin-block-end: 0;
}
//Razmiki med besedilom //Razmiki med besedilom
&.bottom16 { .bottom16 {
margin-bottom: 16px; margin-bottom: 16px;
} }
&.top16 { .top16 {
margin-top: 16px; margin-top: 16px;
} }
&.top32 { .top32 {
margin-top: 32px; margin-top: 32px;
} }
&.bottom32 { .bottom32 {
margin-bottom: 32px; margin-bottom: 32px;
} }
&.bottom8 { .bottom8 {
margin-bottom: 8px; margin-bottom: 8px;
} }
&.top8 { .top8 {
margin-top: 8px; margin-top: 8px;
}
} }
//Barve //Barve

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

@ -39,6 +39,45 @@ div.prevajanje_holder {
span.title { span.title {
font-size: 20px; font-size: 20px;
} }
//Skrita ikona za komentarje na vprašanja
div.comment_container_inline {
display: none;
}
}
//Disabled leva stran
.jezik_left {
pointer-events: none;
color: $very-dark-gray !important;
div.spremenljivka_content{
color: $very-dark-gray !important;
div.spremenljivka_settings {
color: $very-dark-gray !important;
div.variable_name {
color: $very-dark-gray !important;
}
div.spr_settings {
span {
border-color: $dark-gray !important;
background-color: transparent !important;
color: $very-dark-gray !important;
}
}
}
div.spremenljivka_tekst_form,
div.content_div_normalmode{
span.faicon::before {
display: none;
}
}
}
} }
} }
@ -56,8 +95,25 @@ div.prevajanje_holder {
div.lang_name { div.lang_name {
font-size: 20px; font-size: 20px;
margin-bottom: 14px; margin-bottom: 14px;
display: flex;
flex-direction: row;
gap: 12px;
align-items: center;
a { a {
text-decoration: none; text-decoration: none;
color: inherit;
}
div.active_urejanje {
background-color: $light-green2;
border-radius: 2px;
color: $dark-green;
width: fit-content;
box-sizing: border-box;
padding: 2px 21px;
font-size: 16px !important;
font-weight: 400 !important;
} }
} }