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-05-05 11:31:34 +02:00
commit 0418b479b3
14 changed files with 8148 additions and 9043 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/survey/Branching.php
View File

@ -7501,8 +7501,8 @@ class Branching {
// Dodaj blok/if v knjiznico // Dodaj blok/if v knjiznico
echo '<div class="condition_setting_holder">'; echo '<div class="condition_setting_holder">';
echo ' <div class="condition_setting_line">'; echo ' <div class="condition_setting_line with-icon">';
echo ' <button class="blue small" onClick="displayAddIntoLibraryPopup(\''.$if.'\', \'2_'.$row['tip'].'\');">'.$lang['srv_library_add_to_lib'].'</button>'; echo ' <span onClick="displayAddIntoLibraryPopup(\''.$if.'\', \'2_'.$row['tip'].'\');"><span class="faicon library"></span>'.$lang['srv_library_add_to_lib'].'</span>';
echo ' </div>'; echo ' </div>';
echo '</div>'; echo '</div>';
@ -7657,15 +7657,16 @@ class Branching {
echo '</div>'; echo '</div>';
echo '<div class="button_holder">'; echo '<div class="remove_condition_holder">';
echo ' <button id="if_remove_all" class="small black-white" onclick="if_remove(\''.$if.'\', \'1\', \'0\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ).'">'; echo ' <div id="if_remove_all" onclick="if_remove(\''.$if.'\', \'1\', \'0\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ).'">';
echo ($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ); echo ($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) );
echo ' </button>'; echo ' </div>';
echo ' <button class="small white-blue"onclick="if_remove(\''.$if.'\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem'] : ($row['tip']==1?$lang['srv_block_rem']:$lang['srv_loop_rem']) ).'">'; echo ' <div onclick="if_remove(\''.$if.'\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem_only'] : ($row['tip']==1?$lang['srv_block_rem_only']:$lang['srv_loop_rem_only']) ).'">';
echo ($row['tip'] == 0 ? $lang['srv_if_rem'] : ($row['tip']==1?$lang['srv_block_rem']:$lang['srv_loop_rem']) ); echo ' <span class="faicon delete"></span>';
echo ' </button>'; echo ($row['tip'] == 0 ? $lang['srv_if_rem_only'] : ($row['tip']==1?$lang['srv_block_rem_only']:$lang['srv_loop_rem_only']) );
echo ' </div>';
echo '</div>'; echo '</div>';

27
admin/survey/classes/class.Vprasanje.php
View File

