dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9196
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-12-07 01:11:44 +0300
message:
  FRED-API: added links to facilities + minor cosmetic fixes to UI
modified:
  dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm	2012-12-06 21:41:42 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm	2012-12-06 22:11:44 +0000
@@ -1,7 +1,7 @@
 <script>
     $(function () {
-        $(".activateButton").click(function () {
-            if (confirm("Are you sure you want to activate this facility?")) {
+        $('.activateButton').click(function () {
+            if (confirm('Are you sure you want to activate this facility?')) {
                 var id = $(this).parent().parent().find('.facility-id').text();
 
                 $.ajax({
@@ -14,8 +14,8 @@
             }
         });
 
-        $(".deactivateButton").click(function () {
-            if (confirm("Are you sure you want to de-activate this facility?")) {
+        $('.deactivateButton').click(function () {
+            if (confirm('Are you sure you want to de-activate this facility?')) {
                 var id = $(this).parent().parent().find('.facility-id').text();
 
                 $.ajax({
@@ -30,6 +30,12 @@
     });
 </script>
 
+<style>
+    .table > tbody > tr:hover {
+        background-color: #f5f5f5;
+    }
+</style>
+
 <div class="btn-group pull-right">
     <a href="facilities.json" class="btn btn-small btn-info" style="margin-bottom: 5px;">
         <span class="icon-white icon-download-alt"> </span> JSON
@@ -42,7 +48,7 @@
     -->
 </div>
 
-<table class="table table-bordered table-striped">
+<table class="table table-bordered">
     <thead>
     <tr>
         <th>ID</th>
@@ -56,7 +62,7 @@
     #foreach( $facility in $entity.facilities )
     <tr>
         <td class="facility-id" style="width: 1px;">$facility.id</td>
-        <td class="facility-name">$facility.name</td>
+        <td class="facility-name"><a href="facilities/$facility.id">$facility.name</a></td>
         <td class="facility-active" style="width: 1px;">
             #if( $facility.active )
                 <button style="width: 44px;" class="deactivateButton btn btn-mini btn-success"><span class="icon-white icon-ok-circle"> </span> </button>