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

Manjsi popravki

Browse Source
This commit is contained in:
pero1203 2021-05-25 09:37:42 +02:00
parent 1bae034fa9
commit d6e5963b4f
8 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/survey/Branching.php
View File

@ -679,7 +679,7 @@ class Branching {
# find & replace # find & replace
if ($row['locked'] == 0) { if ($row['locked'] == 0) {
echo '<p>'; echo '<p>';
echo '<a href="#" onclick="find_replace(); return false;" title="'.$lang['srv_find_replace'].'" ><span class="advanced_setting"><span class="faicon replace"></span></span>'.$lang['srv_find_replace'].'</a>'; echo '<a href="#" onclick="find_replace(); return false;" title="'.$lang['srv_find_replace_words'].'" ><span class="advanced_setting"><span class="faicon replace"></span></span>'.$lang['srv_find_replace_words'].'</a>';
echo '</p>'; echo '</p>';
} }
@ -6836,7 +6836,8 @@ class Branching {
} }
if ( ! ( mysqli_num_rows($sql1)==1 && $spr_id==0 ) ) { if ( ! ( mysqli_num_rows($sql1)==1 && $spr_id==0 ) ) {
echo '<div id="div_condition_editing_operators" style="padding-left:1%">'.$lang['srv_add_cond'].': echo '<div id="div_condition_editing_operators" style="padding-left:1%">'.$lang['srv_add_cond'].' '.Help::display('DataPiping').':
<a href="#" onclick="condition_add(\''.$if.'\', \'0\', \'0\', \''.$vrednost.'\'); return false;"><strong>&nbsp;AND&nbsp;</strong></a>, <a href="#" onclick="condition_add(\''.$if.'\', \'0\', \'0\', \''.$vrednost.'\'); return false;"><strong>&nbsp;AND&nbsp;</strong></a>,
<a href="#" onclick="condition_add(\''.$if.'\', \'0\', \'1\', \''.$vrednost.'\'); return false;"><strong>&nbsp;AND NOT&nbsp;</strong></a>, <a href="#" onclick="condition_add(\''.$if.'\', \'0\', \'1\', \''.$vrednost.'\'); return false;"><strong>&nbsp;AND NOT&nbsp;</strong></a>,
<a href="#" onclick="condition_add(\''.$if.'\', \'1\', \'0\', \''.$vrednost.'\'); return false;"><strong>&nbsp;OR&nbsp;</strong></a>, <a href="#" onclick="condition_add(\''.$if.'\', \'1\', \'0\', \''.$vrednost.'\'); return false;"><strong>&nbsp;OR&nbsp;</strong></a>,
@ -7227,7 +7228,7 @@ class Branching {
// right_bracket buttons // right_bracket buttons
if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) { if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) {
echo '<td class="tbl_ce_lor white" style="width:50px; text-align:center" nowrap>'; echo '<td class="tbl_ce_tb white" style="width:50px; text-align:center" nowrap>';
if ($row['right_bracket'] > 0) if ($row['right_bracket'] > 0)
echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'right\', \'minus\'); return false;" title="'.$lang['srv_zaklepaj_rem'].'"><span class="faicon delete_circle"></span></a>'; echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'right\', \'minus\'); return false;" title="'.$lang['srv_zaklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
@ -7235,24 +7236,23 @@ class Branching {
echo '<span class="faicon delete_circle icon-grey_normal"></span>'; echo '<span class="faicon delete_circle icon-grey_normal"></span>';
echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add small"></span></a>'; echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add small"></span></a>';
} else { }
echo '<td class="tbl_ce_lor white" style="width:50px; text-align:center" nowrap>'; else {
echo '<td class="tbl_ce_tb white" style="width:50px; text-align:center" nowrap>';
} }
echo '</td>'; echo '</td>';
// move // move
echo '<td class="tbl_ce_bck_blue white" style="text-align:right; width:30px">'; echo '<td class="tbl_ce_tb white" style="text-align:right; width:30px">';
if ($row_count['count'] != 1 ) if ($row_count['count'] != 1 )
echo '<img src="img_0/move_updown.png" class="move" title="'.$lang['srv_move'].'" />'; echo '<img src="img_0/move_updown.png" class="move" title="'.$lang['srv_move'].'" />';
echo '</td>'; echo '</td>';
// remove // remove
echo '<td class="tbl_ce_bck_blue white" style="text-align:left; width:30px">'; echo '<td class="tbl_ce_lor white" style="text-align:left; width:30px">';
if ($row_count['count'] != 1 ) if ($row_count['count'] != 1 )
echo '<a href="#" onclick="condition_remove(\''.$row['if_id'].'\', \''.$condition.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span class="faicon delete icon-grey_dark_link"></span></a>'."\n"; echo '<a href="#" onclick="condition_remove(\''.$row['if_id'].'\', \''.$condition.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span class="faicon delete icon-grey_dark_link"></span></a>'."\n";
//else
//echo '<span class="sprites cancel_blue_light"></span>'."\n";
echo '</td>'; echo '</td>';

13
admin/survey/SurveyAdminSettings.php
View File

@ -830,13 +830,16 @@ class SurveyAdminSettings {
echo '</a>'; echo '</a>';
} }
#<a href="#" onclick="$(\'#komentarji_napredno\').toggle(); return false;">'.$lang['srv_detail_settings'].'</a>'
echo '</p>'; echo '</p>';
echo '<p><a href="#" onclick="$(\'#komentarji_napredno\').toggle(); return false;"><span class="bold">'.$lang['srv_detail_settings'].'</span></a></p>';
echo '<p><a href="index.php?anketa='.$this->anketa.'&a=komentarji"><span class="bold">'.$lang['comments'].'</span></a><br>'; echo '<p><a href="index.php?anketa='.$this->anketa.'&a=komentarji"><span class="bold">'.$lang['comments'].'</span></a></p>';
echo '<a href="index.php?anketa='.$this->anketa.'&a=vabila"><span class="bold">'.$lang['srv_vabila'].'</span></a></p>'; echo '<p><a href="index.php?anketa='.$this->anketa.'&a=vabila"><span class="bold">'.$lang['srv_vabila'].'</span></a></p>';
echo '<p><a href="#" onclick="$(\'#komentarji_napredno\').fadeToggle(); $(\'#komentarji_napredno_arrow\').toggleClass(\'arrow2_d\'); $(\'#komentarji_napredno_arrow\').toggleClass(\'arrow2_u\'); return false;">';
echo ' <span class="bold">'.$lang['srv_detail_settings'].'&nbsp;</span>';
echo ' <span id="komentarji_napredno_arrow" class="faicon arrow2_d"></span>';
echo '</a></p>';
echo '</fieldset>'; echo '</fieldset>';

7
lang/1.php
View File

@ -2144,9 +2144,9 @@ $lang = array (
"srv_loop_edit" => "Uredi zanko", "srv_loop_edit" => "Uredi zanko",
"srv_select_spr" => "Izberite spremenljivko", "srv_select_spr" => "Izberite spremenljivko",
"srv_add_cond" => "Dodaj naslednji pogoj z operatorjem", "srv_add_cond" => "Dodaj naslednji pogoj z operatorjem",
"srv_if_label" => "Ime pogoja", "srv_if_label" => "Interno ime pogoja",
"srv_block_label" => "Ime bloka", "srv_block_label" => "Interno ime bloka",
"srv_loop_label" => "Ime zanke", "srv_loop_label" => "Interno ime zanke",
"srv_error_oklepaji" => "Nepravilno postavljeni oklepaji!", "srv_error_oklepaji" => "Nepravilno postavljeni oklepaji!",
"srv_error_spremenljivka"=> "Izberite spremenljivko!", "srv_error_spremenljivka"=> "Izberite spremenljivko!",
"srv_error_calculation" => "Nepravilno postavljena kalkulacija!", "srv_error_calculation" => "Nepravilno postavljena kalkulacija!",
@ -5258,6 +5258,7 @@ $lang = array (
"s_website_only" => "Po spletnem mestu", "s_website_only" => "Po spletnem mestu",
"s_survey_and_website" => "Povsod", "s_survey_and_website" => "Povsod",
"srv_find_replace" => 'Poišči in zamenjaj', "srv_find_replace" => 'Poišči in zamenjaj',
"srv_find_replace_words" => 'Poišči in zamenjaj besede',
"srv_find" => 'Poišči', "srv_find" => 'Poišči',
"srv_replace_with" => 'Zamenjaj z', "srv_replace_with" => 'Zamenjaj z',
"srv_replace" => 'Zamenjaj', "srv_replace" => 'Zamenjaj',

1
lang/2.php
View File

@ -5220,6 +5220,7 @@ $lang = array (
"s_website_only" => "Website content", "s_website_only" => "Website content",
"s_survey_and_website" => "Everything", "s_survey_and_website" => "Everything",
"srv_find_replace" => 'Find and replace', "srv_find_replace" => 'Find and replace',
"srv_find_replace_words" => 'Find and replace words',
"srv_find" => 'Find', "srv_find" => 'Find',
"srv_replace_with" => 'Replace with', "srv_replace_with" => 'Replace with',
"srv_replace" => 'Replace', "srv_replace" => 'Replace',

16
public/css/admin.css
View File

@ -7457,6 +7457,16 @@ span.faicon.arrow2_l::before {
content: ""; content: "";
} }
span.faicon.arrow2_d::before {
font-size: 14px;
content: "";
}
span.faicon.arrow2_u::before {
font-size: 14px;
content: "";
}
span.faicon.arrow_large2_r::before { span.faicon.arrow_large2_r::before {
font-size: 35px; font-size: 35px;
content: ""; content: "";
@ -19938,6 +19948,12 @@ and open the template in the editor.
.comments_on_alert { .comments_on_alert {
margin-bottom: 10px; margin-bottom: 10px;
} }
.comments_on_alert a {
font-weight: 500;
}
.comments_on_alert a:hover {
color: #166dba;
}
.comment_qtip_title_secondLine { .comment_qtip_title_secondLine {
color: grey; color: grey;

9
resources/sass/admin/comments.scss
View File

@ -58,6 +58,15 @@ and open the template in the editor.
} }
.comments_on_alert { .comments_on_alert {
margin-bottom: 10px; margin-bottom: 10px;
a{
//color: white;
font-weight: 500;
&:hover{
color: $strong_blue_darken;
}
}
} }
.comment_qtip_title_secondLine { .comment_qtip_title_secondLine {
color: $grey_normal; color: $grey_normal;

8
resources/sass/admin/icons/standard.scss
View File

@ -480,6 +480,14 @@ span.faicon.arrow2_l::before{
font-size: 14px; font-size: 14px;
content: "\f053"; content: "\f053";
} }
span.faicon.arrow2_d::before{
font-size: 14px;
content: "\f078";
}
span.faicon.arrow2_u::before{
font-size: 14px;
content: "\f077";
}
span.faicon.arrow_large2_r::before{ span.faicon.arrow_large2_r::before{
font-size: 35px; font-size: 35px;

6
sql/update2.sql
View File

@ -9494,4 +9494,8 @@ UPDATE misc SET value='21.03.30' WHERE what="version";
# Drupal verzija je bila posodobljena in vpišemo na 1ka.si in te # Drupal verzija je bila posodobljena in vpišemo na 1ka.si in te
UPDATE misc SET value='7.80' WHERE what="drupal version"; UPDATE misc SET value='7.80' WHERE what="drupal version";
UPDATE misc SET value='21.05.24' WHERE what="version"; UPDATE misc SET value='21.05.24' WHERE what="version";
INSERT INTO srv_help (help, what) VALUES ('Operatorji', 'srv_if_operator');
UPDATE misc SET value='21.05.25' WHERE what="version";