dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12084
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3615: updated popup to use redmond theme. also did a little cleanup.
------------------------------------------------------------
revno: 3615
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-05-13 11:43:23 +0200
message:
updated popup to use redmond theme. also did a little cleanup.
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.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/popup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm 2011-05-13 05:06:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm 2011-05-13 09:43:23 +0000
@@ -4,9 +4,9 @@
<title>DHIS 2</title>
<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/$stylesheet">
<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/widgets.css">
- <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/theme/jquery-ui-1.8.6.css">
- <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/theme/ui.thickbox.css">
- <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/theme/jquery.cluetip.css">
+ <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.8.12.custom.css">
+ <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/ui.thickbox.css">
+ <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/jquery.cluetip.css">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2011-04-28 08:15:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2011-05-13 09:43:23 +0000
@@ -1,30 +1,29 @@
-<script>
- var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
- var i18n_field_is_required = '$encoder.jsEscape( $i18n.getString( "field_is_required" ) , "'") ';
- var isSubmit = true;
+<script type="text/javascript">
jQuery(document).ready( function(){
+ validation( 'addPatientAttributeForm', function(form){
+ if( isSubmit && ATTRIBUTE_OPTION.checkOnSubmit() ) {
+ form.submit(i18n_field_is_required);
+ }
+ }, function(){
+ isSubmit = true;
- validation( 'addPatientAttributeForm', function(form){
- if( isSubmit && ATTRIBUTE_OPTION.checkOnSubmit() ) {
- form.submit(i18n_field_is_required);
+ var fields = jQuery("#addPatientAttributeForm").serializeArray();
+ jQuery.each(fields, function(i, field) {
+ if( field.name.match("^attrOption")=='attrOption' && field.value == ""){
+ setInnerHTML("attrMessage", i18n_field_is_required);
+ isSubmit = false;
}
- }, function(){
- isSubmit = true;
-
- var fields = $("#addPatientAttributeForm").serializeArray();
- jQuery.each(fields, function(i, field) {
- if( field.name.match("^attrOption")=='attrOption' && field.value == ""){
- setInnerHTML("attrMessage", i18n_field_is_required);
- isSubmit = false;
- }
- });
- });
-
+ });
+ });
jQuery("#attributeComboRow").hide();
checkValueIsExist( "name", "validatePatientAttribute.action");
});
+
+ var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
+ var i18n_field_is_required = '$encoder.jsEscape( $i18n.getString( "field_is_required" ) , "'") ';
+ var isSubmit = true;
</script>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm 2011-05-13 09:11:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm 2011-05-13 09:43:23 +0000
@@ -1,68 +1,84 @@
-<script>
-jQuery(document).ready(function()
-{
- jQuery("#tabs").tabs();
- datePickerValid( 'birthDate' );
-
- jQuery("#searchForm").validate({
- meta:"validate"
- ,errorElement:"span"
- ,submitHandler: function(form)
- {
- searchPerson();
- }
- ,rules : {
- relationshipTypeId : { required: true },
- searchType : { required: true },
- searchValue : { required: true }
- }
- });
-
-
- jQuery("#addRepresentativeForm").validate({
- meta:"validate"
- ,errorElement:"td"
- ,submitHandler: function(form)
- {
- validateAddRepresentative();
- }
- ,rules : {
- relationshipTypeId : { required: true },
- fullName : {required:true,rangelength:[7,50], unicodechars:true},
- gender : { required: true },
- birthDate :{required:false,dateISO:true,datelessthanequaltoday:true}
- },beforeValidateHandler: function(form)
- {
- var dobType = $('#dobType').val();
-
- if( dobType=='V' || dobType=='D' )
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ jQuery("#tabs").tabs();
+ datePickerValid( 'birthDate' );
+
+ jQuery("#searchForm").validate({
+ meta:"validate"
+ ,errorElement:"span"
+ ,submitHandler: function(form) { searchPerson(); }
+ ,rules : {
+ relationshipTypeId : { required: true },
+ searchType : { required: true },
+ searchValue : { required: true }
+ }
+ });
+
+ jQuery("#addRepresentativeForm").validate({
+ meta:"validate"
+ ,errorElement:"td"
+ ,submitHandler: function(form) { validateAddRepresentative(); }
+ ,rules : {
+ relationshipTypeId : { required: true },
+ fullName : {required:true,rangelength:[7,50], unicodechars:true},
+ gender : { required: true },
+ birthDate :{required:false,dateISO:true,datelessthanequaltoday:true}
+ },beforeValidateHandler: function(form)
{
- var birthDate = $('#birthDate').val();
- if( birthDate != '' ){
- $("#memberValidator").val(birthDate);
+ var dobType = jQuery('#dobType').val();
+
+ if( dobType=='V' || dobType=='D' )
+ {
+ var birthDate = jQuery('#birthDate').val();
+ if( birthDate != '' ){
+ jQuery("#memberValidator").val(birthDate);
+ }
+ }else{
+ var age = jQuery('#age').val();
+ jQuery("#memberValidator").val(age);
}
- }else{
- var age = $('#age').val();
- $("#memberValidator").val(age);
}
- }
- });
-
- // Esc key for jQuery thickbox
- // jQuery thickbox already has this event
- // but somehow it's over written by jQuery tabs plugin
- document.onkeydown = function(e){
- if (e == null) { // ie
- keycode = event.keyCode;
- } else { // mozilla
- keycode = e.which;
- }
- if(keycode == 27){ // close
- window.parent.tb_remove();
- }
- }
-});
-
+
+ });
+
+ // Esc key for jQuery thickbox
+ // jQuery thickbox already has this event
+ // but somehow it's over written by jQuery tabs plugin
+ document.onkeydown = function(e){
+ if (e == null) { // ie
+ keycode = event.keyCode;
+ } else { // mozilla
+ keycode = e.which;
+ }
+
+ if(keycode == 27){ // close
+ window.parent.tb_remove();
+ }
+ }
+ });
+
+ var i18n_patient_identifiers = '$encoder.jsEscape( $i18n.getString( "patient_identifiers" ) , "'")';
+ var i18n_patient_attributes = '$encoder.jsEscape( $i18n.getString( "patient_attributes" ) , "'")';
+ var i18n_patient_fullName = '$encoder.jsEscape( $i18n.getString( "full_name" ) , "'")';
+ var i18n_patient_demographics = '$encoder.jsEscape( $i18n.getString( "demographics" ) , "'")';
+ var i18n_patient_gender = '$encoder.jsEscape( $i18n.getString( "gender" ) , "'")';
+ var i18n_patient_date_of_birth = '$encoder.jsEscape( $i18n.getString( "date_of_birth" ) , "'")';
+ var i18n_patient_age = '$encoder.jsEscape( $i18n.getString( "age" ) , "'")';
+ var i18n_patient_blood_group = '$encoder.jsEscape( $i18n.getString( "blood_group" ) , "'")';
+ var i18n_choose_this_person = '$encoder.jsEscape( $i18n.getString( "choose_this_patient" ) , "'")';
+ var i18n_no_duplicate_found = '$encoder.jsEscape( $i18n.getString( "no_duplicate_found" ) , "'")';
+ var i18n_patient_system_id = '$encoder.jsEscape( $i18n.getString( "patient_system_id" ) , "'")';
+ var i18n_child_representative = '$encoder.jsEscape( $i18n.getString( "child_representative" ) , "'")';
+ var i18n_no_result = '$encoder.jsEscape( $i18n.getString( "no_result" ) , "'")';
+ var i18n_error_connect_to_server = '$encoder.jsEscape( $i18n.getString( "error_connect_to_server" ) , "'")';
+ var i18n_please_enter_value = '$encoder.jsEscape( $i18n.getString( "please_enter_value" ) , "'")';
+ var i18n_please_select_search_type = '$encoder.jsEscape( $i18n.getString( "please_select_search_type" ) , "'")';
+ var i18n_please_select_identifier_type = '$encoder.jsEscape( $i18n.getString( "please_select_identifier_type" ) , "'")';
+ var i18n_please_select_attribute_type = '$encoder.jsEscape( $i18n.getString( "please_select_attribute_type" ) , "'")';
+ var i18n_add_person_successfully = '$encoder.jsEscape( $i18n.getString( "add_person_successfully" ) , "'")';
+ var i18n_please_select_relationshipType = '$encoder.jsEscape( $i18n.getString( "please_select_relationshipType" ) , "'")';
+ var i18n_no_patients_found = '$encoder.jsEscape( $i18n.getString( "no_patients_found" ) , "'")';
+ var i18n_search_result = '$encoder.jsEscape( $i18n.getString( "search_result" ) , "'")';
</script>
<!-- TAB Header -->
@@ -260,29 +276,4 @@
</div>
</div>
</div>
-<script>
-
- var i18n_patient_identifiers = '$encoder.jsEscape( $i18n.getString( "patient_identifiers" ) , "'")';
- var i18n_patient_attributes = '$encoder.jsEscape( $i18n.getString( "patient_attributes" ) , "'")';
- var i18n_patient_fullName = '$encoder.jsEscape( $i18n.getString( "full_name" ) , "'")';
- var i18n_patient_demographics = '$encoder.jsEscape( $i18n.getString( "demographics" ) , "'")';
- var i18n_patient_gender = '$encoder.jsEscape( $i18n.getString( "gender" ) , "'")';
- var i18n_patient_date_of_birth = '$encoder.jsEscape( $i18n.getString( "date_of_birth" ) , "'")';
- var i18n_patient_age = '$encoder.jsEscape( $i18n.getString( "age" ) , "'")';
- var i18n_patient_blood_group = '$encoder.jsEscape( $i18n.getString( "blood_group" ) , "'")';
- var i18n_choose_this_person = '$encoder.jsEscape( $i18n.getString( "choose_this_patient" ) , "'")';
- var i18n_no_duplicate_found = '$encoder.jsEscape( $i18n.getString( "no_duplicate_found" ) , "'")';
- var i18n_patient_system_id = '$encoder.jsEscape( $i18n.getString( "patient_system_id" ) , "'")';
- var i18n_child_representative = '$encoder.jsEscape( $i18n.getString( "child_representative" ) , "'")';
- var i18n_no_result = '$encoder.jsEscape( $i18n.getString( "no_result" ) , "'")';
- var i18n_error_connect_to_server = '$encoder.jsEscape( $i18n.getString( "error_connect_to_server" ) , "'")';
- var i18n_please_enter_value = '$encoder.jsEscape( $i18n.getString( "please_enter_value" ) , "'")';
- var i18n_please_select_search_type = '$encoder.jsEscape( $i18n.getString( "please_select_search_type" ) , "'")';
- var i18n_please_select_identifier_type = '$encoder.jsEscape( $i18n.getString( "please_select_identifier_type" ) , "'")';
- var i18n_please_select_attribute_type = '$encoder.jsEscape( $i18n.getString( "please_select_attribute_type" ) , "'")';
- var i18n_add_person_successfully = '$encoder.jsEscape( $i18n.getString( "add_person_successfully" ) , "'")';
- var i18n_please_select_relationshipType = '$encoder.jsEscape( $i18n.getString( "please_select_relationshipType" ) , "'")';
- var i18n_no_patients_found = '$encoder.jsEscape( $i18n.getString( "no_patients_found" ) , "'")';
- var i18n_search_result = '$encoder.jsEscape( $i18n.getString( "search_result" ) , "'")';
-</script>
