dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4843
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-10-05 17:59:17 +0200
message:
  Replaced some icons. Minifed json templates
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramInstance.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePrograms.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add_small.png


--
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-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramInstance.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramInstance.vm	2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramInstance.vm	2011-10-05 15:59:17 +0000
@@ -1,7 +1,7 @@
 {
-	"programInstanceId":"$programInstance.id",
-	"dateOfIncident":"$!format.formatDate( $programInstance.dateOfIncident )",
-	"enrollmentDate":"$!format.formatDate( $programInstance.enrollmentDate )",
-	"dateOfIncidentDescription":"($!programInstance.program.dateOfIncidentDescription)",
-	"dateOfEnrollmentDescription":"($!programInstance.program.dateOfIncidentDescription)"
+"programInstanceId":"$programInstance.id",
+"dateOfIncident":"$!format.formatDate( $programInstance.dateOfIncident )",
+"enrollmentDate":"$!format.formatDate( $programInstance.enrollmentDate )",
+"dateOfIncidentDescription":"($!programInstance.program.dateOfIncidentDescription)",
+"dateOfEnrollmentDescription":"($!programInstance.program.dateOfIncidentDescription)"
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm	2011-05-10 07:25:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm	2011-10-05 15:59:17 +0000
@@ -1,24 +1,24 @@
 #set( $size = $programStages.size() )
 { 
-	"programStages": [
-		#foreach( $programStage in $programStages )
-		  {
-			"id":  ${programStage.id} ,
-			"name": "$!encoder.jsonEncode( ${programStage.name} )"
-		  }#if( $velocityCount < $size ),#end
-		#end],
-		
-	#set( $size = $programStages.size() )
-	"programStageInstances": [
-		#foreach( $programStageInstance in $programInstance.programStageInstances )
-		  {
-			"name": "$programStageInstance.programStage.name",
-			"colorMap": "$colorMap.get( $programStageInstance.id )",
-			"infor": #if( $programStageInstance.completed )
-						"$i18n.getString( 'completed_on' )$format.formatDate( $programStageInstance.executionDate )"
-					#else
-						"$i18n.getString( 'scheduled_for' )$format.formatDate( $programStageInstance.dueDate )"
-					#end
-		  }#if( $velocityCount < $programInstance.programStageInstances.size() ),#end
-		#end]
+"programStages": [
+	#foreach( $programStage in $programStages )
+	  {
+		"id":  ${programStage.id} ,
+		"name": "$!encoder.jsonEncode( ${programStage.name} )"
+	  }#if( $velocityCount < $size ),#end
+	#end],
+	
+#set( $size = $programStages.size() )
+"programStageInstances": [
+	#foreach( $programStageInstance in $programInstance.programStageInstances )
+	  {
+		"name": "$programStageInstance.programStage.name",
+		"colorMap": "$colorMap.get( $programStageInstance.id )",
+		"infor": #if( $programStageInstance.completed )
+					"$i18n.getString( 'completed_on' )$format.formatDate( $programStageInstance.executionDate )"
+				#else
+					"$i18n.getString( 'scheduled_for' )$format.formatDate( $programStageInstance.dueDate )"
+				#end
+	  }#if( $velocityCount < $programInstance.programStageInstances.size() ),#end
+	#end]
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePrograms.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePrograms.vm	2011-05-20 09:23:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePrograms.vm	2011-10-05 15:59:17 +0000
@@ -1,12 +1,12 @@
 #set( $size = $programs.size() )
 { 
-	"organisationUnit": "$!encoder.jsonEncode( ${organisationUnit.name} )",
-	"organisationUnitId": "${organisationUnit.id}",
-	"programs": [
-		#foreach( $program in $programs )
-		  {
-			"id":  ${program.id} ,
-			"name": "$!encoder.jsonEncode( ${program.name} )"
-		  }#if( $velocityCount < $size ),#end
-		#end]
+"organisationUnit": "$!encoder.jsonEncode( ${organisationUnit.name} )",
+"organisationUnitId": "${organisationUnit.id}",
+"programs": [
+	#foreach( $program in $programs )
+	  {
+		"id":  ${program.id} ,
+		"name": "$!encoder.jsonEncode( ${program.name} )"
+	  }#if( $velocityCount < $size ),#end
+	#end]
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add.png	2010-12-10 18:26:13 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add.png	2011-10-05 15:59:17 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add_small.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add_small.png	2010-04-22 17:27:49 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/add_small.png	2011-10-05 15:59:17 +0000 differ