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

Knjiznica - popravki (obvestilo o dodajanju, preimenovanje vprasanja)

Browse Source
This commit is contained in:
pero1203 2022-03-27 17:21:19 +02:00
parent 9a95e455d8
commit 67ff4277c8
6 changed files with 144 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
admin/survey/classes/class.LibraryBranching.php
View File

@ -481,6 +481,7 @@ class LibraryBranching {
echo ' <div class="item_settings displayNone">';
echo ' <ul>';
echo ' <li onClick="deleteLibraryItem(\''.$spremenljivka['id'].'\', \'1\');">'.$lang['srv_library_delete_q'].'</li>';
echo ' <li onClick="displayRenameLibraryItemPopup(\''.$spremenljivka['id'].'\', \'1\');">'.$lang['srv_library_rename_q'].'</li>';
echo ' </ul>';
echo ' </div>';
}
@ -535,6 +536,7 @@ class LibraryBranching {
echo ' <div class="item_settings displayNone">';
echo ' <ul>';
echo ' <li onClick="deleteLibraryItem(\''.$if['id'].'\', \'2\');">'.$lang['srv_library_delete_'.$type].'</li>';
echo ' <li onClick="displayRenameLibraryItemPopup(\''.$if['id'].'\', \''.$subtype.'\');">'.$lang['srv_library_rename_'.$type].'</li>';
echo ' </ul>';
echo ' </div>';
}
@ -544,6 +546,72 @@ class LibraryBranching {
echo '</div>';
}
/**
* Popup pri preimenovanju itema v knjiznici
*/
private function displayRenameItemPopup($item_id, $type){
global $lang;
global $admin_type;
global $global_user_id;
// Podtip elementa (vprasanje, blok, if...)
if($type == '1'){
// Dobimo naslov
$sql = sisplet_query("SELECT naslov FROM srv_spremenljivka WHERE id='".$item_id."'");
$row = mysqli_fetch_array($sql);
$naslov = strip_tags($row['naslov']);
$subtype = 'q';
}
else{
// Dobimo naslov
$sql = sisplet_query("SELECT label FROM srv_if WHERE id='".$item_id."'");
$row = mysqli_fetch_array($sql);
$naslov = $row['label'];
if($type == '2_2')
$subtype = 'loop';
elseif($type == '2_1')
$subtype = 'block';
else
$subtype = 'if';
}
// Naslov okna glede na tip elementa (vprasanje, blok, if...)
echo '<h2>'.$lang['srv_library_rename_'.$subtype].'</h2>';
// Vsebina
echo '<div>';
echo ' <input type="text" id="lib_element_name" class="large" value="'.$naslov.'">';
echo '</div>';
echo '<div class="button_holder">';
echo ' <button class="medium white-blue" onClick="closeAdditionalPopup();">'.$lang['edit1338'].'</button>';
echo ' <button class="medium blue" onClick="renameLibraryItem(\''.$item_id.'\', \''.$type.'\');">'.$lang['srv_library_rename_'.$subtype].'</button>';
echo '</div>';
}
// Dodaten popup za ime direktorija pri preimenovanju
private function displayRenameQuestionPopup($element_id){
global $lang;
echo '<h2>'.$lang['srv_library_folder_name'].'aaa</h2>';
echo '<div>';
echo ' <input type="text" id="lib_element_name" class="large" value="'.$folder_name.'">';
echo '</div>';
echo '<div class="button_holder">';
echo ' <button class="medium white-blue" onClick="closeAdditionalPopup();">'.$lang['edit1338'].'</button>';
echo ' <button class="medium blue" onClick="renameLibraryElement(\''.$element_id.'\', \''.$type.'\');">'.$lang['srv_library_folder_rename'].'</button>';
echo '</div>';
}
// Prikazemo gumbe
private function displayButtons(){
global $global_user_id;
@ -1012,6 +1080,39 @@ class LibraryBranching {
}
}
}
// Odpremo popup za preimenovanje itema
elseif ($_GET['a'] == 'displayRenameLibraryItemPopup') {
$item_id = $_POST['item_id'];
$type = $_POST['type'];
$this->displayRenameItemPopup($item_id, $type);
}
// Preimenujemo itema
elseif ($_GET['a'] == 'renameItem') {
$item_id = $_POST['item_id'];
$type = $_POST['type'];
$title = $_POST['title'];
$this->folder_id = $_POST['folder_id'];
if($item_id != '' && $item_id > 0){
if($type == '1'){
$s = sisplet_query("UPDATE srv_spremenljivka SET naslov='".$title."' WHERE id='".$item_id."'");
if (!$s) echo mysqli_error($GLOBALS['connect_db']);
}
elseif($type == '2_0' || $type == '2_1' || $type == '2_2'){
$s = sisplet_query("UPDATE srv_if SET label='".$title."' WHERE id='".$item_id."'");
if (!$s) echo mysqli_error($GLOBALS['connect_db']);
}
$this->displayQuestionList();
}
}
// Odpremo popup za dodajanje itema v knjiznico

23
admin/survey/script/library.js
View File

