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

Popravek prekrivanja pri mobitelu pri postopnem razpiranju tabel

Browse Source
This commit is contained in:
pero1203 2020-10-27 07:22:33 +01:00
parent 2f0964e086
commit 3668631933
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main/survey/app/Controllers/Vprasanja/MultigridMobileController.php
View File

@ -120,6 +120,8 @@ class MultigridMobileController extends Controller{
// NASLOV posameznega vprasanja // NASLOV posameznega vprasanja
echo '<div class="grid_mobile_title">'; echo '<div class="grid_mobile_title">';
echo ' <div class="grid_mobile_title_text">';
// po potrebi prevedemo naslov // po potrebi prevedemo naslov
$naslov = Language::getInstance()->srv_language_vrednost($row1['id']); $naslov = Language::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') if ($naslov != '')
@ -164,6 +166,8 @@ class MultigridMobileController extends Controller{
echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />'; echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
} }
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem // Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2) if($mobile_tables == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>'; echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
@ -466,6 +470,8 @@ class MultigridMobileController extends Controller{
// NASLOV posameznega vprasanja // NASLOV posameznega vprasanja
echo '<div class="grid_mobile_title">'; echo '<div class="grid_mobile_title">';
echo ' <div class="grid_mobile_title_text">';
// po potrebi prevedemo naslov // po potrebi prevedemo naslov
$naslov = Language::getInstance()->srv_language_vrednost($row1['id']); $naslov = Language::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') if ($naslov != '')
@ -503,6 +509,8 @@ class MultigridMobileController extends Controller{
echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />'; echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
} }
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem // Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
/*if($mobile_tables == 2) /*if($mobile_tables == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/ echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/
@ -769,6 +777,8 @@ class MultigridMobileController extends Controller{
// NASLOV posameznega vprasanja // NASLOV posameznega vprasanja
echo '<div class="grid_mobile_title">'; echo '<div class="grid_mobile_title">';
echo ' <div class="grid_mobile_title_text">';
$naslov = Language::getInstance()->srv_language_vrednost($row1['id']); $naslov = Language::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') $row1['naslov'] = $naslov; if ($naslov != '') $row1['naslov'] = $naslov;
@ -806,6 +816,8 @@ class MultigridMobileController extends Controller{
echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />'; echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
} }
echo ' <div class="grid_mobile_title_text">';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem // Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2) if($mobile_tables == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>'; echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
@ -999,6 +1011,8 @@ class MultigridMobileController extends Controller{
// NASLOV posameznega vprasanja // NASLOV posameznega vprasanja
echo '<div class="grid_mobile_title">'; echo '<div class="grid_mobile_title">';
echo ' <div class="grid_mobile_title_text">';
// po potrebi prevedemo naslov // po potrebi prevedemo naslov
$naslov = Language::getInstance()->srv_language_vrednost($row1['id']); $naslov = Language::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') if ($naslov != '')
@ -1045,6 +1059,8 @@ class MultigridMobileController extends Controller{
echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />'; echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
} }
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem // Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
/*if($mobile_tables == 2) /*if($mobile_tables == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/ echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/
@ -1339,6 +1355,8 @@ class MultigridMobileController extends Controller{
// NASLOV posameznega vprasanja // NASLOV posameznega vprasanja
echo '<div class="grid_mobile_title">'; echo '<div class="grid_mobile_title">';
echo ' <div class="grid_mobile_title_text">';
$naslov = Language::getInstance()->srv_language_vrednost($row1['id']); $naslov = Language::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') $row1['naslov'] = $naslov; if ($naslov != '') $row1['naslov'] = $naslov;
@ -1376,6 +1394,8 @@ class MultigridMobileController extends Controller{
echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />'; echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
} }
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem // Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2) if($mobile_tables == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>'; echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';

4
public/css/main_mobile.css
View File

@ -203,9 +203,9 @@ iframe {
margin-top: 20px; margin-top: 20px;
} }
#outercontainer #container .grupa .spremenljivka .counter { #outercontainer #container .grupa .spremenljivka .counter {
padding-top: 6px; padding-top: 9px;
font-weight: normal; font-weight: normal;
max-width: 18%; max-width: 50%;
} }
#outercontainer #container .grupa .spremenljivka .naslov { #outercontainer #container .grupa .spremenljivka .naslov {
margin: 0; margin: 0;

4
resources/sass/main/main_mobile/content.scss
View File

@ -92,9 +92,9 @@ iframe{
} }
.counter { .counter {
padding-top: 6px; padding-top: 9px;
font-weight: normal; font-weight: normal;
max-width: 18%; max-width: 50%;
} }
.naslov{ .naslov{