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:
Nejc Kovač 2022-08-02 12:19:03 +02:00
commit ca121f3397
2 changed files with 1526 additions and 1461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,11 +474,11 @@ class Vprasanje {
if ($row['ranking_k'] == 0){ if ($row['ranking_k'] == 0){
echo '<fieldset>'; echo '<fieldset>';
//echo ' <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_num_limits'].'</legend>'; echo ' <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_num_limits'].'</legend>';
echo ' <legend>'.$lang['srv_num_limits'].'</legend>'; //echo ' <legend>'.$lang['srv_num_limits'].'</legend>';
//echo ' <div class="fieldset_holder" style="display:none;">'; echo ' <div class="fieldset_holder" style="display:none;">';
echo ' <div class="fieldset_holder">'; //echo ' <div class="fieldset_holder">';
if ($row['tip'] != 21) if ($row['tip'] != 21)
$this->edit_number(); $this->edit_number();
@ -493,11 +493,11 @@ class Vprasanje {
if ($row['tip'] == 7) { if ($row['tip'] == 7) {
echo '<fieldset>'; echo '<fieldset>';
//echo ' <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>'; echo ' <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
echo ' <legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>'; //echo ' <legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
//echo ' <div class="fieldset_holder" style="display:none;">'; echo ' <div class="fieldset_holder" style="display:none;">';
echo ' <div class="fieldset_holder">'; //echo ' <div class="fieldset_holder">';
$this->edit_vrednost_missing(); $this->edit_vrednost_missing();
echo ' </div>'; echo ' </div>';
@ -3063,7 +3063,9 @@ class Vprasanje {
} }
else { //string present else { //string present
$usemap = 'id="hotspot_'.$row['id'].'_image" usemap="#hotspot_'.$row['id'].'_usemap" style="z-index: 1; height:'.$hotspot_image_height.'px; width: '.$hotspot_image_width.'px; position: relative; top: 15px;"'; //z-index: 1, da bo slika pod canvas in prave dimenzije in na pravi poziciji $usemap = 'id="hotspot_'.$row['id'].'_image" usemap="#hotspot_'.$row['id'].'_usemap" style="z-index: 1; height:'.$hotspot_image_height.'px; width: '.
$hotspot_image_width.'px; position: relative; top: 0px;"'; //z-index: 1, da bo slika pod canvas in prave dimenzije in na pravi poziciji
//$hotspot_image_width.'px; position: relative; top: 15px;"'; //z-index: 1, da bo slika pod canvas in prave dimenzije in na pravi poziciji
//v $hotspot_image je potrebno dodati usemap="#hotspot_image_'.$row['id'].'" za identificiranje mape //v $hotspot_image je potrebno dodati usemap="#hotspot_image_'.$row['id'].'" za identificiranje mape
$hotspot_image = substr_replace($hotspot_image, $usemap, 5, 0); //dodaj zeleni string v $hotspot_image $hotspot_image = substr_replace($hotspot_image, $usemap, 5, 0); //dodaj zeleni string v $hotspot_image
} }

2967
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff