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

[Redizajn 1KA v2] Testiranje --> Komentarji - test survey dropdown - switch načina

Browse Source
This commit is contained in:
tejagerjovic 2022-09-29 15:52:21 +02:00
parent 0ebcccb474
commit eebc4aa0a2
5 changed files with 111 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/survey/app/Controllers/BodyController.php
View File

@ -2076,6 +2076,16 @@ class BodyController extends Controller
echo '<div id="preview-window">'; echo '<div id="preview-window">';
echo '<div id="preview_switch">';
// Preklop na celostranski preview
echo '<div id="nacina">';
echo '<span class="bold">'.self::$lang['srv_mode'] . ':</span>';
echo '<span id="normalni" class="'.(get('displayAllPages') ? 'nonactive' : 'active').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, null, array('pages')) . '" title="' . self::$lang['srv_normal_x'] . '">' . self::$lang['srv_normal'] . '</a></span>';
echo '<span id="celostranski" class="'.(get('displayAllPages') ? 'active' : 'nonactive').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, array('pages' => 'all', 'mobile' => '0')) . '" title="' . self::$lang['srv_scrolling_x'] . '">' . self::$lang['srv_scrolling'] . '</a></span>';
echo '</div>';
// Gump za odprtje/zaprtje okna // Gump za odprtje/zaprtje okna
echo '<div id="preview_open" '.($_GET['testdata'] == 'on' ? ' class="testdata"' : '').'>'; echo '<div id="preview_open" '.($_GET['testdata'] == 'on' ? ' class="testdata"' : '').'>';
@ -2083,14 +2093,6 @@ class BodyController extends Controller
echo '<a href="#" onclick="preview_popup_close(); return false;" class="preview_icon_close"><span class="faicon dropup_blue"></span></a>'; echo '<a href="#" onclick="preview_popup_close(); return false;" class="preview_icon_close"><span class="faicon dropup_blue"></span></a>';
echo '</div>'; echo '</div>';
// Preklop na celostranski preview
echo '<div id="preview_switch">';
echo '<span class="bold">'.self::$lang['srv_mode'] . ':</span>';
echo '<span class="'.(get('displayAllPages') ? 'nonactive' : 'active').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, null, array('pages')) . '" title="' . self::$lang['srv_normal_x'] . '">' . self::$lang['srv_normal'] . '</a></span>';
echo '<span class="'.(get('displayAllPages') ? 'active' : 'nonactive').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, array('pages' => 'all', 'mobile' => '0')) . '" title="' . self::$lang['srv_scrolling_x'] . '">' . self::$lang['srv_scrolling'] . '</a></span>';
echo '</div>'; echo '</div>';

4
main/survey/js/script.js
View File

