add abbr name to sector and master plan kpi page, adjust style on tho…

…se pages
panuta · Jan 8, 2011 · 0d1bca0 · 0d1bca0
1 parent 1175d77
commit 0d1bca0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/media/css/styles.page.css b/media/css/styles.page.css
@@ -249,7 +249,8 @@ h2.h2 {font-size:146.5%;padding-bottom:5px;margin-bottom:10px;color:#2D8659;bord
 
 .sector_kpi_page .ss_table .schedules {vertical-align:top;text-align:center;}
 .sector_kpi_page .ss_table .schedules .schedule {background-color:#EEE;padding:5px;margin-bottom:8px;border:1px solid #CCC;text-align:left;}
-.sector_kpi_page .ss_table .schedules .schedule .kpi {font-weight:bold;}
+.sector_kpi_page .ss_table .schedules .schedule .kpi {display:block;margin-bottom:3px;}
+.sector_kpi_page .ss_table .schedules .schedule .value {font-weight:bold;}
 
 .sector_kpi_page .ss_table td.target_kpi, .sector_budget_page .ss_table td.grant_budget {background-color:#EEE;vertical-align:top;text-align:center;}
 .sector_kpi_page .ss_table td.result_kpi, .sector_budget_page .ss_table td.claim_budget {text-align:center;vertical-align:top;}
@@ -313,7 +314,8 @@ h2.h2 {font-size:146.5%;padding-bottom:5px;margin-bottom:10px;color:#2D8659;bord
 
 .master_plan_kpi_page .ss_table .schedules {vertical-align:top;text-align:center;}
 .master_plan_kpi_page .ss_table .schedules .schedule {background-color:#EEE;padding:5px;margin-bottom:8px;border:1px solid #CCC;text-align:left;}
-.master_plan_kpi_page .ss_table .schedules .schedule .kpi {font-weight:bold;}
+.master_plan_kpi_page .ss_table .schedules .schedule .kpi {display:block;margin-bottom:3px;}
+.master_plan_kpi_page .ss_table .schedules .schedule .value {font-weight:bold;}
 
 .master_plan_kpi_page .ss_table td.target_kpi, .master_plan_budget_page .ss_table td.grant_budget {background-color:#EEE;vertical-align:top;text-align:center;}
 .master_plan_kpi_page .ss_table td.result_kpi, .master_plan_budget_page .ss_table td.claim_budget {text-align:center;vertical-align:top;}

diff --git a/templates/page_sector/master_plan_kpi.html b/templates/page_sector/master_plan_kpi.html
@@ -34,22 +34,22 @@
 
           <td class="schedules" colspan="2">
             {% for schedule in program.kpi_schedules.1 %}
-              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}</span> ({{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}})</div>
+              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}{% if schedule.kpi.abbr_name %}({{schedule.kpi.abbr_name}}){% endif %}</span><span class="value">{{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}}</span></div>
             {% endfor %}
           </td>
           <td class="schedules" colspan="2">
             {% for schedule in program.kpi_schedules.2 %}
-              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}</span> ({{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}})</div> 
+              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}{% if schedule.kpi.abbr_name %}({{schedule.kpi.abbr_name}}){% endif %}</span><span class="value">{{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}}</span></div> 
             {% endfor %}
           </td>
           <td class="schedules" colspan="2">
             {% for schedule in program.kpi_schedules.3 %}
-              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}</span> ({{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}})</div>
+              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}{% if schedule.kpi.abbr_name %}({{schedule.kpi.abbr_name}}){% endif %}</span><span class="value">{{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}}</span></div>
             {% endfor %}
           </td>
           <td class="schedules" colspan="2">
             {% for schedule in program.kpi_schedules.4 %}
-              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}</span> ({{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}})</div>
+              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}{% if schedule.kpi.abbr_name %}({{schedule.kpi.abbr_name}}){% endif %}</span><span class="value">{{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}}</span></div>
             {% endfor %}
           </td>
 

diff --git a/templates/page_sector/sector_kpi.html b/templates/page_sector/sector_kpi.html
@@ -36,22 +36,22 @@
 
           <td class="schedules" colspan="2">
             {% for schedule in program.kpi_schedules.1 %}
-              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}</span> ({{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}})</div>
+              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}{% if schedule.kpi.abbr_name %}({{schedule.kpi.abbr_name}}){% endif %}</span><span class="value">{{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}}</span></div>
             {% endfor %}
           </td>
           <td class="schedules" colspan="2">
             {% for schedule in program.kpi_schedules.2 %}
-              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}</span> ({{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}})</div> 
+              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}{% if schedule.kpi.abbr_name %}({{schedule.kpi.abbr_name}}){% endif %}</span><span class="value">{{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}}</span></div>
             {% endfor %}
           </td>
           <td class="schedules" colspan="2">
             {% for schedule in program.kpi_schedules.3 %}
-              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}</span> ({{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}})</div>
+              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}{% if schedule.kpi.abbr_name %}({{schedule.kpi.abbr_name}}){% endif %}</span><span class="value">{{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}}</span></div>
             {% endfor %}
           </td>
           <td class="schedules" colspan="2">
             {% for schedule in program.kpi_schedules.4 %}
-              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}</span> ({{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}})</div>
+              <div class="schedule"><span class="kpi">{{schedule.kpi.ref_no}}{% if schedule.kpi.abbr_name %}({{schedule.kpi.abbr_name}}){% endif %}</span><span class="value">{{schedule.target}} / {{schedule.result}} {{schedule.kpi.unit_name}}</span></div>
             {% endfor %}
           </td>