Merge branch 'master' of https://git.1ka.si:/git/1ka
This commit is contained in:
commit
50e2a7b780
@ -379,6 +379,9 @@ class SurveyAdmin
|
|||||||
echo ' <span class="text">'.$lang['srv_saving'].'</span>';
|
echo ' <span class="text">'.$lang['srv_saving'].'</span>';
|
||||||
echo ' </div> <!-- /loading -->';
|
echo ' </div> <!-- /loading -->';
|
||||||
|
|
||||||
|
// Obvestilo o akciji (success...) spodaj levo
|
||||||
|
echo ' <div id="action_note_holder"></div>';
|
||||||
|
|
||||||
echo ' <div id="clipboard">';
|
echo ' <div id="clipboard">';
|
||||||
$this->clipboard_display();
|
$this->clipboard_display();
|
||||||
echo ' </div> <!-- /clipboard -->';
|
echo ' </div> <!-- /clipboard -->';
|
||||||
|
@ -6428,33 +6428,33 @@ class SurveyAdminAjax {
|
|||||||
|
|
||||||
// Alert na vsa vprašanja - popup
|
// Alert na vsa vprašanja - popup
|
||||||
private function ajax_alert_all_popup(){
|
private function ajax_alert_all_popup(){
|
||||||
global $lang;
|
global $lang;
|
||||||
|
|
||||||
$alert_type = $_POST['alert_type'];
|
$alert_type = $_POST['alert_type'];
|
||||||
|
|
||||||
|
|
||||||
// Vsebina popupa
|
// Vsebina popupa
|
||||||
echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
|
echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
|
||||||
|
|
||||||
echo '<h2>'.$lang['srv_'.$alert_type.'_reminder_all'].'</h2>';
|
echo '<h2>'.$lang['srv_'.$alert_type.'_reminder_all'].'</h2>';
|
||||||
|
|
||||||
echo '<div class="popup_content">';
|
echo '<div class="popup_content">';
|
||||||
echo $lang['srv_reminder_popup_warning'];
|
echo $lang['srv_reminder_popup_warning'];
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
|
||||||
echo '<div class="buttons_holder">';
|
echo '<div class="buttons_holder">';
|
||||||
echo '<span class="buttonwrapper floatRight" style="margin:3px" title="'.$lang['srv_zapri']
|
echo '<span class="buttonwrapper floatRight" style="margin:3px" title="'.$lang['srv_zapri']
|
||||||
.'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="popupClose(); return false;"><span>'
|
.'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="popupClose(); return false;"><span>'
|
||||||
.$lang['srv_zapri'].'</span></a></span>';
|
.$lang['srv_zapri'].'</span></a></span>';
|
||||||
echo '<span class="buttonwrapper floatRight" style="margin:3px" title="'.$lang['srv_tip_sample_t6_8_o2']
|
echo '<span class="buttonwrapper floatRight" style="margin:3px" title="'.$lang['srv_tip_sample_t6_8_o2']
|
||||||
.'"><a class="ovalbutton ovalbutton_gray" href="ajax.php?a=reminder_all&what='.$alert_type.'&anketa='.$this->anketa.'"><span>'
|
.'"><a class="ovalbutton ovalbutton_gray" href="ajax.php?a=reminder_all&what='.$alert_type.'&anketa='.$this->anketa.'"><span>'
|
||||||
.$lang['srv_tip_sample_t6_8_o2'].'</span></a></span>';
|
.$lang['srv_tip_sample_t6_8_o2'].'</span></a></span>';
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generičen alert popup
|
// Generičen alert popup
|
||||||
private function ajax_genericAlertPopup(){
|
private function ajax_genericAlertPopup(){
|
||||||
global $lang;
|
global $lang;
|
||||||
|
|
||||||
$name = $_POST['name'];
|
$name = $_POST['name'];
|
||||||
$optional_parameter = $_POST['optional_parameter'];
|
$optional_parameter = $_POST['optional_parameter'];
|
||||||
@ -6709,6 +6709,29 @@ class SurveyAdminAjax {
|
|||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Generičen popup spodaj levo
|
||||||
|
private function ajax_actionNotePopup(){
|
||||||
|
global $lang;
|
||||||
|
|
||||||
|
$name = $_POST['name'];
|
||||||
|
$type = $_POST['type'];
|
||||||
|
|
||||||
|
if($type == 'error'){
|
||||||
|
$icon = 'close';
|
||||||
|
}
|
||||||
|
elseif($type == 'success'){
|
||||||
|
$icon = 'success';
|
||||||
|
}
|
||||||
|
|
||||||
|
echo '<div class="action_note_box '.$type.'">';
|
||||||
|
|
||||||
|
echo ' <span class="faicon '.$type.'"></span>';
|
||||||
|
echo ' <span class="text">'.$lang['action_note_'.$name].'</span>';
|
||||||
|
echo ' <span class="close" onClick="actionNotePopupClose();">✕</span>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
@ -9,7 +9,7 @@ class LibraryBranching {
|
|||||||
var $folder_id = 0; // Trenutno aktiven folder
|
var $folder_id = 0; // Trenutno aktiven folder
|
||||||
var $expanded_folders = array(); // Razprti folderji
|
var $expanded_folders = array(); // Razprti folderji
|
||||||
|
|
||||||
var $root_folder;
|
var $root_folder = array(); // Root folderji (sistemski in uporabnikov)
|
||||||
var $folder_structure = array(); // Struktura direktorijev uporabnika
|
var $folder_structure = array(); // Struktura direktorijev uporabnika
|
||||||
|
|
||||||
|
|
||||||
@ -135,12 +135,14 @@ class LibraryBranching {
|
|||||||
|
|
||||||
if (!container.is(e.target) && container.has(e.target).length === 0){
|
if (!container.is(e.target) && container.has(e.target).length === 0){
|
||||||
$(".folder_item_settings").addClass("displayNone");
|
$(".folder_item_settings").addClass("displayNone");
|
||||||
|
$(".dots_ver_folder").removeClass("active");
|
||||||
}
|
}
|
||||||
|
|
||||||
var container2 = $(".item_settings, .dots_ver");
|
var container2 = $(".item_settings, .dots_ver");
|
||||||
|
|
||||||
if (!container.is(e.target) && container.has(e.target).length === 0){
|
if (!container.is(e.target) && container.has(e.target).length === 0){
|
||||||
$(".item_settings").addClass("displayNone");
|
$(".item_settings").addClass("displayNone");
|
||||||
|
$(".dots_ver_item").removeClass("active");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -196,8 +198,9 @@ class LibraryBranching {
|
|||||||
while ($rowFolders = mysqli_fetch_array($sqlFolders)) {
|
while ($rowFolders = mysqli_fetch_array($sqlFolders)) {
|
||||||
|
|
||||||
// Nastavimo default prvi aktiven folder
|
// Nastavimo default prvi aktiven folder
|
||||||
if($this->folder_id == 0 && $parent == 0){
|
if($this->folder_id == 0 && $parent == 0 && $uid == 0){
|
||||||
$this->folder_id = $rowFolders['id'];
|
$this->folder_id = $rowFolders['id'];
|
||||||
|
$this->setExpandedFolders($this->folder_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->displayFolderItem($rowFolders['id'], $rowFolders['naslov'], $uid);
|
$this->displayFolderItem($rowFolders['id'], $rowFolders['naslov'], $uid);
|
||||||
@ -253,14 +256,14 @@ class LibraryBranching {
|
|||||||
// Urejanje folderja
|
// Urejanje folderja
|
||||||
if($uid != 0 || $admin_type == 0){
|
if($uid != 0 || $admin_type == 0){
|
||||||
// Tri pikice za prikaz urejanja folderja
|
// Tri pikice za prikaz urejanja folderja
|
||||||
echo ' <span class="faicon dots_ver" onClick="showLibraryFolderEdit(this);"></span>';
|
echo ' <span class="faicon dots_ver dots_ver_folder" onClick="showLibraryFolderEdit(this);"></span>';
|
||||||
|
|
||||||
// Skrit div za urejanje folderja
|
// Skrit div za urejanje folderja
|
||||||
echo ' <div class="folder_item_settings displayNone">';
|
echo ' <div class="folder_item_settings displayNone">';
|
||||||
echo ' <ul>';
|
echo ' <ul>';
|
||||||
echo ' <li onClick="displayAddFolderPopup(\''.$id.'\', \''.$uid.'\');">'.$lang['srv_library_folder_add'].'</li>';
|
echo ' <li onClick="displayAddFolderPopup(\''.$id.'\', \''.$uid.'\');">'.$lang['srv_library_folder_add'].'</li>';
|
||||||
echo ' <li onClick="displayRenameFolderPopup(\''.$id.'\', \''.$title.'\');">'.$lang['srv_library_folder_rename'].'</li>';
|
echo ' <li onClick="displayRenameFolderPopup(\''.$id.'\', \''.$title.'\');">'.$lang['srv_library_folder_rename'].'</li>';
|
||||||
if($id != $this->root_folder)
|
if($id != $this->root_folder['user'])
|
||||||
echo ' <li onClick="deleteLibraryFolder(\''.$id.'\');">'.$lang['srv_library_folder_delete'].'</li>';
|
echo ' <li onClick="deleteLibraryFolder(\''.$id.'\');">'.$lang['srv_library_folder_delete'].'</li>';
|
||||||
echo ' </ul>';
|
echo ' </ul>';
|
||||||
echo ' </div>';
|
echo ' </div>';
|
||||||
@ -330,6 +333,12 @@ class LibraryBranching {
|
|||||||
if($this->folder_id == 0)
|
if($this->folder_id == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
||||||
|
// Naslov trenutnega folderja
|
||||||
|
$sqlCurrentFolder = sisplet_query("SELECT naslov FROM srv_library_folder WHERE id='".$this->folder_id."'");
|
||||||
|
$rowCurrentFolder = mysqli_fetch_array($sqlCurrentFolder);
|
||||||
|
echo '<div class="folder_title"><span class="faicon folder"></span>'.$rowCurrentFolder['naslov'].'</div>';
|
||||||
|
|
||||||
|
|
||||||
// Seznam vprasanj iz anket v knjiznici
|
// Seznam vprasanj iz anket v knjiznici
|
||||||
if($this->tab == 1){
|
if($this->tab == 1){
|
||||||
@ -344,24 +353,35 @@ class LibraryBranching {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
echo '<div class="spacer"></div>';
|
||||||
|
|
||||||
$sqlFolderSurveys = sisplet_query("SELECT a.id, a.naslov FROM srv_anketa a, srv_library_anketa l WHERE a.id=l.ank_id AND l.folder='".$this->folder_id."' ORDER BY naslov ASC");
|
$sqlFolderSurveys = sisplet_query("SELECT a.id, a.naslov FROM srv_anketa a, srv_library_anketa l WHERE a.id=l.ank_id AND l.folder='".$this->folder_id."' ORDER BY naslov ASC");
|
||||||
while ($rowFolderSurveys = mysqli_fetch_array($sqlFolderSurveys)) {
|
while ($rowFolderSurveys = mysqli_fetch_array($sqlFolderSurveys)) {
|
||||||
|
|
||||||
// Naslov ankete
|
// Naslov ankete
|
||||||
echo '<div class="survey_title">'.$rowFolderSurveys['naslov'].'</div>';
|
echo '<div id="survey_title_'.$rowFolderSurveys['id'].'" class="survey_title" onClick="toggleLibrarySurveyQuestions(\''.$rowFolderSurveys['id'].'\');">';
|
||||||
|
echo ' <span class="faicon clipboard"></span>';
|
||||||
|
echo ' <span class="title">'.$rowFolderSurveys['naslov'].'</span>';
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
|
|
||||||
|
// Seznam vprasanj v anketi
|
||||||
|
echo '<div id="survey_questions_'.$rowFolderSurveys['id'].'" class="survey_questions">';
|
||||||
|
|
||||||
$sqlQuestions = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$rowFolderSurveys['id']."' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
|
$sqlQuestions = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$rowFolderSurveys['id']."' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
|
||||||
while ($rowQuestions = mysqli_fetch_array($sqlQuestions)) {
|
while ($rowQuestions = mysqli_fetch_array($sqlQuestions)) {
|
||||||
|
|
||||||
$this->displayRightQuestionItem($rowQuestions);
|
$this->displayRightQuestionItem($rowQuestions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Seznam vprasanj iz knjiznice
|
// Seznam vprasanj iz knjiznice
|
||||||
else{
|
else{
|
||||||
|
|
||||||
// Najprej zlistamo vse child folderje
|
// Najprej zlistamo vse child folderje
|
||||||
/*$sqlFolders = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE parent='".$this->folder_id."' AND tip='".$this->tab."' ORDER BY naslov");
|
$sqlFolders = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE parent='".$this->folder_id."' AND tip='".$this->tab."' ORDER BY naslov");
|
||||||
if (mysqli_num_rows($sqlFolders) > 0){
|
if (mysqli_num_rows($sqlFolders) > 0){
|
||||||
|
|
||||||
// Loop po vseh mapah znotraj parenta
|
// Loop po vseh mapah znotraj parenta
|
||||||
@ -370,7 +390,7 @@ class LibraryBranching {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '<div class="survey_title"></div>';*/
|
echo '<div class="spacer"></div>';
|
||||||
|
|
||||||
$allow_edit = true;
|
$allow_edit = true;
|
||||||
|
|
||||||
@ -414,7 +434,7 @@ class LibraryBranching {
|
|||||||
|
|
||||||
// Naslov ankete
|
// Naslov ankete
|
||||||
SurveyInfo :: getInstance()->SurveyInit($this->folder_id);
|
SurveyInfo :: getInstance()->SurveyInit($this->folder_id);
|
||||||
echo '<div class="survey_title">'.SurveyInfo::getSurveyTitle().'</div>';
|
echo '<div class="folder_title"><span class="faicon folder"></span>'.SurveyInfo::getSurveyTitle().'</div>';
|
||||||
|
|
||||||
$sqlQuestions = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$this->folder_id."' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
|
$sqlQuestions = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$this->folder_id."' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
|
||||||
while ($rowQuestions = mysqli_fetch_array($sqlQuestions)) {
|
while ($rowQuestions = mysqli_fetch_array($sqlQuestions)) {
|
||||||
@ -455,7 +475,7 @@ class LibraryBranching {
|
|||||||
if($this->tab == '0' && ($spremenljivka['folder_uid'] == $global_user_id || $admin_type == 0)){
|
if($this->tab == '0' && ($spremenljivka['folder_uid'] == $global_user_id || $admin_type == 0)){
|
||||||
|
|
||||||
// Tri pikice za prikaz urejanja vprasanja
|
// Tri pikice za prikaz urejanja vprasanja
|
||||||
echo ' <span class="faicon dots_ver" onClick="showLibraryItemEdit(this);"></span>';
|
echo ' <span class="faicon dots_ver dots_ver_item" onClick="showLibraryItemEdit(this);"></span>';
|
||||||
|
|
||||||
// Skrit div za urejanje vprasanja
|
// Skrit div za urejanje vprasanja
|
||||||
echo ' <div class="item_settings displayNone">';
|
echo ' <div class="item_settings displayNone">';
|
||||||
@ -506,7 +526,7 @@ class LibraryBranching {
|
|||||||
if($this->tab == '0' && ($if['folder_uid'] == $global_user_id || $admin_type == 0)){
|
if($this->tab == '0' && ($if['folder_uid'] == $global_user_id || $admin_type == 0)){
|
||||||
|
|
||||||
// Tri pikice za prikaz urejanja folderja
|
// Tri pikice za prikaz urejanja folderja
|
||||||
echo ' <span class="faicon dots_ver" onClick="showLibraryItemEdit(this);"></span>';
|
echo ' <span class="faicon dots_ver dots_ver_item" onClick="showLibraryItemEdit(this);"></span>';
|
||||||
|
|
||||||
// Skrit div za urejanje folderja
|
// Skrit div za urejanje folderja
|
||||||
echo ' <div class="item_settings displayNone">';
|
echo ' <div class="item_settings displayNone">';
|
||||||
@ -665,11 +685,12 @@ class LibraryBranching {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Dobimo root folder uporabnika
|
// Dobimo sistemski root folder in root folder uporabnika
|
||||||
private function getRootFolder(){
|
private function setRootFolders(){
|
||||||
global $global_user_id;
|
global $global_user_id;
|
||||||
global $lang;
|
global $lang;
|
||||||
|
|
||||||
|
// Root folder uporabnika
|
||||||
$sqlFolder = sisplet_query("SELECT id FROM srv_library_folder WHERE uid='".$global_user_id."' AND parent='0' AND tip='".$this->tab."' AND lang='".$lang['id']."'");
|
$sqlFolder = sisplet_query("SELECT id FROM srv_library_folder WHERE uid='".$global_user_id."' AND parent='0' AND tip='".$this->tab."' AND lang='".$lang['id']."'");
|
||||||
|
|
||||||
// Za prvic ko pride user, da mu dodamo folder
|
// Za prvic ko pride user, da mu dodamo folder
|
||||||
@ -684,14 +705,19 @@ class LibraryBranching {
|
|||||||
('".$global_user_id."', '".$this->tab."', '".$naslov."', '0', '".$lang['id']."')
|
('".$global_user_id."', '".$this->tab."', '".$naslov."', '0', '".$lang['id']."')
|
||||||
");
|
");
|
||||||
|
|
||||||
$root_folder_id = mysqli_insert_id($GLOBALS['connect_db']);
|
$this->root_folder['user'] = mysqli_insert_id($GLOBALS['connect_db']);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
$rowFolder = mysqli_fetch_array($sqlFolder);
|
$rowFolder = mysqli_fetch_array($sqlFolder);
|
||||||
$root_folder_id = $rowFolder['id'];
|
$this->root_folder['user'] = $rowFolder['id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
return $root_folder_id;
|
|
||||||
|
// Sistemski root folder
|
||||||
|
$sqlFolder = sisplet_query("SELECT id FROM srv_library_folder WHERE uid='0' AND parent='0' AND tip='".$this->tab."' AND lang='".$lang['id']."'");
|
||||||
|
$rowFolder = mysqli_fetch_array($sqlFolder);
|
||||||
|
|
||||||
|
$this->root_folder['system'] = $rowFolder['id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Seznam folderjev uporabnika
|
// Seznam folderjev uporabnika
|
||||||
@ -733,8 +759,8 @@ class LibraryBranching {
|
|||||||
|
|
||||||
$this->tab = (isset($_POST['tab'])) ? (int)$_POST['tab'] : 0;
|
$this->tab = (isset($_POST['tab'])) ? (int)$_POST['tab'] : 0;
|
||||||
|
|
||||||
// Nastavimo uporabnikov root folder
|
// Nastavimo root folder
|
||||||
$this->root_folder = $this->getRootFolder();
|
$this->setRootFolders();
|
||||||
|
|
||||||
|
|
||||||
// Odpremo popup s knjiznico
|
// Odpremo popup s knjiznico
|
||||||
@ -1003,7 +1029,7 @@ class LibraryBranching {
|
|||||||
$folder_id = $_POST['folder_id'];
|
$folder_id = $_POST['folder_id'];
|
||||||
|
|
||||||
if($folder_id == '' || $folder_id == 0)
|
if($folder_id == '' || $folder_id == 0)
|
||||||
$folder_id = $this->root_folder;
|
$folder_id = $this->root_folder['user'];
|
||||||
|
|
||||||
if ($item_id > 0) {
|
if ($item_id > 0) {
|
||||||
|
|
||||||
@ -1021,10 +1047,10 @@ class LibraryBranching {
|
|||||||
sisplet_query("UPDATE srv_if SET folder='".$folder_id."', label='".$title."' WHERE id='".$id."'");
|
sisplet_query("UPDATE srv_if SET folder='".$folder_id."', label='".$title."' WHERE id='".$id."'");
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->displayAddIntoLibrarySuccess($item_id, $type, $success=true);
|
//$this->displayAddIntoLibrarySuccess($item_id, $type, $success=true);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
$this->displayAddIntoLibrarySuccess($item_id, $type, $success=false);
|
//$this->displayAddIntoLibrarySuccess($item_id, $type, $success=false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -329,11 +329,15 @@ function showLibraryFolderEdit(element){
|
|||||||
|
|
||||||
if($(element).parent().find('.folder_item_settings').hasClass('displayNone')){
|
if($(element).parent().find('.folder_item_settings').hasClass('displayNone')){
|
||||||
$('.folder_item_settings').addClass('displayNone');
|
$('.folder_item_settings').addClass('displayNone');
|
||||||
|
$('.dots_ver_folder').removeClass('active');
|
||||||
$(element).parent().find('.folder_item_settings').removeClass('displayNone');
|
$(element).parent().find('.folder_item_settings').removeClass('displayNone');
|
||||||
|
$(element).addClass('active');
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
$('.folder_item_settings').addClass('displayNone');
|
$('.folder_item_settings').addClass('displayNone');
|
||||||
|
$('.dots_ver_folder').removeClass('active');
|
||||||
$(element).parent().find('.folder_item_settings').addClass('displayNone');
|
$(element).parent().find('.folder_item_settings').addClass('displayNone');
|
||||||
|
$(element).removeClass('active');
|
||||||
}
|
}
|
||||||
|
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
@ -391,6 +395,19 @@ function renameLibraryFolder(folder_id){
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Klik na posamezno anketo - prikazemo/skrijemo vprasanja na desni znotraj ankete (desni tab)
|
||||||
|
function toggleLibrarySurveyQuestions(folder_id){
|
||||||
|
|
||||||
|
if($('#survey_title_'+folder_id).hasClass('active')){
|
||||||
|
$('#survey_title_'+folder_id).removeClass('active');
|
||||||
|
$('#survey_questions_'+folder_id).hide();
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$('#survey_title_'+folder_id).addClass('active');
|
||||||
|
$('#survey_questions_'+folder_id).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Klik na posamezen item na desni
|
// Klik na posamezen item na desni
|
||||||
function selectLibraryItem(item_id){
|
function selectLibraryItem(item_id){
|
||||||
|
|
||||||
@ -413,10 +430,13 @@ function showLibraryItemEdit(element){
|
|||||||
|
|
||||||
if($(element).parent().find('.item_settings').hasClass('displayNone')){
|
if($(element).parent().find('.item_settings').hasClass('displayNone')){
|
||||||
$('.item_settings').addClass('displayNone');
|
$('.item_settings').addClass('displayNone');
|
||||||
|
$('.dots_ver_item').removeClass('active');
|
||||||
$(element).parent().find('.item_settings').removeClass('displayNone');
|
$(element).parent().find('.item_settings').removeClass('displayNone');
|
||||||
|
$(element).addClass('active');
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
$('.item_settings').addClass('displayNone');
|
$('.item_settings').addClass('displayNone');
|
||||||
|
$('.dots_ver_item').removeClass('active');
|
||||||
$(element).parent().find('.item_settings').addClass('displayNone');
|
$(element).parent().find('.item_settings').addClass('displayNone');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -489,11 +509,13 @@ function insertLibraryItemsIntoSurvey(){
|
|||||||
var type = $(this).attr("item-type");
|
var type = $(this).attr("item-type");
|
||||||
|
|
||||||
items.push(id + '_' + type);
|
items.push(id + '_' + type);
|
||||||
});
|
});
|
||||||
|
|
||||||
popupClose();
|
|
||||||
|
|
||||||
$("#branching").load('ajax.php?t=libraryBranching&a=addIntoSurvey', {anketa: srv_meta_anketa_id, items: items});
|
$("#branching").load('ajax.php?t=libraryBranching&a=addIntoSurvey', {anketa: srv_meta_anketa_id, items: items}, function(){
|
||||||
|
|
||||||
|
popupClose();
|
||||||
|
actionNotePopup('lib_add_to_survey', 'success');
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -512,5 +534,10 @@ function addIntoLibrary(item_id, type){
|
|||||||
var title = $('#lib_item_title').val();
|
var title = $('#lib_item_title').val();
|
||||||
var folder_id = $('#lib_item_folder').val();
|
var folder_id = $('#lib_item_folder').val();
|
||||||
|
|
||||||
$("#general_popup").load('ajax.php?t=libraryBranching&a=addIntoLibrary', {anketa: srv_meta_anketa_id, item_id:item_id, type:type, title:title, folder_id:folder_id});
|
//$("#general_popup").load('ajax.php?t=libraryBranching&a=addIntoLibrary', {anketa: srv_meta_anketa_id, item_id:item_id, type:type, title:title, folder_id:folder_id});
|
||||||
|
$.post('ajax.php?t=libraryBranching&a=addIntoLibrary', {anketa: srv_meta_anketa_id, item_id:item_id, type:type, title:title, folder_id:folder_id}, function(){
|
||||||
|
|
||||||
|
popupClose();
|
||||||
|
actionNotePopup('lib_add_to_lib_type'+type, 'success');
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
@ -3700,6 +3700,7 @@ function updateManual1() {
|
|||||||
$("#radioManual1").attr("checked", "checked");
|
$("#radioManual1").attr("checked", "checked");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SE POBRIŠE IN UPORABI "actionNotePopup"!!
|
||||||
function show_success_save(timeout){
|
function show_success_save(timeout){
|
||||||
|
|
||||||
if (timeout == undefined)
|
if (timeout == undefined)
|
||||||
@ -5521,6 +5522,27 @@ function popupClose(){
|
|||||||
$('#fade').fadeOut('slow');
|
$('#fade').fadeOut('slow');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Note popup spodaj levo
|
||||||
|
function actionNotePopup(name, type){
|
||||||
|
|
||||||
|
$('#action_note_holder').html('').load('ajax.php?a=actionNotePopup', {name:name, type:type}, function(){
|
||||||
|
|
||||||
|
setTimeout(function(){
|
||||||
|
actionNotePopupClose();
|
||||||
|
}, 10000);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Zapri note popup spodaj levo
|
||||||
|
function actionNotePopupClose(){
|
||||||
|
|
||||||
|
$('.action_note_box').fadeOut(function(){
|
||||||
|
$('#action_note_holder').html('');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// SE POBRIŠE IN UPORABI "actionNotePopup"!!
|
||||||
function show_success_copy(timeout){
|
function show_success_copy(timeout){
|
||||||
|
|
||||||
if (timeout == undefined)
|
if (timeout == undefined)
|
||||||
@ -5529,4 +5551,4 @@ function show_success_copy(timeout){
|
|||||||
$('#success_copy').load('ajax.php?a=display_success_copy').show();
|
$('#success_copy').load('ajax.php?a=display_success_copy').show();
|
||||||
|
|
||||||
setTimeout(function() {$('#success_copy').animate({opacity:0})}, timeout);
|
setTimeout(function() {$('#success_copy').animate({opacity:0})}, timeout);
|
||||||
}
|
}
|
||||||
|
@ -8451,6 +8451,11 @@ $lang = array (
|
|||||||
'alert_missing_arguments' => "Manjkajoči argumenti! Plugin: dataHolder",
|
'alert_missing_arguments' => "Manjkajoči argumenti! Plugin: dataHolder",
|
||||||
|
|
||||||
|
|
||||||
|
// Besedila popupa levo spodaj (obvestilo o akciji)
|
||||||
|
"action_note_lib_add_to_lib_type1" => "Vprašanje je bilo dodano v knjižnico",
|
||||||
|
"action_note_lib_add_to_lib_type2" => "Blok je bil dodan v knjižnico",
|
||||||
|
"action_note_lib_add_to_survey" => "Elementi so bili dodani v anketo",
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -8346,6 +8346,11 @@ GDPR introduction preview",
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// Besedila popupa levo spodaj (obvestilo o akciji)
|
||||||
|
"action_note_lib_add_to_lib_type1" => "Question added to library",
|
||||||
|
"action_note_lib_add_to_lib_type2" => "Block added to library",
|
||||||
|
"action_note_lib_add_to_survey" => "Question added to survey",
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -17,6 +17,11 @@ span.faicon.minus::before{
|
|||||||
content: "\f068";
|
content: "\f068";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Kljukica
|
||||||
|
span.faicon.success::before,
|
||||||
|
span.circle-check::before{
|
||||||
|
content: "\f058";
|
||||||
|
}
|
||||||
span.faicon.close::before{
|
span.faicon.close::before{
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
@ -679,9 +684,3 @@ span.faicon.list::before{
|
|||||||
span.faicon.link-chain::before{
|
span.faicon.link-chain::before{
|
||||||
content: "\f0c1";
|
content: "\f0c1";
|
||||||
}
|
}
|
||||||
|
|
||||||
//Check circle
|
|
||||||
span.circle-check::before{
|
|
||||||
content: "\f058";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -93,8 +93,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
ul{
|
ul{
|
||||||
|
margin-bottom: 8px;
|
||||||
|
|
||||||
li{
|
li{
|
||||||
|
margin-bottom: 4px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,3 +54,85 @@ body.waitlong {
|
|||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Action spodaj desno (npr. uspesno kopiranje...) */
|
||||||
|
#action_note_holder {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column-reverse;
|
||||||
|
|
||||||
|
z-index: 900;
|
||||||
|
position: fixed;
|
||||||
|
bottom: 16px;
|
||||||
|
left: 16px;
|
||||||
|
|
||||||
|
.action_note_box{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
position: relative;
|
||||||
|
box-sizing: border-box;
|
||||||
|
width: 275px;
|
||||||
|
height: 38px;
|
||||||
|
padding: 0 16px;
|
||||||
|
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
background-color: $white;
|
||||||
|
border: 1px solid $blue;
|
||||||
|
border-radius: 2px;
|
||||||
|
|
||||||
|
&.success{
|
||||||
|
border-color: $blue;
|
||||||
|
|
||||||
|
.faicon:before{
|
||||||
|
color: $blue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.error{
|
||||||
|
border-color: $red;
|
||||||
|
|
||||||
|
.faicon:before{
|
||||||
|
color: $red;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
span.faicon{
|
||||||
|
margin-right: 8px;
|
||||||
|
|
||||||
|
&::before{
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
span.text{
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close{
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
position: absolute !important;
|
||||||
|
top: 10px;
|
||||||
|
right: 10px;
|
||||||
|
z-index: 9999;
|
||||||
|
|
||||||
|
font-size: 12px !important;
|
||||||
|
color: $very-dark-gray;
|
||||||
|
|
||||||
|
&:hover{
|
||||||
|
color: $black;
|
||||||
|
}
|
||||||
|
|
||||||
|
span{
|
||||||
|
color: $very-dark-gray;
|
||||||
|
text-decoration: none;
|
||||||
|
|
||||||
|
&:hover{
|
||||||
|
color: $black;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -134,6 +134,12 @@
|
|||||||
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
|
padding: 7px 8px;
|
||||||
|
margin-right: 0;
|
||||||
|
|
||||||
|
&.active{
|
||||||
|
display: block !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.folder_item_settings{
|
.folder_item_settings{
|
||||||
@ -168,6 +174,22 @@
|
|||||||
|
|
||||||
width: 760px;
|
width: 760px;
|
||||||
|
|
||||||
|
.folder_title{
|
||||||
|
margin-bottom: 16px;
|
||||||
|
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 700;
|
||||||
|
|
||||||
|
.faicon{
|
||||||
|
margin-right: 8px;
|
||||||
|
color: $blue;
|
||||||
|
|
||||||
|
&:before{
|
||||||
|
font-size: 18px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.question_list{
|
.question_list{
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@ -179,15 +201,55 @@
|
|||||||
|
|
||||||
border-bottom: 1px $gray solid;
|
border-bottom: 1px $gray solid;
|
||||||
|
|
||||||
.survey_title{
|
.spacer{
|
||||||
margin: 16px 0 8px 0;
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
font-weight: 600;
|
.survey_title{
|
||||||
text-transform: uppercase;
|
cursor: pointer;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
box-sizing: border-box;
|
||||||
|
min-height: 36px;
|
||||||
|
max-width: 100%;
|
||||||
|
width: 710px;
|
||||||
|
padding: 0 16px;
|
||||||
|
margin: 0 0 8px 0;
|
||||||
|
|
||||||
|
border: 1px $gray solid;
|
||||||
|
border-radius: 2px;
|
||||||
|
|
||||||
&:first-child{
|
&:first-child{
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&:hover{
|
||||||
|
background-color: $light-gray;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.active{
|
||||||
|
border-color: $blue;
|
||||||
|
|
||||||
|
.faicon:before{
|
||||||
|
color: $blue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
span{
|
||||||
|
margin-right: 8px;
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
&.faicon:before{
|
||||||
|
color: $dark-gray2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.survey_questions{
|
||||||
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.question_item_holder,
|
.question_item_holder,
|
||||||
@ -261,10 +323,20 @@
|
|||||||
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
|
padding: 7px 8px;
|
||||||
|
margin-right: 0;
|
||||||
|
|
||||||
&:before{
|
&:before{
|
||||||
color: $black;
|
color: $black;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.active{
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.folder_empty:before{
|
||||||
|
color: $dark-gray2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item_settings{
|
.item_settings{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user