diff --git a/admin/survey/classes/class.LibraryBranching.php b/admin/survey/classes/class.LibraryBranching.php index 94ed6b99e..62a8c4b78 100644 --- a/admin/survey/classes/class.LibraryBranching.php +++ b/admin/survey/classes/class.LibraryBranching.php @@ -60,6 +60,7 @@ class LibraryBranching { // Priazemo glavno vsebino glede na aktiven tab public function displayTabContent(){ + global $lang; // Levi seznam folderjev echo '
'; @@ -75,6 +76,9 @@ class LibraryBranching { $this->displayQuestionList(); echo '
'; + // Item counter + echo '
'.$lang['srv_library_item_counter'].': 0
'; + // Gumbi na dnu echo '
'; $this->displayButtons(); @@ -186,13 +190,13 @@ class LibraryBranching { // Ikoni puscice in mape echo ' '; - echo ' '; + echo ' '; // Naslov folderja echo ' '.$title.''; // Stevilo itemov v folderju - echo ' '.$child_count.''; + //echo ' '.$child_count.''; // Tri pikice za prikaz urejanja folderja @@ -421,11 +425,14 @@ class LibraryBranching { $b = new Branching($this->anketa); $ba = new BranchingAjax($this->ank_id); - foreach($item_ids as $item_id){ + foreach(array_reverse($item_ids) as $item_id){ $last_spr = $b->find_last_spr(); $new_id = $ba->spremenljivka_new($spremenljivka=$last_spr, $if=0, $endif=0, $copy=$item_id, $drop=0); } + Common::getInstance()->Init($this->ank_id); + Common::getInstance()->prestevilci(0, $all=true); + $b->branching_struktura(); } diff --git a/admin/survey/script/library.js b/admin/survey/script/library.js index a531e9751..e2b4087c1 100644 --- a/admin/survey/script/library.js +++ b/admin/survey/script/library.js @@ -356,6 +356,10 @@ function selectLibraryItem(item_id){ $('#question_item_holder_'+item_id).addClass('active'); $('#question_item_check_'+item_id).attr("checked", true); } + + // Prestejemo oznacene iteme + var count = $('.question_item_check:checkbox:checked').length; + $('#selected_item_counter').html(count); } function insertLibraryItemsIntoSurvey(){ diff --git a/lang/1.php b/lang/1.php index 1252e2aca..2d7f9bfc2 100644 --- a/lang/1.php +++ b/lang/1.php @@ -2368,6 +2368,7 @@ $lang = array ( "srv_library" => "Knjižnica", "srv_library_survey_title" => "Knjižnica vprašanj", "srv_library_survey_add" => "Dodaj v anketo", + "srv_library_item_counter" => "Št. izbranih vprašanj", "srv_nadzor" => "Nadzor", "srv_knjiznica_add" => "Če želite dodati spremenljivko v knjižnico, jo povlecite v to polje", "srv_knjiznica_copy" => "Če želite kopirati vprašanje, ga označite z ikono COPY", diff --git a/lang/2.php b/lang/2.php index 2e5cd934b..efdd12183 100644 --- a/lang/2.php +++ b/lang/2.php @@ -2353,6 +2353,7 @@ $lang = array ( "srv_library" => "Library", "srv_library_survey_title" => "Questions library", "srv_library_survey_add" => "Add to survey", + "srv_library_item_counter" => "No. of selected questions", "srv_nadzor" => "Supervise", "srv_knjiznica_add" => "To add a question to a library, drag it to this field", "srv_knjiznica_copy" => "To copy a question, click on COPY icon", diff --git a/lang/44.php b/lang/44.php new file mode 100644 index 000000000..6f8d948d8 --- /dev/null +++ b/lang/44.php @@ -0,0 +1,67 @@ + "0", + "id" => "44", // ID te jezikovne datoteke (ID.php) + "lang_short" => "nn", // si - slovenian, en - english + "language" => "New Norwegian", + + // tukaj so zbrani vsi teksti za respondentov vmesnik ankete + // anketa -> urejanje -> nastavitve -> standardne besede + "srv_survey_non_active" => "Undersøkinga er avslutta.", + "srv_survey_non_active_notStarted" => "Undersøkinga er ikkje aktiv. Valet startar:", + "srv_survey_non_active_expired" => "Undersøkinga er ikkje aktiv. Valet er avslutta:", + "srv_survey_non_active_voteLimit" => "Undersøkinga har nådd maksimalt antal svar.", + "srv_previewalert" => "Du viser akkurat no ei førehandsvising av undersøkinga. Svara dine vil ikkje bli lagra!", + "srv_recognized" => "Svar på undersøkinga som", + "srv_ranking_avaliable_categories" => "Eksisterande kategoriar", + "srv_ranking_ranked_categories" => "Rangeringskategoriar", + "srv_add_field" => "Legg til nytt felt", + "vote_sex_selection" => "Vel kjønn", + "vote_sex_man" => "Mann", + "vote_gender_female" => "Kvinne", + "srv_remind_sum_hard" => "Du har overskride maksimumssummen!", + "srv_remind_sum_soft" => "Du har overskride maksimumssummen. Vil du fortsetje?", + "srv_remind_num_hard" => "Du har overskride den tillatne verdien!", + "srv_remind_num_soft" => "Du har overskride den tillatne verdien. Vil du fortsetje?", + "srv_remind_hard" => "Ver venleg og svar på alle naudsynte spørsmål.", + "srv_remind_soft" => "Du har ikkje svara på alle dei naudsynte spørsmåla. Vil du fortsetje?", + "srv_confirm" => "Stadfest", + "srv_lastpage" => "Siste side", + "srv_nextpage" => "Neste side", + "srv_nextpage_uvod" => "Neste side", + "srv_prevpage" => "Førre side", + "results" => "Resultat", + "vote_count" => "Antal ", + "vote_time" => "Røysting er mogleg frå", + "vote_time_end" => "til", + "hour_all" => "Alle", + "female_female_voting" => "Kvinne", + "srv_intro" => "Bruk litt tid på å gjennomføre denne undersøkinga ved å klikke på \" Neste side \"", + "srv_basecode" => "Skriv inn passordet ditt", + "srv_end" => "Du er ferdig med undersøkinga. Takk.", + "srv_back_edit" => "Tilbake til redigering", + "srv_nextins" => "Neste oppfølging", + "srv_insend" => "Avslutt", + "srv_back_edit" => "Tilbake til redigering", + "srv_alert_msg" => "fullførte undersøkinga", + "srv_alert_subject" => "Undersøkinga er fullført", + "srv_remind_captcha_hard" => "Talet du skreiv inn, er ikkje det same som i biletet!", + "srv_remind_captcha_soft" => "Talet du skreiv inn, er ikkje det same som i biletet! Vil du fortsetje?", + "srv_alert_number_exists" => "Åtvaring: talet finst allereie!", + "srv_alert_number_toobig" => "Åtvaring: Talet er for stort!", + "srv_forma_send" => "Send", + "srv_end" => "Slutt", + "srv_dropdown_select" => "Velje", +); + +include(dirname(__FILE__).'/2.php'); + +// povozimo angleski jezik s prevodi +foreach ($lang_add AS $key => $val) { + $lang[$key] = $val; +} + +?> \ No newline at end of file diff --git a/lang/jeziki.php b/lang/jeziki.php index 3c37534e7..1838e23d1 100644 --- a/lang/jeziki.php +++ b/lang/jeziki.php @@ -46,6 +46,7 @@ $lang_all_global = array( 41 => 'Bosnian', 42 => 'Hindi', 43 => 'Hebrew', + 44 => 'New Norwegian', ), 'kratko-ime' => array( @@ -92,5 +93,6 @@ $lang_all_global = array( 41 => 'bos-l', 42 => 'hi', 43 => 'he', + 44 => 'nn', ), ); \ No newline at end of file diff --git a/public/css/admin_new.css b/public/css/admin_new.css index e1d2651fd..911a87d27 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -13243,6 +13243,10 @@ and open the template in the editor. margin-right: 8px; font-size: 14px; } +.tab_content .content_left ul li.folder_item .folder_item_child_count { + font-size: 12px; + color: #777777; +} .tab_content .content_right { display: flex; flex-direction: column; @@ -13293,6 +13297,15 @@ and open the template in the editor. .tab_content .content_right .question_list .question_item_holder .question_item_info span.faicon { color: #1E88E5; } +.tab_content .content_right .selected_items { + align-self: flex-end; + margin: 16px 0 8px 0; + color: #1E88E5; +} +.tab_content .content_right .button_holder { + margin-top: 0; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates diff --git a/resources/sass/admin_new/pages/survey_edit/library.scss b/resources/sass/admin_new/pages/survey_edit/library.scss index 8fb9eed86..8e069885f 100644 --- a/resources/sass/admin_new/pages/survey_edit/library.scss +++ b/resources/sass/admin_new/pages/survey_edit/library.scss @@ -77,6 +77,19 @@ margin-right: 8px; font-size: 14px; } + + .faicon.folder_empty{ + color: $blue; + } + + .faicon.folder{ + color: $blue; + } + + .folder_item_child_count{ + font-size: 12px; + color: $very-dark-gray; + } } } @@ -151,8 +164,15 @@ } } - .button_holder{ + .selected_items{ + align-self: flex-end; + margin: 16px 0 8px 0; + color: $blue; + } + + .button_holder{ + margin-top: 0; } } }