diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 68489b8d0..0483c2847 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -335,20 +335,23 @@ class Branching { * */ function toolbox () { - + $row = SurveyInfo::getInstance()->getSurveyRow(); + echo '
'; + if($this->survey_type != 0) - $this->toolbox_basic2(); - + $this->toolbox_basic2(); + if ($row['toolbox'] >= 3) - $this->toolbox_library(); + $this->toolbox_library(); + + echo ''; - ?>getTipPreviewHtml(); + + echo '
'; // Mobile add question MobileSurveyAdmin::displayAddQuestion($this->anketa); @@ -371,7 +374,7 @@ class Branching { echo '
'; - echo ' '.$lang['srv_advanced_settings_title']; + echo '
'.$lang['srv_advanced_settings_title'].'
'; $this->toolbox_add_advanced_settings(); @@ -387,31 +390,30 @@ class Branching { $d = new Dostop(); if(($hierarhija && SurveyInfo::getSurveyModules('hierarhija') == 2) || $d->checkDostopSub('lock') && ($admin_type != 0 && $admin_type != 1)){ echo '
'; - echo ''; + echo ' '; echo '
'; } else{ - //echo '

'; echo '
'; - echo ''; + echo ' '; echo '
'; } if(!$hierarhija) { - echo '

'; - echo '

'; + echo '
'.$lang['srv_vprasanje_radio'].'
'; + echo '
'.$lang['srv_vprasanje_checkbox'].'
'; } - echo '

'; - echo '

'; + echo '
'.$lang['srv_vprasanje_multigrid'].'
'; + echo '
'.$lang['srv_vprasanje_text'].'
'; if(!$hierarhija) - echo '

'; + echo '
'.$lang['srv_vprasanje_number'].'
'; - echo '

'; + echo '
'.$lang['srv_vprasanje_label'].'
'; if(!$hierarhija) { - echo '
'; + echo '
'.$lang['srv_mobile_add_question'].''; $this->toolbox_add_advanced(); echo '
'; } @@ -422,27 +424,27 @@ class Branching { // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); - echo '

'; - echo '

'; + echo '
'.$lang['srv_condition'].'
'; + echo '
'.$lang['srv_block_random_blocks'].'
'; } } else { if(!$hierarhija) { - echo '

'; - echo '

'; + echo '
'.$lang['srv_vprasanje_radio'].'
'; + echo '
'.$lang['srv_vprasanje_checkbox'].'
'; } - echo '

'; - echo '

'; + echo '
'.$lang['srv_vprasanje_multigrid'].'
'; + echo '
'.$lang['srv_vprasanje_text'].'
'; if(!$hierarhija) - echo '

'; + echo '
'.$lang['srv_vprasanje_number'].'
'; - echo '

'; + echo '
'.$lang['srv_vprasanje_label'].'
'; if(!$hierarhija) { - echo '
'; + echo '
'.$lang['srv_mobile_add_question'].''; $this->toolbox_add_advanced(); echo '
'; } @@ -453,8 +455,8 @@ class Branching { // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); - echo '

'; - echo '

'; + echo '
'.$lang['srv_condition'].'
'; + echo '
'.$lang['srv_block_random_blocks'].'
'; } } @@ -478,7 +480,7 @@ class Branching { // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); - echo '
'; + echo '
'; echo '

'.$lang['srv_add_question_type'].' '.Help::display('srv_toolbox_add_advanced').'

'; echo '

'.$lang['srv_new_question_text'].'

'; @@ -629,7 +631,7 @@ class Branching { global $site_url; global $global_user_id; - echo '
'; + echo '
'; echo ''.$lang['srv_advanced_settings_title'].''; @@ -716,20 +718,940 @@ class Branching { } echo '
'; + } - // prikaz blokov kot zavihke - /*echo '
'; - $sql = sisplet_query("SELECT i.* FROM srv_if i, srv_branching b WHERE i.tab='1' AND i.tip='1' AND i.id=b.element_if AND b.ank_id='$this->anketa' ORDER BY b.parent, b.vrstni_red"); - if (!$sql) echo mysqli_error($GLOBALS['connect_db']); - $i = 0; - while ($row = mysqli_fetch_array($sql)) { - if ($i++ != 0) echo ' | '; - $label = ($row['label'] == ''?$lang['srv_blok'].' ('.$row['number'].')':$row['label']); - echo '

'; - echo ''.$label.' '; - echo '

'; - } - echo '
';*/ + /** + * preview + * + */ + private function getTipPreviewHtml(){ + global $lang; + global $global_user_id; + + + // Predpregled tipa vprašanj - prikazujemo samo kadar smo v urejanju ankete + if (!$this->anketa > 0) + return; + + if ( ($_GET['a'] != '' || !isset($_GET['anketa'])) && $_GET['a'] != 'branching' ) + return; + + + echo '
'; + + echo '
'; + + + // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik + $userAccess = UserAccess::getInstance($global_user_id); + + // tip 9999 - IF + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_toolbox_if']; + echo '
'; + if(!$userAccess->checkUserAccess($what='if')){ + $userAccess->displayNoAccessText($what='if'); + } + echo '
'; + + // tip 9998 - Block + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_toolbox_block']; + echo '
'; + if(!$userAccess->checkUserAccess($what='block')){ + $userAccess->displayNoAccessText($what='block'); + } + echo '
'; + + // tip 9997 - Loop + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_toolbox_loop']; + echo '
'; + if(!$userAccess->checkUserAccess($what='loop')){ + $userAccess->displayNoAccessText($what='loop'); + } + echo '
'; + + + // tip 1_1 - radio + echo '
'; + // echo '
Primer tipa vprašanj: radio.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 1_10 - gdpr + echo '
'; + // echo '
Primer tipa vprašanj: radio.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_gdpr_intro_title'] . '

'; + echo '
' . $lang['srv_gdpr_intro'] . '.
'.$lang['srv_gdpr_intro4'].'
'; + echo '
' . $lang['srv_gdpr_intro_no'] . '
'; + echo '
' . $lang['srv_gdpr_intro_yes'] . '
'; + echo '
'; + echo '
'; + + // tip 1 - radio (horizontalno) + echo '
'; + // echo '
Primer tipa vprašanj: radio.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . ' ' . $lang['srv_tip_sample_t1_o1'] . ' ' . $lang['srv_tip_sample_t1_o2'] . '
'; + echo '
'; + echo '
'; + + // tip 1_2 - radio (horizontalno - nova vrstica) + echo '
'; + // echo '
Primer tipa vprašanj: radio.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o1'] . ' ' . $lang['srv_tip_sample_t1_o2'] . ' ' . $lang['srv_tip_sample_t1_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 1_5 - radio potrditev + echo '
'; + // echo '
Primer tipa vprašanj: radio.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1_5'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 1_6 - select box + echo '
'; + // echo '
Primer tipa vprašanj: radio.
'; + //echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t3'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 1_8 - Drag-drop + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + //echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + + echo '
'; + echo '
' . $lang['srv_tip_sample_t1_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 1_9 - custom radio picture + echo '
'; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + // star + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + // thumb + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + //smiley + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + // heart + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + // flag + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + // user + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + echo '
'; + echo '
'; + + // tip 1_10 - Image HotSpot + echo '
'; + // echo '
Primer tipa vprašanj: label.
'; + //echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_hotspot_preview_text_radio'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 1_11 - Vizualna anlaogna skala + echo '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + + echo '
'; + for ($i = 1; $i < 7; $i++) { + echo '
+ +
'; + } + echo '
'; + + echo '
'; + echo '
'; + + + // tip 2 - checkbox + echo '
'; + // echo '
Primer tipa vprašanj: checkbox.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t2'] . '
'; + echo '
' . $lang['srv_tip_sample_t2_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t2_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t2_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 2_1 - check(horizontalno) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t2'] . ' ' . $lang['srv_tip_sample_t2_o2'] . ' ' . $lang['srv_tip_sample_t2_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 2_2 - check (horizontalno - nova vrstica) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t2'] . '
'; + echo '
' . $lang['srv_tip_sample_t2_o1'] . ' ' . $lang['srv_tip_sample_t2_o2'] . ' ' . $lang['srv_tip_sample_t2_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 2_8 - Drag-drop + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + + echo '
'; + echo '
' . $lang['srv_tip_sample_t1_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 2_10 - Image HotSpot + echo '
'; + // echo '
Primer tipa vprašanj: label.
'; + //echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_hotspot_preview_text_checkbox'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 3 - select + echo '
'; + // echo '
Primer tipa vprašanj: select.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t3'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21 - besedilo* + echo '
'; + // echo '
Primer tipa vprašanj: text.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_1 - cpatcha + echo '
'; + // echo '
Primer tipa vprašanj: text.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_1_o1'] . '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_2 - email + echo '
'; + // echo '
Primer tipa vprašanj: text.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_2_o1'] . '
'; + echo '
(' . $lang['srv_email_example'] . ')
'; + echo '
'; + echo '

' . $lang['srv_email_example_txt'] . '

'; + echo '
'; + echo '
'; + + // tip 21_3 - url + echo '
'; + // echo '
Primer tipa vprašanj: text.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_3_o1'] . '
'; + echo '
(' . $lang['srv_url_example'] . ')
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_4 - upload + echo '
'; + // echo '
Primer tipa vprašanj: text.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_4_o1'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_5 - textbox box + echo '
'; + // echo '
Primer tipa vprašanj: text.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_6 - elektronski podpis + echo '
'; + // echo '
Primer tipa vprašanj: text.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_6'] . '
'; + echo '
'; + echo '
'; + echo ''; + echo '
'.$lang['srv_signature_name'].' '; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_signature')){ + $userAccess->displayNoAccessText($what='question_type_signature'); + } + echo '
'; + + // tip 21_7 - fotografija + echo '
'; + // echo '
Primer tipa vprašanj: text.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_7'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 5 - label + echo '
'; + // echo '
Primer tipa vprašanj: label.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t5'] . '
'; + echo '
'; + echo '
'; + + // tip 5_2 - nagovor za aktivacijo chata + echo '
'; + // echo '
Primer tipa vprašanj: text.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_chat_question_text'] . '
'; + echo '
'.$lang['srv_chat_turn_on'].'
'; + echo '
'; + echo '
'; + + // tip 26 - lokacija + echo '
'; + // echo '
Primer tipa vprašanj: label.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t26_1'] . '
'; + echo '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_location')){ + $userAccess->displayNoAccessText($what='question_type_location'); + } + echo '
'; + + // tip 26_2 - multi lokacija + echo '
'; + // echo '
Primer tipa vprašanj: label.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t26_2'] . '
'; + echo '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_location')){ + $userAccess->displayNoAccessText($what='question_type_location'); + } + echo '
'; + + // tip 26_1 - moja lokacija + echo '
'; + // echo '
Primer tipa vprašanj: label.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t26_1'] . '
'; + echo '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_location')){ + $userAccess->displayNoAccessText($what='question_type_location'); + } + echo '
'; + + // tip 6 - multigrid + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t6_o1'] . '' . $lang['srv_tip_sample_t6_o2'] . ' ' . $lang['srv_tip_sample_t6_o3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_1 - multigrid (semanticni diferencial) + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t61'] . ':
'; + echo '
 