@ -1247,7 +1247,7 @@ function return_edit_send (site_url, lang_id) {
function preview_popup_close () { function preview_popup_close () {
$('#preview-holder, #preview_switch').fadeOut('medium'); $('#preview-holder, #nacina').fadeOut('medium');
$('#preview-window').addClass('closed'); $('#preview-window').addClass('closed');
@ -1259,7 +1259,7 @@ function preview_popup_close () {
function preview_popup_open () { function preview_popup_open () {
$('#preview-holder, #preview_switch').fadeIn('medium'); $('#preview-holder, #nacina').fadeIn('medium');
$('#preview-window').removeClass('closed'); $('#preview-window').removeClass('closed');

63
public/css/main.css
View File

@ -7295,16 +7295,14 @@ button.ui-datepicker-trigger::before {
position: fixed; position: fixed;
top: 45px; top: 45px;
right: 10px; right: 10px;
width: 270px; width: 265px;
min-height: 32px; min-height: 32px;
font-size: 11px; font-size: 12px;
background-color: white; background-color: white;
border: 2px #1e88e5 solid; box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
border-radius: 5px; border-radius: 2px;
} }
#preview-window.closed { #preview-window.closed {
top: 47px;
right: 12px;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
} }
@ -7358,30 +7356,54 @@ button.ui-datepicker-trigger::before {
content: "\f013"; content: "\f013";
} }
#preview-window #preview_open { #preview-window #preview_open {
position: absolute;
box-sizing: border-box; box-sizing: border-box;
width: 30px;
top: 6px;
right: 8px;
text-align: right; text-align: right;
margin-left: auto;
} }
#preview-window #preview_switch { #preview-window #preview_switch {
font-family: Open Sans, Arial, Sans-Serif !important; font-family: Open Sans, Arial, Sans-Serif !important;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
padding: 8px 15px; padding: 21px 16px;
font-size: 12px; font-size: 12px;
border-bottom: 1px #1e88e5 solid; border-bottom: 1px #1e88e5 solid;
display: flex;
flex-direction: row;
justify-content: space-between;
} }
#preview-window #preview_switch .active a { #preview-window #preview_switch #nacina span.bold {
padding-left: 15px; margin-right: 8px;
font-weight: 600;
color: #ffa608;
} }
#preview-window #preview_switch .nonactive a { #preview-window #preview_switch #nacina #normalni,
padding-left: 15px; #preview-window #preview_switch #nacina #celostranski {
font-weight: 600; padding: 4px 8px;
color: #1e88e5; border: 1px solid #E5E5E5;
}
#preview-window #preview_switch #nacina #normalni.active,
#preview-window #preview_switch #nacina #celostranski.active {
background: #EEF7FF;
color: #1E88E5;
border-color: #1E88E5;
}
#preview-window #preview_switch #nacina #normalni a,
#preview-window #preview_switch #nacina #celostranski a {
color: inherit;
}
#preview-window #preview_switch #nacina #normalni {
border-radius: 2px 0 0 2px;
border-right: none;
}
#preview-window #preview_switch #nacina #normalni.active {
border-right: 1px solid;
}
#preview-window #preview_switch #nacina #celostranski {
border-radius: 0 2px 2px 0;
}
#preview-window #preview_switch #nacina #celostranski.active {
border-color: #1E88E5;
}
#preview-window #preview_switch #nacina #celostranski.nonactive {
border-left: none;
} }
#preview-window #preview-holder { #preview-window #preview-holder {
font-family: Open Sans, Arial, Sans-Serif !important; font-family: Open Sans, Arial, Sans-Serif !important;
@ -7618,6 +7640,9 @@ span.faicon.empty {
border-color: #1E88E5; border-color: #1E88E5;
background-color: #EEF7FF; background-color: #EEF7FF;
} }
#comments_bottom_line a {
margin-left: auto;
}
#comments_bottom_line a #comment_settings { #comments_bottom_line a #comment_settings {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

75
resources/sass/main/main/admin.scss
View File

@ -122,19 +122,17 @@
top: 45px; top: 45px;
right: 10px; right: 10px;
width: 270px; width: 265px;
min-height: 32px; min-height: 32px;
font-size: 11px; font-size: 12px;
background-color: white; background-color: white;
border: 2px #1e88e5 solid; box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
border-radius: 5px; border-radius: 2px;
&.closed{ &.closed{
top: 47px;
right: 12px;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
@ -195,14 +193,11 @@
#preview_open { #preview_open {
position: absolute;
box-sizing: border-box; box-sizing: border-box;
width: 30px; text-align: right;
top: 6px;
right: 8px;
text-align: right; margin-left: auto;
} }
#preview_switch { #preview_switch {
@ -211,23 +206,59 @@
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
padding: 8px 15px; padding: 21px 16px;
font-size: 12px; font-size: 12px;
border-bottom: 1px #1e88e5 solid; border-bottom: 1px #1e88e5 solid;
display:flex;
flex-direction: row;
justify-content: space-between;
.active a{ #nacina {
padding-left: 15px;
span.bold {
margin-right: 8px;
}
font-weight: 600; #normalni,
color: #ffa608; #celostranski {
} padding: 4px 8px;
.nonactive a{ border: 1px solid #E5E5E5;
padding-left: 15px; &.active{
background: #EEF7FF;
font-weight: 600; color: #1E88E5;
color: #1e88e5; border-color: #1E88E5;
}
a {
color: inherit;
}
}
#normalni{
border-radius: 2px 0 0 2px;
border-right: none;
&.active{
border-right: 1px solid;
}
}
#celostranski{
border-radius: 0 2px 2px 0;
&.active{
border-color: #1E88E5;
}
&.nonactive {
border-left: none;
}
}
} }
} }

2
resources/sass/main/main/test_survey_comments.scss
View File

@ -102,6 +102,8 @@ $status-blue: #EAF9FE;
} }
} }
} }
margin-left: auto;
} }
} }