@ -1967,8 +1967,8 @@ class Vprasanje {
echo '<div class="vprasanje_setting_holder">'; echo '<div class="vprasanje_setting_holder">';
echo ' <div class="vprasanje_setting_line">'; echo ' <div class="vprasanje_setting_line with-icon">';
echo ' <button class="blue small" onClick="displayAddIntoLibraryPopup(\''.$this->spremenljivka.'\', \'1\');">'.$lang['srv_library_add_to_lib'].'</button>'; echo ' <span onClick="displayAddIntoLibraryPopup(\''.$this->spremenljivka.'\', \'1\');"><span class="faicon library"></span>'.$lang['srv_library_add_to_lib'].'</span>';
echo ' </div>'; echo ' </div>';
echo '</div>'; echo '</div>';
@ -2653,15 +2653,24 @@ class Vprasanje {
// Hitro dodajanje kategorij // Hitro dodajanje kategorij
echo '<div class="vprasanje_setting_holder" '.$displayNone.'>'; echo '<div class="vprasanje_setting_holder" '.$displayNone.'>';
echo ' <div class="vprasanje_setting_line">'; echo ' <div class="vprasanje_setting_line with-icon">';
echo ' <span onclick="vrednost_fastadd(\''.$this->spremenljivka.'\'); return false;" class="pointer"><span class="sprites paste_word"></span> ';
if ( in_array($row['tip'], array(6, 16, 19, 20)) ) if ( in_array($row['tip'], array(6, 16, 19, 20)) ){
echo $lang['srv_question_fastadd'].' '.Help::display('srv_question_fastadd'); echo '<span onclick="vrednost_fastadd(\''.$this->spremenljivka.'\'); return false;" class="pointer"><span class="faicon file-import"></span> ';
else echo $lang['srv_question_fastadd'].'&nbsp;';
echo $lang['srv_vrednost_fastadd'].' '.Help::display('srv_vrednost_fastadd'); echo '</span>';
echo Help::display('srv_question_fastadd');
}
else{
echo '<span onclick="vrednost_fastadd(\''.$this->spremenljivka.'\'); return false;" class="pointer"><span class="faicon file-import"></span> ';
echo $lang['srv_vrednost_fastadd'].'&nbsp;';
echo '</span>';
echo Help::display('srv_vrednost_fastadd');
}
echo ' </span>';
echo ' </div>'; echo ' </div>';
echo '</div>'; echo '</div>';

2
frontend/install/classes/class.DisplayCheck.php
View File

@ -128,7 +128,7 @@ class DisplayCheck{
echo '<div class="bottom_buttons">'; echo '<div class="bottom_buttons">';
echo ' <a href="index.php?step=welcome"><input name="back" value="'.$lang['back'].'" type="button"></a>'; echo ' <a href="index.php?step=welcome"><input name="back" value="'.$lang['back'].'" type="button"></a>';
if(!$red_error) if(!$red_error)
echo ' <a href="index.php?step=settings"><input type="button" value="'.$lang['next1'].'"></a>'; echo ' <a href="index.php?step=database"><input type="button" value="'.$lang['next1'].'"></a>';
else else
echo ' <a href="index.php?step=check"><input type="button" value="Ponovno preveri"></a>'; echo ' <a href="index.php?step=check"><input type="button" value="Ponovno preveri"></a>';
echo '</div>'; echo '</div>';

2
frontend/install/classes/class.ImportDB.php
View File

@ -7,7 +7,7 @@
class ImportDB{ class ImportDB{
var $clean_db_file = '../../sql/1ka_clean_27-7-2020.sql'; // Datoteka prazne baze za uvoz var $clean_db_file = '../../sql/1ka_clean_26-11-2021.sql'; // Datoteka prazne baze za uvoz
var $update_db_file = '../../sql/update2.sql'; // Datoteka prazne baze za uvoz var $update_db_file = '../../sql/update2.sql'; // Datoteka prazne baze za uvoz
var $version = ''; // Trenutna verzija 1ke var $version = ''; // Trenutna verzija 1ke

10
frontend/install/css/style.css
View File

@ -265,19 +265,19 @@ footer .footer_content .logo_holder img {
/************WELCOME STRAN***************/ /************WELCOME STRAN***************/
.main_content.welcome h2::before { .main_content.welcome h2::before {
content: "1/5 - "; content: "1/4 - ";
} }
/******************************/ /******************************/
/************FINISH STRAN***************/ /************FINISH STRAN***************/
.main_content.finish h2::before { .main_content.finish h2::before {
content: "5/5 - "; content: "4/4 - ";
} }
/******************************/ /******************************/
/************CHECK STRAN***************/ /************CHECK STRAN***************/
.main_content.check h2::before { .main_content.check h2::before {
content: "2/5 - "; content: "2/4 - ";
} }
.main_content.check .check_segment { .main_content.check .check_segment {
margin: 0 0 20px 0; margin: 0 0 20px 0;
@ -312,7 +312,7 @@ footer .footer_content .logo_holder img {
/******************************/ /******************************/
/************SETTINGS STRAN***************/ /************SETTINGS STRAN***************/
.main_content.settings h2::before { .main_content.settings h2::before {
content: "3/5 - "; content: "3/4 - ";
} }
.main_content.settings .settings_segment { .main_content.settings .settings_segment {
margin: 0 0 20px 0; margin: 0 0 20px 0;
@ -343,7 +343,7 @@ footer .footer_content .logo_holder img {
/******************************/ /******************************/
/************DATABASE STRAN***************/ /************DATABASE STRAN***************/
.main_content.database h2::before { .main_content.database h2::before {
content: "4/5 - "; content: "3/4 - ";
} }
/******************************/ /******************************/

9
lang/1.php
View File

@ -2190,11 +2190,14 @@ $lang = array (
"srv_podif_edit" => "Uredi pogoj za prikaz kategorije", "srv_podif_edit" => "Uredi pogoj za prikaz kategorije",
"srv_block_new" => "Dodaj blok", "srv_block_new" => "Dodaj blok",
"srv_if_rem" => "Odstrani pogoj", "srv_if_rem" => "Odstrani pogoj",
"srv_if_rem_all" => "Izbri&#353;i pogoj in celotno vsebino", "srv_if_rem_only" => "Odstrani pogoj (obdrži vsebino)",
"srv_if_rem_all" => "Odstrani pogoj in celotno vsebino",
"srv_block_rem" => "Odstrani blok", "srv_block_rem" => "Odstrani blok",
"srv_block_rem_only" => "Odstrani blok (obdrži vsebino)",
"srv_block_rem_all" => "Odstrani blok in celotno vsebino",
"srv_loop_rem" => "Odstrani zanko", "srv_loop_rem" => "Odstrani zanko",
"srv_block_rem_all" => "Izbri&#353;i blok in celotno vsebino", "srv_loop_rem_only" => "Odstrani zanko (obdrži vsebino)",
"srv_loop_rem_all" => "Izbri&#353;i zanko in celotno vsebino", "srv_loop_rem_all" => "Odstrani zanko in celotno vsebino",
"srv_if_edit" => "Uredi pogoj", "srv_if_edit" => "Uredi pogoj",
"srv_block_edit" => "Uredi blok", "srv_block_edit" => "Uredi blok",
"srv_loop_edit" => "Uredi zanko", "srv_loop_edit" => "Uredi zanko",

5
lang/2.php
View File

@ -2177,10 +2177,13 @@ $lang = array (
"srv_podif_edit" => "Edit conditions *IF for category display", "srv_podif_edit" => "Edit conditions *IF for category display",
"srv_block_new" => "Add block", "srv_block_new" => "Add block",
"srv_if_rem" => "Remove condition", "srv_if_rem" => "Remove condition",
"srv_if_rem_only" => "Remove condition (keep content)",
"srv_if_rem_all" => "Remove condition and all its content", "srv_if_rem_all" => "Remove condition and all its content",
"srv_block_rem" => "Remove block", "srv_block_rem" => "Remove block",
"srv_loop_rem" => "Remove loop", "srv_block_rem_only" => "Remove block (keep content)",
"srv_block_rem_all" => "Remove block and all its content", "srv_block_rem_all" => "Remove block and all its content",
"srv_loop_rem" => "Remove loop",
"srv_loop_rem_only" => "Remove loop (keep content)",
"srv_loop_rem_all" => "Remove loop and all its content", "srv_loop_rem_all" => "Remove loop and all its content",
"srv_if_edit" => "Edit if", "srv_if_edit" => "Edit if",
"srv_block_edit" => "Edit block", "srv_block_edit" => "Edit block",

77
public/css/admin_new.css
View File

@ -5466,13 +5466,11 @@ span.faicon.export::before {
content: "\f56e"; content: "\f56e";
} }
/*span.faicon.import::before{ span.faicon.file-import::before {
font-size: 24px; content: "";
content: "\f56f"; transform: scaleX(-1);
}*/ }
/*span.faicon.import{
width: 32px;
}*/
span.faicon.import::before { span.faicon.import::before {
font-size: 24px; font-size: 24px;
font-weight: 400; font-weight: 400;
@ -13911,6 +13909,25 @@ div#variabla_new span.correct {
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.half-half .content textarea { #vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.half-half .content textarea {
width: 100%; width: 100%;
} }
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon span {
display: flex;
align-items: center;
cursor: pointer;
color: #1E88E5;
}
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon span:hover {
color: #0059ab;
}
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon span:hover .faicon::before {
color: #0059ab;
}
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon .faicon {
margin-right: 8px;
}
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon .faicon:before {
color: #1E88E5;
font-size: 18px;
}
#vprasanje_float_editing .vprasanje_edit_holder p, #vprasanje_float_editing .vprasanje_edit_holder p,
#vprasanje_float_editing .vprasanje_edit_holder span, #vprasanje_float_editing .vprasanje_edit_holder span,
#vprasanje_float_editing .vprasanje_edit_holder label { #vprasanje_float_editing .vprasanje_edit_holder label {
@ -18234,6 +18251,25 @@ and open the template in the editor.
#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.half-half .content textarea { #branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.half-half .content textarea {
width: 100%; width: 100%;
} }
#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon span {
display: flex;
align-items: center;
cursor: pointer;
color: #1E88E5;
}
#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon span:hover {
color: #0059ab;
}
#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon span:hover .faicon::before {
color: #0059ab;
}
#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon .faicon {
margin-right: 8px;
}
#branching #div_condition_editing_float .condition_edit .condition_setting_holder .condition_setting_line.with-icon .faicon:before {
color: #1E88E5;
font-size: 18px;
}
#branching #div_condition_editing_float .condition_edit p, #branching #div_condition_editing_float .condition_edit p,
#branching #div_condition_editing_float .condition_edit span, #branching #div_condition_editing_float .condition_edit span,
#branching #div_condition_editing_float .condition_edit label { #branching #div_condition_editing_float .condition_edit label {
@ -18287,6 +18323,33 @@ and open the template in the editor.
#branching #div_condition_editing_float .button_holder button:last-of-type { #branching #div_condition_editing_float .button_holder button:last-of-type {
margin-bottom: 0; margin-bottom: 0;
} }
#branching #div_condition_editing_float .remove_condition_holder {
margin: 0 16px;
padding: 16px 0;
border-top: 1px #D3D3D3 solid;
}
#branching #div_condition_editing_float .remove_condition_holder div {
cursor: pointer;
margin-bottom: 16px;
color: #1E88E5;
font-size: 14px;
transition: 0.2s;
}
#branching #div_condition_editing_float .remove_condition_holder div .faicon {
margin-right: 8px;
}
#branching #div_condition_editing_float .remove_condition_holder div .faicon:before {
font-size: 14px;
}
#branching #div_condition_editing_float .remove_condition_holder div:last-child {
margin-bottom: 0;
}
#branching #div_condition_editing_float .remove_condition_holder div:hover {
color: #0059ab;
}
#branching #div_condition_editing_float .remove_condition_holder div:hover .faicon:before {
color: #0059ab;
}
#branching span.IF_title_start { #branching span.IF_title_start {
font-weight: 900; font-weight: 900;
color: #1E88E5; color: #1E88E5;