123
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t61_v1x'] . '
' . $lang['srv_tip_sample_t61_v1y'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t61_v2x'] . '
' . $lang['srv_tip_sample_t61_v2y'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t61_v3x'] . '
' . $lang['srv_tip_sample_t61_v3y'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_2 - multigrid (dropdown) + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_3 - multigrid (double grid) + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t6_v1'] . '' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
 
' . $lang['srv_tip_sample_t6_o1'] . '' . $lang['srv_tip_sample_t6_o2'] . '' . $lang['srv_tip_sample_t6_o3'] . ' ' . $lang['srv_tip_sample_t6_o1'] . '' . $lang['srv_tip_sample_t6_o2'] . '' . $lang['srv_tip_sample_t6_o3'] . '
'; + echo '
'; + echo '
www.xxx.si
'; + echo '
'; + echo '
www.yyy.si
'; + echo '
'; + echo '
www.zzz.si
'; + echo '
'; + + echo '
'; + echo '
'; + + + // tip 6_4 - multigrid (one against another) + echo '
'; + // echo '
Primer tipa vprašanj: one against another.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6_4'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_4_v1'] . '
' . $lang['srv_tip_sample_t6_4_vmes'] . '' . $lang['srv_tip_sample_t6_4_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_4_v1'] . '
' . $lang['srv_tip_sample_t6_4_vmes'] . '' . $lang['srv_tip_sample_t6_4_v3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_4_v3'] . '
' . $lang['srv_tip_sample_t6_4_vmes'] . '' . $lang['srv_tip_sample_t6_4_v2'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_5 - multigrid (max diff) + echo '
'; + // echo '
Primer tipa vprašanj: max diff.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6_5'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_c1'] . '
 
' . $lang['srv_tip_sample_t6_5_c2'] . '
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_v1'] . '
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_v2'] . '
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_v3'] . '
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_v4'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_6 - multigrid (select box) + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6_6'] . '
'; + echo '
' . $lang['srv_tip_sample_t6_6_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_6_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_6_v3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_6_v4'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_8 - multigrid (Tabela Da/Ne) + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t6_8_o1'] . '' . $lang['srv_tip_sample_t6_8_o2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_9 - Drag-drop + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; //$lang['srv_new_question_icon'] + echo '' . $lang['srv_new_question'] . ''; + + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + + echo '
'; + echo '


'; + echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; + echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; + echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + echo '
    '; + //echo '
    '.$lang['srv_tip_sample_t6_o1'].'
    tralrarla
    '.$lang['srv_tip_sample_t6_o2'].'
    '.$lang['srv_tip_sample_t6_o3'].'

    '; + echo '
  • +
    ' . $lang['srv_tip_sample_t6_o1'] . '
    +
  • '; //izpis "naslova" okvirja + echo '
  • +
    +
  • ' . "\n"; //izpis okvirja + echo '
  • +
    ' . $lang['srv_tip_sample_t6_o2'] . '
    +
  • '; //izpis "naslova" okvirja + echo '
  • +
    +
  • ' . "\n"; //izpis okvirja + echo '
  • +
    ' . $lang['srv_tip_sample_t6_o3'] . '
    +
  • '; //izpis "naslova" okvirja + echo '
  • +
    +
  • ' . "\n"; //izpis okvirja + echo '
'; + echo '
'; + echo '
'; + + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_10 - Image HotSpot + echo '
'; + // echo '
Primer tipa vprašanj: label.
'; + //echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_hotspot_preview_text_radio_grid'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + + // tip 16 - multicheckbox + echo '
'; + // echo '
Primer tipa vprašanj: multicheckbox.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t16'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t16_o1'] . '' . $lang['srv_tip_sample_t16_o2'] . ' ' . $lang['srv_tip_sample_t16_o3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t16_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t16_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t16_v3'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 19 - multitext + echo '
'; + // echo '
Primer tipa vprašanj: multitext.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t19'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t19_o1'] . '' . $lang['srv_tip_sample_t19_o2'] . '' . $lang['srv_tip_sample_t19_o3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t19_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t19_v2'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 20 - multinumber + echo '
'; + // echo '
Primer tipa vprašanj: multinumber.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t20'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t20_o1'] . '' . $lang['srv_tip_sample_t20_o2'] . '' . $lang['srv_tip_sample_t20_o3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t20_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t20_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t20_v3'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 7 - number + echo '
'; + // echo '
Primer tipa vprašanj: number.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t7'] . '
'; + echo '
' . $lang['srv_tip_sample_t7_o1'] . '
'; + echo '
'; + echo '
'; + + // tip 7_2 - slider + echo '
'; + // echo '
Primer tipa vprašanj: number.
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t7_2'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 8 - datum + echo '
'; + // echo '
Primer tipa vprašanj: datum.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t8'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 17 - Razvrščanje prestavljanje (default) + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t17'] . '
'; + + echo '
'; + echo '
' . $lang['srv_tip_sample_t17_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t17_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t17_o3'] . '
'; + echo '
'; + + echo '
'; + echo '
1
'; + echo '
2
'; + echo '
3
'; + echo '
'; + echo '
'; + + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_ranking')){ + $userAccess->displayNoAccessText($what='question_type_ranking'); + } + echo '
'; + + // tip 171 - Razvrščanje ostevilcevanje (design = 1) + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t171'] . '
'; + + echo '
' . $lang['srv_tip_sample_t171_o1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t171_o2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t171_o3'] . '
'; + echo '
'; + + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_ranking')){ + $userAccess->displayNoAccessText($what='question_type_ranking'); + } + echo '
'; + + // tip 172 - Razvrščanje premikanje (design = 2) + echo '
'; + // echo '
Primer tipa vprašanj: multigrid.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t172'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t172_o1'] . '
 
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t172_o2'] . '
 
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t172_o3'] . '
 
'; + echo '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_ranking')){ + $userAccess->displayNoAccessText($what='question_type_ranking'); + } + echo '
'; + + // tip 18 - vsota + echo '
'; + // echo '
Primer tipa vprašanj: vsota.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t18'] . '
'; + echo '
' . $lang['srv_tip_sample_t18_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t18_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t18_o3'] . '
'; + echo '
' . $lang['srv_tip_sample_t18_o4'] . '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_sum')){ + $userAccess->displayNoAccessText($what='question_type_sum'); + } + echo '
'; + + // tip 24 - Kombinirana tabela + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_survey_table_multiple']; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_multitable')){ + $userAccess->displayNoAccessText($what='question_type_multitable'); + } + echo '
'; + + // tip 27 - Heatmap + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_vprasanje_heatmap']; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_heatmap')){ + $userAccess->displayNoAccessText($what='question_type_heatmap'); + } + echo '
'; + + // tip 22 - Kalkulacija + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_vprasanje_tip_long_22']; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_calculation')){ + $userAccess->displayNoAccessText($what='question_type_calculation'); + } + echo '
'; + + // tip 25 - Kvota + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_vprasanje_tip_long_25']; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_quota')){ + $userAccess->displayNoAccessText($what='question_type_quota'); + } + echo '
'; + + // tip 9 - SN-imena + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t9'] . ':
'; + echo '
'; + echo '
' . $lang['srv_add_field'] . '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='social_network')){ + $userAccess->displayNoAccessText($what='social_network'); + } + echo '
'; + + // tip 9_1 - SN-imena - fiksno st. polj + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t9'] . ':
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 9_2 - SN-imena - 1 textbox + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t9'] . ':
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 9_3 - SN-imena - vnos stevila polj + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t9'] . ':
'; + echo '
' . $lang['srv_design_count'] . ':
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + // demografska vprasanja + include_once('../../main/survey/app/global_function.php'); + $Survey = new \App\Controllers\SurveyController(true); + save('forceShowSpremenljivka', true); + + $dem = Array('XSPOL', 'XSTAR2a4', 'XZST1surs4', 'XDS2a4', 'XIZ1a2', 'XLOKACREGk', 'XPODJPRIH'); + + foreach ($dem AS $key) { + + $id = Demografija::getInstance()->getSpremenljivkaID($key); + + if ($id > 0) { + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + \App\Controllers\Vprasanja\VprasanjaController::getInstance()->displaySpremenljivka($id); + + echo '
'; + echo '
'; + } + } + + + echo '
'; + + echo '
'; // tip_preview } /** diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index c4f350822..133011de6 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -372,10 +372,6 @@ class SurveyAdmin global $lang; - // Predpregled tipa vprašanj - prikazujemo samo kadar smo v urejanju ankete - $this->getTipPreviewHtml(); - - // Loading ikona echo '
'; echo ' '.$lang['srv_saving']; @@ -5046,939 +5042,6 @@ class SurveyAdmin return $rows['active']; } - /** - * preview - * - */ - private function getTipPreviewHtml(){ - global $lang; - global $global_user_id; - - - // Predpregled tipa vprašanj - prikazujemo samo kadar smo v urejanju ankete - if (!$this->anketa > 0) - return; - - if ( ($_GET['a'] != '' || !isset($_GET['anketa'])) && $_GET['a'] != 'branching' ) - return; - - - echo '
'; - - echo '
'; - - - // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - $userAccess = UserAccess::getInstance($global_user_id); - - // tip 9999 - IF - echo '
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo $lang['srv_toolbox_if']; - echo '
'; - if(!$userAccess->checkUserAccess($what='if')){ - $userAccess->displayNoAccessText($what='if'); - } - echo '
'; - - // tip 9998 - Block - echo '
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo $lang['srv_toolbox_block']; - echo '
'; - if(!$userAccess->checkUserAccess($what='block')){ - $userAccess->displayNoAccessText($what='block'); - } - echo '
'; - - // tip 9997 - Loop - echo '
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo $lang['srv_toolbox_loop']; - echo '
'; - if(!$userAccess->checkUserAccess($what='loop')){ - $userAccess->displayNoAccessText($what='loop'); - } - echo '
'; - - - // tip 1_1 - radio - echo '
'; - // echo '
Primer tipa vprašanj: radio.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t1'] . '
'; - echo '
' . $lang['srv_tip_sample_t1_o1'] . '
'; - echo '
' . $lang['srv_tip_sample_t1_o2'] . '
'; - echo '
' . $lang['srv_tip_sample_t1_o3'] . '
'; - echo '
'; - echo '
'; - - // tip 1_10 - gdpr - echo '
'; - // echo '
Primer tipa vprašanj: radio.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_gdpr_intro_title'] . '

