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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
urospodkriznik 2022-09-13 17:24:14 +02:00
commit 3604ac6c25
8 changed files with 1535 additions and 1543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/survey/BranchingAjax.php
View File

@ -2258,7 +2258,16 @@ class BranchingAjax {
$rowanketa = SurveyInfo::getInstance()->getSurveyRow(); $rowanketa = SurveyInfo::getInstance()->getSurveyRow();
echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'.$type.''].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
$tip_lang = '';
if ($type == 1 && $view == 4) //splošen komentar na strani testiranje
$tip_lang = 'S';
if ($type == 0 && $view == 1) //splošen komentar v dropdownu
$tip_lang = 'S';
if ($spremenljivka != 0) //komentar na vprašanja
$tip_lang = 'Q';
echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'.$tip_lang.''].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
if ($buttons) { if ($buttons) {
echo '<div class="button_holder bottom0">'; echo '<div class="button_holder bottom0">';

73
admin/survey/SurveyAdminSettings.php
View File

@ -6890,19 +6890,6 @@ class SurveyAdminSettings {
echo '</div>'; echo '</div>';
// Dodajanje novega komentarja
echo '<div id="comment_toggle_0_4" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_4\')">';
echo $lang['srv_add_comment_toggle'];
echo '</div>';
echo '<div class="comment_wrapper" id="comment_wrapper_0_4">';
echo '<div class="new_comment" id="survey_comment_0_4">';
$ba = new BranchingAjax($this->anketa);
$ba->add_comment_field(0, '1', '4', false);
echo '</div>';
echo '</div>';
$sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]' ".$only_unresolved." "); $sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]' ".$only_unresolved." ");
$rows = (mysqli_num_rows($sql) == 0) ? 0 : mysqli_num_rows($sql) - 1; $rows = (mysqli_num_rows($sql) == 0) ? 0 : mysqli_num_rows($sql) - 1;
if ($rows > 0){ if ($rows > 0){
@ -6994,6 +6981,20 @@ class SurveyAdminSettings {
} }
} }
// Dodajanje novega komentarja
echo '<div id="comment_toggle_0_4" class="add_comment_toggle pointer" onClick="toggleAddComment(\'0_4\')">';
echo '<span class="faicon inline_comment link-right"></span>';
echo $lang['srv_survey_general_comment'];
echo '</div>';
echo '<div class="comment_wrapper" id="comment_wrapper_0_4">';
echo '<div class="new_comment" id="survey_comment_0_4">';
$ba = new BranchingAjax($this->anketa);
$ba->add_comment_field(0, '1', '4', false);
echo '</div>';
echo '</div>';
echo '</div>'; echo '</div>';
@ -7103,19 +7104,6 @@ class SurveyAdminSettings {
echo '<p class="bottom16">'.$lang['srv_no_comments'].'</p>'; echo '<p class="bottom16">'.$lang['srv_no_comments'].'</p>';
} }
} }
/* Dodajanje novega komentarja
echo '<div id="comment_toggle_0_5" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_5\')">';
echo $lang['srv_add_comment_toggle'];
echo '</div>';
echo '<div class="comment_wrapper" id="comment_wrapper_0_5">';
echo '<div class="new_comment" id="survey_comment_0_5">';
$ba = new BranchingAjax($this->anketa);
$ba->add_comment_field(0, '4', '5', false);
echo '</div>';
echo '</div>';*/
echo '</div>'; echo '</div>';
echo '</div>'; // div.komentarji_anketa_holder echo '</div>'; // div.komentarji_anketa_holder
@ -7696,21 +7684,6 @@ class SurveyAdminSettings {
echo '</div>'; echo '</div>';
if ($addfieldposition == '' || $addfieldposition == 0) {
echo '<div id="comment_toggle_'.$spr_id.'_'.'4'.'" class="add_comment_toggle" onClick="toggleAddComment(\''.$spr_id.'_'.'4'.'\')">';
echo $lang['srv_add_comment_toggle'];
echo '</div>';
echo '<div class="comment_wrapper" id="comment_wrapper_'.$spr_id.'_'.'4'.'">';
echo '<div class="new_comment" id="survey_comment_'.$spr_id.'_'.'4'.'">';
$ba = new BranchingAjax($this->anketa);
$ba->add_comment_field($spr_id, '1', '4', false);
echo '</div>';
echo '</div>';
}
// komentarji urednikov // komentarji urednikov
if ($row1['thread'] > 0) { if ($row1['thread'] > 0) {
@ -7794,8 +7767,24 @@ class SurveyAdminSettings {
} }
if ($addfieldposition == '' || $addfieldposition == 0) {
echo '<div id="comment_toggle_'.$spr_id.'_'.'4'.'" class="add_comment_toggle pointer" onClick="toggleAddComment(\''.$spr_id.'_'.'4'.'\')">';
echo '<span class="faicon inline_comment link-right"></span>';
echo $lang['srv_question_comment'];
echo '</div>';
echo '<div class="comment_wrapper" id="comment_wrapper_'.$spr_id.'_'.'4'.'">';
echo '<div class="new_comment" id="survey_comment_'.$spr_id.'_'.'4'.'">';
$ba = new BranchingAjax($this->anketa);
$ba->add_comment_field($spr_id, '1', '4', false);
echo '</div>';
echo '</div>';
}
echo '</div>'; echo '</div>';
echo '<div class="question_comment resp">'; echo '<div class="question_comment resp">';

2
admin/survey/classes/class.GDPR.php
View File

@ -411,7 +411,7 @@ class GDPR{
// Nimamo zahtevkov // Nimamo zahtevkov
if(count($request_list) == 0 &&count($request_list_done) == 0){ if(count($request_list) == 0 &&count($request_list_done) == 0){
echo '<p class="bold">'.$lang['srv_gdpr_requests_none'].'</p>'; echo '<div class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_none'].'</div>';
return; return;
} }

8
lang/1.php
View File

@ -3587,9 +3587,9 @@ $lang = array (
"srv_advanced_options_note" => "Za uporabo nekaterih naprednih opcij potrebujete status managerja!<br/><a href=\"https://www.1ka.si/d/sl/o-1ka/splosen-opis/nivoji-uporabnikov/manager?from1ka=1\" target=\"_blank\">Zaprosite za status managerja</a>.", "srv_advanced_options_note" => "Za uporabo nekaterih naprednih opcij potrebujete status managerja!<br/><a href=\"https://www.1ka.si/d/sl/o-1ka/splosen-opis/nivoji-uporabnikov/manager?from1ka=1\" target=\"_blank\">Zaprosite za status managerja</a>.",
"user_see_hour_views" => "Uporabnik vidi vpoglede v svoje &#269;asovnice", "user_see_hour_views" => "Uporabnik vidi vpoglede v svoje &#269;asovnice",
"srv_survey_comment" => "Dodaj komentarje o anketi", "srv_survey_comment" => "Dodaj komentarje o anketi",
"srv_survey_general_comment" => "Dodaj splošen komentar na anketo", "srv_survey_general_comment" => "Dodaj splošni komentar na anketo",
"srv_survey_comments" => "Poglej komentarje o anketi", "srv_survey_comments" => "Poglej komentarje o anketi",
"srv_question_comment" => "Dodaj komentar o vpra&#353;anju", "srv_question_comment" => "Dodaj komentar na vprašanje",
"srv_question_comments" => "Poglej komentarje o vpra&#353;anju", "srv_question_comments" => "Poglej komentarje o vpra&#353;anju",
"srv_forum_intro" => "Tema vsebuje komentarje na vpra&#353;anje: ", "srv_forum_intro" => "Tema vsebuje komentarje na vpra&#353;anje: ",
"srv_forum_intro_if" => "Tema vsebuje komentarje na if: ", "srv_forum_intro_if" => "Tema vsebuje komentarje na if: ",
@ -4922,8 +4922,8 @@ $lang = array (
"desc2" => "Padajo&#269;e brez preteklih (samo za datume)", "desc2" => "Padajo&#269;e brez preteklih (samo za datume)",
"archive_date" => "Zapis datuma v arhivu: ", "archive_date" => "Zapis datuma v arhivu: ",
"srv_comments_add_comment" => "Nov komentar", "srv_comments_add_comment" => "Nov komentar",
"srv_comments_add_comment0" => "Nov splošni komentar na anketo", "srv_comments_add_commentS" => "Nov splošni komentar na anketo",
"srv_comments_add_comment1" => "Nov komentar na vprašanje", "srv_comments_add_commentQ" => "Nov komentar na vprašanje",
"srv_comments_unresolved" => "Samo nerešeni komentarji", "srv_comments_unresolved" => "Samo nerešeni komentarji",
"srv_comments_marks" => "Označevanje komentarjev", "srv_comments_marks" => "Označevanje komentarjev",
"srv_comments_marks_0" => "Enostavno (Končano)", "srv_comments_marks_0" => "Enostavno (Končano)",

8
lang/2.php
View File

@ -3558,9 +3558,9 @@ $lang = array (
"srv_advanced_options_note" => "Some advanced options are only available for users with the status of manager.<br/>For manager status contact us at email: <a href=\"mailto:info@1ka.si\">info@1ka.si</a> or phone: 01/5805278.", "srv_advanced_options_note" => "Some advanced options are only available for users with the status of manager.<br/>For manager status contact us at email: <a href=\"mailto:info@1ka.si\">info@1ka.si</a> or phone: 01/5805278.",
"user_see_hour_views" => "User sees views of his timetables", "user_see_hour_views" => "User sees views of his timetables",
"srv_survey_comment" => "Comment survey", "srv_survey_comment" => "Comment survey",
"srv_survey_general_comment" => "Comment survey", "srv_survey_general_comment" => "Add a general survey comment",
"srv_survey_comments" => "View survey comments", "srv_survey_comments" => "View survey comments",
"srv_question_comment" => "Comment question", "srv_question_comment" => "Add a question comment",
"srv_question_comments" => "View question comments", "srv_question_comments" => "View question comments",
"srv_forum_intro" => "This thread has comments about question: ", "srv_forum_intro" => "This thread has comments about question: ",
"srv_forum_if" => "This thread has comments about if: ", "srv_forum_if" => "This thread has comments about if: ",
@ -4896,8 +4896,8 @@ $lang = array (
"srv_chart_settings_fullScale" => "Full scale", "srv_chart_settings_fullScale" => "Full scale",
"srv_chart_open_answers_settings" => "Open answers settings", "srv_chart_open_answers_settings" => "Open answers settings",
"srv_comments_add_comment" => "New comment", "srv_comments_add_comment" => "New comment",
"srv_comments_add_comment0" => "New general survey comment", "srv_comments_add_commentS" => "New general survey comment",
"srv_comments_add_comment1" => "New question comment", "srv_comments_add_commentQ" => "New question comment",
"srv_comments_unresolved" => "Display only unresolved comments", "srv_comments_unresolved" => "Display only unresolved comments",
"srv_comments_marks" => "Labelling comments", "srv_comments_marks" => "Labelling comments",
"srv_comments_marks_0" => "Simple (done)", "srv_comments_marks_0" => "Simple (done)",

2940
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

8
resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
View File

@ -74,7 +74,7 @@ table.gdpr_surveys {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
padding: 8px 16px; padding: 5px 16px;
border-radius: 2px; border-radius: 2px;
@ -107,6 +107,8 @@ table.gdpr_surveys {
textarea.gdpr_requests_comment{ textarea.gdpr_requests_comment{
width: 320px; width: 320px;
height: 40px;
margin: 0;
font-size: 14px; font-size: 14px;
} }
@ -203,10 +205,10 @@ div#gdrp_requests_unresolved {
} }
#num_box1.checked{ #num_box1.checked{
background-color: rgba(20, 255, 0, 0.05); background-color: $light-green2;
} }
#num_box2.checked{ #num_box2.checked{
background-color: rgba(255, 0, 0, 0.05); background-color: $light-red;
} }
#num_box3.checked{ #num_box3.checked{
background-color: #FFFFFF; background-color: #FFFFFF;

28
resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
View File

@ -102,15 +102,11 @@ div.page_komentarji_anketa {
div.add_comment_toggle { div.add_comment_toggle {
transition: 0.3s; transition: 0.3s;
font-size: 14px !important;
border: 1px solid $gray; color: $blue;
border-radius: 2px; span {
width: 100%; font-size: inherit !important;
padding: 9px 8px; }
margin-bottom: 16px;
color: $very-dark-gray;
cursor: text;
} }
div.comment_type { div.comment_type {
@ -425,15 +421,11 @@ div.page_komentarji_anketa {
div.add_comment_toggle { div.add_comment_toggle {
transition: 0.3s; transition: 0.3s;
font-size: 14px !important;
border: 1px solid $gray; color: $blue;
border-radius: 2px; span {
width: 100%; font-size: inherit !important;
padding: 9px 8px; }
margin-bottom: 16px;
color: $very-dark-gray;
cursor: text;
} }
div.comment_type { div.comment_type {