← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #00351

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 107: dhis-web-maintenance-dataset: Improved icons and help text

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 107
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-03-23 20:20:18 +0100
message:
  dhis-web-maintenance-dataset: Improved icons and help text
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/start_process.png
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add_section.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/assign.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/delete.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/edit_layout.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/i18n.png
  dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java	2009-03-23 19:20:18 +0000
@@ -104,7 +104,7 @@
                 
                 if ( convertedDataElementId == null )
                 {
-                    log.error( "'" + name + "' contains a non-existing data element identifier: " + dataElementId );
+                    log.warn( "'" + name + "' contains a non-existing data element identifier: " + dataElementId );
                     
                     convertedDataElementId = -1;
                 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add_section.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add_section.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add_section.png	2009-03-23 19:20:18 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/assign.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/assign.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/assign.png	2009-03-23 19:20:18 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/delete.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/delete.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/delete.png	2009-03-23 19:20:18 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/edit_layout.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/edit_layout.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/edit_layout.png	2009-03-23 19:20:18 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/i18n.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/i18n.png	2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/i18n.png	2009-03-23 19:20:18 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/start_process.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/start_process.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/start_process.png	2009-03-23 19:20:18 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/viewExportForm.vm	2009-03-23 19:20:18 +0000
@@ -25,7 +25,7 @@
                 #foreach( $export in $exports )
                 <tr>
                     <td#alternate( $mark )>$encoder.htmlEncode( $export.name )</td>
-                    <td style="text-align:center"#alternate( $mark )><a href="exportDataMartExport.action?id=$export.id" title="$i18n.getString( "export" )"><img src="../images/up_left.png" alt="$i18n.getString( "export" )"></a></td>
+                    <td style="text-align:center"#alternate( $mark )><a href="exportDataMartExport.action?id=$export.id" title="$i18n.getString( "export" )"><img src="../images/start_process.png" alt="$i18n.getString( "export" )"></a></td>
                     <td style="text-align:center"#alternate( $mark )><a href="getOptions.action?id=$export.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a></td>
                     <td style="text-align:center"#alternate( $mark )><a href="javascript:removeDatamartExport( $export.id, '$encoder.jsEncode( $export.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a></td>
                     <td style="text-align:center"#alternate( $mark )><a href="javascript:addToDashboard( '$export.id' )"  title="$i18n.getString( 'add_to_dashboard' )"><img src="../images/add_to_dashboard.png" alt="$i18n.getString( 'add_to_dashboard' )"></a></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2009-03-11 15:16:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2009-03-23 19:20:18 +0000
@@ -15,7 +15,7 @@
 dataset_management 											= Dataset management
 add_new 													= Add new
 operations 													= Operations
-define_associations 										= Assign dataset to organisation units for registering
+define_associations 										= Assign dataset to organisation units
 edit 														= Edit
 remove 														= Remove
 show_details 												= Show details
@@ -35,7 +35,7 @@
 duplicate_names 											= A dataset with this name is already registered
 duplicate_short_names										= A dataset with this short name is already registered
 duplicate_codes												= A dataset with this code is already registered
-illegal_associations 										= An dataset cannot be assigned to two organisation units where one of them is a direct or indirect parent of the other
+illegal_associations 										= A dataset cannot be assigned to two organisation units where one of them is a direct or indirect parent of the other
 remove_all 													= Remove all
 select_all_at_level 										= Select all at level
 update 														= Update
@@ -81,3 +81,5 @@
 move_to_top													= Move to top
 move_to_bottom												= Move to bottom
 cancel														= Cancel
+design_data_entry_form										= Design data entry form
+view_section_management										= View section management

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm	2009-03-23 19:20:18 +0000
@@ -42,14 +42,14 @@
                    <a href="$i18n.getString( "translation_translate" )" title="$i18n.getString( "translation_translate" )" onclick="this.href='javascript:location.href= \'../dhis-web-commons/i18n.action?className=DataSet&amp;objectId=$dataSet.id&amp;returnUrl=\' + location.href'"><img src="../images/i18n.png" alt="$i18n.getString( "translation_translate" )"></a>
                 </td>
                 <td style="text-align:center"#alternate( $mark )>
+                  <a href="javascript:viewDataEntryForm( '$dataSet.id' )" title="$i18n.getString( "design_data_entry_form" )"><img src="../images/edit_layout.png" alt="$i18n.getString( "design_data_entry_form" )"></a>
+                </td>  
+				<td style="text-align:center"#alternate( $mark )>
+                  <a href="javascript:showsection( $dataSet.id )" title="$i18n.getString( "view_section_management" )"><img src="../images/add_section.png" alt="$i18n.getString( "view_section_management" )"></a>
+                </td>  
+                <td style="text-align:center"#alternate( $mark )>
                   <a href="javascript:removeDataSet( '$dataSet.id', '$encoder.jsEncode( $dataSet.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
-                </td>
-                <td style="text-align:center"#alternate( $mark )>
-                  <a href="javascript:viewDataEntryForm( '$dataSet.id' )" title="$i18n.getString( "dataentryform" )"><img src="../images/edit_layout.png" alt="$i18n.getString( "dataentryform" )"></a>
-                </td>  
-				<td style="text-align:center"#alternate( $mark )>
-                  <a href="javascript:showsection( $dataSet.id )" title="$i18n.getString( "section_management" )"><img src="../images/add_section.png" alt="$i18n.getString( "show_details" )"></a>
-                </td>              
+                </td>            
                 <td style="text-align:center"#alternate( $mark )>
                   <a href="javascript:showDataSetDetails( $dataSet.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
                 </td>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm	2009-03-23 19:20:18 +0000
@@ -27,7 +27,7 @@
 				#foreach ( $table in $tables )
 				<tr>
 					<td#alternate( $mark )>$encoder.htmlEncode( $table.name )</td>
-					<td style="text-align:center"#alternate( $mark )><a href="getReportParams.action?id=$table.id&mode=table" title="$i18n.getString( "create" )"><img src="../images/up_left.png" alt="$i18n.getString( "create" )"></a></td>
+					<td style="text-align:center"#alternate( $mark )><a href="getReportParams.action?id=$table.id&mode=table" title="$i18n.getString( "create" )"><img src="../images/start_process.png" alt="$i18n.getString( "create" )"></a></td>
                     <td style="text-align:center"#alternate( $mark )><a href="displayAddTableForm.action?id=$table.id&mode=$table.mode&category=$table.hasCategoryOptionCombos()" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a></td>
                     <td style="text-align:center"#alternate( $mark )><a href="javascript:removeTable( $table.id, '$encoder.jsEncode( $table.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a></td>
 					<td style="text-align:center"#alternate( $mark )><a href="javascript:showTableDetails( $table.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a></td>



--
Trunk
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.
  Thread Previous • Date Previous • • Thread Next