'; - echo '
' . $lang['srv_gdpr_intro'] . '.
'.$lang['srv_gdpr_intro4'].'
'; - echo '
' . $lang['srv_gdpr_intro_no'] . '
'; - echo '
' . $lang['srv_gdpr_intro_yes'] . '
'; - echo '
'; - echo '
'; - - // tip 1 - radio (horizontalno) - echo '
'; - // echo '
Primer tipa vprašanj: radio.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t1'] . ' ' . $lang['srv_tip_sample_t1_o1'] . ' ' . $lang['srv_tip_sample_t1_o2'] . '
'; - echo '
'; - echo '
'; - - // tip 1_2 - radio (horizontalno - nova vrstica) - echo '
'; - // echo '
Primer tipa vprašanj: radio.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t1'] . '
'; - echo '
' . $lang['srv_tip_sample_t1_o1'] . ' ' . $lang['srv_tip_sample_t1_o2'] . ' ' . $lang['srv_tip_sample_t1_o3'] . '
'; - echo '
'; - echo '
'; - - // tip 1_5 - radio potrditev - echo '
'; - // echo '
Primer tipa vprašanj: radio.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t1_5'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 1_6 - select box - echo '
'; - // echo '
Primer tipa vprašanj: radio.
'; - //echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t3'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 1_8 - Drag-drop - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - //echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t1'] . '
'; - - echo '
'; - echo '
' . $lang['srv_tip_sample_t1_o1'] . '
'; - echo '
' . $lang['srv_tip_sample_t1_o2'] . '
'; - echo '
' . $lang['srv_tip_sample_t1_o3'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - echo '
'; - echo '
'; - - echo '
'; - echo '
'; - - // tip 1_9 - custom radio picture - echo '
'; - echo '
'; - - echo '
' . $lang['srv_tip_sample_t1'] . '
'; - // star - echo '
'; - for ($i = 1; $i < 4; $i++) { - echo '
'; - } - echo '
'; - - // thumb - echo '
'; - for ($i = 1; $i < 4; $i++) { - echo '
'; - } - echo '
'; - - //smiley - echo '
'; - for ($i = 1; $i < 4; $i++) { - echo '
'; - } - echo '
'; - - // heart - echo '
'; - for ($i = 1; $i < 4; $i++) { - echo '
'; - } - echo '
'; - - // flag - echo '
'; - for ($i = 1; $i < 4; $i++) { - echo '
'; - } - echo '
'; - - // user - echo '
'; - for ($i = 1; $i < 4; $i++) { - echo '
'; - } - echo '
'; - - echo '
'; - echo '
'; - - // tip 1_10 - Image HotSpot - echo '
'; - // echo '
Primer tipa vprašanj: label.
'; - //echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_hotspot_preview_text_radio'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 1_11 - Vizualna anlaogna skala - echo '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t1'] . '
'; - - echo '
'; - for ($i = 1; $i < 7; $i++) { - echo '
- -
'; - } - echo '
'; - - echo '
'; - echo '
'; - - - // tip 2 - checkbox - echo '
'; - // echo '
Primer tipa vprašanj: checkbox.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t2'] . '
'; - echo '
' . $lang['srv_tip_sample_t2_o1'] . '
'; - echo '
' . $lang['srv_tip_sample_t2_o2'] . '
'; - echo '
' . $lang['srv_tip_sample_t2_o3'] . '
'; - echo '
'; - echo '
'; - - // tip 2_1 - check(horizontalno) - echo '
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t2'] . ' ' . $lang['srv_tip_sample_t2_o2'] . ' ' . $lang['srv_tip_sample_t2_o3'] . '
'; - echo '
'; - echo '
'; - - // tip 2_2 - check (horizontalno - nova vrstica) - echo '
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t2'] . '
'; - echo '
' . $lang['srv_tip_sample_t2_o1'] . ' ' . $lang['srv_tip_sample_t2_o2'] . ' ' . $lang['srv_tip_sample_t2_o3'] . '
'; - echo '
'; - echo '
'; - - // tip 2_8 - Drag-drop - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t1'] . '
'; - - echo '
'; - echo '
' . $lang['srv_tip_sample_t1_o1'] . '
'; - echo '
' . $lang['srv_tip_sample_t1_o2'] . '
'; - echo '
' . $lang['srv_tip_sample_t1_o3'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - echo '
'; - echo '
'; - - echo '
'; - echo '
'; - - // tip 2_10 - Image HotSpot - echo '
'; - // echo '
Primer tipa vprašanj: label.
'; - //echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_hotspot_preview_text_checkbox'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 3 - select - echo '
'; - // echo '
Primer tipa vprašanj: select.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t3'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 21 - besedilo* - echo '
'; - // echo '
Primer tipa vprašanj: text.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t21'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 21_1 - cpatcha - echo '
'; - // echo '
Primer tipa vprašanj: text.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t21_1_o1'] . '
'; - echo '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 21_2 - email - echo '
'; - // echo '
Primer tipa vprašanj: text.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t21_2_o1'] . '
'; - echo '
(' . $lang['srv_email_example'] . ')
'; - echo '
'; - echo '

' . $lang['srv_email_example_txt'] . '

'; - echo '
'; - echo '
'; - - // tip 21_3 - url - echo '
'; - // echo '
Primer tipa vprašanj: text.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t21_3_o1'] . '
'; - echo '
(' . $lang['srv_url_example'] . ')
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 21_4 - upload - echo '
'; - // echo '
Primer tipa vprašanj: text.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t21_4_o1'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 21_5 - textbox box - echo '
'; - // echo '
Primer tipa vprašanj: text.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t21'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 21_6 - elektronski podpis - echo '
'; - // echo '
Primer tipa vprašanj: text.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t21_6'] . '
'; - echo '
'; - echo '
'; - echo ''; - echo '
'.$lang['srv_signature_name'].' '; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_signature')){ - $userAccess->displayNoAccessText($what='question_type_signature'); - } - echo '
'; - - // tip 21_7 - fotografija - echo '
'; - // echo '
Primer tipa vprašanj: text.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t21_7'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 5 - label - echo '
'; - // echo '
Primer tipa vprašanj: label.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t5'] . '
'; - echo '
'; - echo '
'; - - // tip 5_2 - nagovor za aktivacijo chata - echo '
'; - // echo '
Primer tipa vprašanj: text.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_chat_question_text'] . '
'; - echo '
'.$lang['srv_chat_turn_on'].'
'; - echo '
'; - echo '
'; - - // tip 26 - lokacija - echo '
'; - // echo '
Primer tipa vprašanj: label.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t26_1'] . '
'; - echo '
'; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_location')){ - $userAccess->displayNoAccessText($what='question_type_location'); - } - echo '
'; - - // tip 26_2 - multi lokacija - echo '
'; - // echo '
Primer tipa vprašanj: label.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t26_2'] . '
'; - echo '
'; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_location')){ - $userAccess->displayNoAccessText($what='question_type_location'); - } - echo '
'; - - // tip 26_1 - moja lokacija - echo '
'; - // echo '
Primer tipa vprašanj: label.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t26_1'] . '
'; - echo '
'; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_location')){ - $userAccess->displayNoAccessText($what='question_type_location'); - } - echo '
'; - - // tip 6 - multigrid - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - - echo '
' . $lang['srv_tip_sample_t6'] . '
'; - echo '
 
' . $lang['srv_tip_sample_t6_o1'] . '' . $lang['srv_tip_sample_t6_o2'] . ' ' . $lang['srv_tip_sample_t6_o3'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - - // tip 6_1 - multigrid (semanticni diferencial) - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - - echo '
' . $lang['srv_tip_sample_t61'] . ':
'; - echo '
 
123
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t61_v1x'] . '
' . $lang['srv_tip_sample_t61_v1y'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t61_v2x'] . '
' . $lang['srv_tip_sample_t61_v2y'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t61_v3x'] . '
' . $lang['srv_tip_sample_t61_v3y'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - - // tip 6_2 - multigrid (dropdown) - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - - echo '
' . $lang['srv_tip_sample_t6'] . '
'; - echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - - // tip 6_3 - multigrid (double grid) - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - - echo '
' . $lang['srv_tip_sample_t6'] . '
'; - echo '
 
' . $lang['srv_tip_sample_t6_v1'] . '' . $lang['srv_tip_sample_t6_v3'] . '
'; - echo '
'; - - echo '
 
