[Powertop] [PATCH v2 24/31] report-html: fixed not hidding sections errors

[Powertop] [PATCH v2 24/31] report-html: fixed not hidding sections errors

[Alexandra Yates]

[-- Attachment #1: Type: text/plain, Size: 5972 bytes --]

Removed multiple division when displaying more than one table on a
section as it was the case of Device Info and Tuning sections. Now all
sections display accordingly to the selected menu button.

Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com>
---
 src/devices/device.cpp          |    4 ++--
 src/devlist.cpp                 |    4 +---
 src/powertop.css                |   19 +++++++++----------
 src/report/report-data-html.cpp |   11 +++++++++++
 src/report/report-data-html.h   |    4 ++++
 src/tuning/tuning.cpp           |    9 +++++----
 6 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/devices/device.cpp b/src/devices/device.cpp
index 83ee02f..a916bf6 100644
--- a/src/devices/device.cpp
+++ b/src/devices/device.cpp
@@ -225,7 +225,7 @@ void show_report_devices(void)
 
 	/* div attr css_class and css_id */
         tag_attr div_attr;
-        init_div(&div_attr, "", "device");
+        init_div(&div_attr, "", "devinfo");
 
         /* Set Table attributes, rows, and cols */
         table_attributes std_table_css;
@@ -235,7 +235,7 @@ void show_report_devices(void)
 
 	idx = cols;
  	rows= all_devices.size() + 1;
-        init_std_table_attr(&std_table_css, rows, cols);
+        init_std_side_table_attr(&std_table_css, rows, cols);
 
         /* Set Title attributes */
         tag_attr title_attr;
diff --git a/src/devlist.cpp b/src/devlist.cpp
index ada3538..1b99490 100644
--- a/src/devlist.cpp
+++ b/src/devlist.cpp
@@ -296,9 +296,6 @@ void report_show_open_devices(void)
 	if (target->size() == 0)
 		return;
 
-	/* div attr css_class and css_id */
-	tag_attr div_attr;
-	init_div(&div_attr, "", "device");
 
 	/* Set Table attributes, rows, and cols */
 	table_attributes std_table_css;
@@ -331,6 +328,7 @@ void report_show_open_devices(void)
 	}
 
 	/* Report Output */
+	/* No div attribute here inherits from device power report */
 	report.add_title(&title_attr, __("Process Device Activity"));
 	report.add_table(process_data, &std_table_css);
 	report.end_div();
diff --git a/src/powertop.css b/src/powertop.css
index 38daa1f..ff86880 100644
--- a/src/powertop.css
+++ b/src/powertop.css
@@ -12,7 +12,7 @@ var powertop = {
   cpuidle: 'CPU Idle',
   cpufreq: 'CPU Frequency',
   software: 'Software Info',
-  device: 'Device Info',
+  devinfo: 'Device Info',
   tuning: 'Tuning'
  },
  cadd: function(idx, c){
@@ -85,6 +85,13 @@ var powertop = {
 	padding:0px;
 }
 
+body {
+	background-color: #eee; /* Background color */
+	color: #222;            /* Font color */
+	font-family: Helvetica;
+	font-size: 14px;
+}
+
 #main_container{
 	width: 960px;
 	margin: 2px auto;
@@ -207,15 +214,7 @@ li.summary_list
 
 
 
-/*menu css*/
-
-body {
-	background-color: #eee; /* Background color */
-	color: #222;            /* Font color */
-	font-family: Helvetica;
-	font-size: 14px;
-}
-
+/* main menu css*/
 #main_menu {
 	display: inline-block;
 	font-weight: bold;
diff --git a/src/report/report-data-html.cpp b/src/report/report-data-html.cpp
index 72d2e52..78354c3 100644
--- a/src/report/report-data-html.cpp
+++ b/src/report/report-data-html.cpp
@@ -34,6 +34,17 @@ void init_std_table_attr(struct table_attributes *table_css, int rows, int cols)
 	table_css->rows=rows;
 	table_css->cols=cols;
 }
