dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10072
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-03-08 12:47:01 +0300
message:
  FRED-API: more UI fixes
modified:
  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/facility.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	2013-03-08 08:41:32 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm	2013-03-08 09:47:01 +0000
@@ -132,17 +132,9 @@
     });
 </script>
 
-<style>
-/*
-    .table > tbody > tr:hover {
-        background-color : #f5f5f5;
-    }
-*/
-</style>
-
-<div class='btn-group pull-right'>
+<div class='btn-group pull-right' style='margin-left: 10px;'>
     <a href='facilities.json' class='btn btn-small btn-info' style='margin-bottom: 5px;'>
-        <span class='icon-white icon-download-alt'> </span> JSON
+        <span class='icon-white icon-download'> </span> JSON
     </a>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facility.vm'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facility.vm	2013-03-07 18:52:55 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facility.vm	2013-03-08 09:47:01 +0000
@@ -120,8 +120,8 @@
             <fieldset>
                 <legend>Facility</legend>
 
-                <label for="facilityID">ID</label>
-                <input id="facilityID" disabled="disabled" type="text" class="$inputSize" value="$entity.id"/>
+                <label for="facilityID">UUID</label>
+                <input id="facilityID" disabled="disabled" type="text" class="$inputSize" value="$entity.uuid"/>
 
                 <label for="facilityName">Name</label>
                 <input #if(!$canUpdate)disabled#end id="facilityName" type="text" class="$inputSize" value="$esc.escapeHtml4($entity.name)"/>
@@ -145,8 +145,14 @@
                         #if( $identifier.context == "DHIS2_CODE" )
                             #set( $dhis2Code = $identifier.id )
                         #end
+                        #if( $identifier.context == "DHIS2_UID" )
+                            #set( $dhis2Uid = $identifier.id )
+                        #end
                     #end
 
+                    <label for="facilityDhis2Uid">UID</label>
+                    <input disabled id="facilityDhis2Uid" type="text" class="$inputSize" value="$!esc.escapeHtml4($dhis2Uid)"/>
+
                     <label for="facilityDhis2Code">Code</label>
                     <input #if(!$canUpdate)disabled#end id="facilityDhis2Code" type="text" class="$inputSize" value="$!esc.escapeHtml4($dhis2Code)"/>