dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07008
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1964: Use JQuery Dialog instead of popup window in Multiple Data Entry.
------------------------------------------------------------
revno: 1964
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-08-25 12:51:43 +0700
message:
Use JQuery Dialog instead of popup window in Multiple Data Entry.
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/caseaggregation.png
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm
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/util/commons.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/css/redmond/jquery-ui.css
--
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/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2010-08-05 12:25:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2010-08-25 05:51:43 +0000
@@ -151,7 +151,7 @@
blood_test_hiv = Blood Test HIV
test_for_thalassemia = Test For Thalassemia
testing_for_hepatitis_b = Testing For Hepatitis-B
-urine_test_Infection = Urine Test – Infection (Pus Cells, Bacteria)
+urine_test_Infection = Urine Test \u2013 Infection (Pus Cells, Bacteria)
urine_test_sugar = Urine Test - Sugar
urine_test_albumin = Urine Test- Albumin
tt1_date = TT 1 Date
@@ -297,7 +297,7 @@
blood_test_hiv = Blood Test HIV
test_for_thalassemia = Test For Thalassemia
testing_for_hepatitis_b = Testing For Hepatitis-B
-urine_test_Infection = Urine Test – Infection (Pus Cells, Bacteria)
+urine_test_Infection = Urine Test \u2013 Infection (Pus Cells, Bacteria)
urine_test_sugar = Urine Test - Sugar
urine_test_albumin = Urine Test- Albumin
tt1_date = TT 1 Date
@@ -463,6 +463,7 @@
urine_test_Infection = Urine Test Infection
discharge_date_from_institution = Discharge Date From Institution
case_aggregation = Beneficiary Aggregation
-case_aggregation_form = Beneficiary Aggregation Form
-dataset_list = Dataset List
-multiple_data_entry = Multiple Data Entry
\ No newline at end of file
+case_aggregation_form = Beneficiary Aggregation Form
+dataset_list = Dataset List
+multiple_data_entry = Multiple Data Entry
+intro_case_aggregation = Generate routine data values from patient-data by month (or other interval if desired) and organisation unit.
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2010-08-14 15:02:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2010-08-25 05:51:43 +0000
@@ -149,15 +149,24 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-caseentry/dataentryRecords.vm</param>
<param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
- <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/dataEntry.js</param>
+ <param name="javascripts">
+ ../dhis-web-commons/util/jquery-ui.js,
+ ../dhis-web-commons/calendar/calendar.js,
+ ../dhis-web-commons/calendar/calendar-lang.js,
+ ../dhis-web-commons/calendar/calendar-setup.js,
+ ../dhis-web-commons/util/jquery.metadata.js,
+ ../dhis-web-commons/ouwt/ouwt.js,javascript/dataEntry.js,
+ javascript/customcheckbox/prettyCheckboxes.js
+ </param>
+ <param name="stylesheets">
+ ../dhis-web-commons/util/css/redmond/jquery-ui.css,
+ style/patient.css,
+ javascript/customcheckbox/prettyCheckboxes.css
+ </param>
</action>
<action name="viewProgramStageRecords" class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction">
- <result name="success" type="velocity">/popup.vm</result>
- <param name="page">/dhis-web-caseentry/programStageDataEntryForm.vm</param>
- <param name="javascripts">../dhis-web-commons/util/jquery-ui.js,../dhis-web-commons/ouwt/ouwt.js,javascript/dataEntry.js,../dhis-web-commons/calendar/calendar.js,../dhis-web-commons/calendar/calendar-lang.js,../dhis-web-commons/calendar/calendar-setup.js
- ,../dhis-web-commons/util/jquery.metadata.js,javascript/customcheckbox/prettyCheckboxes.js</param>
- <param name="stylesheets">../dhis-web-commons/util/css/redmond/jquery-ui.css,style/patient.css,javascript/customcheckbox/prettyCheckboxes.css</param>
+ <result name="success" type="velocity">/dhis-web-caseentry/programStageDataEntryForm.vm</result>
</action>
<action name="completeProgramStageDataEntry" class="org.hisp.dhis.caseentry.action.caseentry.CompleteDataEntryAction">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2010-05-17 02:59:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2010-08-25 05:51:43 +0000
@@ -82,14 +82,9 @@
</select>
#elseif( $programStageDataElement.dataElement.type == "date" )
<input type="text" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="value[$programStageDataElement.dataElement.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveDateValue( $programStageDataElement.dataElement.id, '$encoder.jsEncode( $programStageDataElement.dataElement.name )' )" tabindex="$tabIndex" >
- <img src="../images/calendar_icon.gif" width="16" height="16" id="get$programStageDataElement.dataElement.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "service_date" )">
<script type="text/javascript">
- Calendar.setup({
- inputField : "value[$programStageDataElement.dataElement.id].date", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "get$programStageDataElement.dataElement.id" // trigger for the calendar (button ID)
- });
- </script>
+ datePicker('value[$programStageDataElement.dataElement.id].date');
+ </script>
#else
<input name="entryfield" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="value[$programStageDataElement.dataElement.id].value" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveValue( $programStageDataElement.dataElement.id, '$encoder.jsEncode( $programStageDataElement.dataElement.name )' )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" >
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2010-08-25 05:51:43 +0000
@@ -73,14 +73,9 @@
<td> </td>
<td><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
<td><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" >
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getExecutionDate" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "execution_date" )"></td>
- <script type="text/javascript">
- Calendar.setup({
- inputField : "executionDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getExecutionDate" // trigger for the calendar (button ID)
- });
- </script>
+ <script type="text/javascript">
+ datePicker('executionDate');
+ </script>
#end
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2010-08-05 12:32:20 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2010-08-25 05:51:43 +0000
@@ -1,4 +1,3 @@
-
#parse( "/dhis-web-caseentry/multiDataEntrySelect.vm" )
<table class="mainPageTable">
@@ -35,11 +34,11 @@
#foreach( $programStageInstance in $programInstance.programStageInstances )
#if( $programStageInstance.executionDate )
<td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">
- <a href="javascript:viewPrgramStageRecords( $programStageInstance.id )">$format.formatDate( $programStageInstance.executionDate )</a>
+ <a href="javascript:viewPrgramStageRecords( $programStageInstance.id );">$format.formatDate( $programStageInstance.executionDate )</a>
</td>
#else
<td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">
- <a href="javascript:viewPrgramStageRecords( $programStageInstance.id )">$format.formatDate( $programStageInstance.dueDate )</a>
+ <a href="javascript:viewPrgramStageRecords( $programStageInstance.id );">$format.formatDate( $programStageInstance.dueDate )</a>
</td>
#end
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2010-06-19 15:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2010-08-25 05:51:43 +0000
@@ -5,4 +5,5 @@
#introListImgItem( "dataEntrySelect.action" "data_entry" "dataentry" )
#introListImgItem( "reportSelect.action" "summary_report" "summaryreport" )
#introListImgItem( "visitPlanSelect.action" "visit_plan" "visitplan" )
+ #introListImgItem( "caseAggregationForm.action" "case_aggregation" "caseaggregation" )
</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2010-08-05 12:25:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2010-08-25 05:51:43 +0000
@@ -1,8 +1,7 @@
-
function viewPrgramStageRecords( programStageInstanceId )
{
- var url = 'viewProgramStageRecords.action?programStageInstanceId=' + programStageInstanceId;
+ /* var url = 'viewProgramStageRecords.action?programStageInstanceId=' + programStageInstanceId;
var width = 800
var height = 500;
@@ -10,7 +9,19 @@
var top = parseInt( ( screen.availHeight/2 ) - ( height/2 ) );
var windowFeatures = 'width=' + width + ',height=' + height + ',scrollbars=yes, resizable=yes,left=' + left + ',top=' + top + 'screenX=' + left + ',screenY=' + top;
- window.open( url, '_blank_', windowFeatures);
+ window.open( url, '_blank_', windowFeatures); */
+
+ var url = 'viewProgramStageRecords.action?programStageInstanceId=' + programStageInstanceId;
+ $('#contentDataRecord').dialog('destroy').remove();
+ $('<div id="contentDataRecord" style="z-index: 1;">' ).load(url).dialog({
+ title: 'ProgramStage',
+ maximize: true,
+ closable: true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width: 800,
+ height: 400
+ });
}
@@ -923,7 +934,7 @@
jQuery(this_).css({
"background-color":"#ffffcc"
});
-
+
var data = jQuery(this_).metadata({
type:"attr",
name:"data"
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2010-08-14 15:02:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2010-08-25 05:51:43 +0000
@@ -1,8 +1,7 @@
-
<form id="selectRecordingForm" name="selectRecordingForm" method="post" action="selectDataRecording.action">
<input type="hidden" id="id" name="id" value="$patient.id">
-
+
<table class="mainPageTable">
<tr>
<td>
@@ -36,13 +35,8 @@
#if( $programStageInstance )
<td><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
<td><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" >
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getExecutionDate" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "execution_date" )"></td>
<script type="text/javascript">
- Calendar.setup({
- inputField : "executionDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getExecutionDate" // trigger for the calendar (button ID)
- });
+ datePicker( 'executionDate' );
</script>
#end
</tr>
@@ -152,13 +146,8 @@
</select>
#elseif( $programStageDataElement.dataElement.type == "date" )
<input type="text" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="value[$programStageDataElement.dataElement.id].date" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveDateValue( $programStageDataElement.dataElement.id, '$encoder.jsEncode( $programStageDataElement.dataElement.name )' )" tabindex="$tabIndex" >
- <img src="../images/calendar_icon.gif" width="16" height="16" id="get$programStageDataElement.dataElement.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "service_date" )">
<script type="text/javascript">
- Calendar.setup({
- inputField : "value[$programStageDataElement.dataElement.id].date", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "get$programStageDataElement.dataElement.id" // trigger for the calendar (button ID)
- });
+ datePicker('value[$programStageDataElement.dataElement.id].date');
</script>
#else
<input name="entryfield" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="value[$programStageDataElement.dataElement.id].value" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveValue( $programStageDataElement.dataElement.id, '$encoder.jsEncode( $programStageDataElement.dataElement.name )' )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" >
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2009-10-28 19:47:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2010-08-25 05:51:43 +0000
@@ -24,14 +24,9 @@
<td><label>$i18n.getString( "start_date" )</label></td>
<td>
<input type="text" id="startDate" name="startDate" #if( $startDate ) value="$encoder.htmlEncode( $startDate )" #end>
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getStartDate" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "execution_date" )">
- <script type="text/javascript">
- Calendar.setup({
- inputField : "startDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getStartDate" // trigger for the calendar (button ID)
- });
- </script>
+ <script type="text/javascript">
+ datePicker('startDate');
+ </script>
</td>
</tr>
@@ -39,14 +34,9 @@
<td><label>$i18n.getString( "end_date" )</label></td>
<td>
<input type="text" id="endDate" name="endDate" #if( $endDate ) value="$encoder.htmlEncode( $endDate )" #end>
- <img src="../images/calendar_icon.gif" width="16" height="16" id="getEndDate" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "execution_date" )">
<script type="text/javascript">
- Calendar.setup({
- inputField : "endDate", // id of the input field
- ifFormat : "$i18n.getString("format.date.label")", // format of the input field
- button : "getEndDate" // trigger for the calendar (button ID)
- });
- </script>
+ datePicker('endDate');
+ </script>
</td>
</tr>
</table>
=== 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 2010-08-23 08:51:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2010-08-25 05:51:43 +0000
@@ -348,6 +348,7 @@
cursor: default;
background: #c8d0d4;
font-family: tahoma, verdana, sans-serif;
+ z-index: 9999999999999;
}
.calendar table
@@ -361,6 +362,7 @@
cursor: default;
background: #c8d0d4;
font-family: tahoma, verdana, sans-serif;
+ z-index: 9999999999999;
}
/* Header part -- contains navigation buttons and day names. */
@@ -728,6 +730,6 @@
div.error { background: url(../images/error.png) no-repeat 10px 10px }
div.success { background: url(../images/success.png) no-repeat 10px 10px }
div.warning { background: url(../images/warning.png) no-repeat 10px 10px }
-div.growlUI h1, div.growlUI h2 { color: white; padding: 5px 5px 5px 75px; text-align: left;font-size:medium }
+div.growlUI h1, div.growlUI h2 { color: white; padding: 10px 10px 10px 75px; text-align: left;font-size:medium }
div.growlUI h2 { font-size: small }
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js 2010-08-24 07:43:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js 2010-08-25 05:51:43 +0000
@@ -911,11 +911,65 @@
}
/**
+ * Create Mask with proccessing *
+ */
+function MaskAjaxProccess()
+{
+ this.processWidth = 100;
+ this.processHeight = 100;
+
+ this.width = document.documentElement.clientWidth;
+ this.height = document.documentElement.clientHeight;
+ this.mask = document.createElement( 'div' );
+
+ this.mask.id = "mask";
+ this.mask.style.position = "fixed";
+ this.mask.style.display = "none";
+ this.mask.style.top = 0;
+ this.mask.style.width = this.width + "px";
+ this.mask.style.height = this.height + "px";
+ this.mask.style.background = "#000000";
+ this.mask.style.opacity = 0.5;
+ this.mask.style.zIndex = 10;
+
+ this.process = document.createElement( 'div' );
+ this.process.id = "process";
+ this.process.style.display = "none";
+ this.process.style.position = "fixed";
+ this.process.style.background = "#000000";
+ this.process.style.backgroundRepeat = "no-repeat";
+ this.process.style.width = this.processWidth + "px";
+ this.process.style.height = this.processHeight + "px";
+ this.process.style.backgroundImage = "url(../images/ajax-loader-preview.gif)";
+ this.process.style.top = ((this.height / 2) - (this.processHeight/2)) + "px";
+ this.process.style.left = ((this.width / 2) - (this.processWidth/2)) + "px";
+ this.process.style.zIndex = 11;
+ this.process.style.border = "#CCCCCC 3px solid";
+
+ this.show = function()
+ {
+ document.body.appendChild(this.process);
+ document.body.appendChild( this.mask );
+
+ $('#mask' ).fadeIn(1000);
+ $('#process' ).fadeIn(1000);
+ }
+
+ this.hide = function()
+ {
+ $('#mask' ).fadeOut(1000);
+ $('#process' ).fadeOut(1000);
+ }
+
+}
+var MaskAjaxProccess = new MaskAjaxProccess();
+
+/**
* Clock screen by mask *
*/
function lockScreen()
{
- jQuery.blockUI({ message: i18n_waiting , css: {
+ jQuery.blockUI({ message: 'Please wait ... ', css: {
border: 'none',
padding: '15px',
backgroundColor: '#000',
@@ -953,18 +1007,3 @@
nameField.focus();
}
}
-
-function showErrorMessage( message, time )
-{
- jQuery.growlUI( i18n_error, message, 'error', time );
-}
-
-function showSuccessMessage( message, time )
-{
- jQuery.growlUI( i18n_success, message, 'success', time );
-}
-
-function showWarningMessage( message, time )
-{
- jQuery.growlUI( i18n_warning, message, 'warning', time );
-}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/css/redmond/jquery-ui.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/css/redmond/jquery-ui.css 2009-03-10 07:27:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/css/redmond/jquery-ui.css 2010-08-25 05:51:43 +0000
@@ -647,7 +647,7 @@
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1;}
.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/caseaggregation.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/caseaggregation.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/caseaggregation.png 2010-08-25 05:51:43 +0000 differ
