diff --git a/admin/survey/classes/class.NewSurvey.php b/admin/survey/classes/class.NewSurvey.php index 1fa32ff20..d68958dcf 100644 --- a/admin/survey/classes/class.NewSurvey.php +++ b/admin/survey/classes/class.NewSurvey.php @@ -477,6 +477,7 @@ class NewSurvey{ echo '
'; // Naslov + echo '
' . $lang['srv_newSurvey_survey_archive'] . '
'; echo '
' . $lang['srv_newSurvey_survey_archive_title'] . '
'; echo '

'.$lang['srv_newSurvey_survey_archive_text2'].'

'; @@ -487,7 +488,7 @@ class NewSurvey{ echo ''; //echo ''; - echo ''; + echo ''; echo $lang['srv_arhiv_datoteka_save_txt2'].'.'; diff --git a/lang/1.php b/lang/1.php index b627e6995..a6997f190 100644 --- a/lang/1.php +++ b/lang/1.php @@ -7062,6 +7062,7 @@ $lang = array ( 'srv_newSurvey_survey_copy_dropdown' => "-- Izberi anketo --", 'srv_newSurvey_survey_copy_text' => "Naslov obstoječe ankete", 'srv_newSurvey_survey_archive' => "Uvoz .1ka datoteke", + 'srv_newSurvey_survey_archive_choosefile' => "Izberi datoteko", 'srv_newSurvey_survey_archive2' => "Uvozi 1ka anketo iz arhiva", '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", diff --git a/lang/2.php b/lang/2.php index 2b702a5ba..e06dd9751 100644 --- a/lang/2.php +++ b/lang/2.php @@ -6948,6 +6948,7 @@ $lang = array ( 'srv_newSurvey_survey_copy_dropdown' => "-- Choose a survey --", 'srv_newSurvey_survey_copy_text' => "Existing survey title", 'srv_newSurvey_survey_archive' => ".1ka file import", + 'srv_newSurvey_survey_archive_choosefile' => "Choose file", 'srv_newSurvey_survey_archive2' => "Import 1ka survey from archive", '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", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index c245b394c..91f9dec2c 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -13987,41 +13987,26 @@ and open the template in the editor. #new_anketa_div .layout_right_item .fieldset .setting .radioSetting_type.active { color: #777777; } -#new_anketa_div .layout_right_item .fieldset .setting input { - padding: 0; - margin: 0; +#new_anketa_div .layout_right_item .fieldset .setting input[type=file]#restore { + display: none; } -#new_anketa_div .layout_right_item .fieldset .setting select { - padding: 2px 5px; - margin: 0; - width: 302px; - font-size: 12px; - border: 1px solid #1E88E5 !important; - border-radius: 1px; +#new_anketa_div .layout_right_item .fieldset .setting label.custom_file_upload { + box-sizing: border-box; + cursor: pointer; + font-weight: 600; + font-family: Source Sans Pro, sans-serif; + box-shadow: none; + border: 0; + transition: 0.3s; + padding: 10px 32px; + min-width: 160px; + font-size: 16px; + color: #333333; + background-color: #E5E5E5; + border: 1px #333333 solid; } -#new_anketa_div .layout_right_item .fieldset .setting input[type=file] { - height: 24px; - width: 240px; - font-size: 10px; -} -#new_anketa_div .layout_right_item .fieldset .setting input[type=text] { - padding: 10px 12px; - width: 310px; - font-size: 15px; - border: 1px solid #1E88E5 !important; - border-radius: 1px; -} -#new_anketa_div .layout_right_item .fieldset .setting #novaanketa_akronim_1_chars { - float: right; - padding-right: 15px; - font-weight: 400; - font-size: 11px; -} -#new_anketa_div .layout_right_item .fieldset .setting #novaanketa_naslov_1_chars { - float: right; - padding-right: 7px; - font-weight: 400; - font-size: 11px; +#new_anketa_div .layout_right_item .fieldset .setting label.custom_file_upload:hover { + background-color: #d8d8d8; } #new_anketa_div .layout_right_item .fieldset .setting input[type=radio] { margin: 0 8px 4px 0; 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 732049983..62e4cf7c9 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 @@ -81,46 +81,41 @@ $skin_selector: $red; .radioSetting_type.active { color: $selectors; } - input { - padding: 0; - margin: 0; - } - select { - padding: 2px 5px; - margin: 0; - width: 302px; - font-size: 12px; - border: 1px solid $blue !important; - border-radius: 1px; - } - input[type="file"] { - height: 24px; - width: 240px; - font-size: 10px; - } - input[type="text"] { - padding: 10px 12px; - width: 310px; - - font-size: 15px; - - border: 1px solid $blue !important; - border-radius: 1px; - } - #novaanketa_akronim_1_chars { - float: right; - padding-right: 15px; - - font-weight: 400; - font-size: 11px; - } - #novaanketa_naslov_1_chars { - float: right; - padding-right: 7px; - - font-weight: 400; - font-size: 11px; + + //Custom inputi + input[type="file"]#restore { + display: none; } + + //Button - medium - gray + label.custom_file_upload { + box-sizing: border-box; + cursor: pointer; + + font-weight: $semi-bold; + font-family: $font_family; + + box-shadow: none; + border: 0; + + transition: 0.3s; + + padding: 10px 32px; + min-width: 160px; + font-size: 16px; + + color: $black; + + background-color: $gray; + border: 1px $black solid; + + &:hover { + background-color: darken($gray, 5%); + } + + + } + input[type="radio"] { margin: 0 8px 4px 0; display: none !important; @@ -183,6 +178,8 @@ $skin_selector: $red; color: $radio_selector; } } + + .survey_title_text_holder{ display: flex; flex-direction: row;