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:
pero1203 2022-01-13 11:52:52 +01:00
commit 348a67f645
5 changed files with 1492 additions and 1413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/survey/SurveyAdminSettings.php
View File

@ -2248,14 +2248,15 @@ class SurveyAdminSettings {
$next_uvod = $lang_id == '' ? $admin_lang['srv_nextpage_uvod_desc'] : $resp_lang['srv_nextpage_uvod_desc'];
echo '<tr class="standardna-beseda">';
echo '<td>'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? '<span class="gray italic">('.$next_uvod.')</span>' : '').'</td> ';
echo '<td>'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? ' ('.$next_uvod.')' : '').'</td> ';
echo '<td>'.$lang[$text].'</td>';
echo '<td><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div></td>';
echo '<td><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div>';
if($editor == 1)
echo '<span class="faicon edit2 sb-edit"'.$onclick.' style="float:right; margin-top:1px; display:none;"></span>';
echo '<textarea name="srvlang_'.$text.$lang_id.'" id="polje_srvlang_'.$text.$lang_id.'" style="display:none;">'.$value.'</textarea>';
echo '</td>';
echo '</tr>';
}
@ -4186,7 +4187,15 @@ class SurveyAdminSettings {
echo '<tr>';
echo '<td>'.datetime($row['insert_time']).'</td>';
echo '<td>'.$row['insert_name'].'</td>';
echo '<td>'.($row['intro_opomba']!='' ? $row['intro_opomba'] : '/').'</td>';
if ($row['intro_opomba']=='')
$opomba = "/";
else if (strlen($row['intro_opomba']) > 40)
$opomba = substr($row['intro_opomba'], 0, 37).'...';
else
$opomba = $row['intro_opomba'];
echo '<td>'.$opomba.'</td>';
//Ikone
echo '<td class="right">';

2856
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -132,8 +132,8 @@ span.faicon.pagination_right::before{
content: "\f105";
}
span.faicon.edit::before{
font-size: 16px;
span.faicon.edit::before,
span.faicon.edit2::before{
content: "\f304";
}

4
resources/sass/admin_new/components/popup/page_specific/page_specific.scss
View File

@ -8,4 +8,6 @@
@import "custom_report";
@import "survey_edit";
@import "survey_edit";
@import "standardne_besede";

24
resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss Normal file
View File

@ -0,0 +1,24 @@
.fixed-position {
position: fixed;
z-index: 101;
top: 50%;
left: 50%;
#vrednost_edit {
display: block;
margin-top: -200px;
margin-left: -300px;
span.buttonwrapper a.ovalbutton_gray{
color: $blue;
&:hover span{
color: white;
}
}
span.buttonwrapper a.ovalbutton_orange span{
color: white;
}
}
}