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

[Redizajn 1KA] - Moje ankete --> Uvoz .1ka datoteke - v1

Browse Source 
Manjka še placemetn za error message + custom upload gumb.
This commit is contained in:
tejagerjovic 2022-01-03 00:03:07 +01:00
parent d9f5d5e1e6
commit fb2b17c155
5 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,6 @@ class NewSurvey{
echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>'; echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';
echo '<button class="medium blue" onclick="newAnketaBlank();" id="noSurvey_create">'.$lang['next1'].'</button>'; echo '<button class="medium blue" onclick="newAnketaBlank();" id="noSurvey_create">'.$lang['next1'].'</button>';
echo '</div>'; echo '</div>';
echo '<div class="noSurvey_buttons">';
} }
@ -480,7 +479,8 @@ class NewSurvey{
// Naslov // Naslov
echo '<div class="title">' . $lang['srv_newSurvey_survey_archive_title'] . '</div>'; echo '<div class="title">' . $lang['srv_newSurvey_survey_archive_title'] . '</div>';
echo $lang['srv_newSurvey_survey_archive_text2']; echo '<p class="bottom32">'.$lang['srv_newSurvey_survey_archive_text2'].'</p>';
echo '<p class="bottom32">'.$lang['srv_newSurvey_survey_archive_text'].'</p>';
echo '<div class="setting archive">'; echo '<div class="setting archive">';
echo '<form id="restore" action="ajax.php?a=archive_restore" method="post" name="restorefrm" enctype="multipart/form-data" >'; echo '<form id="restore" action="ajax.php?a=archive_restore" method="post" name="restorefrm" enctype="multipart/form-data" >';
@ -491,8 +491,6 @@ class NewSurvey{
echo $lang['srv_arhiv_datoteka_save_txt2'].'.'; echo $lang['srv_arhiv_datoteka_save_txt2'].'.';
echo '<br /><br />'.$lang['srv_newSurvey_survey_archive_text'].'.';
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';
@ -508,11 +506,9 @@ class NewSurvey{
// Gumba naprej in preklici // Gumba naprej in preklici
echo '<div class="noSurvey_buttons">'; echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';
echo '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>'; echo '<button class="medium blue" onclick="document.restorefrm.submit();" id="noSurvey_create">'.$lang['next1'].'</button>';
echo '<a href="#" onclick="document.restorefrm.submit();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
echo '</div>'; echo '</div>';
} }

6
lang/1.php
View File

@ -7058,11 +7058,11 @@ $lang = array (
'srv_newSurvey_survey_copy_paragraph' => "Iz seznama izberi anketo in klikni gumb \"Naprej\". Ustvarila se bo kopija izbrane ankete.", 'srv_newSurvey_survey_copy_paragraph' => "Iz seznama izberi anketo in klikni gumb \"Naprej\". Ustvarila se bo kopija izbrane ankete.",
'srv_newSurvey_survey_copy_dropdown' => "-- Izberi anketo --", 'srv_newSurvey_survey_copy_dropdown' => "-- Izberi anketo --",
'srv_newSurvey_survey_copy_text' => "Naslov obstoječe ankete", 'srv_newSurvey_survey_copy_text' => "Naslov obstoječe ankete",
'srv_newSurvey_survey_archive' => "Uvoz \".1ka\" datoteke", 'srv_newSurvey_survey_archive' => "Uvoz .1ka datoteke",
'srv_newSurvey_survey_archive2' => "Uvozi 1ka anketo iz arhiva", 'srv_newSurvey_survey_archive2' => "Uvozi 1ka anketo iz arhiva",
'srv_newSurvey_survey_archive_title' => "Uvozi 1ka anketo (restavriraj anketo iz arhivske datoteke)", 'srv_newSurvey_survey_archive_title' => "Restavriraj anketo iz arhivske .1ka datoteke",
'srv_newSurvey_survey_archive_text' => "Iz arhivske datoteke se bo ustvarila kopija arhivirane ankete", 'srv_newSurvey_survey_archive_text' => "Iz arhivske datoteke se bo ustvarila kopija arhivirane ankete",
'srv_newSurvey_survey_archive_text2' => "Uvozite lahko anketo, ki ste jo iz arhiva predhodno shranili kot datoteko v formatu .1ka.", 'srv_newSurvey_survey_archive_text2' => "Uvozi se lahko anketa, ki je bila v arhivu predhodno shranjena kot datoteka s končnico .1ka.",
'srv_newSurvey_survey_archive_error1' => "Pri uvozu ankete je prišlo do napake. Preverite, če ste izbrali ustrezno datoteko s končnico .1ka.", 'srv_newSurvey_survey_archive_error1' => "Pri uvozu ankete je prišlo do napake. Preverite, če ste izbrali ustrezno datoteko s končnico .1ka.",
'srv_newSurvey_survey_archive_error2' => "Pri uvozu ankete je prišlo do napake. Zbrane datoteke ni mogoče uvoziti.", 'srv_newSurvey_survey_archive_error2' => "Pri uvozu ankete je prišlo do napake. Zbrane datoteke ni mogoče uvoziti.",
'srv_newSurvey_survey_from_text' => "Uvoz besedila", 'srv_newSurvey_survey_from_text' => "Uvoz besedila",

6
lang/2.php
View File

@ -6944,11 +6944,11 @@ $lang = array (
'srv_newSurvey_survey_copy_paragraph' => "Select the survey from the list and click the \"Next\" button. A copy of the selected survey will be created.", 'srv_newSurvey_survey_copy_paragraph' => "Select the survey from the list and click the \"Next\" button. A copy of the selected survey will be created.",
'srv_newSurvey_survey_copy_dropdown' => "-- Choose a survey --", 'srv_newSurvey_survey_copy_dropdown' => "-- Choose a survey --",
'srv_newSurvey_survey_copy_text' => "Existing survey title", 'srv_newSurvey_survey_copy_text' => "Existing survey title",
'srv_newSurvey_survey_archive' => "\".1ka\" file import", 'srv_newSurvey_survey_archive' => ".1ka file import",
'srv_newSurvey_survey_archive2' => "Import 1ka survey from archive", 'srv_newSurvey_survey_archive2' => "Import 1ka survey from archive",
'srv_newSurvey_survey_archive_title' => "Import 1ka survey (restore survey from archive file)", 'srv_newSurvey_survey_archive_title' => "Restore survey from the .1ka archive file",
'srv_newSurvey_survey_archive_text' => "Archived survey copy will be created from the archive file", 'srv_newSurvey_survey_archive_text' => "Archived survey copy will be created from the archive file",
'srv_newSurvey_survey_archive_text2' => "You can import survey from file in .1ka format.", 'srv_newSurvey_survey_archive_text2' => "A survey can be imported if it was previously saved in the archive as a file with the extension .1ka.",
'srv_newSurvey_survey_archive_error1' => "Import error. Check your selected file for import.", 'srv_newSurvey_survey_archive_error1' => "Import error. Check your selected file for import.",
'srv_newSurvey_survey_archive_error2' => "Import error. Selected .1ka file cannot be imported.", 'srv_newSurvey_survey_archive_error2' => "Import error. Selected .1ka file cannot be imported.",
'srv_newSurvey_survey_from_text' => "Import text", 'srv_newSurvey_survey_from_text' => "Import text",

5
public/css/admin_new.css
View File

@ -14205,11 +14205,6 @@ and open the template in the editor.
#new_anketa_div #right_content .fieldset .setting .visual-radio-scale.checked .enka-vizualna-skala::before { #new_anketa_div #right_content .fieldset .setting .visual-radio-scale.checked .enka-vizualna-skala::before {
color: #1E88E5; color: #1E88E5;
} }
#new_anketa_div #right_content .fieldset .setting.archive {
margin-top: 20px;
font-weight: 500;
font-size: 14px;
}
#new_anketa_div #right_content .fieldset .survey_title_text_holder { #new_anketa_div #right_content .fieldset .survey_title_text_holder {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

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

@ -183,11 +183,6 @@ $skin_selector: $red;
color: $radio_selector; color: $radio_selector;
} }
} }
.setting.archive {
margin-top: 20px;
font-weight: 500;
font-size: 14px;
}
.survey_title_text_holder{ .survey_title_text_holder{
display: flex; display: flex;
flex-direction: row; flex-direction: row;