@ -385,7 +385,7 @@ function deleteLibraryFolder(folder_id){
$("#lib_folder_list").load('ajax.php?t=libraryBranching&a=deleteFolder', {anketa: srv_meta_anketa_id, tab: tab, folder_id: folder_id});
}
// Pobrisemo obstojeci folder
// Preimenujemo obstojeci folder
function renameLibraryFolder(folder_id){
var tab = $('#active_tab').val();
@ -458,6 +458,27 @@ function deleteLibraryItem(item_id, item_type){
});
}
// Odpremo popup za dodajanje itema v knjiznico v urejanju ankete
function displayRenameLibraryItemPopup(item_id, type){
var tab = $('#active_tab').val();
$("#lib_additional_popup").fadeIn();
$("#lib_additional_popup").load('ajax.php?t=libraryBranching&a=displayRenameLibraryItemPopup', {anketa: srv_meta_anketa_id, tab: tab, item_id: item_id, type: type});
}
// Preimenujemo obstojeci element
function renameLibraryItem(item_id, type){
var tab = $('#active_tab').val();
var title = $('#lib_element_name').val();
var folder_id = $('.folder_item.active').attr("folder-id");
closeAdditionalPopup();
$("#lib_question_list").load('ajax.php?t=libraryBranching&a=renameItem', {anketa: srv_meta_anketa_id, tab: tab, item_id: item_id, type: type, title: title, folder_id: folder_id});
}
// Funkcija za init drag drop vprasanj v knjiznici
function dropLibraryItem(item_id, item_type, folder_id){

4
lang/1.php
View File

@ -2387,6 +2387,10 @@ $lang = array (
"srv_library_delete_if" => "Odstrani pogoj",
"srv_library_delete_block" => "Odstrani blok",
"srv_library_delete_loop" => "Odstrani zanko",
"srv_library_rename_q" => "Preimenuj vprašanje",
"srv_library_rename_if" => "Preimenuj pogoj",
"srv_library_rename_block" => "Preimenuj blok",
"srv_library_rename_loop" => "Preimenuj zanko",
"srv_library_add_to_lib_title_q" => "Dodaj vprašanje v knjižnico",
"srv_library_add_to_lib_title_if" => "Dodaj pogoj v knjižnico",
"srv_library_add_to_lib_title_block" => "Dodaj blok v knjižnico",

4
lang/2.php
View File

@ -2372,6 +2372,10 @@ $lang = array (
"srv_library_delete_if" => "Remove condition",
"srv_library_delete_block" => "Remove block",
"srv_library_delete_loop" => "Remove loop",
"srv_library_rename_q" => "Rename question",
"srv_library_rename_if" => "Rename condition",
"srv_library_rename_block" => "Rename block",
"srv_library_rename_loop" => "Rename loop",
"srv_library_add_to_lib_title" => "Add to library",
"srv_library_add_to_lib_title_q" => "Add question to library",
"srv_library_add_to_lib_title_if" => "Add condition to library",

25
public/css/admin_new.css
View File

@ -5024,24 +5024,12 @@ readers do not read off random characters that represent icons */
src: url("../fonts/FontAwesome5/fa-solid-900.eot");
src: url("../fonts/FontAwesome5/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../fonts/FontAwesome5/fa-solid-900.woff2") format("woff2"), url("../fonts/FontAwesome5/fa-solid-900.woff") format("woff"), url("../fonts/FontAwesome5/fa-solid-900.ttf") format("truetype"), url("../fonts/FontAwesome5/fa-solid-900.svg#fontawesome") format("svg");
}
@font-face {
font-family: "Font Awesome 5 Brands";
font-style: normal;
font-weight: 400;
src: url("../fonts/FontAwesome5/fa-brands-400.eot");
src: url("../fonts/FontAwesome5/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../fonts/FontAwesome5/fa-brands-400.woff2") format("woff2"), url("../fonts/FontAwesome5/fa-brands-400.woff") format("woff"), url("../fonts/FontAwesome5/fa-brands-400.ttf") format("truetype"), url("../fonts/FontAwesome5/fa-brands-400.svg#fontawesome") format("svg");
}
.fa,
.fas {
font-family: "Font Awesome 5 Free";
font-weight: 900;
}
.fa-brands {
font-family: "Font Awesome 5 Brands";
font-weight: 400;
}
/*!
* Font Awesome Free 5.3.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
@ -5061,6 +5049,11 @@ body {
font-family: Source Sans Pro, sans-serif;
}
.fa-brands {
font-family: "Font Awesome 5 Brands";
font-weight: 400;
}
/*
All colors
*/
@ -6638,7 +6631,7 @@ span.faicon.arhiv_mail::before {
}
span.faicon.share-arrow::before {
content: "\f14d";
content: "";
}
/*
@ -14723,7 +14716,7 @@ and open the template in the editor.
.tab_content .content_right .question_list .question_item_holder .folder_item_info.folder_item_info,
.tab_content .content_right .question_list .folder_item_holder .question_item_info.folder_item_info,
.tab_content .content_right .question_list .folder_item_holder .folder_item_info.folder_item_info {
width: 710px;
width: 730px;
}
.tab_content .content_right .question_list .question_item_holder .question_item_info:hover,
.tab_content .content_right .question_list .question_item_holder .folder_item_info:hover,
@ -14865,6 +14858,7 @@ and open the template in the editor.
}
#lib_additional_popup {
z-index: 9999;
position: absolute !important;
top: 40%;
left: calc(50% - 200px);
@ -22325,6 +22319,9 @@ div.page_diagnostics .time_span {
display: inline-block;
vertical-align: bottom;
}
div.page_diagnostics .time_span.year_2023 {
background-color: #92a9cf;
}
div.page_diagnostics .time_span.year_2022 {
background-color: #f79646;
}

3
resources/sass/admin_new/pages/survey_edit/library.scss
View File

@ -290,7 +290,7 @@
border-radius: 2px;
&.folder_item_info{
width: 710px;
width: 730px;
}
&:hover{
@ -377,6 +377,7 @@
}
#lib_additional_popup{
z-index: 9999;
position: absolute !important;
top: 40%;
left: calc(50% - 200px);