← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14690: Centralizing css

 

------------------------------------------------------------
revno: 14690
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-04-05 19:55:31 +0200
message:
  Centralizing css
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSingleSelect.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/manager/DefaultSelectionTreeManager.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/manager/DefaultOrganisationUnitSelectionManager.java


--
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/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-02-18 12:23:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-04-05 17:55:31 +0000
@@ -284,9 +284,10 @@
   font-size: 9pt; /* Size to change */
   background-color: white;
   height: 300px;
-  width:595px;  
-  overflow:auto;
-  border:1px solid #cccccc;   
+  width: 493px;  
+  overflow: auto;
+  border: 1px solid #ccc;   
+  padding: 2px 0 0 5px;
 }
 
 div#selectionTree ul 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2013-11-06 10:41:43 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2014-04-05 17:55:31 +0000
@@ -31,7 +31,7 @@
 }
 </script>
 
-<table cellspacing=0 width="535px">
+<table>
 	<thead>
 		<tr>
 			<th colspan="2">$i18n.getString( "organisation_unit_selection_tree" )
@@ -52,7 +52,7 @@
 						<select id="groupList" name="groupList" style="width:10em"/>
 						<input type="button" value="$i18n.getString( 'unselect_in_group' )" onclick="unSelectOrganisationUnitByGroup()" style="width:10em">	
 						<input type="button" value="$i18n.getString( 'select_children' )" onclick="selectChildren()" style="width:10em"/>	
-						<div id="selectionTree" style="padding:5px;width:100%"></div>
+						<div id="selectionTree"></div>
 					</div>
 				</div>
 			</td>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSingleSelect.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSingleSelect.vm	2011-04-04 16:47:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSingleSelect.vm	2014-04-05 17:55:31 +0000
@@ -15,7 +15,7 @@
 });
 </script>
 
-<table cellspacing=0 width="495px">
+<table style="padding: 0; margin: 0;">
 	<thead>
 		<tr>
 			<th colspan="2">$i18n.getString( "organisation_unit_selection_tree" )
@@ -26,7 +26,7 @@
 	<tbody>
 		<tr>
 			<td>											
-				<div id="selectionTree" style="padding:5px;"></div>	
+				<div id="selectionTree"></div>	
 			</td>
 		</tr>
 	</tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/manager/DefaultSelectionTreeManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/manager/DefaultSelectionTreeManager.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/manager/DefaultSelectionTreeManager.java	2014-04-05 17:55:31 +0000
@@ -41,8 +41,9 @@
 import java.util.Set;
 
 /**
+ * The selection tree is used for data output and analysis.
+ * 
  * @author Torgeir Lorange Ostby
- * @version $Id: DefaultSelectionTreeManager.java 5652 2008-09-06 13:24:34Z larshelg $
  */
 public class DefaultSelectionTreeManager
     implements SelectionTreeManager

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/manager/DefaultOrganisationUnitSelectionManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/manager/DefaultOrganisationUnitSelectionManager.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/manager/DefaultOrganisationUnitSelectionManager.java	2014-04-05 17:55:31 +0000
@@ -40,9 +40,9 @@
 import com.opensymphony.xwork2.ActionContext;
 
 /**
+ * The web tree is used for data input and data capture/write operations.
+ * 
  * @author Torgeir Lorange Ostby
- * @version $Id: DefaultOrganisationUnitSelectionManager.java 5652 2008-09-06
- *          13:24:34Z larshelg $
  */
 public class DefaultOrganisationUnitSelectionManager
     implements OrganisationUnitSelectionManager