' . $lang['srv_tip_sample_t6_o1'] . '' . $lang['srv_tip_sample_t6_o2'] . '' . $lang['srv_tip_sample_t6_o3'] . ' ' . $lang['srv_tip_sample_t6_o1'] . '' . $lang['srv_tip_sample_t6_o2'] . '' . $lang['srv_tip_sample_t6_o3'] . '
'; - echo '
'; - echo '
www.xxx.si
'; - echo '
'; - echo '
www.yyy.si
'; - echo '
'; - echo '
www.zzz.si
'; - echo '
'; - - echo '
'; - echo '
'; - - - // tip 6_4 - multigrid (one against another) - echo '
'; - // echo '
Primer tipa vprašanj: one against another.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - - echo '
' . $lang['srv_tip_sample_t6_4'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_4_v1'] . '
' . $lang['srv_tip_sample_t6_4_vmes'] . '' . $lang['srv_tip_sample_t6_4_v2'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_4_v1'] . '
' . $lang['srv_tip_sample_t6_4_vmes'] . '' . $lang['srv_tip_sample_t6_4_v3'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_4_v3'] . '
' . $lang['srv_tip_sample_t6_4_vmes'] . '' . $lang['srv_tip_sample_t6_4_v2'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - - // tip 6_5 - multigrid (max diff) - echo '
'; - // echo '
Primer tipa vprašanj: max diff.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - - echo '
' . $lang['srv_tip_sample_t6_5'] . '
'; - echo '
 
' . $lang['srv_tip_sample_t6_5_c1'] . '
 
' . $lang['srv_tip_sample_t6_5_c2'] . '
'; - echo '
'; - echo '
 
' . $lang['srv_tip_sample_t6_5_v1'] . '
'; - echo '
'; - echo '
 
' . $lang['srv_tip_sample_t6_5_v2'] . '
'; - echo '
'; - echo '
 
' . $lang['srv_tip_sample_t6_5_v3'] . '
'; - echo '
'; - echo '
 
' . $lang['srv_tip_sample_t6_5_v4'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - - // tip 6_6 - multigrid (select box) - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - - echo '
' . $lang['srv_tip_sample_t6_6'] . '
'; - echo '
' . $lang['srv_tip_sample_t6_6_v1'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_6_v2'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_6_v3'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_6_v4'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - - // tip 6_8 - multigrid (Tabela Da/Ne) - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - - echo '
' . $lang['srv_tip_sample_t6'] . '
'; - echo '
 
' . $lang['srv_tip_sample_t6_8_o1'] . '' . $lang['srv_tip_sample_t6_8_o2'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - - // tip 6_9 - Drag-drop - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; //$lang['srv_new_question_icon'] - echo '' . $lang['srv_new_question'] . ''; - - echo '
'; - - echo '
' . $lang['srv_tip_sample_t6'] . '
'; - - echo '
'; - echo '


'; - echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; - echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; - echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; - echo '
'; - - echo '
'; - echo '
'; - echo '
    '; - //echo '
    '.$lang['srv_tip_sample_t6_o1'].'
    tralrarla
    '.$lang['srv_tip_sample_t6_o2'].'
    '.$lang['srv_tip_sample_t6_o3'].'

    '; - echo '
  • -
    ' . $lang['srv_tip_sample_t6_o1'] . '
    -
  • '; //izpis "naslova" okvirja - echo '
  • -
    -
  • ' . "\n"; //izpis okvirja - echo '
  • -
    ' . $lang['srv_tip_sample_t6_o2'] . '
    -
  • '; //izpis "naslova" okvirja - echo '
  • -
    -
  • ' . "\n"; //izpis okvirja - echo '
  • -
    ' . $lang['srv_tip_sample_t6_o3'] . '
    -
  • '; //izpis "naslova" okvirja - echo '
  • -
    -
  • ' . "\n"; //izpis okvirja - echo '
'; - echo '
'; - echo '
'; - - echo '
'; - - echo '
'; - echo '
'; - - // tip 6_10 - Image HotSpot - echo '
'; - // echo '
Primer tipa vprašanj: label.
'; - //echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_hotspot_preview_text_radio_grid'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - - // tip 16 - multicheckbox - echo '
'; - // echo '
Primer tipa vprašanj: multicheckbox.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t16'] . '
'; - echo '
 
' . $lang['srv_tip_sample_t16_o1'] . '' . $lang['srv_tip_sample_t16_o2'] . ' ' . $lang['srv_tip_sample_t16_o3'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t16_v1'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t16_v2'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t16_v3'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 19 - multitext - echo '
'; - // echo '
Primer tipa vprašanj: multitext.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t19'] . '
'; - echo '
 
' . $lang['srv_tip_sample_t19_o1'] . '' . $lang['srv_tip_sample_t19_o2'] . '' . $lang['srv_tip_sample_t19_o3'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t19_v1'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t19_v2'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 20 - multinumber - echo '
'; - // echo '
Primer tipa vprašanj: multinumber.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t20'] . '
'; - echo '
 
' . $lang['srv_tip_sample_t20_o1'] . '' . $lang['srv_tip_sample_t20_o2'] . '' . $lang['srv_tip_sample_t20_o3'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t20_v1'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t20_v2'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t20_v3'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 7 - number - echo '
'; - // echo '
Primer tipa vprašanj: number.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t7'] . '
'; - echo '
' . $lang['srv_tip_sample_t7_o1'] . '
'; - echo '
'; - echo '
'; - - // tip 7_2 - slider - echo '
'; - // echo '
Primer tipa vprašanj: number.
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t7_2'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 8 - datum - echo '
'; - // echo '
Primer tipa vprašanj: datum.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t8'] . '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 17 - Razvrščanje prestavljanje (default) - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t17'] . '
'; - - echo '
'; - echo '
' . $lang['srv_tip_sample_t17_o1'] . '
'; - echo '
' . $lang['srv_tip_sample_t17_o2'] . '
'; - echo '
' . $lang['srv_tip_sample_t17_o3'] . '
'; - echo '
'; - - echo '
'; - echo '
1
'; - echo '
2
'; - echo '
3
'; - echo '
'; - echo '
'; - - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_ranking')){ - $userAccess->displayNoAccessText($what='question_type_ranking'); - } - echo '
'; - - // tip 171 - Razvrščanje ostevilcevanje (design = 1) - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t171'] . '
'; - - echo '
' . $lang['srv_tip_sample_t171_o1'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t171_o2'] . '
'; - echo '
'; - echo '
' . $lang['srv_tip_sample_t171_o3'] . '
'; - echo '
'; - - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_ranking')){ - $userAccess->displayNoAccessText($what='question_type_ranking'); - } - echo '
'; - - // tip 172 - Razvrščanje premikanje (design = 2) - echo '
'; - // echo '
Primer tipa vprašanj: multigrid.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t172'] . '
'; - echo '
 
' . $lang['srv_tip_sample_t172_o1'] . '
 
'; - echo '
'; - echo '
 
' . $lang['srv_tip_sample_t172_o2'] . '
 
'; - echo '
'; - echo '
 
' . $lang['srv_tip_sample_t172_o3'] . '
 
