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

Redesign popravki napak - uvoz ankete iz besedila

Browse Source
This commit is contained in:
Peter Hrvatin 2022-05-02 08:03:50 +02:00
parent 754ce34114
commit a0c53b45fb
5 changed files with 139 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
admin/survey/SurveyAdminAjax.php
View File

@ -6140,23 +6140,34 @@ class SurveyAdminAjax {
// uvoz iz besedila // uvoz iz besedila
echo '<div class="fieldset anketa_from_text">'; echo '<div class="fieldset anketa_from_text">';
echo '<div class="popup_close"><a href="#" onClick="popupImportAnketaFromText_close();">✕</a></div>'; echo '<div class="popup_close"><a href="#" onClick="popupImportAnketaFromText_close();">✕</a></div>';
// Naslov // Naslov
echo '<h2>' . $lang['srv_newSurvey_survey_from_text_title'] . ' '.Help::display('srv_create_survey_from_text').'</h2>'; echo '<h2>' . $lang['srv_newSurvey_survey_from_text_title'] . ' '.Help::display('srv_create_survey_from_text').'</h2>';
echo '<span>' . $lang['srv_newSurvey_survey_from_text_text'] . '</span>';
echo '<div class="instructions">';
echo ' <p>'.$lang['srv_newSurvey_survey_from_text_text1'].'</p>';
echo ' <p>'.$lang['srv_newSurvey_survey_from_text_text2'].'</p>';
echo ' <p>'.$lang['srv_newSurvey_survey_from_text_text3'].'</p>';
echo '</div>';
echo '<div class="import_holder">';
// Input okno za text // Input okno za text
echo '<div id="input_field_holder"><div id="input_field">'; echo '<div id="input_field_holder"><div id="input_field">';
//echo '<textarea placeholder="'.$lang['srv_newSurvey_survey_from_text_example'].'" onKeyUp="$(\'#preview_field\').html($(\'textarea\').val());"></textarea>'; echo ' <textarea id="anketa_from_text_textarea" placeholder="'.$lang['srv_newSurvey_survey_from_text_example'].'" onKeyUp="anketaFromText_preview();"></textarea>';
echo '<textarea id="anketa_from_text_textarea" placeholder="'.$lang['srv_newSurvey_survey_from_text_example'].'" onKeyUp="anketaFromText_preview();"></textarea>';
echo '</div></div>'; echo '</div></div>';
// Preview okno // Preview okno
echo '<div id="preview_field_holder"><div id="preview_field">'; echo '<div id="preview_field_holder"><div id="preview_field">';
echo '<span class="caps bold">'.$lang['srv_poglejanketo2'].'</span>'; echo ' <span class="caps bold">'.$lang['srv_poglejanketo2'].'</span>';
echo '</div></div>'; echo '</div></div>';
echo '</div>';
echo '</div>'; echo '</div>';

8
admin/survey/classes/class.NewSurvey.php
View File

@ -836,7 +836,7 @@ class NewSurvey{
// Dodamo se textbox ce je samo vprasanje // Dodamo se textbox ce je samo vprasanje
$text = preg_replace( $text = preg_replace(
'/(<span class="variable_title">[^<>]+<\/span>)<br \/><br \/>/', '/(<span class="variable_title">[^<>]+<\/span>)<br \/><br \/>/',
'$1<br /><input type="text" class="large" /><br />', '$1<br /><input type="text" class="large" /><br /><br />',
$text $text
); );
@ -849,13 +849,13 @@ class NewSurvey{
// Dodamo se textbox na zadnjo vrstico ce je potrebno // Dodamo se textbox na zadnjo vrstico ce je potrebno
$text = preg_replace( $text = preg_replace(
'/(<span class="variable_title">[^<>]+<\/span>)\Z/', '/(<span class="variable_title">[^<>]+<\/span>)\Z/',
'$1<br /><input type="text" class="large" /><br />', '$1<br /><input type="text" class="large" />',
$text $text
); );
// Dodamo se textbox na prvo vrstico, ce je potrebno // Dodamo se textbox na prvo vrstico, ce je potrebno
$text = preg_replace( $text = preg_replace(
'/(<span class="variable_title">[^<>]+<\/span>)<br \/>/', '/(<span class="variable_title">[^<>]+<\/span>)<br \/><br \/>/',
'$1<br /><input type="text" class="large" /><br />', '$1<br /><input type="text" class="large" /><br /><br />',
$text, 1 $text, 1
); );
} }

49
public/css/admin_new.css
View File

@ -11565,6 +11565,7 @@ and open the template in the editor.
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-right: 36px; margin-right: 36px;
width: auto;
} }
#new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting_holder input[type=text] { #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting_holder input[type=text] {
width: 332px; width: 332px;
@ -20848,59 +20849,65 @@ and open the template in the editor.
#popup_import_from_text .anketa_from_text h2 { #popup_import_from_text .anketa_from_text h2 {
margin-top: 0; margin-top: 0;
} }
#popup_import_from_text .anketa_from_text #input_field_holder { #popup_import_from_text .anketa_from_text .instructions p {
float: left; 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%; width: 50%;
height: 400px; height: 400px;
box-sizing: border-box; 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%; width: 100%;
height: 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%; width: 100%;
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
resize: none; resize: none;
padding: 20px; padding: 16px;
border: 1px #1E88E5 solid !important; 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; 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; color: transparent;
} }
#popup_import_from_text .anketa_from_text #preview_field_holder { #popup_import_from_text .anketa_from_text .import_holder #preview_field_holder {
float: right;
width: 50%; width: 50%;
height: 400px; height: 400px;
box-sizing: border-box; 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%; width: 100%;
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
overflow: auto; overflow: auto;
padding: 20px; padding: 16px;
background-color: #1E88E5; border: 1px #E5E5E5 solid;
border: 1px #1E88E5 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; font-size: 18px;
line-height: 30px; 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-size: 15px;
font-weight: 400; 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; 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"; font-family: "Font Awesome 5 Free";
content: ""; content: "";
display: inline-block; display: inline-block;
@ -20909,7 +20916,7 @@ and open the template in the editor.
letter-spacing: 8px; letter-spacing: 8px;
font-weight: 400; 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: ""; content: "";
color: #E5E5E5; color: #E5E5E5;
} }

