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

Analiza --> statistike: popravljen bug pri gumbih

Browse Source
This commit is contained in:
Nejc Kovač 2022-08-16 11:07:54 +02:00
parent 05672045d7
commit c18b3557b1
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2084,7 +2084,7 @@ class SurveyList {
$result = '<strong><a href="'.$site_url.'admin/survey/index.php?anketa='.$id.'&a='.A_REDIRECTLINK.'" title="'.$text.'">'.$text.'</a></strong>'; $result = '<strong><a href="'.$site_url.'admin/survey/index.php?anketa='.$id.'&a='.A_REDIRECTLINK.'" title="'.$text.'">'.$text.'</a></strong>';
} elseif ($type == 'active') { } elseif ($type == 'active') {
$result = '<a href="/" onclick="anketa_active(\''.$id.'\',\''.(int)$text.'\',\'true\'); return false;">' . $result = '<a href="/" onclick="anketa_active(\''.$id.'\',\''.(int)$text.'\',\'true\'); return false;">' .
'<span class="faicon '.((int)$text==1?'star_on':'star_off').'" alt="'.(int)$text.'" title="'.((int)$text==1?$lang['srv_anketa_active']:$lang['srv_anketa_noactive']).'"></span>'. '<span class="faicon '.((int)$text==1?'star_on':'star_off').'" alt="'.(int)$text.'" title="'.((int)$text==1?$lang['srv_anketa_active']:$lang['srv_anketa_noactive']).'"> </span>'.
'</a>'; '</a>';
} elseif ($type == 'delete') { } elseif ($type == 'delete') {
if ((int)$options['anketa_canEdit'] > 0) { if ((int)$options['anketa_canEdit'] > 0) {

5
admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php
View File

@ -50,13 +50,14 @@ class SurveyAnalysisHelper {
// Samo zvezdica (sums, grafi, freq...) // Samo zvezdica (sums, grafi, freq...)
if($type < 5) if($type < 5)
echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 0); return false;"><span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span></a>'; echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 0); return false;"><span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span> <div class= "icon_text star_icon"> Vključi v poročilo po meri </div></a>';
// Zvezdica s textom // Zvezdica s textom
else{ else{
echo '<div class="custom_report_include">'; echo '<div class="custom_report_include">';
echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 1); return false;">'; echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 1); return false;">';
echo '<span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span>'; echo '<span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"> </span>';
echo '<span id="'.$id.'_insert" '.($insert == 0 ? ' style="display:none;" ' : '').'> '.$lang['srv_custom_report_insert'].'</span>'; echo '<span id="'.$id.'_insert" '.($insert == 0 ? ' style="display:none;" ' : '').'> '.$lang['srv_custom_report_insert'].'</span>';
echo '<span id="'.$id.'_inserted" '.($insert == 0 ? '' : ' style="display:none;" ').'> '.$lang['srv_custom_report_inserted'].'</span>'; echo '<span id="'.$id.'_inserted" '.($insert == 0 ? '' : ' style="display:none;" ').'> '.$lang['srv_custom_report_inserted'].'</span>';
echo '</a>'; echo '</a>';

15
public/css/admin_new.css
View File

@ -11148,6 +11148,18 @@ div#gdrp_requests_unresolved {
margin-bottom: 32px; margin-bottom: 32px;
} }
.head_msg {
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 24px;
}
.head_msg h2 {
margin-bottom: 0px;
margin-left: 8px;
padding-bottom: 0px;
}
div.setting_holder.red label { div.setting_holder.red label {
color: red; color: red;
} }
@ -29537,6 +29549,9 @@ iframe#ifmcontentstoprint {
.analysis_icons_holder .icon_box > a .sum_frekv { .analysis_icons_holder .icon_box > a .sum_frekv {
margin-left: 8px; margin-left: 8px;
} }
.analysis_icons_holder .icon_box > a .star_icon {
margin-left: 6px;
}
.analysis_icons_holder .icon_box > a:last-of-type { .analysis_icons_holder .icon_box > a:last-of-type {
margin-right: 0; margin-right: 0;
} }