diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index e2758c2e5..72f5aeefd 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -6140,23 +6140,34 @@ class SurveyAdminAjax { // uvoz iz besedila echo '
'; + echo ''; // Naslov echo '

' . $lang['srv_newSurvey_survey_from_text_title'] . ' '.Help::display('srv_create_survey_from_text').'

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

'.$lang['srv_newSurvey_survey_from_text_text1'].'

'; + echo '

'.$lang['srv_newSurvey_survey_from_text_text2'].'

'; + echo '

'.$lang['srv_newSurvey_survey_from_text_text3'].'

'; + echo '
'; + + + echo '
'; + // Input okno za text echo '
'; - //echo ''; - echo ''; + echo ' '; echo '
'; // Preview okno echo '
'; - echo ''.$lang['srv_poglejanketo2'].''; + echo ' '.$lang['srv_poglejanketo2'].''; echo '
'; + + echo '
'; + echo '
'; diff --git a/admin/survey/classes/class.NewSurvey.php b/admin/survey/classes/class.NewSurvey.php index 6e39e9f26..829574d6a 100644 --- a/admin/survey/classes/class.NewSurvey.php +++ b/admin/survey/classes/class.NewSurvey.php @@ -836,7 +836,7 @@ class NewSurvey{ // Dodamo se textbox ce je samo vprasanje $text = preg_replace( '/([^<>]+<\/span>)

/', - '$1

', + '$1


', $text ); @@ -849,13 +849,13 @@ class NewSurvey{ // Dodamo se textbox na zadnjo vrstico ce je potrebno $text = preg_replace( '/([^<>]+<\/span>)\Z/', - '$1

', + '$1
', $text ); // Dodamo se textbox na prvo vrstico, ce je potrebno $text = preg_replace( - '/([^<>]+<\/span>)
/', - '$1

', + '/([^<>]+<\/span>)

/', + '$1


', $text, 1 ); } diff --git a/public/css/admin_new.css b/public/css/admin_new.css index e782c2c68..7d1b3775f 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -11565,6 +11565,7 @@ and open the template in the editor. display: flex; flex-direction: column; margin-right: 36px; + width: auto; } #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting_holder input[type=text] { width: 332px; @@ -20848,59 +20849,65 @@ and open the template in the editor. #popup_import_from_text .anketa_from_text h2 { margin-top: 0; } -#popup_import_from_text .anketa_from_text #input_field_holder { - float: left; +#popup_import_from_text .anketa_from_text .instructions p { + margin-bottom: 8px; +} +#popup_import_from_text .anketa_from_text .import_holder { + display: flex; + align-items: center; + justify-content: space-between; + margin-top: 16px; +} +#popup_import_from_text .anketa_from_text .import_holder #input_field_holder { width: 50%; height: 400px; box-sizing: border-box; - padding: 20px; + margin-right: 16px; } -#popup_import_from_text .anketa_from_text #input_field_holder #input_field { +#popup_import_from_text .anketa_from_text .import_holder #input_field_holder #input_field { width: 100%; height: 100%; } -#popup_import_from_text .anketa_from_text #input_field_holder #input_field textarea { +#popup_import_from_text .anketa_from_text .import_holder #input_field_holder #input_field textarea { width: 100%; height: 100%; box-sizing: border-box; resize: none; - padding: 20px; - border: 1px #1E88E5 solid !important; + padding: 16px; + margin: 0; + border: 1px #E5E5E5 solid !important; } -#popup_import_from_text .anketa_from_text #input_field_holder #input_field textarea:focus::-webkit-input-placeholder { +#popup_import_from_text .anketa_from_text .import_holder #input_field_holder #input_field textarea:focus::-webkit-input-placeholder { color: transparent; } -#popup_import_from_text .anketa_from_text #input_field_holder #input_field textarea:focus::-moz-placeholder { +#popup_import_from_text .anketa_from_text .import_holder #input_field_holder #input_field textarea:focus::-moz-placeholder { color: transparent; } -#popup_import_from_text .anketa_from_text #preview_field_holder { - float: right; +#popup_import_from_text .anketa_from_text .import_holder #preview_field_holder { width: 50%; height: 400px; box-sizing: border-box; - padding: 20px; } -#popup_import_from_text .anketa_from_text #preview_field_holder #preview_field { +#popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field { width: 100%; height: 100%; box-sizing: border-box; overflow: auto; - padding: 20px; - background-color: #1E88E5; - border: 1px #1E88E5 solid; + padding: 16px; + border: 1px #E5E5E5 solid; } -#popup_import_from_text .anketa_from_text #preview_field_holder #preview_field span.title { +#popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.title { font-size: 18px; line-height: 30px; } -#popup_import_from_text .anketa_from_text #preview_field_holder #preview_field span.variable { +#popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable { font-size: 15px; font-weight: 400; } -#popup_import_from_text .anketa_from_text #preview_field_holder #preview_field span.variable input[type=radio] { +#popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio] { display: none !important; } -#popup_import_from_text .anketa_from_text #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before { +#popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio] + span.enka-checkbox-radio:before { font-family: "Font Awesome 5 Free"; content: ""; display: inline-block; @@ -20909,7 +20916,7 @@ and open the template in the editor. letter-spacing: 8px; font-weight: 400; } -#popup_import_from_text .anketa_from_text #preview_field_holder #preview_field span.variable input[type=radio]:checked + span.enka-checkbox-radio:before { +#popup_import_from_text .anketa_from_text .import_holder #preview_field_holder #preview_field span.variable input[type=radio]:checked + span.enka-checkbox-radio:before { content: ""; color: #E5E5E5; } diff --git a/resources/sass/admin_new/pages/new_survey_page/right_content.scss b/resources/sass/admin_new/pages/new_survey_page/right_content.scss index b8009b95d..fcc44d9d3 100644 --- a/resources/sass/admin_new/pages/new_survey_page/right_content.scss +++ b/resources/sass/admin_new/pages/new_survey_page/right_content.scss @@ -85,6 +85,7 @@ $skin_selector: $red; display: flex; flex-direction: column; margin-right: 36px; + width: auto; input { &[type="text"] { diff --git a/resources/sass/admin_new/pages/survey_edit/popups/import_from_text.scss b/resources/sass/admin_new/pages/survey_edit/popups/import_from_text.scss index ea984af1f..d0456c6d5 100644 --- a/resources/sass/admin_new/pages/survey_edit/popups/import_from_text.scss +++ b/resources/sass/admin_new/pages/survey_edit/popups/import_from_text.scss @@ -22,86 +22,98 @@ h2{ margin-top: 0; } + + .instructions{ + + p{ + margin-bottom: 8px; + } + } - #input_field_holder{ - float: left; - width: 50%; - height: 400px; - box-sizing: border-box; - - padding: 20px; - - #input_field{ - width: 100%; - height: 100%; - - textarea{ - width: 100%; - height: 100%; - box-sizing: border-box; - - resize: none; - padding: 20px; - - border: 1px $blue solid !important; - - &:focus::-webkit-input-placeholder{ - color: transparent; - } - &:focus::-moz-placeholder{ - color: transparent; - } - } - } - } - #preview_field_holder{ - float: right; - width: 50%; - height: 400px; - box-sizing: border-box; - - padding: 20px; - - #preview_field{ - width: 100%; - height: 100%; - box-sizing: border-box; - overflow: auto; - - padding: 20px; - - background-color: $blue; - border: 1px $blue solid; - - span.title{ - font-size: 18px; - line-height: 30px; - } - span.variable{ - font-size: 15px; - font-weight: 400; - - input[type="radio"]{ - display: none !important; - } - input[type="radio"] + span.enka-checkbox-radio:before{ - font-family: $fontawesome; - content: "\f111"; - - display: inline-block; - - font-size: 14px; - color: $gray; - letter-spacing: 8px; - font-weight: 400; - } - input[type="radio"]:checked + span.enka-checkbox-radio:before{ - content: "\f192"; - color: $gray; - } - } - } - } + .import_holder{ + display: flex; + align-items: center; + justify-content: space-between; + + margin-top: 16px; + + #input_field_holder{ + width: 50%; + height: 400px; + box-sizing: border-box; + + margin-right: 16px; + + #input_field{ + width: 100%; + height: 100%; + + textarea{ + width: 100%; + height: 100%; + box-sizing: border-box; + + resize: none; + padding: 16px; + margin: 0; + + border: 1px $gray solid !important; + + &:focus::-webkit-input-placeholder{ + color: transparent; + } + &:focus::-moz-placeholder{ + color: transparent; + } + } + } + } + #preview_field_holder{ + width: 50%; + height: 400px; + box-sizing: border-box; + + #preview_field{ + width: 100%; + height: 100%; + box-sizing: border-box; + overflow: auto; + + padding: 16px; + + //background-color: $blue; + border: 1px $gray solid; + + span.title{ + font-size: 18px; + line-height: 30px; + } + span.variable{ + font-size: 15px; + font-weight: 400; + + input[type="radio"]{ + display: none !important; + } + input[type="radio"] + span.enka-checkbox-radio:before{ + font-family: $fontawesome; + content: "\f111"; + + display: inline-block; + + font-size: 14px; + color: $gray; + letter-spacing: 8px; + font-weight: 400; + } + input[type="radio"]:checked + span.enka-checkbox-radio:before{ + content: "\f192"; + color: $gray; + } + } + } + } + } } }