15
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -78,16 +78,11 @@ span.faicon.export::before{
content: "\f56e"; content: "\f56e";
} }
span.faicon.file-import::before{
content: "\f56f";
transform: scaleX(-1);
}
/*span.faicon.import::before{
font-size: 24px;
content: "\f56f";
}*/
/*span.faicon.import{
width: 32px;
}*/
span.faicon.import::before{ span.faicon.import::before{
font-size: 24px; font-size: 24px;
font-weight: 400; font-weight: 400;
@ -711,4 +706,4 @@ span.faicon.fa-1::before{
span.faicon.phone::before{ span.faicon.phone::before{
content: "\f095"; content: "\f095";
} }

65
resources/sass/admin_new/pages/survey_edit/conditions.scss
View File

@ -455,6 +455,34 @@ and open the template in the editor.
} }
} }
} }
&.with-icon{
span{
display: flex;
align-items: center;
cursor: pointer;
color: $blue;
&:hover{
color: $dark-blue;
.faicon::before{
color: $dark-blue;
}
}
}
.faicon{
margin-right: 8px;
&:before{
color: $blue;
font-size: 18px;
}
}
}
} }
} }
@ -531,6 +559,43 @@ and open the template in the editor.
} }
} }
} }
.remove_condition_holder{
margin: 0 16px;
padding: 16px 0;
border-top: 1px $dark-gray2 solid;
div{
cursor: pointer;
margin-bottom: 16px;
color: $blue;
font-size: 14px;
transition: 0.2s;
.faicon{
margin-right: 8px;
&:before{
font-size: 14px;
}
}
&:last-child{
margin-bottom: 0;
}
&:hover{
color: $dark-blue;
.faicon:before{
color: $dark-blue;
}
}
}
}
} }

28
resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
View File

@ -213,6 +213,34 @@
} }
} }
} }
&.with-icon{
span{
display: flex;
align-items: center;
cursor: pointer;
color: $blue;
&:hover{
color: $dark-blue;
.faicon::before{
color: $dark-blue;
}
}
}
.faicon{
margin-right: 8px;
&:before{
color: $blue;
font-size: 18px;
}
}
}
} }
} }

7936
sql/1ka_clean_26-11-2021.sql Normal file
View File

File diff suppressed because it is too large Load Diff

2879
sql/1ka_clean_27-9-2018.sql
View File

File diff suppressed because one or more lines are too long

6119
sql/1ka_clean_27-9-2018_orig.sql
View File

File diff suppressed because one or more lines are too long