1
resources/sass/admin_new/pages/new_survey_page/right_content.scss
View File

@ -85,6 +85,7 @@ $skin_selector: $red;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-right: 36px; margin-right: 36px;
width: auto;
input { input {
&[type="text"] { &[type="text"] {

170
resources/sass/admin_new/pages/survey_edit/popups/import_from_text.scss
View File

@ -22,86 +22,98 @@
h2{ h2{
margin-top: 0; margin-top: 0;
} }
.instructions{
p{
margin-bottom: 8px;
}
}
#input_field_holder{ .import_holder{
float: left; display: flex;
width: 50%; align-items: center;
height: 400px; justify-content: space-between;
box-sizing: border-box;
margin-top: 16px;
padding: 20px;
#input_field_holder{
#input_field{ width: 50%;
width: 100%; height: 400px;
height: 100%; box-sizing: border-box;
textarea{ margin-right: 16px;
width: 100%;
height: 100%; #input_field{
box-sizing: border-box; width: 100%;
height: 100%;
resize: none;
padding: 20px; textarea{
width: 100%;
border: 1px $blue solid !important; height: 100%;
box-sizing: border-box;
&:focus::-webkit-input-placeholder{
color: transparent; resize: none;
} padding: 16px;
&:focus::-moz-placeholder{ margin: 0;
color: transparent;
} border: 1px $gray solid !important;
}
} &:focus::-webkit-input-placeholder{
} color: transparent;
#preview_field_holder{ }
float: right; &:focus::-moz-placeholder{
width: 50%; color: transparent;
height: 400px; }
box-sizing: border-box; }
}
padding: 20px; }
#preview_field_holder{
#preview_field{ width: 50%;
width: 100%; height: 400px;
height: 100%; box-sizing: border-box;
box-sizing: border-box;
overflow: auto; #preview_field{
width: 100%;
padding: 20px; height: 100%;
box-sizing: border-box;
background-color: $blue; overflow: auto;
border: 1px $blue solid;
padding: 16px;
span.title{
font-size: 18px; //background-color: $blue;
line-height: 30px; border: 1px $gray solid;
}
span.variable{ span.title{
font-size: 15px; font-size: 18px;
font-weight: 400; line-height: 30px;
}
input[type="radio"]{ span.variable{
display: none !important; font-size: 15px;
} font-weight: 400;
input[type="radio"] + span.enka-checkbox-radio:before{
font-family: $fontawesome; input[type="radio"]{
content: "\f111"; display: none !important;
}
display: inline-block; input[type="radio"] + span.enka-checkbox-radio:before{
font-family: $fontawesome;
font-size: 14px; content: "\f111";
color: $gray;
letter-spacing: 8px; display: inline-block;
font-weight: 400;
} font-size: 14px;
input[type="radio"]:checked + span.enka-checkbox-radio:before{ color: $gray;
content: "\f192"; letter-spacing: 8px;
color: $gray; font-weight: 400;
} }
} input[type="radio"]:checked + span.enka-checkbox-radio:before{
} content: "\f192";
} color: $gray;
}
}
}
}
}
} }
} }