';
// Ikoni puscice in mape
- echo '
';
- echo '
';
+ echo '
';
+ echo '
';
// Naslov folderja
echo '
'.$title.' ';
@@ -318,17 +331,58 @@ class LibraryBranching {
// Tri pikice za prikaz urejanja folderja
- echo '
';
+ echo '
';
// Skrit div za urejanje folderja
- echo '
';
- echo ' Test';
+ echo '
';
+ echo ' ';
echo '
';
echo '
';
}
+ // Prikazemo seznam vprasanj v folderju
+ private function displayQuestionList(){
+ global $global_user_id;
+ global $lang;
+
+ // Folder ni nastavljen
+ if($this->folder_id == 0)
+ return;
+
+
+ $sqlFolderQuestions = sisplet_query("SELECT * FROM srv_spremenljivka WHERE folder='".$this->folder_id."' AND gru_id='-1' ORDER BY naslov ASC");
+ while ($rowFolderQuestions = mysqli_fetch_array($sqlFolderQuestions)) {
+ $this->displayQuestionItem($rowFolderQuestions);
+ }
+ }
+
+ // Prikazemo 1 vrstico (item, vprasanje) na desni
+ private function displayQuestionItem($spremenljivka){
+ global $lang;
+
+ echo '
';
+
+ echo '
';
+
+ echo '
';
+ echo ' '.substr(strip_tags($spremenljivka['naslov']), 0, 40).' ';
+ echo '
';
+
+ echo '
';
+ }
+
+ // Prikazemo gumbe
+ private function displayButtons(){
+ global $global_user_id;
+ global $lang;
+
+ echo '
'.$lang['edit1338'].' ';
+ echo '
'.$lang['srv_library_survey_add'].' ';
+ }
+
/**
* Popup pri dodajanju itema v knjiznico - potrditev, izbira folderja, urejanje naslova
@@ -338,7 +392,7 @@ class LibraryBranching {
* - 1->vprasanja
* - 2->if/blok
*/
- public function displayAddIntoLibrary($id, $type){
+ private function displayAddIntoLibrary($id, $type){
global $lang;
// Naslov v oknu
@@ -351,839 +405,36 @@ class LibraryBranching {
}
-
-
- /**
- * @desc prikaze ife / bloke v knjiznici
- */
- function display_ifs ($folder) {
- global $lang, $admin_type;
-
- $sql = sisplet_query("SELECT * FROM srv_if WHERE folder = '$folder' ORDER BY label ASC, id ASC");
- while ($row = mysqli_fetch_array($sql)) {
-
- echo '
';
- echo ' ';
-
- echo '
';
- if ($admin_type==0 or $this->tab==1)
- echo '
';
- echo '
';
-
- echo '
';
-
- echo '
';
-
- echo '
';
- }
-
- }
-
-
- /**
- * @desc prikaze seznam iskanih anket v knjiznici
- */
- function display_contentfolders_searchList () {
- global $lang;
- global $admin_type;
- global $global_user_id;
- global $site_url;
-
- $language = "";
-
- if ($this->tab == 2)
- $uid = 0;
- else
- $uid = $global_user_id;
-
- if ($uid == 0)
- $language = " AND lang='$lang[id]' ";
-
- // v skrite html elemente shranimo tab, in prva
- echo '
';
- echo '
';
- echo '
';
-
- echo '
'."\n";
-
-
- // Sestavimo query za search po knjiznici
- $search_query = $this->getSearchString();
-
- $sql1 = sisplet_query("SELECT sa.*
- FROM srv_anketa sa, srv_library_anketa l, srv_grupa sg, srv_spremenljivka ss, srv_vrednost sv
- WHERE sa.id=l.ank_id AND sg.ank_id=sa.id AND ss.gru_id=sg.id AND sv.spr_id=ss.id
- AND l.uid='$uid' ".$search_query."
- GROUP BY sa.id
- ORDER BY sa.naslov ASC");
- if (!$sql1) echo mysqli_error($GLOBALS['connect_db']);
-
- // Loop po najdenih anketah
- if (mysqli_num_rows($sql1) > 0) {
- while ($row1 = mysqli_fetch_array($sql1)) {
-
- echo '';
- echo ' ';
-
- echo '
';
-
-
- echo '
';
- echo ' '.$match.' ', $text_searched);
- }
- }
- }
- }
-
- echo skrajsaj($text_searched, 40).''."\n";
-
- echo '
';
- echo '
';
- }
- }
-
- echo ' '."\n";
- echo ' '."\n";
-
-
- if ($parent == 0) {
- echo ''."\n";
- }
-
- if ( $parent == 0 ) {
- ?>
-
- '.$lang['s_search_settings_lib'].'';
-
- echo '
';
- }
-
- // Prikazemo search okno za iskanje po anketah znotraj knjiznice
- private function displaySearch(){
- global $lang;
- global $site_url;
-
- echo '
';
- }
-
- // vrne sql string za search po anketah glede na nastavitve searcha
- private function getSearchString(){
-
- $search_text = mysqli_real_escape_string($GLOBALS['connect_db'], $this->searchString);
-
- // Vse gre v lowerstring
- $search_text = strtolower($search_text);
-
- // Sklanjamo po search besedi
- $search_text = explode (" ", $search_text);
-
- for ($a=0; $a
5)
- $search_text[$a] = substr ($search_text[$a], 0, -2);
- elseif (strlen ($search_text[$a]) > 2)
- $search_text[$a] = substr ($search_text[$a], 0, -1);
- else
- $search_text[$a] = $search_text[$a];
-
- $this->searchStringProcessed[$a] = $search_text[$a];
- $search_text[$a] = '%'.$search_text[$a].'%';
- }
-
- $search_text = implode (" ", $search_text);
-
- // Search po kljucnih besedah znotraj vprasanj (naslovi vprasanj in vrednosti)
- if($this->searchSettings['stype'] == '1')
- $result = " AND (LOWER(sa.introduction) LIKE LOWER('".$search_text."')
- OR LOWER(sa.conclusion) LIKE LOWER('".$search_text."')
- OR LOWER(ss.naslov) LIKE LOWER('".$search_text."')
- OR LOWER(sv.naslov) LIKE LOWER('".$search_text."'))";
- // Search po naslovu
- else
- $result = " AND (LOWER(sa.naslov) LIKE LOWER('".$search_text."') OR LOWER(sa.akronim) LIKE LOWER('".$search_text."'))";
-
- return $result;
- }
-
/**
* @desc pohendla ajax klice
*/
- function ajax () {
+ public function ajax () {
- if (isset($_POST['tab']))
- $this->tab = (int)$_POST['tab'];
- else if (isset($_GET['tab']))
- $this->tab = (int)$_GET['tab'];
- if ($this->tab == 'undefined')
- $this->tab = 0;
- if (isset($_POST['prva']))
- $this->prva = $_POST['prva'];
- else if (isset($_GET['prva']))
- $this->prva = $_GET['prva'];
- if ($this->prva == 'undefined')
- $this->prva = 0;
+ // Odpremo popup s knjiznico
+ if ($_GET['a'] == 'displayLibraryPopup') {
+ $this->displayLibrary();
+ }
- if ($this->tab <= 1)
- $this->tip = 0;
- else
- $this->tip = 1;
+ // Preklopimo tab v kniznici
+ elseif ($_GET['a'] == 'displayLibraryTabContent') {
- if ($_GET['a'] == 'display_knjiznica') {
- $this->ajax_display_knjiznica();
+ $this->tab = (isset($_POST['tab'])) ? (int)$_POST['tab'] : 0;
+ $this->displayTabContent();
+ }
- } elseif ($_GET['a'] == 'library_add') {
- $this->ajax_library_add();
+ // Odpremo folder z vprasanji v knjiznici
+ elseif ($_GET['a'] == 'displayLibraryQuestionList') {
- } elseif ($_GET['a'] == 'spr_dropped') {
- $this->ajax_spr_dropped();
+ $this->folder_id = $_POST['folder_id'];
+ $this->displayQuestionList();
+ }
- } elseif ($_GET['a'] == 'if_dropped') {
- $this->ajax_if_dropped();
-
- } elseif ($_GET['a'] == 'folder_dropped') {
- $this->ajax_folder_dropped();
-
- } elseif ($_GET['a'] == 'folder_rename') {
- $this->ajax_folder_rename();
-
- } elseif ($_GET['a'] == 'folder_newname') {
- $this->ajax_folder_newname();
-
- } elseif ($_GET['a'] == 'new_folder') {
- $this->ajax_new_folder();
-
- } elseif ($_GET['a'] == 'delete_folder') {
- $this->ajax_delete_folder();
-
- } elseif ($_GET['a'] == 'folder_collapsed') {
- $this->ajax_folder_collapsed();
-
- } elseif ($_GET['a'] == 'library_del_anketa') {
- $this->ajax_library_del_anketa();
-
- } elseif ($_GET['a'] == 'library_del_myanketa') {
- $this->ajax_library_del_myanketa();
-
- } elseif ($_GET['a'] == 'library_add_myanketa') {
- $this->ajax_library_add_myanketa();
-
- } elseif ($_GET['a'] == 'anketa_copy') {
- $this->ajax_anketa_copy();
- } elseif ($_GET['a'] == 'anketa_copy_new') {
- $this->ajax_anketa_copy_new();
-
- } elseif ($_GET['a'] == 'if_remove') {
- $this->ajax_if_remove();
-
- } elseif ($_GET['a'] == 'brisi_spremenljivko') {
- $this->ajax_brisi_spremenljivko();
-
- } elseif ($_GET['a'] == 'alert_copy_anketa') {
- $this->ajax_alert_copy_anketa();
-
- } elseif ($_GET['a'] == 'anketa_archive_and_copy') {
- $this->ajax_anketa_archive_and_copy();
-
- }
+ // Odpremo popup za dodajanje itema v knjiznico
+ elseif ($_GET['a'] == 'displayAddIntoLibraryPopup') {
+ $this->displayAddIntoLibrary();
+ }
}
-
- function ajax_display_knjiznica () {
- $this->display();
- }
-
- function ajax_library_add () {
- global $lang;
-
- $data = array();
-
- if ($this->tip == 0) {
- $spremenljivka = substr($_POST['spremenljivka'], 10); // odrezemo branching_
- $folder = $_POST['folder'];
-
- // v knjiznico dodamo spremenljivko
- if ($spremenljivka > 0) {
- $id = $this->Branching->nova_spremenljivka(-1, 0, 0, $spremenljivka);
- sisplet_query("UPDATE srv_spremenljivka SET folder = '$folder' WHERE id = '$id'");
-
- $data['response'] = $lang['srv_library_q_added'];
-
- // v knjiznico dodamo if/blok
- } else {
- $if = substr($_POST['spremenljivka'], 12); // odrezemo branching_if
-
- if ($if > 0) {
- $id = $this->Branching->if_copy(0, $if, true);
- sisplet_query("UPDATE srv_if SET folder = '$folder' WHERE id = '$id'");
-
- $data['response'] = $lang['srv_library_b_added'];
- }
- }
- }
-
- ob_start();
- $this->display_folders();
- $data['folders'] = ob_get_clean();
-
- echo json_encode($data);
-
- }
-
-
- function ajax_spr_dropped() {
- global $global_user_id;
-
- $spremenljivka = $_POST['spremenljivka'];
- $folder = $_POST['folder'];
-
- if ($this->tab == 0 or $this->tab == 2)
- $uid = 0;
- elseif ($this->tab == 1 or $this->tab == 3)
- $uid = $global_user_id;
-
- if ($this->tip == 0) {
- sisplet_query("UPDATE srv_spremenljivka SET folder = '$folder' WHERE id = '$spremenljivka'");
- } else {
- sisplet_query("UPDATE srv_library_anketa SET folder = '$folder' WHERE ank_id = '$spremenljivka' AND uid='$uid'");
- }
- //$this->display();
- $this->display_folders();
- }
-
- function ajax_if_dropped() {
- global $global_user_id;
-
- $if = $_POST['if'];
- $folder = $_POST['folder'];
-
- sisplet_query("UPDATE srv_if SET folder = '$folder' WHERE id = '$if'");
-
- //$this->display();
- $this->display_folders();
- }
-
- function ajax_folder_dropped() {
-
- $drop = $_POST['drop'];
- $folder = $_POST['folder'];
-
- if ($drop != $folder)
- sisplet_query("UPDATE srv_library_folder SET parent = '$folder' WHERE id = '$drop' AND tip='$this->tip'");
-
- //$this->display();
- $this->display_folders();
- }
-
- function ajax_folder_rename () {
-
- $folder = $_POST['folder'];
-
- $sql = sisplet_query("SELECT naslov FROM srv_library_folder WHERE id = '$folder'");
- $row = mysqli_fetch_array($sql);
-
- echo '';
-
- }
-
- function ajax_folder_newname () {
- $folder = $_POST['folder'];
- $naslov = $_POST['naslov'];
-
- sisplet_query("UPDATE srv_library_folder SET naslov='$naslov' WHERE id ='$folder'");
-
- //$this->display();
- $this->display_folders();
- }
-
- function ajax_new_folder () {
- global $lang;
- global $global_user_id;
- $folder = $_POST['folder'];
-
- if ($this->tab == 0 or $this->tab == 2)
- $uid = 0;
- elseif ($this->tab == 1 or $this->tab == 3)
- $uid = $global_user_id;
-
- $uid = $_POST['uid'];
-
- $s = sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent) VALUES ('$uid', '$this->tip', '$lang[srv_newfolder]', '$folder')");
- if (!$s) echo mysqli_error($GLOBALS['connect_db']);
- $insert_id = mysqli_insert_id($GLOBALS['connect_db']);
-
- $_COOKIE['library_folders'] .= '-'.$insert_id.'-'; // $_COOKIE popravimo, da bo sprememba vidna tudi v display_folders()
- setcookie('library_folders', $_COOKIE['library_folders'], time()+2500000);
-
- // $this->display();
- $this->display_folders();
-
- }
-
- function ajax_delete_folder () {
- global $lang;
-
- $folder = $_POST['folder'];
-
- $sql = sisplet_query("SELECT parent FROM srv_library_folder WHERE id = '$folder'");
- $row = mysqli_fetch_array($sql);
-
- if ($this->tip == 0) {
- sisplet_query("UPDATE srv_spremenljivka SET folder = '$row[parent]' WHERE folder = '$folder'");
- sisplet_query("UPDATE srv_if SET folder = '$row[parent]' WHERE folder = '$folder'");
- } else {
- sisplet_query("UPDATE srv_library_anketa SET folder = '$row[parent]' WHERE folder = '$folder'");
- }
-
- sisplet_query("UPDATE srv_library_folder SET parent = '$row[parent]' WHERE parent = '$folder'");
-
- sisplet_query("DELETE FROM srv_library_folder WHERE id = '$folder'");
-
- //$this->display();
- $this->display_folders();
- }
-
- function ajax_folder_collapsed () {
- $folder = $_POST['folder'];
- $collapsed = $_POST['collapsed'];
-
- $cookie = $_COOKIE['library_folders'];
-
- if ($collapsed == 0) {
- $cookie .= '-'.$folder.'-';
- } else {
- $cookie = str_replace('-'.$folder.'-', '', $cookie);
- }
-
- setcookie('library_folders', $cookie, time()+2500000);
-
- echo ''.$row2['naslov'].' '))."',";
-
-
- //$new_id = $this->SurveyAdmin->anketa_copy($ank_id);
- $sas = new SurveyAdminSettings();
- $new_id = $sas->anketa_copy($ank_id);
-
- // popravimo naslov, opombo, dostop, in novega avtorja
- sisplet_query("UPDATE srv_anketa SET $naslov $intro_opomba dostop='$row[dostop]', insert_uid='$global_user_id', edit_uid='$global_user_id' WHERE id='$new_id'");
- // vsilimo refresh podatkov
- SurveyInfo :: getInstance()->resetSurveyData();
-
- // dostop uporabimo od stare ankete in ne od skopirane (trnutno ne kopira pravic od prej, če ustvarjamo novo anketo)
- // TODO: po kakšni logiki ohranimo dostop od stare ankete?? Če jo jaz ustvarim je prav, v kolikor kopirma iz knjižnice pa tole ni ok!
- if(!empty($anketa)) {
- sisplet_query("DELETE FROM srv_dostop WHERE ank_id = '$new_id'");
- while ($rows = mysqli_fetch_array($sqls)) {
- sisplet_query("INSERT INTO srv_dostop (ank_id, uid) VALUES ('$new_id', '$rows[uid]')");
- }
- }
-
- // Vrnemo samo ID ankete
- if($hierarhija) {
- sisplet_query("INSERT INTO srv_anketa_module (ank_id, modul) VALUES ('".$new_id."', 'hierarhija')");
- sisplet_query("INSERT INTO srv_hierarhija_users (user_id, anketa_id, type) VALUES ('".$global_user_id."', '".$new_id."', 1)");
-
- // Določimo vlogo
- (new \Hierarhija\Hierarhija($new_id))->izrisisSistemskoVprsanjeVloga();
-
- echo $new_id;
- }else{
- echo 'index.php?anketa='.$new_id.'&a=branching';
- }
- }
-
- /**
- * ustvari novo kopijo ankete
- * @param ank_id samo za API - prekrije tudi vse echo
- */
- function ajax_anketa_copy_new ($ank_id = null) {
- global $global_user_id, $lang, $site_url;
-
- $API_call = false;
-
- if($ank_id == null) {
- $ank_id = $_POST['ank_id']; // anketa, ki jo uporabimo za predlogo
-
- // Če imamo hierarhijo in je privzeta anketa potem preverimo v settings_optional.php
- if(!empty($_POST['hierarhija']) && $ank_id == 'privzeta'){
- $ank_id = AppSettings::getInstance()->getSetting('hierarhija-default_id');
- }
- }
- else {
- $API_call = true;
- }
-
- $sql = sisplet_query("SELECT naslov, dostop FROM srv_anketa WHERE id = '$ank_id'");
- $row = mysqli_fetch_array($sql);
-
- // Nastavimo naslov
- if(isset($_POST['naslov']) && $_POST['naslov'] != '' && $_POST['naslov'] != $lang['srv_naslov'] && $_POST['naslov'] != $lang['srv_novaanketa_polnoime'] && trim($_POST['naslov']) != "")
- $naslov = " naslov='".$_POST['naslov']."',";
- else
- $naslov = " naslov='".addslashes($lang['srv_library_copy_of'].$row['naslov'])."',";
-
- // Nastavimo akronim, ce ga imamo
- $akronim = "";
- if(isset($_POST['akronim']) && $_POST['akronim'] != '' && $_POST['akronim'] != $lang['srv_naslov'] && $_POST['akronim'] != $lang['srv_novaanketa_ime_respondenti'] && trim($_POST['akronim']) != "")
- $akronim = " akronim='".$_POST['akronim']."',";
-
- $intro_opomba = " intro_opomba='".(addslashes($lang['srv_library_copy_of_note'].''.$row['naslov'].' '))."',";
-
- //$new_id = $this->SurveyAdmin->anketa_copy($ank_id);
- $sas = new SurveyAdminSettings();
- $new_id = $sas->anketa_copy($ank_id);
-
- // popravimo naslov, opombo, dostop, in novega avtorja in ugasnemo email vabila
- sisplet_query("UPDATE srv_anketa
- SET $naslov $akronim $intro_opomba dostop='$row[dostop]', insert_uid='$global_user_id', edit_uid='$global_user_id', user_base='0'
- WHERE id='$new_id'");
-
- // vsilimo refresh podatkov
- SurveyInfo :: getInstance()->resetSurveyData();
-
- // dostop od stare ankete odstranimo
- sisplet_query("DELETE FROM srv_dostop WHERE ank_id = '$new_id'");
-
- //dostop dodamo uporabniku, ki si kopira anketo
- sisplet_query("INSERT INTO srv_dostop (ank_id, uid) VALUES ('$new_id', '$global_user_id')");
-
- // Ce imamo pri ustvarjanju doloceno tudi mapo, anketo vstavimo v njo
- if(isset($_POST['folder']) && $_POST['folder'] > 0){
-
- // Razpremo folder v akterega uvrscamo anketo
- $sql = sisplet_query("UPDATE srv_mysurvey_folder SET open='1' WHERE id='".$_POST['folder']."' AND usr_id='".$global_user_id."'");
-
- // Vstavimo anketo
- $sql = sisplet_query("INSERT INTO srv_mysurvey_anketa (ank_id, usr_id, folder) VALUES ('".$new_id."', '".$global_user_id."', '".$_POST['folder']."')");
- }
-
- // popravimo branching, ce kopiramo staro anketo, ki ima lahko pokvarjenega
- $b = new Branching($new_id);
- $b->repare_branching();
-
- // v kolikor je vkloplje modul evalvacija v šolah - hierarhija potem modul vključimo tudi v izbrani anketi
- if(SurveyInfo::checkSurveyModule('hierarhija', $ank_id) || !empty($_POST['novaHierarhjia'])){
- sisplet_query("INSERT INTO srv_anketa_module (ank_id, modul) VALUES ('".$new_id."', 'hierarhija')");
- sisplet_query("INSERT INTO srv_hierarhija_users (user_id, anketa_id, type) VALUES ('".$global_user_id."', '".$new_id."', 1)");
-
-
- // Določimo vlogo
- (new \Hierarhija\Hierarhija($new_id))->izrisisSistemskoVprsanjeVloga();
-
- // Omenjeno funkcijo kopije strukture in preusmeritev uporabimo, kadar kopiramo obstoječe anketo skupaj s strukturo
- if($_POST['hierarhija'] == 1 && empty($_POST['novaHierarhjia'])){
- // $new_id je ID nove ankete, ki je bila skopirana
- // $ank_id pa je ID naše trenutne ankete
- \Hierarhija\HierarhijaKopiranjeClass::getInstance($new_id)->kopirajCelotroStrukturoKNoviAnketi($ank_id);
-
- }
-
- if(empty($_POST['novaHierarhjia'])){
- echo 'index.php?anketa=' . $new_id .'&a='.A_HIERARHIJA_SUPERADMIN.'&m='.M_ADMIN_UREDI_SIFRANTE;
- }else{
- echo $new_id;
- }
-
- }else {
- if(!$API_call)
- echo 'index.php?anketa=' . $new_id;
- }
-
- //vrrni id nove ankete za API
- return $new_id;
- }
-
- function ajax_if_remove () {
-
- $if = $_POST['if'];
- $this->anketa = $_POST['anketa'];
-
- $BranchingAjax = new BranchingAjax($this->anketa);
- // ne bomo izpisal kar izpisuje ta funkcija
- ob_start();
- $BranchingAjax->ajax_if_remove($if);
- ob_end_clean();
-
- //$this->display();
- $this->display_folders();
- }
-
- function ajax_brisi_spremenljivko () {
- $spremenljivka = $_POST['spremenljivka'];
-
- $this->SurveyAdmin->brisi_spremenljivko($spremenljivka);
-
- //$this->display();
- $this->display_folders();
- }
-
- function ajax_alert_copy_anketa () {
- global $lang;
-
- // preverimo stevilo trenutno dodanih vprasanj ce jih ni, ni potrebno arhivirat
- $sql = sisplet_query("SELECT s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$_POST['anketa']."'");
- if (mysqli_num_rows($sql) > 0)
- {
- ?>
-
-
-
- SurveyAdmin->anketa_copy($ank_id);
- $sas = new SurveyAdminSettings();
- $new_id = $sas->anketa_copy($ank_id);
-
- $intro_opomba = addslashes( $lang['srv_library_copy_of_note'].''.$row2['naslov'].' ' );
-
- // popravimo polja
- sisplet_query("UPDATE srv_anketa SET naslov='$row[naslov]', intro_opomba='$intro_opomba', dostop='$row[dostop]', insert_uid='$global_user_id', insert_time=NOW(), edit_uid='$global_user_id', edit_time=NOW() WHERE id='$new_id'");
-
- // dostop uporabimo od stare ankete in ne od skopirane
- sisplet_query("DELETE FROM srv_dostop WHERE ank_id = '$new_id'");
- while ($rows = mysqli_fetch_array($sqls)) {
- sisplet_query("INSERT INTO srv_dostop (ank_id, uid) VALUES ('$new_id', '$rows[uid]')");
- }
-
- // staro anketo razglasimo kot backup(arhiv) nove
- sisplet_query("UPDATE srv_anketa SET backup='$new_id', active=0, edit_uid='$global_user_id', edit_time=NOW(), naslov = CONCAT( naslov, ' ', DAY(NOW()), '.', MONTH(NOW()), '.', YEAR(NOW()) ) WHERE id='$anketa'");
- // vsilimo refresh podatkov
- SurveyInfo :: getInstance()->resetSurveyData();
-
- // redirektamo na novo anketo
- echo 'index.php?anketa='.$new_id;
- }
-
- function repareTabs() {
- if ($this->tab >= 2)
- $this->tip = 1;
- else
- $this->tip = 0;
-
- // popravimo tabe če smo v glasovanju ali formi
- if ($this->mode < 2) {
- // uredimo tabe
- if ($this->tab==0 || $this->tab==1) {
- $this->tip = 1;
- $this->tab=2;
- }
- }
- }
-
}
?>
diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js
index 32b7d78e3..0242c9c26 100644
--- a/admin/survey/script/branching.js
+++ b/admin/survey/script/branching.js
@@ -60,6 +60,7 @@ function onload_init_branching() {
// funkcijo poklicemo ko se stran naloada in ob koncu vsakega ajax klica
branching_struktura();
+
$("body").ajaxStop(function () {
branching_struktura();
});
@@ -1163,9 +1164,8 @@ function vrednost_condition_editing(vrednost) {
}
function condition_editing(_if, odpreminus) {
+
close_all_editing();
- // zapremo knjiznico
- $('#toolbox_library').hide();
$('li#branching_if' + _if).addClass('if_editing');
$('ul#if_' + _if).addClass('if_editing');
diff --git a/admin/survey/script/invitations.js b/admin/survey/script/invitations.js
index 58d13b7a2..b0d7fc979 100644
--- a/admin/survey/script/invitations.js
+++ b/admin/survey/script/invitations.js
@@ -1621,16 +1621,15 @@ function noEmailingType(value){
function smtpAAIPopupShow(){
$('#fade').fadeTo('slow', 1);
- $('#popup_note').html('').fadeIn('slow');
- $("#popup_note").load('ajax.php?t=invitations&a=showAAISmtpPopup', {anketa: srv_meta_anketa_id, noNavi:'true'});
+ $('#general_popup').html('').fadeIn('slow');
+ $("#general_popup").load('ajax.php?t=invitations&a=showAAISmtpPopup', {anketa: srv_meta_anketa_id, noNavi:'true'});
}
function smtpAAIPopupClose(){
// Ni sprejel - vrnemo radio
$('input[name=SMTPMailMode][value=2]').prop('checked', true);
- $('#popup_note').fadeOut('slow').html('');
- $('#fade').fadeOut('slow');
+ popupClose();
}
function smtpAAISet(){
diff --git a/admin/survey/script/library.js b/admin/survey/script/library.js
index 5b11d3761..1299149b5 100644
--- a/admin/survey/script/library.js
+++ b/admin/survey/script/library.js
@@ -254,3 +254,53 @@ function check_library () {
}
+
+
+// Odpremo knjiznico v urejanju ankete
+function displayLibraryPopup(){
+
+ $('#fade').fadeTo('slow', 1);
+ $('#general_popup').html('').fadeIn('slow');
+
+ $("#general_popup").load('ajax.php?t=libraryBranching&a=displayLibraryPopup', {anketa: srv_meta_anketa_id});
+}
+
+// Preklop med tabi
+function displayLibraryTab(tab){
+
+ if(tab == 1){
+ $('#tab_0').removeClass('active');
+ $('#tab_1').addClass('active');
+ }
+ else{
+ $('#tab_1').removeClass('active');
+ $('#tab_0').addClass('active');
+ }
+
+ $("#tab_content").load('ajax.php?t=libraryBranching&a=displayLibraryTabContent', {anketa: srv_meta_anketa_id, tab: tab});
+}
+
+// Odpremo folder - na desni prikazemo vprasanja
+function openLibraryFolder(folder_id){
+
+ $('.folder_item').removeClass('active');
+ $('#folder_item_'+folder_id).addClass('active');
+
+ $("#lib_question_list").load('ajax.php?t=libraryBranching&a=displayLibraryQuestionList', {anketa: srv_meta_anketa_id, folder_id: folder_id});
+}
+
+// Razpremo/skrcimo folder na levi
+function expandLibraryFolder(folder_id){
+
+}
+
+// Odpremo popup za dodajanje itema v knjiznico v urejanju ankete
+function displayAddIntoLibraryPopup(){
+
+ $('#fade').fadeTo('slow', 1);
+ $('#general_popup').html('').fadeIn('slow');
+
+ $("#general_popup").load('ajax.php?t=libraryBranching&a=displayAddIntoLibraryPopup', {anketa: srv_meta_anketa_id});
+}
+
+
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 6c7a4c2a3..3ad9f52f0 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -2560,7 +2560,6 @@ function show_tip_preview_toolbox (tip, copy, advanced, podtip) {
$("#tip_preview").css( { "right": ($(window).width()-cnt.left) + "px", "left":"auto", "top":(10+pos.top) + "px" } );
else
$("#tip_preview").css( { "right": ($(window).width()-cnt.left) + "px", "left":"auto", "top":(10+pos.top) + "px" } );
- //$("#tip_preview").css( { "left": (10+pos.left + width) + "px", "right":"auto", "top":(10+pos.top) + "px" } );
// prikažemo glavni div
$("#tip_preview").show();
@@ -3980,17 +3979,13 @@ function dostopAddAccess () {
// Popup z rezultatom (uspesno ali neuspesno dodajanje dostopa)
$('#fade').fadeTo('slow', 1);
- $('#popup_note').html('').fadeIn('slow');
- $("#popup_note").load('ajax.php?a=add_survey_dostop_popup', {addusers:addusers, addusers_note:addusers_note, anketa:srv_meta_anketa_id}, function(){
+ $('#general_popup').html('').fadeIn('slow');
+ $("#general_popup").load('ajax.php?a=add_survey_dostop_popup', {addusers:addusers, addusers_note:addusers_note, anketa:srv_meta_anketa_id}, function(){
// Refresh vsebine v ozadju
$("#globalSetingsList").load('ajax.php?a=refresh_dostop_settings', {anketa:srv_meta_anketa_id});
});
}
-function dostopAddAccessPopupClose(){
- $('#popup_note').fadeOut('slow').html('');
- $('#fade').fadeOut('slow');
-}
function comments_admin_toggle (type) {
if ( $('#comments_admin'+type).attr('admin_on') == 'true' ) {
@@ -5444,13 +5439,8 @@ $(document).ready(function(){
function consultingPopupOpen(){
$('#fade').fadeTo('slow', 1);
- $('#popup_note').html('').fadeIn('slow');
- $("#popup_note").load('ajax.php?a=consulting_popup_open', {anketa: srv_meta_anketa_id});
-}
-function consultingPopupClose(){
-
- $('#popup_note').fadeOut('slow').html('');
- $('#fade').fadeOut('slow');
+ $('#general_popup').html('').fadeIn('slow');
+ $("#general_popup").load('ajax.php?a=consulting_popup_open', {anketa: srv_meta_anketa_id});
}
@@ -5470,14 +5460,10 @@ function CopyToClipboard(copyText){
function popupAlertAll(alert_type){
$('#fade').fadeTo('slow', 1);
- $('#popup_note').html('').fadeIn('slow');
- $("#popup_note").load('ajax.php?a=alert_all_popup', {alert_type:alert_type, anketa:srv_meta_anketa_id});
+ $('#general_popup').html('').fadeIn('slow');
+ $("#general_popup").load('ajax.php?a=alert_all_popup', {alert_type:alert_type, anketa:srv_meta_anketa_id});
}
-function AlertAllPopupClose(){
- $('#popup_note').fadeOut('slow').html('');
- $('#fade').fadeOut('slow');
-}
//Generičen alert popup
function genericAlertPopup(name, optional_parameter){
@@ -5487,15 +5473,14 @@ function genericAlertPopup(name, optional_parameter){
}
$('#fade').fadeTo('slow', 1);
- $('#popup_note').addClass('popup_orange');
- $('#popup_note').html('').fadeIn('slow');
- $("#popup_note").load('ajax.php?a=genericAlertPopup', {name:name, optional_parameter:optional_parameter});
+ $('#general_popup').addClass('popup_orange');
+ $('#general_popup').html('').fadeIn('slow');
+ $("#general_popup").load('ajax.php?a=genericAlertPopup', {name:name, optional_parameter:optional_parameter});
}
-function genericAlertPopupClose(){
- $('#popup_note').fadeOut('slow').html('');
- $('#fade').fadeOut('slow');
- $('#popup_note').removeClass('popup_orange');
+function genericAlertPopupClose(){
+ popupClose();
+ $('#general_popup').removeClass('popup_orange');
}
//Toggle za prikaz nastavitev in opozoril v parapodatkih
@@ -5527,8 +5512,11 @@ function toggleParapodatki(){
$("#connect_identifier_warning").removeClass('displayNone');
else
- $("#connect_identifier_warning").addClass('displayNone');
-
-
-
+ $("#connect_identifier_warning").addClass('displayNone');
+}
+
+
+function popupClose(){
+ $('#general_popup').fadeOut('slow').html('');
+ $('#fade').fadeOut('slow');
}
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 6e4f7d223..3e7167535 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -25,10 +25,7 @@ function vprasanje_fullscreen (spremenljivka, cache, chart_edit, no_close) {
if ( ! (no_close==true) )
close_all_editing();
-
- // zapremo knjiznico
- $('#toolbox_library').hide();
-
+
// ce smo v formi zapremo hitre nastavitve desno zgoraj
$('#form_settings_obvescanje').hide();
$('#email_switch').attr("src", "img_0/plus.png");
@@ -184,9 +181,6 @@ function vprasanje_save (silentsave, spr, callback) {
$('#vprasanje_float_editing').hide().html('');
$(id).removeClass('spr_editing');
-
- // prikazemo knjiznico ce je odprta
- $('#toolbox_library').show();
}
$.post('ajax.php?t=vprasanje&a=vprasanje_save&silentsave='+silentsave, form_serialize, function (data) {
diff --git a/lang/1.php b/lang/1.php
index f772bbd4f..fcec7e8c7 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2366,6 +2366,8 @@ $lang = array (
"srv_concl_link_recnum" => "Recnum responedenta",
"srv_concl_link_datapiping" => "V url lahko vključite tudi vrednosti odgovorov s sintakso #IME_VPRAŠANJA# #QUESTION_NAME#