------------------------------------------------------------ revno: 3487 committer: Morten Olav Hansen <[email protected]> branch nick: dhis2 timestamp: Thu 2011-04-28 15:26:51 +0200 message: made kama the default skin, and did other minor fixes modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/config.js dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.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/dhis-web-commons/ckeditor/config.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/config.js 2011-04-27 08:32:13 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/config.js 2011-04-28 13:26:51 +0000 @@ -3,9 +3,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license */ +/* http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html */ CKEDITOR.editorConfig = function( config ) { - // Define changes to default configuration here. For example: - // config.language = 'fr'; - // config.uiColor = '#AADC6E'; + config.skin = 'kama'; }; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java 2011-04-27 17:36:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java 2011-04-28 13:26:51 +0000 @@ -127,12 +127,12 @@ } private String dataEntryValue; - + public String getDataEntryValue() { return dataEntryValue; } - + // ------------------------------------------------------------------------- // Execute // ------------------------------------------------------------------------- @@ -148,10 +148,15 @@ { dataEntryValue = prepareDataEntryFormCode( dataEntryForm.getHtmlCode() ); } - + else + { + dataEntryValue = ""; + } + autoSave = (Boolean) userSettingService.getUserSetting( UserSettingService.AUTO_SAVE_DATA_ENTRY_FORM, false ); - operands = new ArrayList<DataElementOperand>( dataElementCategoryService.getFullOperands( dataSet.getDataElements() ) ); + operands = new ArrayList<DataElementOperand>( dataElementCategoryService.getFullOperands( dataSet + .getDataElements() ) ); Collections.sort( operands, new DataElementOperandNameComparator() ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2011-04-27 17:36:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2011-04-28 13:26:51 +0000 @@ -9,15 +9,8 @@ } } - jQuery('#designTextarea').ckeditor({ - skin: 'office2003' - }); - - var editor = jQuery("#designTextarea").ckeditorGet(); - - #if( $dataEntryForm ) - editor.setData('$encoder.jsEscape( $dataEntryValue, "'" )'); - #end + jQuery('#designTextarea').ckeditor(); + jQuery("#designTextarea").ckeditorGet().setData('$encoder.jsEscape( $dataEntryValue, "'" )'); }); var stat = "ADD"; @@ -27,10 +20,8 @@ var t; var timer_is_on = 0; - #if( $dataEntryForm ) stat = "EDIT"; dataEntryFormId = $dataEntryForm.id; - #end var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "dataentryform_confirm_delete" ) , "'" )'; var i18n_save_success = '$encoder.jsEscape( $i18n.getString( "save_success" ) , "'" )';
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
