diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 4383aff66..64083c785 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -4175,7 +4175,7 @@ class SurveyAdmin
echo '' . $lang['srv_export_hover_print'] . '';
echo '' . $lang['srv_export_hover_pdf'] . '';
echo '' . $lang['srv_export_hover_rtf'] . '';
- echo '' . $lang['srv_export_hover_ppt'] . '';
+ echo '' . $lang['srv_export_hover_ppt'] . '';
}
else if ($_GET['m'] == M_ANALYSIS_MEANS) {
echo '' . $lang['srv_export_hover_archive'] . '';
diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php
index cf26bc19e..694f9ab1b 100644
--- a/admin/survey/classes/class.SurveyCustomReport.php
+++ b/admin/survey/classes/class.SurveyCustomReport.php
@@ -561,10 +561,10 @@ class SurveyCustomReport {
// Izbira podtipa (tabela / graf)
echo ' ';
- echo ' ';
+ echo ' ';
echo ' ';
- echo ' ';
+ echo ' ';
}
// Nastavitve za TTEST
diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index cf98c8111..b30b21e3a 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -982,15 +982,16 @@ class SurveyStaticHtml
}
}
- public function displayChartOptions()
- {
+ public function displayChartOptions(){
global $lang, $admin_type;
+ SurveyChart::Init($this->sid);
+
// Nastavitev HQ grafov
- echo '
';
+ echo '';
+ echo ' ';
+ echo ' ';
+ echo '';
// Nastavitev skina grafov
@@ -1053,7 +1054,7 @@ class SurveyStaticHtml
if ($hideAdvanced == false) {
echo '';
- echo '' . $lang['srv_chart_skin'] . ': ' . $name . '';
+ echo ' ' . $lang['srv_chart_skin'] . ': ' . $name . '';
echo '';
}
}
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
index 90ad0f69d..76b765e14 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
@@ -2007,7 +2007,7 @@ class SurveyAnalysis {
if ($variable['other'] != true) {
echo '';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' '.$_cnt.' | ';
echo ' ';
@@ -2156,7 +2156,7 @@ class SurveyAnalysis {
echo '';
- echo '';
+ echo '';
echo ' ';
echo ' 0 ? ' vkey="1"' : '')
@@ -2178,7 +2178,7 @@ class SurveyAnalysis {
echo ' | ';
- echo '';
+ echo '';
echo ' ';
echo ' '.$_arguments.' | ';
echo ' ';
@@ -2962,7 +2962,7 @@ class SurveyAnalysis {
echo '';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' 0 ? ' vkey="'.$key.'"' : '')
@@ -2983,7 +2983,7 @@ class SurveyAnalysis {
// suma
echo ' | ';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' '.((int)self::$_FREQUENCYS[$_sequence]['validCnt']).' | ';
echo ' ';
@@ -3313,7 +3313,7 @@ class SurveyAnalysis {
#mg_inspectž
echo '';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' 0 ? ' gid="'.$variable['key'].'_1"' : '').'>'.$variable['freq'].' | ';
echo ' ';
@@ -3332,7 +3332,7 @@ class SurveyAnalysis {
// suma
echo '';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' '.(int)$grid['suma'].' | ';
echo ' ';
@@ -3361,7 +3361,7 @@ class SurveyAnalysis {
echo '';
#mg_inspect
- echo ' ';
+ echo ' ';
echo ' ';
echo ' 0 ? ' gid="'.$variable['key'].'_2"' : '').'>'.$variable['freq'].' | ';
echo ' ';
@@ -3379,7 +3379,7 @@ class SurveyAnalysis {
// suma
echo '';
- echo ' ';
+ echo ' ';
echo ' ';
echo ' '.(int)$_right_grid['suma'].' | ';
echo ' ';
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
index ce2373ce4..19b8c4659 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
@@ -313,7 +313,6 @@ class SurveyChart {
// prikazemo nastavitve
if (self::$isArchive != true && self::$publicChart != true) {
self::displayGlobalSettings();
- echo " \n";
}
# preberemo header
@@ -7091,8 +7090,8 @@ class SurveyChart {
echo '';
echo '- ';
- echo $lang['srv_chart_hq'].': ';
- echo '';
+ echo ' ';
+ echo ' ';
echo '
';
# nastavitev skina grafov
diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js
index dcb6f72e5..29e775814 100644
--- a/admin/survey/script/script_analiza.js
+++ b/admin/survey/script/script_analiza.js
@@ -732,13 +732,19 @@ function show_single_percent(id, status) {
if($('#freq-p_button_1_'+id).hasClass('active')){
if($('#freq-p_button_2_'+id).hasClass('active')){
- $('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).hide();});
+ $('[name=single_sums_percent_cnt_'+id+']').each(function() {
+ $(this).hide().parent().parent().removeClass('freq_row');
+ });
+
$('#freq-p_button_1_'+id).removeClass('active');
}
}
// Prizgemo
else{
- $('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).show();});
+ $('[name=single_sums_percent_cnt_'+id+']').each(function() {
+ $(this).show().parent().parent().addClass('freq_row');
+ });
+
$('#freq-p_button_1_'+id).addClass('active');
}
}
@@ -749,13 +755,19 @@ function show_single_percent(id, status) {
if($('#freq-p_button_2_'+id).hasClass('active')){
if($('#freq-p_button_1_'+id).hasClass('active')){
- $('[name=single_sums_percent_'+id+']').each(function() {$(this).hide();});
+ $('[name=single_sums_percent_'+id+']').each(function() {
+ $(this).hide().parent().parent().removeClass('percent_row');
+ });
+
$('#freq-p_button_2_'+id).removeClass('active');
}
}
// Prizgemo
else{
- $('[name=single_sums_percent_'+id+']').each(function() {$(this).show();});
+ $('[name=single_sums_percent_'+id+']').each(function() {
+ $(this).show().parent().parent().addClass('percent_row');
+ });
+
$('#freq-p_button_2_'+id).addClass('active');
}
}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index fc3bcdd7b..5a5241e1a 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6531,8 +6531,9 @@ and open the template in the editor.
*/
/* Izvozi */
span.faicon.pdf::before {
- font-size: 16px;
content: "";
+ font-size: 16px;
+ font-weight: 400;
color: #ed1c24;
}
@@ -27546,20 +27547,20 @@ and open the template in the editor.
text-align: center;
border: 0;
}
-#div_analiza_data:not(.anal_arch) table tr th table.cell_table tr:first-of-type td,
-#div_analiza_data:not(.anal_arch) table tr td table.cell_table tr:first-of-type td,
-#div_means_data table tr th table.cell_table tr:first-of-type td,
-#div_means_data table tr td table.cell_table tr:first-of-type td,
-#div_break_data table tr th table.cell_table tr:first-of-type td,
-#div_break_data table tr td table.cell_table tr:first-of-type td,
-#ttestResults table tr th table.cell_table tr:first-of-type td,
-#ttestResults table tr td table.cell_table tr:first-of-type td,
-.subpage_analysis_creport table tr th table.cell_table tr:first-of-type td,
-.subpage_analysis_creport table tr td table.cell_table tr:first-of-type td,
-.report_element_data table tr th table.cell_table tr:first-of-type td,
-.report_element_data table tr td table.cell_table tr:first-of-type td,
-#arch_body_div table tr th table.cell_table tr:first-of-type td,
-#arch_body_div table tr td table.cell_table tr:first-of-type td {
+#div_analiza_data:not(.anal_arch) table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_analiza_data:not(.anal_arch) table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_means_data table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_means_data table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_break_data table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_break_data table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+#ttestResults table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#ttestResults table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+.subpage_analysis_creport table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+.subpage_analysis_creport table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+.report_element_data table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+.report_element_data table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+#arch_body_div table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#arch_body_div table tr td table.cell_table.percent_row.freq_row tr:first-of-type td {
border-bottom: 1px #E5E5E5 dashed;
}
#div_analiza_data:not(.anal_arch) table tr.row1 th,
@@ -27861,6 +27862,7 @@ and open the template in the editor.
}
.analysis_bottom_settings .comment_holder span {
font-size: 14px;
+ font-style: normal;
}
.analysis_bottom_settings .comment_holder span.faicon:before {
font-size: 14px;
@@ -27902,6 +27904,9 @@ and open the template in the editor.
.analysis_bottom_settings a .faicon.xls:before {
color: #00C437;
}
+.analysis_bottom_settings a .faicon.ppt:before {
+ color: #fa4913;
+}
iframe#ifmcontentstoprint {
border: 0;
@@ -28733,6 +28738,10 @@ iframe#ifmcontentstoprint {
overflow: hidden;
text-align: center;
}
+.chart_holder.chart_holder:first-child,
+.tableChart.chart_holder:first-child {
+ padding-top: 6px;
+}
.chart_holder .chart_title,
.tableChart .chart_title {
width: 800px;
diff --git a/resources/sass/admin_new/basic/icons/export.scss b/resources/sass/admin_new/basic/icons/export.scss
index 3241d7b2a..cbe74614e 100644
--- a/resources/sass/admin_new/basic/icons/export.scss
+++ b/resources/sass/admin_new/basic/icons/export.scss
@@ -12,22 +12,23 @@ and open the template in the editor.
// PDF
span.faicon.pdf::before{
- font-size: 16px;
- content: "\f1c1";
-
- color: #ed1c24;
+ content: "\f1c1";
+ font-size: 16px;
+
+ font-weight: 400;
+ color: #ed1c24;
}
span.faicon.pdf.black{
color: $blue !important;
&:hover{
- color: #ed1c24 !important;
+ color: #ed1c24 !important;
}
}
a:hover span.faicon.pdf.black{
color: #ed1c24 !important;
}
span.faicon.pdf.black::before{
- color: inherit !important;
+ color: inherit !important;
}
diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss
index c87afef10..2bdea3575 100644
--- a/resources/sass/admin_new/pages/survey_analysis/basic.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/basic.scss
@@ -241,10 +241,10 @@
text-align: center;
border: 0;
}
+ }
- &:first-of-type td{
- border-bottom: 1px $gray dashed;
- }
+ &.percent_row.freq_row tr:first-of-type td{
+ border-bottom: 1px $gray dashed;
}
}
}
@@ -426,6 +426,7 @@
span{
font-size: 14px;
+ font-style: normal;
&.faicon:before{
font-size: 14px;
@@ -485,6 +486,9 @@
&.xls:before{
color: $green;
}
+ &.ppt:before{
+ color: #fa4913;
+ }
}
}
}
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
index b5de8317f..6afcdf1c3 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
@@ -12,6 +12,10 @@
overflow: hidden;
text-align: center;
+
+ &.chart_holder:first-child{
+ padding-top: 6px;
+ }
.chart_title {
width: 800px;
| | | | | | | | |