diff --git a/admin/survey/classes/class.NewSurvey.php b/admin/survey/classes/class.NewSurvey.php
index 21bfa737f..88f442cd3 100644
--- a/admin/survey/classes/class.NewSurvey.php
+++ b/admin/survey/classes/class.NewSurvey.php
@@ -52,10 +52,10 @@ class NewSurvey{
echo ''.$lang['srv_newSurvey_survey_new'].'';
// Anketa iz predloga (knjiznice) - samo na www.1ka.si, testu in arnesu
- if((strpos($site_url, 'www.1ka.si') !== false && !isVirtual())
+ if/**((strpos($site_url, 'www.1ka.si') !== false && !isVirtual())
|| strpos($site_url, 'test.1ka.si')
|| strpos($site_url, '1ka.arnes.si')
- || isDebug()){
+ || isDebug())**/(1){
echo ''.$lang['srv_newSurvey_survey_template'].'';
@@ -426,21 +426,27 @@ class NewSurvey{
}
- // Vsebina za ustvarjanje ankete iz predloge
+ // Vsebina za kopiranje obstoječe ankete
private function displayRightContentCopy(){
global $lang;
global $site_url;
global $site_path;
global $global_user_id;
- // 1. sklop - tip ankete (navadna, forma, glasovanje)
+ //1. sklop ime ankete, mapa - se doda v 2. fazi redizajna @TG
+
+ // 2. sklop - seznam obstoječih anket
echo '
';
+ echo '
' . $lang['srv_newSurvey_survey_copy'] . '
';
echo '
'.$lang['srv_newSurvey_survey_copy_title'].'
';
//echo '
';
//echo '
';
// Gumba naprej in preklici
+
+ echo '';
+ echo '';
+ echo '';
+ echo '
';
echo '';
}
// Vsebina za uvažanje ankete iz arhiva
diff --git a/lang/1.php b/lang/1.php
index 308925bac..cf961d148 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -7036,7 +7036,7 @@ $lang = array (
'srv_newSurvey_survey_new' => "Nova anketa",
'srv_newSurvey_survey_new2' => "Ustvari novo anketo",
'srv_newSurvey_survey_new_folder' => "Shrani anketo v mapo",
- 'srv_newSurvey_survey_new_folder_def' => "Izberi mapo",
+ 'srv_newSurvey_survey_new_folder_def' => "-- Izberi mapo --",
'srv_newSurvey_survey_template' => "1KA predloge",
'srv_newSurvey_survey_template2' => "Ustvari anketo iz predloge",
'srv_newSurvey_survey_template_type' => "Tip ankete",
@@ -7055,6 +7055,8 @@ $lang = array (
'srv_newSurvey_survey_template_error' => "Prosimo izberite predlogo",
'srv_newSurvey_survey_copy' => "Moje 1KA ankete",
'srv_newSurvey_survey_copy_title' => "Kopiraj svojo obstoječo anketo",
+ '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_text' => "Naslov obstoječe ankete",
'srv_newSurvey_survey_archive' => "Uvoz \".1ka\" format",
'srv_newSurvey_survey_archive2' => "Uvozi 1ka anketo iz arhiva",
diff --git a/lang/2.php b/lang/2.php
index d528b599d..d2d5a29b4 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6922,7 +6922,7 @@ $lang = array (
'srv_newSurvey_survey_new' => "New survey",
'srv_newSurvey_survey_new2' => "Create new survey",
'srv_newSurvey_survey_new_folder' => "Save survey into folder",
- 'srv_newSurvey_survey_new_folder_def' => "Select folder",
+ 'srv_newSurvey_survey_new_folder_def' => "-- Select folder --",
'srv_newSurvey_survey_template' => "1KA templates",
'srv_newSurvey_survey_template2' => "Create survey from template",
'srv_newSurvey_survey_template_preview' => "Preview",
@@ -6941,6 +6941,8 @@ $lang = array (
'srv_newSurvey_survey_template_error' => "Please select template",
'srv_newSurvey_survey_copy' => "My 1KA surveys",
'srv_newSurvey_survey_copy_title' => "Copy existing survey",
+ '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_text' => "Existing survey title",
'srv_newSurvey_survey_archive' => "Import \".1ka\" format",
'srv_newSurvey_survey_archive2' => "Import 1ka survey from archive",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 9834b8356..d4a5b0d80 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -14092,23 +14092,26 @@ and open the template in the editor.
margin-bottom: 32px;
font-size: 26px;
}
+#new_anketa_div #right_content .fieldset p.bottom32 {
+ margin-bottom: 32px;
+}
#new_anketa_div #right_content .fieldset .setting_horizontal_wrapper {
display: flex;
flex-direction: row;
margin-bottom: 32px;
}
-#new_anketa_div #right_content .fieldset .setting_horizontal_wrapper .setting_holder {
+#new_anketa_div #right_content .fieldset .setting_holder {
display: flex;
flex-direction: column;
margin-right: 36px;
}
-#new_anketa_div #right_content .fieldset .setting_horizontal_wrapper .setting_holder input[type=text] {
+#new_anketa_div #right_content .fieldset .setting_holder input[type=text] {
width: 332px;
}
-#new_anketa_div #right_content .fieldset .setting_horizontal_wrapper .setting_holder select.dropdown {
+#new_anketa_div #right_content .fieldset .setting_holder select.dropdown {
width: 332px;
}
-#new_anketa_div #right_content .fieldset .setting_horizontal_wrapper .setting_holder span.charalimit {
+#new_anketa_div #right_content .fieldset .setting_holder span.charalimit {
font-size: 12px;
line-height: 15px;
width: 332px;
@@ -14494,15 +14497,6 @@ input[type=radio] + span.enka-checkbox-radio {
color: #1E88E5;
}
-select#my_surveys {
- padding: 5px 8px;
- margin-left: 15px;
- height: 30px;
- font-size: 12px;
- border: 1px solid #b9c5d9 !important;
- border-radius: 1px;
-}
-
.noSurvey_skin #noSurvey_skins .skin:hover .preview {
background-color: #FF0000;
border: 1px #1E88E5 solid;
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 431f0b0ad..13a71fc34 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
@@ -38,33 +38,40 @@ $skin_selector: $red;
font-size: 26px;
}
+ p {
+ &.bottom32 {
+ margin-bottom: 32px;
+ }
+ }
+
.setting_horizontal_wrapper {
display: flex;
flex-direction: row;
margin-bottom: 32px;
- .setting_holder {
- display: flex;
- flex-direction: column;
- margin-right: 36px;
+ }
- input {
- &[type="text"] {
- width: 332px;
- }
- }
+ .setting_holder {
+ display: flex;
+ flex-direction: column;
+ margin-right: 36px;
- select.dropdown{
+ input {
+ &[type="text"] {
width: 332px;
}
-
- span.charalimit {
- font-size: 12px;
- line-height: 15px;
- width: 332px;
- color: $very-dark-gray;
- text-align: right;
- }
+ }
+
+ select.dropdown{
+ width: 332px;
+ }
+
+ span.charalimit {
+ font-size: 12px;
+ line-height: 15px;
+ width: 332px;
+ color: $very-dark-gray;
+ text-align: right;
}
}
@@ -530,16 +537,7 @@ input[type="radio"] {
color: $radio_selector;
}
}
-select#my_surveys {
- padding: 5px 8px;
- margin-left: 15px;
- height: 30px;
-
- font-size: 12px;
-
- border: 1px solid #b9c5d9 !important;
- border-radius: 1px;
-}
+
.noSurvey_skin {
#noSurvey_skins {
.skin {