diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php index 49b24e0a8..15369202e 100644 --- a/admin/survey/classes/class.Vprasanje.php +++ b/admin/survey/classes/class.Vprasanje.php @@ -228,12 +228,12 @@ class Vprasanje { // navadno vprasanje else { - // POGOSTE NASTAVITVE - echo '
'.$lang['srv_common_settings'].''; + // TIP IN PODTIP VPRASANJA + echo '
'; - // variabla na vrhu + // Izbira tipa vprasanja $this->variable(1); - + // prikaz vprasanja - postavitev if ( in_array($row['tip'], array(1, 2, 3, 6, 7, 16, 17, 20, 9, 26, 27)) ) { $this->edit_subtip(); @@ -247,7 +247,13 @@ class Vprasanje { $this->edit_orientation(); } } - + + echo '
'; + + + // POGOSTE NASTAVITVE + echo '
'.$lang['srv_common_settings'].''; + // datum-min/max date if ( in_array($row['tip'], array(8)) ) { $this->edit_date_range(); @@ -273,8 +279,10 @@ class Vprasanje { // opomba na vprasanje $this->edit_opomba(); - // Dodaj vprasanje v knjiznico - $this->add_into_library(); + // Crta pod nagovorom + if ($row['tip'] == 5) { + $this->edit_nagovor_line(); + } echo '
'; @@ -290,6 +298,11 @@ class Vprasanje { if( in_array($row['tip'], array(1, 2, 6, 17)) ){ $this->edit_hot_spot_settings(); } + + // Heatmap + if ($row['tip'] == 27) { + $this->edit_heatmap_settings(); + } if ( in_array($row['tip'], array(6, 16, 19, 20)) ) { @@ -498,11 +511,6 @@ class Vprasanje { $this->edit_limit(); } } - - // Crta pod nagovorom - if ($row['tip'] == 5) { - $this->edit_nagovor_line(); - } } } } @@ -1195,15 +1203,22 @@ class Vprasanje { // Spremenljivka - echo '
'.$lang['srv_spremenljivka'].''; + echo '
'; + $this->edit_variable(); + $this->edit_label(); + + $this->edit_sistem(); + + // Dodaj vprasanje v knjiznico + $this->add_into_library(); + echo '
'; // Lastnosti echo '
'.$lang['srv_lastnosti'].''; - $this->edit_sistem(); //echo '

'.$lang['srv_prikaz_vprasanja'].'

'; $this->edit_visible(); @@ -1865,11 +1880,6 @@ class Vprasanje { $this->edit_subtype_map(); } - //podtip heatmap - if ($row['tip'] == 27) { - $this->edit_heatmap_settings(); - } - echo ' - '.$lang['srv_vprasanje_heatmap_num_clicks'].':'.Help::display('srv_hotspot_visibility').' '; - echo ''; - echo '

'; - //roleta za izbiro najvecjega stevila klikov na sliko - konec - - //checkbox za "Pokazi stevec klikov" - echo ''; - //checkbox za "Pokazi stevec klikov" - konec - - //checkbox za "Pokazi klike" - echo ''; - //checkbox za "Pokazi klike" - konec - - //dodatne nastavitve, ce morajo biti kliki vidni - - echo '
'; - - //Izbira barve klika - if ($heatmap_click_color == '') { - $value = '#000000'; - echo '

'.$lang['srv_vprasanje_heatmap_clicks_color'].': '.$lang['srv_te_default'].'

'; - }else{ - $value = $heatmap_click_color; - } - echo '

'.$lang['srv_vprasanje_heatmap_clicks_color'].': '; - echo ''; - echo '

'; - - echo '
'; - //Izbira barve klika - konec - - //Izbira radija/velikosti klika - echo '

'.$lang['srv_vprasanje_heatmap_clicks_size'].': '.$heatmap_click_size.'

'; - //Izbira radija/velikosti klika - konec - //Izbira oblike klika $heatmap_click_shape - echo '

'.$lang['srv_vprasanje_heatmap_clicks_shape'].': '; - echo ''; - echo '

'; - //Izbira oblike klika - konec + echo '
'.$lang['srv_hot_spot_settings'].''; + + // roleta za izbiro najvecjega stevila klikov na sliko + echo '
'; + echo '
'; + echo ' '; + echo ' '; + + echo '
'; + + // checkbox za "Pokazi stevec klikov" + echo '
'; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + + echo '
'; + + echo '
'; + // roleta za izbiro najvecjega stevila klikov na sliko - konec + + + //checkbox za "Pokazi klike" + echo '
'; + + echo '
'; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + + echo '
'; + echo '
'; - //dodatne nastavitve, ce morajo biti kliki vidni - konec + //checkbox za "Pokazi klike" - konec + + + // dodatne nastavitve, ce morajo biti kliki vidni + echo '
'; + + //Izbira barve klika + if ($heatmap_click_color == '') { + $value = '#000000'; + echo '

'.$lang['srv_vprasanje_heatmap_clicks_color'].': '.$lang['srv_te_default'].'

'; + } + else{ + $value = $heatmap_click_color; + } + echo '

'.$lang['srv_vprasanje_heatmap_clicks_color'].': '; + echo ''; + echo '

'; + + echo '
'; + //Izbira barve klika - konec + + //Izbira radija/velikosti klika + echo '
'; + echo ' '; + echo ' '.$heatmap_click_size.''; + echo '
'; + //Izbira radija/velikosti klika - konec + + //Izbira oblike klika $heatmap_click_shape + echo '
'; + echo ' '; + echo ' '; + echo '
'; + //Izbira oblike klika - konec + + echo '
'; + //dodatne nastavitve, ce morajo biti kliki vidni - konec + + + echo '
'; + //fieldset Obmocja - zacasno skrivanje echo '
'.$lang['srv_hot_spot_regions_menu'].''; - if (mysqli_num_rows($sqlR) != 0){ - //pokazi shranjena obmocja - while ($rowR = mysqli_fetch_array($sqlR)) { - echo '
'.$rowR['region_name'].'

'; - } - } - //Sporocilo ob odsotnosti slike - echo '

'.$lang['srv_hotspot_message'].'

'; - //Sporocilo ob odsotnosti slike - konec - - //Dodajanje območja - gumb - echo '

'; - - //*************************** SKRIVANJE NASTAVITEV OBMOCJA - $display_regions_menu = 'style="display:none;"'; //skrivanje nastavitev obmocja + v js datotekah - //*************************** - //div za nastavitve obmocja - echo '
'; - //Izbira barve obmocja - if ($hotspot_region_color == '') { - $value = '#000000'; - echo ''.$lang['srv_hotspot_region_color_text'].': '.$lang['srv_te_default'].' '; - }else{ - $value = $hotspot_region_color; - } - - echo ''.$lang['srv_hotspot_region_color_text'].': '; - echo ''; - echo ''; - - echo '
'; - //Izbira barve obmocja - konec - - //Regions visibility options - echo '

'.$lang['srv_hotspot_visibility_options_title'].':'.Help::display('srv_hotspot_visibility').' '; - echo ''; - echo '

'; - //Regions visibility options - konec - - //Tooltips options - if($row['tip'] == 1 || $row['tip'] == 2){ //ce je radio ali checkbox - $srv_hotspot_tooltip = 'srv_hotspot_tooltip'; - }else if($row['tip'] == 6){ - $srv_hotspot_tooltip = 'srv_hotspot_tooltip_grid'; - } - echo '

'.$lang['srv_hotspot_tooltips_options_title'].':'.Help::display($srv_hotspot_tooltip).' '; - echo ''; - echo '

'; - //Tooltips options - konec - echo '
'; - //div za nastavitve obmocja - konec + echo '
'; + + //pokazi shranjena obmocja + while ($rowR = mysqli_fetch_array($sqlR)) { + echo '
'; + echo '
'.$rowR['region_name'].'

'; + echo '
'; + } + + echo '
'; + } + + //Sporocilo ob odsotnosti slike + echo '
'; + echo '
'; + echo ' '.$lang['srv_hotspot_message'].''; + echo '
'; + echo '
'; + //Sporocilo ob odsotnosti slike - konec + + + //Dodajanje območja - gumb + echo '
'; + echo '
'; + echo ' '; + echo '
'; + echo '
'; + + //*************************** SKRIVANJE NASTAVITEV OBMOCJA + $display_regions_menu = 'style="display:none;"'; //skrivanje nastavitev obmocja + v js datotekah + //*************************** + //div za nastavitve obmocja + echo '
'; + //Izbira barve obmocja + if ($hotspot_region_color == '') { + $value = '#000000'; + echo ''.$lang['srv_hotspot_region_color_text'].': '.$lang['srv_te_default'].' '; + }else{ + $value = $hotspot_region_color; + } + + echo ''.$lang['srv_hotspot_region_color_text'].': '; + echo ''; + echo ''; + + echo '
'; + //Izbira barve obmocja - konec + + //Regions visibility options + echo '

'.$lang['srv_hotspot_visibility_options_title'].':'.Help::display('srv_hotspot_visibility').' '; + echo ''; + echo '

'; + //Regions visibility options - konec + + //Tooltips options + if($row['tip'] == 1 || $row['tip'] == 2){ //ce je radio ali checkbox + $srv_hotspot_tooltip = 'srv_hotspot_tooltip'; + }else if($row['tip'] == 6){ + $srv_hotspot_tooltip = 'srv_hotspot_tooltip_grid'; + } + + echo '

'.$lang['srv_hotspot_tooltips_options_title'].':'.Help::display($srv_hotspot_tooltip).' '; + echo ''; + echo '

'; + //Tooltips options - konec + echo '
'; + //div za nastavitve obmocja - konec echo '
'; //fieldset Obmocja - konec - } } diff --git a/lang/1.php b/lang/1.php index ca34c9fff..fbe23f368 100644 --- a/lang/1.php +++ b/lang/1.php @@ -2798,8 +2798,8 @@ $lang = array ( "srv_analiza_charts" => "Grafi", "srv_analiza_link" => "Kadar je spremenljivk manj kot 20 kaže povezava 'Analiza' na", "srv_gridAreaSize" => "Širina podvprašanj", - "srv_gridAreaHidden" => "Skrita labela", - "srv_textAreaSize" => "Velikost: ", + "srv_gridAreaHidden" => "Skrita labela", + "srv_textAreaSize" => "Velikost", "srv_text_length_char_num" => "Limit znakov: ", "srv_gridAlign" => "Poravnava celic: ", "srv_gridAlign_center" => "Sredinsko", @@ -7667,10 +7667,11 @@ $lang = array ( 'srv_reminder_tracking_validation' => "Validacije", 'srv_reminder_tracking_hard' => "Trdo", 'srv_reminder_tracking_soft' => "Mehko", - 'srv_hot_spot' => "Image Hot Spot", + 'srv_hot_spot' => "Image Hot Spot", + 'srv_hot_spot_settings' => "Image Hot Spot nastavitve", 'srv_hot_spot_load_image' => "Naloži sliko", 'srv_hot_spot_edit_image' => "Uredi sliko", - 'srv_hot_spot_regions' => "Dodaj območje", + 'srv_hot_spot_regions' => "Dodaj območje", 'srv_hot_spot_regions_menu' => "Območja", 'srv_hot_spot_region_name' => "Ime območja", 'srv_hotspot_message' => "Dodajanje območij je omogočeno, ko je prisotna slika", diff --git a/lang/2.php b/lang/2.php index 7539129da..79d2d6e61 100644 --- a/lang/2.php +++ b/lang/2.php @@ -2771,8 +2771,8 @@ $lang = array ( "srv_analiza_charts" => "Charts", "srv_analiza_link" => "When the number of variables is lower than 20, the link 'Analysis' is set to", "srv_gridAreaSize" => "Subquestion text width", - "srv_gridAreaHidden" => "Hidden labels", - "srv_textAreaSize" => "Size: ", + "srv_gridAreaHidden" => "Hidden labels", + "srv_textAreaSize" => "Size", "srv_text_length_char_num" => "Limit of characters: ", "srv_gridAlign" => "Cell alignment: ", "srv_gridAlign_center" => "Center", @@ -7551,10 +7551,11 @@ $lang = array ( 'srv_reminder_tracking_validation' => "Validation", 'srv_reminder_tracking_hard' => "Hard", 'srv_reminder_tracking_soft' => "Soft", - 'srv_hot_spot' => "Image Hot Spot", + 'srv_hot_spot' => "Image Hot Spot", + 'srv_hot_spot_settings' => "Image Hot Spot settings", 'srv_hot_spot_load_image' => "Upload image", 'srv_hot_spot_edit_image' => "Edit image", - 'srv_hot_spot_regions' => "Add a region", + 'srv_hot_spot_regions' => "Add a region", 'srv_hot_spot_regions_menu' => "Regions", 'srv_hot_spot_region_name' => "Region name", 'srv_hotspot_message' => "Adding regions is enabled, when an image is present", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 3785fba22..5ca1b911b 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -14418,7 +14418,7 @@ div#variabla_new span.correct { color: #777777; } #vprasanje_float_editing .vprasanje_edit_holder .tab { - padding: 0 16px; + padding: 0 12px; } #vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit { max-height: calc(100vh - 250px); @@ -14439,6 +14439,10 @@ div#variabla_new span.correct { border: 0; border-top: 1px solid #D3D3D3; } +#vprasanje_float_editing .vprasanje_edit_holder fieldset.first { + border-top: 0; + margin-top: -16px; +} #vprasanje_float_editing .vprasanje_edit_holder fieldset legend { margin: 0; padding: 0 10px 0 0; @@ -14486,6 +14490,12 @@ div#variabla_new span.correct { #vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.half-half .content textarea { width: 100%; } +#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.inline { + justify-content: space-between; +} +#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.inline .content label:last-child { + margin-right: 0; +} #vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon span { display: flex; align-items: center; @@ -14517,7 +14527,7 @@ div#variabla_new span.correct { background: #FFFFFF; border: 1px solid #D3D3D3; box-sizing: border-box; - border-radius: 4px; + border-radius: 2px; } #vprasanje_float_editing .vprasanje_edit_holder select { cursor: pointer; @@ -14526,7 +14536,7 @@ div#variabla_new span.correct { padding: 0 8px; background-color: #FFFFFF; border: 1px solid #D3D3D3; - border-radius: 4px; + border-radius: 2px; } #vprasanje_float_editing .vprasanje_edit_holder input[type=text], #vprasanje_float_editing .vprasanje_edit_holder input[type=number] { @@ -14535,7 +14545,7 @@ div#variabla_new span.correct { height: 30px; background-color: #FFFFFF; border: 1px solid #D3D3D3; - border-radius: 4px; + border-radius: 2px; } #vprasanje_float_editing .vprasanje_edit_holder textarea { box-sizing: border-box; @@ -14544,7 +14554,7 @@ div#variabla_new span.correct { font-size: 14px; background-color: #FFFFFF; border: 1px solid #D3D3D3; - border-radius: 4px; + border-radius: 2px; } /* @@ -18545,7 +18555,7 @@ and open the template in the editor. color: #1E88E5; } #branching #div_condition_editing_float .condition_edit { - margin: 0 16px; + margin: 0 12px; background-color: white; } #branching #div_condition_editing_float .condition_edit fieldset { @@ -18634,7 +18644,7 @@ and open the template in the editor. background: #FFFFFF; border: 1px solid #D3D3D3; box-sizing: border-box; - border-radius: 4px; + border-radius: 2px; } #branching #div_condition_editing_float .condition_edit select { cursor: pointer; @@ -18643,7 +18653,7 @@ and open the template in the editor. padding: 0 8px; background-color: #FFFFFF; border: 1px solid #D3D3D3; - border-radius: 4px; + border-radius: 2px; } #branching #div_condition_editing_float .condition_edit input[type=text], #branching #div_condition_editing_float .condition_edit input[type=number] { @@ -18652,7 +18662,7 @@ and open the template in the editor. height: 30px; background-color: #FFFFFF; border: 1px solid #D3D3D3; - border-radius: 4px; + border-radius: 2px; } #branching #div_condition_editing_float .condition_edit textarea { box-sizing: border-box; @@ -18661,7 +18671,7 @@ and open the template in the editor. font-size: 14px; background-color: #FFFFFF; border: 1px solid #D3D3D3; - border-radius: 4px; + border-radius: 2px; } #branching #div_condition_editing_float .button_holder { flex-direction: column; diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss index 53d0cbdcc..be4b97d03 100644 --- a/resources/sass/admin_new/pages/survey_edit/conditions.scss +++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss @@ -198,7 +198,7 @@ and open the template in the editor. // Glavna vsebina .condition_edit { - margin: 0 16px; + margin: 0 12px; background-color: white; @@ -319,7 +319,7 @@ and open the template in the editor. background: #FFFFFF; border: 1px solid $dark-gray2; box-sizing: border-box; - border-radius: 4px; + border-radius: 2px; } select{ @@ -332,7 +332,7 @@ and open the template in the editor. background-color: $white; border: 1px solid $dark-gray2; - border-radius: 4px; + border-radius: 2px; } input[type="text"], @@ -344,7 +344,7 @@ and open the template in the editor. background-color: $white; border: 1px solid $dark-gray2; - border-radius: 4px; + border-radius: 2px; } textarea{ @@ -357,7 +357,7 @@ and open the template in the editor. background-color: $white; border: 1px solid $dark-gray2; - border-radius: 4px; + border-radius: 2px; } } diff --git a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss index 8f41188a1..0e9546cfb 100644 --- a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss +++ b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss @@ -120,7 +120,7 @@ } .tab{ - padding: 0 16px; + padding: 0 12px; } // Glavna vsebina @@ -152,7 +152,12 @@ border: 0; border-top: 1px solid $dark-gray2; - + &.first{ + border-top: 0; + margin-top: -16px; + } + + legend { margin: 0; padding: 0 10px 0 0; @@ -214,6 +219,17 @@ } } + &.inline{ + justify-content: space-between; + + .content{ + + label:last-child{ + margin-right: 0; + } + } + } + &.with-icon{ span{ @@ -258,7 +274,7 @@ background: #FFFFFF; border: 1px solid $dark-gray2; box-sizing: border-box; - border-radius: 4px; + border-radius: 2px; } select{ @@ -271,7 +287,7 @@ background-color: $white; border: 1px solid $dark-gray2; - border-radius: 4px; + border-radius: 2px; } input[type="text"], @@ -283,7 +299,7 @@ background-color: $white; border: 1px solid $dark-gray2; - border-radius: 4px; + border-radius: 2px; } textarea{ @@ -296,7 +312,7 @@ background-color: $white; border: 1px solid $dark-gray2; - border-radius: 4px; + border-radius: 2px; } }