+void init_std_side_table_attr(struct table_attributes *table_css, int rows, int cols){
+	table_css->table_class="emphasis2 side_by_side_left";
+	table_css->tr_class="emph1";
+	table_css->th_class="emph_title";
+	table_css->td_class="";
+	table_css->pos_table_title=T;
+	table_css->title_mod=0;
+	table_css->rows=rows;
+	table_css->cols=cols;
+}
+
 
 void init_pkg_table_attr(struct table_attributes *table_css, int rows, int cols){
 	table_css->table_class="emphasis2 side_by_side_left";
diff --git a/src/report/report-data-html.h b/src/report/report-data-html.h
index 7e517eb..f16977e 100644
--- a/src/report/report-data-html.h
+++ b/src/report/report-data-html.h
@@ -44,6 +44,10 @@ void
 init_std_table_attr(struct table_attributes *table_css, int rows, int cols);
 
 void
+init_std_side_table_attr(struct table_attributes *table_css, int rows,
+		int cols);
+
+void
 init_pkg_table_attr(struct table_attributes *table_css, int rows, int cols);
 
 void
diff --git a/src/tuning/tuning.cpp b/src/tuning/tuning.cpp
index 8a41114..ac479a2 100644
--- a/src/tuning/tuning.cpp
+++ b/src/tuning/tuning.cpp
@@ -207,7 +207,7 @@ void report_show_tunables(void)
 
 	 /* div attr css_class and css_id */
         tag_attr div_attr;
-        init_div(&div_attr, "", "tuning");
+        init_div(&div_attr, "clear_block", "tuning");
 
 	/* Set Table attributes, rows, and cols */
 	table_attributes tune_table_css;
@@ -242,7 +242,6 @@ void report_show_tunables(void)
 	report.add_div(&div_attr);
 	report.add_title(&title_attr,__("Software Settings in Need of Tuning"));
 	report.add_table(tunable_data, &tune_table_css);
-	report.end_div();
 
 	/* Second Table */
 	/* Set Table attributes, rows, and cols */
@@ -258,10 +257,13 @@ void report_show_tunables(void)
 		untunable_data[i+1]= string(all_untunables[i]->description());
 
 	/* Report Output */
+<<<<<<< HEAD
 	report.add_div(&div_attr);
 	report.add_title(&title_attr,__("Untunable Software Issues"));
+=======
+	report.add_title(&title_attr,"Untunable Software Issues");
+>>>>>>> 4d9b82e... report-html: fixed not hidding sections errors
 	report.add_table(untunable_data, &tune_table_css);
-	report.end_div();
 
 	/* Third Table */
 	/* Set Table attributes, rows, and cols */
@@ -283,7 +285,6 @@ void report_show_tunables(void)
 		idx+=1;
         }
 	/* Report Output */
-	report.add_div(&div_attr);
 	report.add_title(&title_attr,__("Optimal Tuned Software Settings"));
         report.add_table(tuned_data, &tune_table_css);
         report.end_div();
-- 
1.7.9.5

Re: [Powertop] [PATCH v2 24/31] report-html: fixed not hidding sections errors

[Igor Zhbanov]

[-- Attachment #1: Type: text/plain, Size: 2065 bytes --]

Hi Alexandra,


Alexandra Yates wrote:
> Removed multiple division when displaying more than one table on a
> section as it was the case of Device Info and Tuning sections. Now all
> sections display accordingly to the selected menu button.
>
> Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com>
> ---
>   src/devices/device.cpp          |    4 ++--
>   src/devlist.cpp                 |    4 +---
>   src/powertop.css                |   19 +++++++++----------
>   src/report/report-data-html.cpp |   11 +++++++++++
>   src/report/report-data-html.h   |    4 ++++
>   src/tuning/tuning.cpp           |    9 +++++----
>   6 files changed, 32 insertions(+), 19 deletions(-)
>
...
> diff --git a/src/tuning/tuning.cpp b/src/tuning/tuning.cpp
> index 8a41114..ac479a2 100644
> --- a/src/tuning/tuning.cpp
> +++ b/src/tuning/tuning.cpp
...
> @@ -258,10 +257,13 @@ void report_show_tunables(void)
>   		untunable_data[i+1]= string(all_untunables[i]->description());
>   
>   	/* Report Output */

Here is some garbage after merge.

> +<<<<<<< HEAD
>   	report.add_div(&div_attr);
>   	report.add_title(&title_attr,__("Untunable Software Issues"));
> +=======
> +	report.add_title(&title_attr,"Untunable Software Issues");
> +>>>>>>> 4d9b82e... report-html: fixed not hidding sections errors
>   	report.add_table(untunable_data, &tune_table_css);
> -	report.end_div();
>   
>   	/* Third Table */
>   	/* Set Table attributes, rows, and cols */
> @@ -283,7 +285,6 @@ void report_show_tunables(void)
>   		idx+=1;
>           }
>   	/* Report Output */
> -	report.add_div(&div_attr);
>   	report.add_title(&title_attr,__("Optimal Tuned Software Settings"));
>           report.add_table(tuned_data, &tune_table_css);
>           report.end_div();

-- 
Best regards,
Igor Zhbanov,
Expert Software Engineer,
phone: +7 (495) 797 25 00 ext 3981
e-mail: i.zhbanov(a)samsung.com

Mobile group, Moscow R&D center, Samsung Electronics
12 Dvintsev street, building 1
127018, Moscow, Russian Federation