dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8997
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-11-13 14:20:22 +0100
message:
  Added more org unit group symbols
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/13.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/14.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/15.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/16.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/17.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/18.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/19.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/20.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/21.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/22.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/23.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/24.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/25.png
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/02.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/07.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/08.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/09.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/10.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/11.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/12.png
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.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-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-11-13 08:20:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-11-13 13:20:22 +0000
@@ -98,9 +98,9 @@
   border-width: 1px;
   border-color: #D0D0D0;
   padding: 11px;
-  margin: 20px 15px 0 15px;
+  margin: 20px 15px 0 40px;
   display: block;
-  width: 280px;
+  width: 286px;
   border-radius: 2px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/02.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/02.png	2012-10-24 13:47:13 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/02.png	2012-11-13 13:20:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/07.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/07.png	2012-10-24 13:47:13 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/07.png	2012-11-13 13:20:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/08.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/08.png	2012-10-24 13:47:13 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/08.png	2012-11-13 13:20:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/09.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/09.png	2012-10-24 13:47:13 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/09.png	2012-11-13 13:20:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/10.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/10.png	2012-10-24 13:47:13 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/10.png	2012-11-13 13:20:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/11.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/11.png	2012-10-24 13:47:13 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/11.png	2012-11-13 13:20:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/12.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/12.png	2012-10-24 13:47:13 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/12.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/13.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/13.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/13.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/14.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/14.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/14.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/15.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/15.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/15.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/16.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/16.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/16.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/17.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/17.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/17.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/18.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/18.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/18.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/19.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/19.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/19.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/20.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/20.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/20.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/21.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/21.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/21.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/22.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/22.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/22.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/23.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/23.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/23.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/24.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/24.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/24.png	2012-11-13 13:20:22 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/25.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/25.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/orgunitgroup/25.png	2012-11-13 13:20:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js	2012-10-24 13:47:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js	2012-11-13 13:20:22 +0000
@@ -30,8 +30,8 @@
 function openSymbolDialog()
 {
 	$( "#symbolDiv" ).dialog( {
-		height: 194,
-		width: 194,
+		height: 290,
+		width: 250,
 		modal: true,
 		resizable: false,
 		title: "Select symbol"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm	2012-10-24 13:47:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSymbol.vm	2012-11-13 13:20:22 +0000
@@ -22,18 +22,35 @@
         <td><img src="${base}02.png" onclick="selectSymbol( '02.png' )"></td>
         <td><img src="${base}03.png" onclick="selectSymbol( '03.png' )"></td>
         <td><img src="${base}04.png" onclick="selectSymbol( '04.png' )"></td>
-    </tr>
-    <tr>
         <td><img src="${base}05.png" onclick="selectSymbol( '05.png' )"></td>
+    </tr>
+    <tr>
         <td><img src="${base}06.png" onclick="selectSymbol( '06.png' )"></td>
         <td><img src="${base}07.png" onclick="selectSymbol( '07.png' )"></td>
         <td><img src="${base}08.png" onclick="selectSymbol( '08.png' )"></td>
-    </tr>
-    <tr>
         <td><img src="${base}09.png" onclick="selectSymbol( '09.png' )"></td>
         <td><img src="${base}10.png" onclick="selectSymbol( '10.png' )"></td>
+    </tr>
+    <tr>
         <td><img src="${base}11.png" onclick="selectSymbol( '11.png' )"></td>
         <td><img src="${base}12.png" onclick="selectSymbol( '12.png' )"></td>
+        <td><img src="${base}13.png" onclick="selectSymbol( '13.png' )"></td>
+        <td><img src="${base}14.png" onclick="selectSymbol( '14.png' )"></td>
+        <td><img src="${base}15.png" onclick="selectSymbol( '15.png' )"></td>
+    </tr>
+    <tr>
+        <td><img src="${base}16.png" onclick="selectSymbol( '16.png' )"></td>
+        <td><img src="${base}17.png" onclick="selectSymbol( '17.png' )"></td>
+        <td><img src="${base}18.png" onclick="selectSymbol( '18.png' )"></td>
+        <td><img src="${base}19.png" onclick="selectSymbol( '19.png' )"></td>
+        <td><img src="${base}20.png" onclick="selectSymbol( '20.png' )"></td>
+    </tr>
+    <tr>
+        <td><img src="${base}21.png" onclick="selectSymbol( '21.png' )"></td>
+        <td><img src="${base}22.png" onclick="selectSymbol( '22.png' )"></td>
+        <td><img src="${base}23.png" onclick="selectSymbol( '23.png' )"></td>
+        <td><img src="${base}24.png" onclick="selectSymbol( '24.png' )"></td>
+        <td><img src="${base}25.png" onclick="selectSymbol( '25.png' )"></td>
     </tr>
 </table>