From 2180a7b528cf227ce9fd7a1538882443eb0341c7 Mon Sep 17 00:00:00 2001
From: assert0
Date: Sat, 26 Feb 2011 17:51:33 -0500
Subject: [PATCH] file module updates

---
 modules/file/file.css    |    2 +-
 modules/file/file.module |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git modules/file/file.css modules/file/file.css
index e94c8a1..88ebc23 100644
--- modules/file/file.css
+++ modules/file/file.css
@@ -21,7 +21,7 @@
 }
 
 .form-managed-file div.ajax-progress div {
-  display: inline;
+  display: block;
 }
 
 .form-managed-file div.ajax-progress-bar {
diff --git modules/file/file.module modules/file/file.module
index 2dd2bad..60e45a5 100644
--- modules/file/file.module
+++ modules/file/file.module
@@ -46,7 +46,6 @@ function file_menu() {
   );
   $items['file/progress'] = array(
     'page callback' => 'file_ajax_progress',
-    'delivery callback' => 'ajax_deliver',
     'access arguments' => array('access content'),
     'theme callback' => 'ajax_base_page_theme',
     'type' => MENU_CALLBACK,
@@ -355,7 +354,9 @@ function file_managed_file_process($element, &$form_state, $form) {
   $fid = isset($element['#value']['fid']) ? $element['#value']['fid'] : 0;
 
   // Set some default element properties.
-  $element['#progress_indicator'] = empty($element['#progress_indicator']) ? 'none' : $element['#progress_indicator'];
+  $instance = field_widget_instance($element, $form_state);
+  $settings = $instance['widget']['settings']; 
+  $element['#progress_indicator'] = empty($settings['progress_indicator']) ? 'none' : $settings['progress_indicator'];
   $element['#file'] = $fid ? file_load($fid) : FALSE;
   $element['#tree'] = TRUE;
 
@@ -409,6 +410,7 @@ function file_managed_file_process($element, &$form_state, $form) {
         '#type' => 'hidden',
         '#value' => $upload_progress_key,
         '#attributes' => array('class' => array('file-progress')),
+        '#weight' => -20,
       );
     }
     elseif ($implementation == 'apc') {
@@ -416,6 +418,7 @@ function file_managed_file_process($element, &$form_state, $form) {
         '#type' => 'hidden',
         '#value' => $upload_progress_key,
         '#attributes' => array('class' => array('file-progress')),
+        '#weight' => -20,
       );
     }
 
-- 
1.7.1