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

[Redizajn 1KA] - Testiranje --> Komentarji - reply textbox update

Browse Source
This commit is contained in:
tejagerjovic 2022-04-29 01:38:57 +02:00
parent df8de19225
commit 2f1b559e7b
9 changed files with 72 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/survey/BranchingAjax.php
View File

@ -2327,8 +2327,11 @@ class BranchingAjax {
$rowanketa = SurveyInfo::getInstance()->getSurveyRow();
echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
echo '<div class="button_holder bottom0">';
echo '<button class="medium white-blue" onClick="toggleAddComment(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>';
echo '<button class="medium blue" onclick="add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', $(\'#vsebina_'.$spremenljivka.'_'.$view.'\').val()); return false;">'.$lang['srv_comments_new'].'</button>';
echo '</div>';
if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) {
echo '<div style="float:right">';

30
admin/survey/SurveyAdminSettings.php
View File

@ -7085,18 +7085,26 @@ class SurveyAdminSettings {
else{
// Ce so komentarji aktivirani
if($survey_comment != ''){
echo $lang['srv_no_comments_solved'];
echo '<p class="bottom16">'.$lang['srv_no_comments_solved'].'</p>';
}
else{
echo $lang['srv_no_comments'];
echo '<p class="bottom16">'.$lang['srv_no_comments'].'</p>';
}
}
// Dodajanje novega komentarja
echo '<div id="comment_toggle_0_4" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_4\')">';
echo '<span class="faicon link-right comments"></span>';
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>';
echo '</fieldset>';
echo '</div>';
@ -7176,13 +7184,19 @@ class SurveyAdminSettings {
else{
// Ce so komentarji aktivirani
if($survey_comment_resp != ''){
echo $lang['srv_no_comments_solved'];
echo '<p class="bottom16">'.$lang['srv_no_comments_solved'].'</p>';
}
else{
echo $lang['srv_no_comments'];
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 '<span class="faicon link-right comments"></span>';
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, '1', '5', false);
@ -7937,15 +7951,15 @@ class SurveyAdminSettings {
echo '</ul>';
if ($c == 0) {
echo '<div style="margin-top: 60px;">';
echo $lang['srv_no_comments_solved'].'<br/>';
echo '<div>';
echo $lang['srv_no_comments_solved'];
#echo '<a href="index.php?anketa='.$this->anketa.'&a=urejanje">'.$lang['srv_settings_komentarji'].'</a>';
echo '</div>';
}
}
else {
echo '<div style="margin-top: 60px;">';
echo $lang['srv_no_comments'].'<br/>';
echo '<div>';
echo $lang['srv_no_comments'];
echo '</div>';
}

9
admin/survey/script/script.js
View File

@ -5625,4 +5625,13 @@ function toggleAktivnostCheckboxes(type) {
$("#toggleDataCheckboxes_Date").toggleClass("border_blue");
}
}
function toggleAddComment (box_id) {
var toggle = '#comment_toggle_' + box_id;
var wrapper = '#comment_wrapper_' + box_id;
$(toggle).toggle();
$(wrapper).toggle();
}

1
lang/1.php
View File

@ -3566,6 +3566,7 @@ $lang = array (
"srv_forum_back" => "Nazaj na urejanje ankete",
"srv_admin_comment" => "Komentarji urednikov",
"srv_repondent_comment" => "Komentarji respondentov",
"srv_add_comment_toggle" => "Dodaj nov komentar",
"srv_add_comment" => "Dodaj komentar",
"srv_view_comment" => "Poglej komentarje",
"srv_delete_respondent" => "Izbri&#353;i respondenta in njegove vnose.",

1
lang/2.php
View File

@ -3535,6 +3535,7 @@ $lang = array (
"srv_forum_back" => "Back to survey editing",
"srv_admin_comment" => "Administrators comments",
"srv_repondent_comment" => "Respondents comments",
"srv_add_comment_toggle" => "Add new comment",
"srv_add_comment" => "Add comment",
"srv_view_comment" => "Editors comments",
"srv_delete_respondent" => "Delete respondent.",

24
public/css/admin_new.css
View File

@ -5650,13 +5650,10 @@ span.faicon.mobile_off::after {
}
span.faicon.comments::before {
font-size: 24px;
content: "\f27a";
}
span.faicon.comments_empty::before {
font-size: 24px;
font-weight: 400;
content: "\f27a";
}
@ -21902,18 +21899,27 @@ div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fi
margin-bottom: 16px;
color: #808080;
}
div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment,
div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment {
div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.add_comment_toggle,
div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.add_comment_toggle {
transition: 0.3s;
}
div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper,
div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper {
display: none;
transition: 0.3s;
}
div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment,
div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment {
display: flex;
flex-direction: column;
}
div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment textarea,
div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment textarea {
div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment textarea,
div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment textarea {
width: 100%;
height: 100px;
}
div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment button,
div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment button {
div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment button,
div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment button {
width: fit-content;
margin-top: 8px;
}

2
resources/sass/admin/icons/standard.scss
View File

@ -234,11 +234,9 @@ span.faicon.mobile_off::after{
margin-left: -23px;
}
span.faicon.comments::before{
font-size: 24px;
content: "\f27a";
}
span.faicon.comments_num::before{
font-size: 24px;
content: "\f27a";
}
span.faicon.comments_num {

3
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -248,12 +248,9 @@ span.faicon.mobile_off::after{
margin-left: -23px;
}
span.faicon.comments::before{
font-size: 24px;
content: "\f27a";
}
span.faicon.comments_empty::before{
font-size: 24px;
font-weight: 400;
content: "\f27a";
}
span.faicon.comments_num::before{

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

@ -94,20 +94,30 @@ div.page_komentarji_anketa {
}
}
div.new_comment {
display: flex;
flex-direction: column;
div.add_comment_toggle {
transition: 0.3s;
}
textarea {
width: 100%;
height: 100px;
}
div.comment_wrapper {
display: none;
transition: 0.3s;
button {
width: fit-content;
margin-top: 8px;
div.new_comment {
display: flex;
flex-direction: column;
textarea {
width: 100%;
height: 100px;
}
button {
width: fit-content;
margin-top: 8px;
}
}
}
}
}
}