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-14 10:28:22 +02:00
commit 56fdadd056
11 changed files with 1420 additions and 1337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/survey/SurveyAdmin.php
View File

@ -1434,7 +1434,6 @@ class SurveyAdmin
echo '</div>';
echo '<div class="settings">';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=urejanje" title="' . $lang['srv_settings_komentarji1'] . '">';
echo '<span class="faicon wheel_32"></span>';
echo '</a>';
echo '</div>';

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

@ -5715,4 +5715,9 @@ function toggleAddUser(){
function toggleCommentDropdown () {
$("#comment_dropdown").toggleClass('displayNone');
}
function toggleCommentDropdownTestSurvey () {
$("#comment_dropdown").toggleClass('displayNone');
$(".open_comment_box").toggleClass('active');
}

2
lang/1.php
View File

@ -3587,7 +3587,7 @@ $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>.",
"user_see_hour_views" => "Uporabnik vidi vpoglede v svoje &#269;asovnice",
"srv_survey_comment" => "Dodaj komentarje o anketi",
"srv_survey_general_comment" => "Dodaj splošni komentar na anketo",
"srv_survey_general_comment" => "Dodaj splošni komentar",
"srv_survey_comments" => "Poglej komentarje o anketi",
"srv_question_comment" => "Dodaj komentar na vprašanje",
"srv_question_comments" => "Poglej komentarje o vpra&#353;anju",

2
lang/2.php
View File

@ -3558,7 +3558,7 @@ $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.",
"user_see_hour_views" => "User sees views of his timetables",
"srv_survey_comment" => "Comment survey",
"srv_survey_general_comment" => "Add a general survey comment",
"srv_survey_general_comment" => "Add a general comment",
"srv_survey_comments" => "View survey comments",
"srv_question_comment" => "Add a question comment",
"srv_question_comments" => "View question comments",

61
main/survey/app/Controllers/BodyController.php
View File

@ -2341,7 +2341,7 @@ class BodyController extends Controller
// Komentarji urednikov na anketo
if (get('userAutor')) {
echo '<div style="margin: 20px 0 15px; width: 100%;">';
echo '<div id="comments_bottom_line">';
$view = 1;
$survey_comment = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment');
@ -2350,48 +2350,43 @@ class BodyController extends Controller
$_GET['testdata'] == 'on')
) {
echo '<span class="stngs floatLeft">';
echo '<div class="open_comment_box" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0" onclick="toggleCommentDropdownTestSurvey();">';
echo '<span class="faicon fa-comment empty"></span>';
echo self::$lang['srv_survey_general_comment'] . ' ';
echo '</a>';
$show_survey_comment = $_GET['show_survey_comment'];
if ($row['forum'] == 0 || $row['thread'] == 0) {
echo '<a href="#" onclick="return false;" class="surveycomment bold" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
echo self::$lang['srv_comment_splosen'] . ' ';
echo '<span class="faicon comment" title="' . self::$lang['srv_survey_comment'] . '" alt="' . self::$lang['srv_survey_comment'] . '"></span>';
echo '</a>';
} else {
$sqlf = sisplet_query("SELECT COUNT(*) AS count FROM post WHERE tid='$row[thread]'");
$rowf = mysqli_fetch_array($sqlf);
$rowf['count']--; //zaradi 1. avtomatskega posta
echo '<a href="#" onclick="return false;" class="surveycomment bold" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
echo self::$lang['srv_comment_splosen'] . ' ';
echo '<span class="faicon comment" title="' . self::$lang['srv_survey_comment'] . '" alt="' . self::$lang['srv_survey_comment'] . '"></span>';
// ali prikazemo okno odprto - je dodan tak admin komentar
$sqlf1 = sisplet_query("SELECT * FROM post p WHERE p.tid='$row[thread]' AND p.ocena='5'");
while ($rowf1 = mysqli_fetch_array($sqlf1)) {
$s = sisplet_query("SELECT * FROM views WHERE pid='$rowf1[id]' AND uid='self::$global_user_id'");
if (mysqli_num_rows($s) == 0)
$show_survey_comment = 1;
}
echo '</a>';
}
echo '</div>'; //.open_comment_box
echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/js-lang.php?lang='.self::$lang['lang_short'].'&amp;v=13.06.07"></script>';
// Ce je tole vklopljeno se js porusi?
//echo '<script type="text/javascript" src="'.self::$site_url.'/admin/survey/minify/g=jsnew?v=13.06.07"></script>';
echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/jquery/jquery.qtip-1.0.js"></script>';
echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/script.js"></script>';
echo '<script> $(function() { load_comment(\'#surveycomment_0_' . $view . '\'' . ($show_survey_comment == '1' ? ', \'2\'' : '') . '); });</script>';
echo '</span>';
}
// Uredniske nastavitve link
echo '<span class="floatRight bold"><a href="' . self::$site_url . '/admin/survey/index.php?anketa=' . get('anketa') . '&a=testiranje&popup=open" target="_blank" title="' . self::$lang['srv_uredniske_nastavitve'] . '">' . self::$lang['settings'] . ' <span class="faicon settings"></span></a></span>';
echo '<a href="' . self::$site_url . '/admin/survey/index.php?anketa=' . get('anketa') . '&a=testiranje&popup=open" target="_blank" title="' . self::$lang['srv_uredniske_nastavitve'] . '">';
echo '<div id="comment_settings">';
echo '<span class="faicon settings"></span>';
echo '</div></a>';
echo '</div>'; // #comments_bottom_line
//dropdown na klik ikone
echo '<div id="comment_dropdown" class="displayNone">';
echo 'test';
$anketa = get('anketa');
echo '<div id="survey_comment_0_1">';
$ba = new BranchingAjax($anketa);
$ba->add_comment_field(0, '0', '1', false, false);
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="small white-blue" onclick="toggleCommentDropdown(); return false;">'.$lang['edit1338'].'</button>';
echo '<button class="small blue" onclick="add_comment(\'0\', \'0\', \'1\', $(\'#vsebina_0_1\').val()); actionNotePopup(\'comment_added\', \'success\');return false;">'.$lang['srv_comments_new'].'</button>';
echo '</div>';
echo '</div>'; //comment_dropdown
}
// Komentarji respondentov na anketo
elseif (self::$global_user_id > 0 || true) {

59
public/css/admin_new.css
View File

@ -20319,7 +20319,7 @@ and open the template in the editor.
box-sizing: border-box;
min-height: 36px;
max-width: 100%;
width: 710px;
width: 730px;
padding: 0 16px;
margin: 0 0 8px 0;
border: 1px #E5E5E5 solid;
@ -20344,6 +20344,12 @@ and open the template in the editor.
.tab_content .content_right .question_list .survey_title span.faicon:before {
color: #D3D3D3;
}
.tab_content .content_right .question_list .survey_title .faicon.clipboard:before {
font-weight: 400;
}
.tab_content .content_right .question_list .survey_title.active .faicon.clipboard:before {
font-weight: 600;
}
.tab_content .content_right .question_list .survey_questions {
display: none;
}
@ -20443,7 +20449,7 @@ and open the template in the editor.
.tab_content .content_right .question_list .question_item_holder .folder_item_info .dots_ver:before,
.tab_content .content_right .question_list .folder_item_holder .question_item_info .dots_ver:before,
.tab_content .content_right .question_list .folder_item_holder .folder_item_info .dots_ver:before {
color: #333333;
color: #1E88E5;
}
.tab_content .content_right .question_list .question_item_holder .question_item_info .dots_ver.active,
.tab_content .content_right .question_list .question_item_holder .folder_item_info .dots_ver.active,
@ -20457,7 +20463,7 @@ and open the template in the editor.
.tab_content .content_right .question_list .folder_item_holder .folder_item_info .monitor {
display: none;
padding: 7px 8px;
margin-right: 8px;
margin-right: 4px;
}
.tab_content .content_right .question_list .question_item_holder .question_item_info .folder_empty:before,
.tab_content .content_right .question_list .question_item_holder .folder_item_info .folder_empty:before,
@ -20484,6 +20490,8 @@ and open the template in the editor.
top: 35px;
width: 140px;
border-radius: 2px;
border: 0;
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
}
.tab_content .content_right .question_list .question_item_holder .question_item_info .item_settings a,
.tab_content .content_right .question_list .question_item_holder .folder_item_info .item_settings a,
@ -20529,6 +20537,7 @@ and open the template in the editor.
.tab_content .content_right .question_list .folder_item_holder .question_item_info .item_settings ul li,
.tab_content .content_right .question_list .folder_item_holder .folder_item_info .item_settings ul li {
color: #1E88E5;
font-size: 14px;
transition: 0.2s;
}
.tab_content .content_right .question_list .question_item_holder .question_item_info .item_settings ul li:hover,
@ -23650,50 +23659,6 @@ and open the template in the editor.
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_type {
text-transform: uppercase;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings {
padding: 16px;
color: #333333;
font-weight: 400;
font-size: 16px;
line-height: 20px;
text-align: left;
background: #FFFFFF;
border: 1px solid #C4C4C4;
box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
position: absolute;
z-index: 9999;
right: 0;
top: 35px;
border-radius: 2px;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings a {
text-decoration: none;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings ul {
margin: 0;
padding: 0;
list-style-type: none;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings ul li {
margin-bottom: 16px;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings ul li:last-of-type {
margin-bottom: 0;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings ul li span {
cursor: pointer;
color: #333333;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings ul li span:hover {
color: #1E88E5;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings ul li {
color: #1E88E5;
transition: 0.2s;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings ul li:hover {
color: #0059ab;
}
.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .monitor {
display: none;
margin-right: 0;

2513
public/css/main.css
View File

File diff suppressed because it is too large Load Diff

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

@ -217,7 +217,7 @@
box-sizing: border-box;
min-height: 36px;
max-width: 100%;
width: 710px;
width: 730px;
padding: 0 16px;
margin: 0 0 8px 0;
@ -248,6 +248,13 @@
color: $dark-gray2;
}
}
.faicon.clipboard:before{
font-weight: 400;
}
&.active .faicon.clipboard:before{
font-weight: 600;
}
}
.survey_questions{
@ -336,7 +343,7 @@
margin-right: 0;
&:before{
color: $black;
color: $blue;
}
&.active{
@ -348,7 +355,7 @@
display: none;
padding: 7px 8px;
margin-right: 8px;
margin-right: 4px;
}
.folder_empty:before{
@ -364,11 +371,15 @@
top: 35px;
width: 140px;
border-radius: 2px;
border: 0;
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
ul li{
color: $blue;
font-size: 14px;
transition: 0.2s;

21
resources/sass/admin_new/pages/survey_edit/popups/vprasanje_deleted.scss
View File

@ -102,27 +102,6 @@
.item_type{
text-transform: uppercase;
}
.item_settings{
@include hover_basic();
position: absolute;
z-index: 9999;
right: 0;
top: 35px;
border-radius: 2px;
ul li{
color: $blue;
transition: 0.2s;
&:hover{
color: $dark-blue;
}
}
}
.monitor{
display: none;

2
resources/sass/main/main.scss
View File

@ -15,3 +15,5 @@ and open the template in the editor.
@import "main/footer";
@import "main/content";
@import "main/admin";
@import "main/test_survey_comments"

70
resources/sass/main/main/test_survey_comments.scss Normal file
View File

@ -0,0 +1,70 @@
.displayNone {
display: none;
}
.fa-comment:before {
content: "\f075";
}
span.faicon.empty {
font-weight: 400 !important;
}
//Vrstica za dodajanje komentarja in nastavitve na dnu okna
#comments_bottom_line {
display: flex;
flex-direction: row;
align-content: center;
justify-content: space-between;
margin: 0 15px 15px 15px;
.open_comment_box {
display: flex;
flex-direction: row;
align-content: center;
justify-content: center;
cursor: pointer;
border-radius: 2px;
border: 1px solid #E5E5E5;
padding: 4px;
span.faicon {
margin-right: 8px;
&::before{
color: #1E88E5 !important;
font-size: 16px !important;
line-height: 17px !important;
}
}
&.active {
color: #1E88E5;
border-color: #1E88E5;
background-color: #F4F9FE;
}
}
a {
#comment_settings {
display: flex;
flex-direction: row;
align-content: center;
justify-content: center;
border-radius: 2px;
border: 1px solid #E5E5E5;
padding: 4px;
span.faicon {
&::before{
color: #1E88E5 !important;
font-size: 16px !important;
line-height: 17px !important;
}
}
}
}
}