=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.fileresource.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.fileresource.js 2015-10-01 18:46:36 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.fileresource.js 2015-10-02 11:06:55 +0000 @@ -2,7 +2,6 @@ $.fn.fileEntryField = function() { // TODO Use i18n - // TODO Disable field when offline var $container = $( this ); @@ -35,7 +34,6 @@ 'pe': periodId }; - // Logic var deleteFileDataValue = function() { var postData = formData; postData.value = ''; @@ -132,13 +130,26 @@ $button.button( 'enable' ); }; - setButtonBlocked(); + var disableField = function() { + $button.button( 'disable' ); + $field.toggleClass( 'entryfileresource-disabled', true ); + }; + + var enableField = function() { + $button.button( 'enable' ); + $field.toggleClass( 'entryfileresource-disabled', false ); + }; $( document ).on( dhis2.de.event.dataValuesLoaded, function() { ( !$field.data( 'value' ) ) ? setButtonUpload() : setButtonDelete(); } ); - // Initialize file uploader + $( document ).on( "dhis2.offline", disableField ); + $( document ).on( "dhis2.online", enableField ); + + // Init + setButtonBlocked(); + $fileInput.fileupload( { url: '../api/dataValues/files', paramName: 'file', === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2015-10-01 13:22:12 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2015-10-02 11:06:55 +0000 @@ -261,11 +261,17 @@ { height: 28px; width: 200px; - border: 1px solid #aaa; + border: 1px solid #dadada; display: table-cell; overflow: hidden; position: relative; } + +.entryfileresource-disabled +{ + background-color: #f3f3f3 !important; +} + /* Upload progress display */ .upload-progress