'; - echo '
'; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_ranking')){ - $userAccess->displayNoAccessText($what='question_type_ranking'); - } - echo '
'; - - // tip 18 - vsota - echo '
'; - // echo '
Primer tipa vprašanj: vsota.
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t18'] . '
'; - echo '
' . $lang['srv_tip_sample_t18_o1'] . '
'; - echo '
' . $lang['srv_tip_sample_t18_o2'] . '
'; - echo '
' . $lang['srv_tip_sample_t18_o3'] . '
'; - echo '
' . $lang['srv_tip_sample_t18_o4'] . '
'; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_sum')){ - $userAccess->displayNoAccessText($what='question_type_sum'); - } - echo '
'; - - // tip 24 - Kombinirana tabela - echo '
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo $lang['srv_survey_table_multiple']; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_multitable')){ - $userAccess->displayNoAccessText($what='question_type_multitable'); - } - echo '
'; - - // tip 27 - Heatmap - echo '
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo $lang['srv_vprasanje_heatmap']; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_heatmap')){ - $userAccess->displayNoAccessText($what='question_type_heatmap'); - } - echo '
'; - - // tip 22 - Kalkulacija - echo '
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo $lang['srv_vprasanje_tip_long_22']; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_calculation')){ - $userAccess->displayNoAccessText($what='question_type_calculation'); - } - echo '
'; - - // tip 25 - Kvota - echo '
'; - echo '' . $lang['srv_new_question_icon'] . ''; - echo '
'; - echo $lang['srv_vprasanje_tip_long_25']; - echo '
'; - if(!$userAccess->checkUserAccess($what='question_type_quota')){ - $userAccess->displayNoAccessText($what='question_type_quota'); - } - echo '
'; - - // tip 9 - SN-imena - echo '
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t9'] . ':
'; - echo '
'; - echo '
' . $lang['srv_add_field'] . '
'; - echo '
'; - if(!$userAccess->checkUserAccess($what='social_network')){ - $userAccess->displayNoAccessText($what='social_network'); - } - echo '
'; - - // tip 9_1 - SN-imena - fiksno st. polj - echo '
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t9'] . ':
'; - echo '
'; - echo '
'; - echo '
'; - echo '
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 9_2 - SN-imena - 1 textbox - echo '
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t9'] . ':
'; - echo '
'; - echo '
'; - echo '
'; - - // tip 9_3 - SN-imena - vnos stevila polj - echo '
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - echo '
' . $lang['srv_tip_sample_t9'] . ':
'; - echo '
' . $lang['srv_design_count'] . ':
'; - echo '
'; - echo '
'; - echo '
'; - echo '
'; - echo '
'; - - // demografska vprasanja - include_once('../../main/survey/app/global_function.php'); - $Survey = new \App\Controllers\SurveyController(true); - save('forceShowSpremenljivka', true); - - $dem = Array('XSPOL', 'XSTAR2a4', 'XZST1surs4', 'XDS2a4', 'XIZ1a2', 'XLOKACREGk', 'XPODJPRIH'); - - foreach ($dem AS $key) { - - $id = Demografija::getInstance()->getSpremenljivkaID($key); - - if ($id > 0) { - echo '
'; - echo '' . $lang['srv_new_question'] . ''; - echo '
'; - - \App\Controllers\Vprasanja\VprasanjaController::getInstance()->displaySpremenljivka($id); - - echo '
'; - echo '
'; - } - } - - - echo '
'; - - echo '
'; // tip_preview - } /** * porihtana funkcija, da poklice SurveyRespondents::checkSystemVariables(), ki je zadolzena za dodajanje sistemskih spremenljivk diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js index 7ab7d5822..96575ae68 100644 --- a/admin/survey/script/branching.js +++ b/admin/survey/script/branching.js @@ -717,8 +717,7 @@ var is_new_spr_dragable = false; // gledamo ali vlečemo new_spr da skrbimo za s // inicializira toolbox na levi strani function init_toolbox() { - /*$('#toolbox, #toolbox_basic, #toolbox_settings').draggable({handle: '.handle'});*/ - $('p.new_spr:not(.user_access_locked), p.new_adv:not(.user_access_locked), p.new_if:not(.user_access_locked), p.new_block:not(.user_access_locked), p.new_loop:not(.user_access_locked), p.new_pb', '#toolbox_basic').draggable({ + $('.new_spr:not(.user_access_locked), .new_adv:not(.user_access_locked), .new_if:not(.user_access_locked), .new_block:not(.user_access_locked), .new_loop:not(.user_access_locked), .new_pb', '#toolbox_basic').draggable({ start: function () { is_new_spr_dragable = true, $('#toolbox_add_advanced').addClass('dragging') }, @@ -734,12 +733,15 @@ function init_toolbox() { }).bind('click', function (event) { var ta = $(event.target); - ta = $(ta).closest('p'); + ta = $(ta).closest('div'); + if (ta.hasClass('new_spr')) { // nova spremenljivka (iz toolboxa) - //$('html, body').animate({scrollTop: $('body').height()+$('#branching').height()}); // scrollamo na dno zaslona - var tip = ta.attr('tip'); + var podtip = 0; - if (ta.hasClass('podtip')) podtip = ta.attr('podtip'); + + if (ta.hasClass('podtip')) + podtip = ta.attr('podtip'); + // pri kreiranju generatorja imen ustvarimo za njim se loop in nagovor, ki mu pripadata if (tip == '9_sn') { SN_generator_new(0, 1); @@ -748,19 +750,19 @@ function init_toolbox() { spremenljivka_new(0, 0, 1, 0, tip, podtip); } - } else if (ta.hasClass('new_adv')) { // nova spremenljivka advanced (prikaze se popup z vsemi tipi vprasanj) - //$('html, body').animate({scrollTop: $('body').height()+$('#branching').height()}); // scrollamo na dno zaslona + } + else if (ta.hasClass('new_adv')) { // nova spremenljivka advanced (prikaze se popup z vsemi tipi vprasanj) toolbox_add_advanced(0, 0, 1); - - } else if (ta.hasClass('new_if')) { // nov if iz toolbox + } + else if (ta.hasClass('new_if')) { // nov if iz toolbox $('html, body').animate({scrollTop: $('body').height() + $('#branching').height()}); // scrollamo na dno zaslona if_new(0, 0, 1, 0); - - } else if (ta.hasClass('new_block')) { // nov blok iz toolboxa + } + else if (ta.hasClass('new_block')) { // nov blok iz toolboxa $('html, body').animate({scrollTop: $('body').height() + $('#branching').height()}); // scrollamo na dno zaslona if_new(0, 0, 1, 1); - - } else if (ta.hasClass('new_loop')) { // nov loop iz toolboxa + } + else if (ta.hasClass('new_loop')) { // nov loop iz toolboxa $('html, body').animate({scrollTop: $('body').height() + $('#branching').height()}); // scrollamo na dno zaslona if_new(0, 0, 1, 2); } @@ -769,42 +771,44 @@ function init_toolbox() { setTimeout(function () { $('#toolbox_add_advanced').removeClass('dragging'); }, 500); - }); // mousever preview vprasanja $('#toolbox_basic').bind('mouseover', function (event) { - var tip = $(event.target).closest('p.new_spr, p.new_adv, p.new_if, p.new_block, p.new_loop, p.new_sn'); + var tip = $(event.target).closest('.new_spr, .new_adv, .new_if, .new_block, .new_loop, .new_sn'); - if (tip.hasClass('adv')) { // tooltip za vprasanja v advanced toolboxu - if (tip.hasClass('podtip')) { // vprasanja s podtipom + // tooltip za vprasanja v advanced toolboxu + if (tip.hasClass('adv')) { + + // vprasanja s podtipom + if (tip.hasClass('podtip')) { show_tip_preview_subtype(-1, tip.attr('podtip'), tip.attr('tip')); } else if (tip.hasClass('new_sn')) { show_tip_preview_toolbox(tip.attr('tip'), 0, 1); } - else if (tip.hasClass('new_spr')) { // osnovna vprasanja, samo z tipom + // osnovna vprasanja, samo z tipom + else if (tip.hasClass('new_spr')) { show_tip_preview_toolbox(tip.attr('tip'), 0, 1); } } - else if (tip.hasClass('new_spr') && !is_new_spr_dragable) { // tooltip za vprasanja v osnovnemu toolboxu + // tooltip za vprasanja v osnovnemu toolboxu + else if (tip.hasClass('new_spr') && !is_new_spr_dragable) { var podtip = tip.attr('podtip'); show_tip_preview_toolbox(tip.attr('tip'), undefined, undefined, podtip); } else if (tip.hasClass('new_if') || tip.hasClass('new_block') || tip.hasClass('new_loop')) { show_tip_preview_toolbox(tip.attr('tip')); } - else if (tip.hasClass('new_adv')) { // gumb za + + // gumb za + + else if (tip.hasClass('new_adv')) { // prikazemo s CSSom } }).bind('mouseout', function (event) { $("#tip_preview").hide(); }); - - // max-height toolboxa - //$('#toolbox_basic').css('max-height', $(window).height()-188); } // prikaze popup za dodajanje naprednih tipov vprasanj @@ -2237,7 +2241,6 @@ function alert_close_block() { function quick_settings(spremenljivka, results, what) { var status1 = $('#form_settings_obvescanje').css('display'); - //var status2 = $('#form_settings_vabila').css('display'); if (what == 'finish_author' || what == 'finish_respondent_cms' || what == 'finish_respondent' || what == 'finish_other') { if (results.checked == true) @@ -2246,9 +2249,6 @@ function quick_settings(spremenljivka, results, what) { results = 0; } - //$("#simple").load('ajax.php?a=form_settings', {anketa: srv_meta_anketa_id, spremenljivka: spremenljivka, results: results, what: what}); - //$.post('ajax.php?a=form_settings', {anketa: srv_meta_anketa_id, spremenljivka: spremenljivka, results: results, what: what}); - $("#quick_settings").load('ajax.php?t=branching&a=edit_quick_settings', { anketa: srv_meta_anketa_id, spremenljivka: spremenljivka, @@ -2536,7 +2536,6 @@ function slider_edit_init(spremenljivka, min, max, def, slider_handle, slider_ha if (nakazi_odgovore == 1 && slider_handle == 1){//ce zelimo bunke za nakazovanje odgovorov $('#sliderbranching_' + spremenljivka).slider().removeClass("classic_slider"); //odstrani razred s klasicnimi crticami $('#sliderbranching_' + spremenljivka).slider().addClass("circle_slider"); //dodaj razred z bunkicami za nakazovanje - //$('#sliderbranching_' + spremenljivka + ' .ui-slider-handle').css('visibility', 'hidden');//skrij handle } else if (nakazi_odgovore == 0 && slider_handle == 0){ //drugace $('#sliderbranching_' + spremenljivka).slider().addClass("classic_slider"); //dodaj klasicen razred @@ -2544,7 +2543,6 @@ function slider_edit_init(spremenljivka, min, max, def, slider_handle, slider_ha } else if (nakazi_odgovore == 1 && slider_handle == 0){ //drugace $('#sliderbranching_' + spremenljivka).slider().addClass("elipse_slider"); //dodaj klasicen razred - //$('#sliderbranching_' + spremenljivka).slider().removeClass("circle_slider"); //odstrani razred circle slider } //konec ureditve bunk in elips za nakazovanje moznih odgovorov @@ -2564,12 +2562,10 @@ function slider_edit_init(spremenljivka, min, max, def, slider_handle, slider_ha if (vmesne_Crtice == 1){//ce je potrebno pokazati vmesne črtice rest = "pip"; - //console.log('Črtice'); } else if (vmesne_Crtice == 0) { rest = false; - //console.log('Brez črtic'); } @@ -2683,7 +2679,6 @@ function slider_edit_init_prevajanje(spremenljivka, min, max, def, slider_handle //globalne spremenljivke, ki so potrebne za posodobitev drsnika v prevodih - konec $("#variabla_limit_" + spremenljivka).css('display', 'none'); - //$("input[name^='foo_" + spremenljivka + "']").parent().css('display', 'none'); //pokomnetiral zaradi skrivanja missing-ov var minmaxlabela = "label";//hrani nastavitev za minmax labele var rest = false; //hrani nastavitve za vmesne črtice z ("label") in brez label ("pip") ter odsotnost črtic (false) @@ -2707,7 +2702,6 @@ function slider_edit_init_prevajanje(spremenljivka, min, max, def, slider_handle if (nakazi_odgovore == 1 && slider_handle == 1){//ce zelimo bunke za nakazovanje odgovorov $('#sliderbranching_prevajanje' + spremenljivka).slider().removeClass("classic_slider"); //odstrani razred s klasicnimi crticami $('#sliderbranching_prevajanje' + spremenljivka).slider().addClass("circle_slider"); //dodaj razred z bunkicami za nakazovanje - //$('#sliderbranching_' + spremenljivka + ' .ui-slider-handle').css('visibility', 'hidden');//skrij handle } else if (nakazi_odgovore == 0 && slider_handle == 0){ //drugace $('#sliderbranching_prevajanje' + spremenljivka).slider().addClass("classic_slider"); //dodaj klasicen razred @@ -2715,7 +2709,6 @@ function slider_edit_init_prevajanje(spremenljivka, min, max, def, slider_handle } else if (nakazi_odgovore == 1 && slider_handle == 0){ //drugace $('#sliderbranching_prevajanje' + spremenljivka).slider().addClass("elipse_slider"); //dodaj klasicen razred - //$('#sliderbranching_' + spremenljivka).slider().removeClass("circle_slider"); //odstrani razred circle slider } //konec ureditve bunk in elips za nakazovanje moznih odgovorov @@ -2735,12 +2728,10 @@ function slider_edit_init_prevajanje(spremenljivka, min, max, def, slider_handle if (vmesne_Crtice == 1){//ce je potrebno pokazati vmesne črtice rest = "pip"; - //console.log('Črtice'); } else if (vmesne_Crtice == 0) { rest = false; - //console.log('Brez črtic'); } @@ -2749,14 +2740,6 @@ function slider_edit_init_prevajanje(spremenljivka, min, max, def, slider_handle rest = "label"; } -/* if(tip_vmesne_descr_labele != 0 && prevod==''){ //ce se je izbralo prednalozene vmesne opisne labele in ni prevoda - vmesne_opisne_labele = vmesne_descr_labele.split(";"); - max = vmesne_opisne_labele.length-1; - }else if((slider_VmesneDescrLabel)||(tip_vmesne_descr_labele != 0 && prevod)){ //ce se je izbralo Brez oz. custom opisne labele ALI se je izbralo prednalozene vmesne opisne labele in je prevod - vmesne_opisne_labele = slider_CustomDescriptiveLabels.split(";"); - max = vmesne_opisne_labele.length; - } */ - if((slider_VmesneDescrLabel)||(tip_vmesne_descr_labele != 0)){ //ce se je izbralo Brez oz. custom opisne labele ALI se je izbralo prednalozene vmesne opisne labele vmesne_opisne_labele = slider_CustomDescriptiveLabels.split(";"); max = vmesne_opisne_labele.length; @@ -2771,7 +2754,8 @@ function slider_edit_init_prevajanje(spremenljivka, min, max, def, slider_handle slide: function (event, ui) { if (slider_window_number == 0){ //ce rabimo stevilo nad handle - // Sproti popravljamo vrednost v okencu ob slidu + + // Sproti popravljamo vrednost v okencu ob slidu $("#sliderTextbranching_" + spremenljivka).html(ui.value); // Premikamo okencek skupaj z sliderjem @@ -2783,12 +2767,7 @@ function slider_edit_init_prevajanje(spremenljivka, min, max, def, slider_handle }; // wait for the ui.handle to set its position setTimeout(delay, 5); - } - - //if (slider_handle == 1){//ce si zelimo skriti handle - //$('#sliderbranching_' + spremenljivka + ' .ui-slider-handle').css('visibility', '');// - //} - + } }, // Prikazemo okencek s vrednostjo @@ -2819,19 +2798,11 @@ function slider_edit_init_prevajanje(spremenljivka, min, max, def, slider_handle } $('#sliderbranching_' + spremenljivka + ' .ui-slider-handle').css('left', percent_def + '%'); - - - //if (slider_handle == 1){//ce si zelimo skriti handle - //$('#sliderbranching_' + spremenljivka + ' .ui-slider-handle').css('visibility', 'hidden');//skrij handle - //$('#sliderbranching_' + spremenljivka + ' .special_slider').css('visibility', '');//skrij handle - //} - - + // Postavimo na zacetku okencek na pravo mesto if (slider_window_number == 0){ $("#sliderTextbranching_" + spremenljivka).position({ of: $('#sliderbranching_' + spremenljivka + ' .ui-slider-handle'), - //of: $('#sliderbranching_' + spremenljivka + ' .classic_slider'), offset: "0, -37" }); } @@ -2843,7 +2814,7 @@ function slider_edit_init_prevajanje(spremenljivka, min, max, def, slider_handle last: minmaxlabela, labels: vmesne_opisne_labele, }); - //$( ".selector" ).slider( "option", "value", 10 ); + $('#sliderbranching_prevajanje' + spremenljivka).slider("option", "value", def);//postavi rocico na mesto, kjer je izracunana default vrednost } //********************************************************* @@ -2882,7 +2853,6 @@ function slider_edit_grid_init(spremenljivka, vrednost, min, max, def, vmesne_la if (nakazi_odgovore == 1 && slider_handle == 1){//ce zelimo bunke za nakazovanje odgovorov $('#sliderbranching_' + spremenljivka + '_' + vrednost).slider().removeClass("classic_slider"); //odstrani razred s klasicnimi crticami $('#sliderbranching_' + spremenljivka + '_' + vrednost).slider().addClass("circle_slider"); //dodaj razred z bunkicami za nakazovanje - //$('#sliderbranching_' + spremenljivka + ' .ui-slider-handle').css('visibility', 'hidden');//skrij handle } else if (nakazi_odgovore == 0 && slider_handle == 0){ //drugace $('#sliderbranching_' + spremenljivka + '_' + vrednost).slider().addClass("classic_slider"); //dodaj klasicen razred @@ -2890,7 +2860,6 @@ function slider_edit_grid_init(spremenljivka, vrednost, min, max, def, vmesne_la } else if (nakazi_odgovore == 1 && slider_handle == 0){ //drugace $('#sliderbranching_' + spremenljivka + '_' + vrednost).slider().addClass("elipse_slider"); //dodaj klasicen razred - //$('#sliderbranching_' + spremenljivka).slider().removeClass("circle_slider"); //odstrani razred circle slider } //konec ureditve bunk in elips za nakazovanje moznih odgovorov @@ -2986,11 +2955,6 @@ function slider_edit_grid_init(spremenljivka, vrednost, min, max, def, vmesne_la } $('#sliderbranching_' + spremenljivka + '_' + vrednost + ' .ui-slider-handle').css('left', percent_def + '%'); - //if($('#slider_handle_'+spremenljivka+' option:selected').val() == 2){//ce si zelimo skriti handle - //if(slider_handle == 1){//ce si zelimo skriti handle - //$('#sliderbranching_' + spremenljivka + '_' + vrednost + ' .ui-slider-handle').css('visibility', 'hidden');//skrij handle - //$('#slider_' + spremenljivka + ' .ui-slider-handle.ui-state-default.ui-corner-all').css('visibility', 'hidden');//skrij handle - //} if (slider_window_number == 0){ // Postavimo na zacetku okencek na pravo mesto $("#sliderTextbranching_" + spremenljivka + "_" + vrednost).position({ @@ -3000,8 +2964,6 @@ function slider_edit_grid_init(spremenljivka, vrednost, min, max, def, vmesne_la }); } } - - //}); }) .slider("pips",{ rest: rest, @@ -3086,11 +3048,9 @@ function slider_edit_grid_init_prevajanje(spremenljivka, vrednost, min, max, def if (vmesne_Crtice == 1){//ce je potrebno pokazati vmesne črtice rest = "pip"; - //console.log('Črtice'); } else if (vmesne_Crtice == 0) { rest = false; - //console.log('Brez črtic'); } //if (vmesne_labels == 1) { @@ -3160,11 +3120,6 @@ function slider_edit_grid_init_prevajanje(spremenljivka, vrednost, min, max, def } $('#sliderbranching_prevajanje' + spremenljivka + '_' + vrednost + ' .ui-slider-handle').css('left', percent_def + '%'); - //if($('#slider_handle_'+spremenljivka+' option:selected').val() == 2){//ce si zelimo skriti handle - //if(slider_handle == 1){//ce si zelimo skriti handle - //$('#sliderbranching_' + spremenljivka + '_' + vrednost + ' .ui-slider-handle').css('visibility', 'hidden');//skrij handle - //$('#slider_' + spremenljivka + ' .ui-slider-handle.ui-state-default.ui-corner-all').css('visibility', 'hidden');//skrij handle - //} if (slider_window_number == 0){ // Postavimo na zacetku okencek na pravo mesto $("#sliderTextbranching_" + spremenljivka + "_" + vrednost).position({ @@ -3174,8 +3129,6 @@ function slider_edit_grid_init_prevajanje(spremenljivka, vrednost, min, max, def }); } } - - //}); }) .slider("pips",{ rest: rest, diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index 2ddb26a24..c9bc6db96 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -2535,8 +2535,8 @@ function show_tip_preview_toolbox (tip, copy, advanced, podtip) { if (advanced == 1) { if ($("#tip_preview_sub_"+tip).length > 0) { - var pos = $("p[tip="+tip+"]", "#toolbox_add_advanced").offset(); - var width = $("p[tip="+tip+"]", "#toolbox_add_advanced").width(); + var pos = $("div[tip="+tip+"]", "#toolbox_add_advanced").offset(); + var width = $("div[tip="+tip+"]", "#toolbox_add_advanced").width(); $("#tip_preview").css( { "left": (10+pos.left + width) + "px", "right":"auto", "top":(10+pos.top) + "px" } ); // prikažemo glevni div @@ -2558,8 +2558,8 @@ function show_tip_preview_toolbox (tip, copy, advanced, podtip) { } else { if ($("#tip_preview_sub_"+tip).length > 0) { - var pos = $("p[tip="+tip+"]:not(.adv)", "#toolbox_basic").offset(); - var width = $("p[tip="+tip+"]:not(.adv)", "#toolbox_basic").width(); + var pos = $("div[tip="+tip+"]:not(.adv)", "#toolbox_basic").offset(); + var width = $("div[tip="+tip+"]:not(.adv)", "#toolbox_basic").width(); $("#tip_preview").css( { "left": (13+pos.left + width) + "px", "right":"auto", "top":(pos.top) + "px" } ); // prikažemo glevni div @@ -2836,8 +2836,8 @@ function show_tip_preview_subtype(spr, design, tip) { } else { //pozicioniramo div - var pos = $("#toolbox_add_advanced p[tip="+tip+"][podtip="+design+"]").offset(); - var width = $("#toolbox_add_advanced p[tip="+tip+"][podtip="+design+"]").width(); + var pos = $("#toolbox_add_advanced div[tip="+tip+"][podtip="+design+"]").offset(); + var width = $("#toolbox_add_advanced div[tip="+tip+"][podtip="+design+"]").width(); $("#tip_preview").css( { "left": (10+pos.left + width) + "px", "right":"auto", "top":(10+pos.top) + "px" } ); } diff --git a/public/css/admin_new.css b/public/css/admin_new.css index ea2a45f65..d898be16e 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10564,82 +10564,6 @@ and open the template in the editor. color: #1E88E5; } -#tip_preview { - position: absolute; - display: none; - z-index: 9999; - width: auto; - height: auto; - pointer-events: none; -} - -.tip_preview_sub { - display: none; - margin: 10px 10px 10px 10px; -} -.tip_preview_sub > span { - padding: 10px; -} - -.inside { - min-width: 380px; - background-color: #1E88E5; - border: 1px #1E88E5 solid; -} - -.tip_sample { - padding: 10px; - overflow: hidden; - margin-top: 10px; -} -.tip_sample div.spremenljivka div.naslov { - font-weight: bold; - width: auto; - padding: 0; -} -.tip_sample div.spremenljivka div.naslov p { - margin: 0; -} - -.tip_sample_text { - font-weight: 500; -} - -.tip_sample_option { - padding-left: 5px; - width: 100%; -} -.tip_sample_option div { - display: block; - float: left; - width: 100px; -} -.tip_sample_option span { - display: block; - float: left; - width: 80px; - text-align: center; - margin-bottom: 3px; -} - -.tip_sample_option2 { - padding-left: 5px; - width: 100%; -} -.tip_sample_option2 div { - display: block; - float: left; - width: 100px; -} -.tip_sample_option2 span { - display: block; - float: left; - width: 80px; - text-align: center; - margin-bottom: 3px; - width: 60px; -} - .popup_content.consulting { font-weight: 600; padding: 20px 20px; @@ -10757,32 +10681,190 @@ and open the template in the editor. /* Levi toolbox v urejanju ankete (dodajanje vprasanj...) */ -.toolbox { - cursor: pointer; +.toolbox_holder { + display: flex; + flex-direction: column; position: fixed; left: 0; - width: 240px; + top: 220px; background-color: #F2F2F2; } - -#toolbox_advanced_settings { - top: 218px; +.toolbox_holder .toolbox { + cursor: pointer; + display: flex; + flex-direction: column; } -#toolbox_advanced_settings #toolbox_advanced_settings_holder { +.toolbox_holder .toolbox .toolbox_item { + display: flex; + padding: 0 12px 0 0; + border-bottom: 1px #E5E5E5 solid; + transition: 0.2s; +} +.toolbox_holder .toolbox .toolbox_item .item_icon { + width: 40px; + line-height: 40px; + text-align: center; +} +.toolbox_holder .toolbox .toolbox_item .item_icon:before { + font-size: 16px; +} +.toolbox_holder .toolbox .toolbox_item .item_icon.matrix_32 { + margin-top: 7px; + line-height: 9px; +} +.toolbox_holder .toolbox .toolbox_item .item_icon.matrix_32:before { + font-size: 11px !important; +} +.toolbox_holder .toolbox .toolbox_item .item_icon.abc_32, .toolbox_holder .toolbox .toolbox_item .item_icon.number_32 { + margin-top: -1px; + line-height: 40px; +} +.toolbox_holder .toolbox .toolbox_item .item_icon.abc_32:before, .toolbox_holder .toolbox .toolbox_item .item_icon.number_32:before { + font-size: 14px !important; +} +.toolbox_holder .toolbox .toolbox_item .item_text { + font-size: 14px; + line-height: 40px; + text-indent: 3px; +} +.toolbox_holder .toolbox .toolbox_item:hover { + background-color: #E5E5E5; +} +.toolbox_holder .toolbox .toolbox_item.new_adv { + color: #FFFFFF; + background-color: #1E88E5; +} +.toolbox_holder .toolbox .toolbox_item.new_adv:hover { + background-color: #0059ab; +} +.toolbox_holder .toolbox .toolbox_item.new_block { + border-bottom: none; +} +.toolbox_holder .toolbox #locked_toolbar { + position: absolute; + top: 1px; + left: 1px; + width: 45px; + height: 194px; + padding: 140px 0 0 3px; + background: rgba(30, 136, 229, 0.85); +} +.toolbox_holder .toolbox #locked_toolbar span.lock_big { + margin-left: 13px; +} +.toolbox_holder .toolbox #toolbox_basic.forma { + height: 266px; + top: 235px; +} +.toolbox_holder .toolbox #toolbox_basic.forma #locked_toolbar { + height: 199px; + padding-top: 85px; +} +.toolbox_holder .toolbox_expand { display: none; cursor: auto; - z-index: 99; position: fixed; - top: 218px; + z-index: 99; + top: 220px; + left: 245px; + box-sizing: border-box; + width: 272px; + max-height: 520px; + background: #FFFFFF; + border: 1px solid #E5E5E5; + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15); +} +.toolbox_holder .toolbox_preview { + display: none; + cursor: auto; + pointer-events: none; + position: fixed; + z-index: 9999; + top: 220px; + left: 520px; + box-sizing: border-box; + width: 450px; + max-height: 520px; + background: #F8F8F8; + border: 1px solid #E5E5E5; + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15); +} +.toolbox_holder .toolbox_preview .tip_preview_sub { + display: none; + margin: 10px 10px 10px 10px; +} +.toolbox_holder .toolbox_preview .tip_preview_sub > span { + padding: 10px; +} +.toolbox_holder .toolbox_preview .tip_sample { + padding: 10px; + overflow: hidden; + margin-top: 10px; +} +.toolbox_holder .toolbox_preview .tip_sample div.spremenljivka div.naslov { + font-weight: bold; + width: auto; + padding: 0; +} +.toolbox_holder .toolbox_preview .tip_sample div.spremenljivka div.naslov p { + margin: 0; +} +.toolbox_holder .toolbox_preview .tip_sample_text { + font-weight: 500; +} +.toolbox_holder .toolbox_preview .tip_sample_option { + padding-left: 5px; + width: 100%; +} +.toolbox_holder .toolbox_preview .tip_sample_option div { + display: block; + float: left; + width: 100px; +} +.toolbox_holder .toolbox_preview .tip_sample_option span { + display: block; + float: left; + width: 80px; + text-align: center; + margin-bottom: 3px; +} +.toolbox_holder .toolbox_preview .tip_sample_option2 { + padding-left: 5px; + width: 100%; +} +.toolbox_holder .toolbox_preview .tip_sample_option2 div { + display: block; + float: left; + width: 100px; +} +.toolbox_holder .toolbox_preview .tip_sample_option2 span { + display: block; + float: left; + width: 80px; + text-align: center; + margin-bottom: 3px; + width: 60px; +} +.toolbox_holder.open { + width: 240px; +} +.toolbox_holder.closed { + width: 50px; +} +.toolbox_holder.closed .toolbox_item .item_text { + display: none; +} +.toolbox_holder.closed .toolbox_expand { left: 55px; +} + +#toolbox_advanced_settings #toolbox_advanced_settings_holder { width: auto; height: auto; min-height: 100px; padding: 10px 20px 0 10px; text-align: left; font-size: 11px; - border: 1px solid #1E88E5; - background-color: #1E88E5; } #toolbox_advanced_settings #toolbox_advanced_settings_holder span.advanced_settings_title { vertical-align: middle; @@ -10799,185 +10881,164 @@ and open the template in the editor. } #toolbox_basic { - top: 255px; -} -#toolbox_basic div.new_adv { - cursor: default; - cursor: pointer; - margin: 0px 1px; - padding: 8px 4px; - text-align: center; - background-color: #FFC700; - background-repeat: repeat-y; -} -#toolbox_basic p { - margin: 10px 3px 3px; -} -#toolbox_basic p img { - cursor: move; -} -#toolbox_basic p span.sprites { - margin-right: 2px; -} -#toolbox_basic .handle { - color: #FF0000; - font-weight: bold; -} -#toolbox_basic p.left { - overflow: hidden; - margin-left: 0; - margin-right: 0; - padding-left: 9px; - padding-right: 2px; -} -#toolbox_basic p.right { - overflow: hidden; - margin-left: 0; - margin-right: 0; - padding-left: 9px; - padding-right: 2px; -} -#toolbox_basic p.whole { - overflow: hidden; - margin-left: 0; - margin-right: 0; - padding-left: 2%; - padding-right: 2%; - margin-top: 6px; -} -#toolbox_basic p.new_spr { - cursor: pointer; - margin: 0px 1px; - padding: 8px 4px; - text-align: center; -} -#toolbox_basic p.new_spr:hover { - background-color: #1775c8; -} -#toolbox_basic p.new_if { - cursor: pointer; - margin: 0px 1px; - padding: 8px 4px; - text-align: center; -} -#toolbox_basic p.new_if:hover { - background-color: #1775c8; -} -#toolbox_basic p.new_pb { - cursor: pointer; - margin: 0px 1px; - padding: 8px 4px; - text-align: center; -} -#toolbox_basic p.new_pb:hover { - background-color: #1775c8; -} -#toolbox_basic p.new_block { - cursor: pointer; - margin: 0px 1px; - padding: 8px 4px; - text-align: center; -} -#toolbox_basic p.new_block:hover { - background-color: #1775c8; + /*div.new_adv { + cursor: default; + cursor: pointer; + margin: 0px 1px; + padding: 8px 4px; + text-align: center; + background-color: $yellow; + background-repeat: repeat-y; + } + p { + img { + cursor: move; + } + margin: 10px 3px 3px; + span.sprites { + margin-right: 2px; + } + } + .handle { + color: $red; + font-weight: bold; + } + p.left { + overflow: hidden; + margin-left: 0; + margin-right: 0; + padding-left: 9px; + padding-right: 2px; + } + p.right { + overflow: hidden; + margin-left: 0; + margin-right: 0; + padding-left: 9px; + padding-right: 2px; + } + p.whole { + overflow: hidden; + margin-left: 0; + margin-right: 0; + padding-left: 2%; + padding-right: 2%; + margin-top: 6px; + } + + p.new_spr { + cursor: pointer; + margin: 0px 1px; + padding: 8px 4px; + text-align: center; + &:hover { + background-color: darken($blue, 7%); + } + } + p.new_if { + cursor: pointer; + margin: 0px 1px; + padding: 8px 4px; + text-align: center; + &:hover { + background-color: darken($blue, 7%); + } + } + p.new_pb { + cursor: pointer; + margin: 0px 1px; + padding: 8px 4px; + text-align: center; + &:hover { + background-color: darken($blue, 7%); + } + } + p.new_block { + cursor: pointer; + margin: 0px 1px; + padding: 8px 4px; + text-align: center; + &:hover { + background-color: darken($blue, 7%); + } + }*/ } -#toolbox_add_advanced { - display: none; - cursor: auto; - z-index: -1; - position: fixed; - top: 218px; - left: 55px; - width: 495px; - height: auto; - min-height: 100px; - padding: 0px 10px 10px 10px; - background-color: #1E88E5; - text-align: left; - border: 1px solid #1E88E5; -} -#toolbox_add_advanced p.toolbox_add_title { - color: #1E88E5; - font-weight: 600; - font-size: 14px; -} -#toolbox_add_advanced p.new_spr { - float: left; - cursor: pointer; - width: 150px; - margin: 1px 0px 1px 1px; - padding: 4px 7px; - text-align: left; -} -#toolbox_add_advanced p.new_spr:hover { - background-color: #1E88E5; -} -#toolbox_add_advanced p.new_loop { - float: left; - cursor: pointer; - width: 150px; - margin: 1px 0px 1px 1px; - padding: 4px 7px; - text-align: left; -} -#toolbox_add_advanced p.new_loop:hover { - background-color: #1E88E5; -} -#toolbox_add_advanced .holder { - width: 33%; - float: left; - border: 0; - background: 0; -} -#toolbox_add_advanced p.new_question { - text-align: left; -} -#toolbox_add_advanced .new_spr_spacer { - float: left; - cursor: pointer; - width: 150px; - margin: 1px 0px 1px 1px; - padding: 4px 7px; - text-align: left; - cursor: auto; - height: 18px; -} -#toolbox_add_advanced p.naslov { - float: left; - width: 150px; - margin: 10px 0 3px 0; - padding: 0 5px 0px 2px; - font-size: 13px; - font-weight: 600; - text-align: left; -} -#toolbox_add_advanced p span { - display: none; -} - -#locked_toolbar { - position: absolute; - top: 1px; - left: 1px; - width: 45px; - height: 194px; - padding: 140px 0 0 3px; - background: rgba(30, 136, 229, 0.85); -} -#locked_toolbar span.lock_big { - margin-left: 13px; -} - -#toolbox_basic.forma { - height: 266px; - top: 235px; -} -#toolbox_basic.forma #locked_toolbar { - height: 199px; - padding-top: 85px; -} +/*#toolbox_add_advanced { + display: none; + cursor: auto; + z-index: -1; + position: fixed; + left: 55px; + width: 495px; + height: auto; + min-height: 100px; + padding: 0px 10px 10px 10px; + background-color: $blue; + text-align: left; + border: 1px solid $blue; + p.toolbox_add_title { + color: $blue; + font-weight: 600; + font-size: 14px; + } + p.new_spr { + &:hover { + background-color: $blue; + } + float: left; + cursor: pointer; + width: 150px; + margin: 1px 0px 1px 1px; + padding: 4px 7px; + text-align: left; + } + p.new_loop { + &:hover { + background-color: $blue; + } + float: left; + cursor: pointer; + width: 150px; + margin: 1px 0px 1px 1px; + padding: 4px 7px; + text-align: left; + } + .holder { + width: 33%; + float: left; + border: 0; + background: 0; + } + p.new_question { + text-align: left; + } + .new_spr_spacer { + float: left; + cursor: pointer; + width: 150px; + margin: 1px 0px 1px 1px; + padding: 4px 7px; + text-align: left; + cursor: auto; + height: 18px; + } + p.naslov { + float: left; + width: 150px; + margin: 10px 0 3px 0; + padding: 0 5px 0px 2px; + font-size: 13px; + font-weight: 600; + text-align: left; + } + p { + span { + display: none; + } + } +}*/ .mobile_add_question { display: none; } diff --git a/resources/sass/admin_new/components/popup/page_specific/preview_question.scss b/resources/sass/admin_new/components/popup/page_specific/preview_question.scss index 7b4d46cdd..6d05329ce 100644 --- a/resources/sass/admin_new/components/popup/page_specific/preview_question.scss +++ b/resources/sass/admin_new/components/popup/page_specific/preview_question.scss @@ -678,74 +678,3 @@ $progress_bar_background: black; color: $blue; } } -#tip_preview { - position: absolute; - display: none; - z-index: 9999; - width: auto; - height: auto; - pointer-events: none; -} -.tip_preview_sub { - display: none; - margin: 10px 10px 10px 10px; - >span { - padding: 10px; - } -} -.inside { - min-width: 380px; - background-color: $blue; - border: 1px $blue solid; -} -.tip_sample { - padding: 10px; - overflow: hidden; - margin-top: 10px; - div.spremenljivka { - div.naslov { - font-weight: bold; - width: auto; - padding: 0; - p { - margin: 0; - } - } - } -} -.tip_sample_text { - font-weight: 500; -} -.tip_sample_option { - padding-left: 5px; - width: 100%; - div { - display: block; - float: left; - width: 100px; - } - span { - display: block; - float: left; - width: 80px; - text-align: center; - margin-bottom: 3px; - } -} -.tip_sample_option2 { - padding-left: 5px; - width: 100%; - div { - display: block; - float: left; - width: 100px; - } - span { - display: block; - float: left; - width: 80px; - text-align: center; - margin-bottom: 3px; - width: 60px; - } -} \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_edit/toolbox.scss b/resources/sass/admin_new/pages/survey_edit/toolbox.scss index 141689f59..897707fc1 100644 --- a/resources/sass/admin_new/pages/survey_edit/toolbox.scss +++ b/resources/sass/admin_new/pages/survey_edit/toolbox.scss @@ -2,29 +2,245 @@ Levi toolbox v urejanju ankete (dodajanje vprasanj...) */ -.toolbox{ - cursor: pointer; + +// Toolbox elementi na levi pri urejanju vprasalnika +.toolbox_holder{ + display: flex; + flex-direction: column; + position: fixed; left: 0; - - width: 240px; + top: 220px; background-color: $light-gray2; + + + // Posamezni toolbox + .toolbox{ + cursor: pointer; + display: flex; + flex-direction: column; + + .toolbox_item{ + display: flex; + + padding: 0 12px 0 0; + + border-bottom: 1px $gray solid; + + transition: 0.2s; + + .item_icon{ + width: 40px; + line-height: 40px; + + text-align: center; + + &:before{ + font-size: 16px; + } + + &.matrix_32{ + margin-top: 7px; + line-height: 9px; + + &:before{ + font-size: 11px !important; + } + } + &.abc_32, + &.number_32{ + margin-top: -1px; + line-height: 40px; + + &:before{ + font-size: 14px !important; + } + } + } + + .item_text{ + font-size: 14px; + line-height: 40px; + text-indent: 3px; + } + + &:hover{ + background-color: $gray; + } + + + &.new_spr{ + + } + + &.new_adv{ + color: $white; + background-color: $blue; + + &:hover{ + background-color: $dark-blue; + } + } + + &.new_if{ + + } + + &.new_block{ + border-bottom: none; + } + } + + // Zaklenjen toolbox + #locked_toolbar { + position: absolute; + top: 1px; + left: 1px; + width: 45px; + height: 194px; + padding: 140px 0 0 3px; + background: rgba($blue, 0.85); + span.lock_big { + margin-left: 13px; + } + } + + #toolbox_basic.forma { + #locked_toolbar { + height: 199px; + padding-top: 85px; + } + height: 266px; + top: 235px; + } + } + + // Nastavitve, ki se razprejo pri hoverju na toolbox item + .toolbox_expand{ + display: none; + cursor: auto; + + position: fixed; + z-index: 99; + top: 220px; + left: 245px; + + box-sizing: border-box; + width: 272px; + max-height: 520px; + + background: $white; + border: 1px solid $gray; + + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15); + } + + // Preview, ki se prikaze na hoverju (npr. vprasanja) + .toolbox_preview{ + display: none; + cursor: auto; + pointer-events: none; + + position: fixed; + z-index: 9999; + top: 220px; + left: 520px; + + box-sizing: border-box; + width: 450px; + max-height: 520px; + + background: $light-gray; + border: 1px solid $gray; + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15); + + + + .tip_preview_sub { + display: none; + margin: 10px 10px 10px 10px; + >span { + padding: 10px; + } + } + .inside { + + } + .tip_sample { + padding: 10px; + overflow: hidden; + margin-top: 10px; + div.spremenljivka { + div.naslov { + font-weight: bold; + width: auto; + padding: 0; + p { + margin: 0; + } + } + } + } + .tip_sample_text { + font-weight: 500; + } + .tip_sample_option { + padding-left: 5px; + width: 100%; + div { + display: block; + float: left; + width: 100px; + } + span { + display: block; + float: left; + width: 80px; + text-align: center; + margin-bottom: 3px; + } + } + .tip_sample_option2 { + padding-left: 5px; + width: 100%; + div { + display: block; + float: left; + width: 100px; + } + span { + display: block; + float: left; + width: 80px; + text-align: center; + margin-bottom: 3px; + width: 60px; + } + } + } + + &.open{ + width: 240px; + } + &.closed{ + width: 50px; + + .toolbox_item .item_text{ + display: none; + } + + .toolbox_expand{ + left: 55px; + } + } } + // Napredne nastavitve na vrhu (zobnik) #toolbox_advanced_settings { - top: 218px; #toolbox_advanced_settings_holder { - display: none; - cursor: auto; - z-index: 99; - - position: fixed; - top: 218px; - left: 55px; - width: auto; height: auto; min-height: 100px; @@ -33,9 +249,6 @@ text-align: left; font-size: 11px; - border: 1px solid $blue; - background-color: $blue; - span.advanced_settings_title { vertical-align: middle; padding: 0 0 0 2px; @@ -55,9 +268,8 @@ // Dodajanje vprasanj #toolbox_basic { - top: 255px; - div.new_adv { + /*div.new_adv { cursor: default; cursor: pointer; margin: 0px 1px; @@ -137,14 +349,14 @@ &:hover { background-color: darken($blue, 7%); } - } + }*/ } -#toolbox_add_advanced { +/*#toolbox_add_advanced { display: none; cursor: auto; z-index: -1; position: fixed; - top: 218px; + left: 55px; width: 495px; height: auto; @@ -213,28 +425,9 @@ display: none; } } -} +}*/ + -#locked_toolbar { - position: absolute; - top: 1px; - left: 1px; - width: 45px; - height: 194px; - padding: 140px 0 0 3px; - background: rgba($blue, 0.85); - span.lock_big { - margin-left: 13px; - } -} -#toolbox_basic.forma { - #locked_toolbar { - height: 199px; - padding-top: 85px; - } - height: 266px; - top: 235px; -} .mobile_add_question{