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

[Redizajn 1KA] - Moje ankete --> Moje ankete -v1

Browse Source
This commit is contained in:
tejagerjovic 2022-01-02 23:19:58 +01:00
parent 1e3f76c2c7
commit 6c91017cb0
5 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,10 +52,10 @@ class NewSurvey{
echo '<a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=new" title="'.$lang['srv_newSurvey_survey_new2'].'"><span class="item '.($this->subpage == 'new' ? ' active' : '').'" onClick=""><span class="faicon fa-clipboard-list link-right"></span>'.$lang['srv_newSurvey_survey_new'].'</span></a>';
// 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 '<a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template" title="'.$lang['srv_newSurvey_survey_template2'].'"><span class="item '.($this->subpage == 'template' ? ' active' : '').'"><span class="faicon fa-file-image link-right"></span>'.$lang['srv_newSurvey_survey_template'].'</span></a>';
@ -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 '<div class="fieldset">';
echo '<div class="pre-title">' . $lang['srv_newSurvey_survey_copy'] . '</div>';
echo '<div class="title">'.$lang['srv_newSurvey_survey_copy_title'].'</div>';
//echo '<input placeholder="'.$lang['srv_newSurvey_survey_copy_text'].'" list="my_surveys" data-list-focus="true" style="width:300px;">';
//echo '<datalist id="my_surveys">';
echo '<select name="my_surveys" id="my_surveys">';
echo '<p class="bottom32">'.$lang['srv_newSurvey_survey_copy_paragraph'].'</p>';
echo '<div class="setting_holder">';
echo '<select class="dropdown large" name="my_surveys" id="my_surveys">';
echo '<option value="0">'.$lang['srv_newSurvey_survey_copy_dropdown'].'</option>';
// Pridobimo seznam obstoječih anket
$sql = sisplet_query("SELECT id, naslov, akronim FROM srv_anketa WHERE insert_uid='".$global_user_id."' ORDER BY naslov ASC");
while($row = mysqli_fetch_array($sql)){
@ -448,17 +454,18 @@ class NewSurvey{
}
//echo '</datalist>';
echo '</select>';
echo '</div>';
echo '</div>';
// Gumba naprej in preklici
echo '<div class="noSurvey_buttons">';
echo '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
echo '<a href="#" onclick="newAnketaCopy();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
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 '<button class="medium blue" onclick="newAnketaCopy();" id="noSurvey_create">'.$lang['next1'].'</button>';
echo '</div>';
echo '<div class="noSurvey_buttons">';
}
// Vsebina za uvažanje ankete iz arhiva

4
lang/1.php
View File

@ -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",

4
lang/2.php
View File

@ -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",

20
public/css/admin_new.css
View File

@ -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;

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

@ -38,11 +38,19 @@ $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;
@ -66,7 +74,6 @@ $skin_selector: $red;
text-align: right;
}
}
}
.setting {
padding: 0 0 7px 15px;
@ -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 {