Index: plugins/context_reaction_block.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/context/plugins/Attic/context_reaction_block.inc,v
retrieving revision 1.1.2.35
diff -u -r1.1.2.35 context_reaction_block.inc
--- plugins/context_reaction_block.inc	6 Aug 2010 16:13:32 -0000	1.1.2.35
+++ plugins/context_reaction_block.inc	13 Oct 2010 20:47:39 -0000
@@ -140,6 +140,22 @@
         '#type' => 'markup',
         '#value' => theme('context_block_browser', $this->get_blocks(NULL, NULL, $this->rebuild_needed()), $context),
       );
+
+      // Don't show toggle if show empty regions is shown globally
+      if (!variable_get('context_reaction_block_all_regions', FALSE)) {
+        if (isset($_SESSION['context-reaction-showall']) && $_SESSION['context-reaction-showall'] === TRUE) {
+          $value = t('Hide empty regions');
+        } else {
+          $value = t('Show empty regions');
+        }
+
+        $form['showall_toggle'] = array(
+          '#type' => 'submit',
+          '#value' => $value,
+          '#submit' => array('context_reaction_block_toggle_submit'),
+        );
+      }
+
       $this->rebuild_needed(FALSE);
     }
     return $form;
@@ -608,3 +624,19 @@
     exit;
   }
 }
+
+/**
+ * Submit hanlder for the Toggle empty regions button.
+ */
+function context_reaction_block_toggle_submit(&$form, &$form_state) {
+  // Get the current status
+  $status = empty($_SESSION['context-reaction-showall']) ? FALSE : $_SESSION['context-reaction-showall'];
+
+  if ($status === FALSE) {
+    $_SESSION['context-reaction-showall'] = TRUE;
+  } else {
+    $_SESSION['context-reaction-showall'] = FALSE;
+  }
+
+  return;
+}
\ No newline at end of file
Index: plugins/context_reaction_css_injector.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/context/plugins/Attic/context_reaction_css_injector.inc,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 context_reaction_css_injector.inc
--- plugins/context_reaction_css_injector.inc	14 Dec 2009 22:34:05 -0000	1.1.2.1
+++ plugins/context_reaction_css_injector.inc	13 Oct 2010 20:47:39 -0000
@@ -25,10 +25,11 @@
       if (!empty($context->reactions[$this->plugin])) {
         foreach ($context->reactions[$this->plugin] as $crid) {
           if ($css_rule = _css_injector_load_rule($crid)) {
-            drupal_add_css(file_create_path($css_rule['file_path']), 'module', $css_rule['media'], $css_rule['preprocess']);
+            ctools_include('css');
+            ctools_css_add_css(_css_injector_rule_filename($css_rule['crid']), 'module', $css_rule['media'], $css_rule['preprocess']);
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
Index: theme/context_reaction_block.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/context/theme/Attic/context_reaction_block.theme.inc,v
retrieving revision 1.1.2.13
diff -u -r1.1.2.13 context_reaction_block.theme.inc
--- theme/context_reaction_block.theme.inc	23 Aug 2010 14:29:09 -0000	1.1.2.13
+++ theme/context_reaction_block.theme.inc	13 Oct 2010 20:47:39 -0000
@@ -102,7 +102,11 @@
 function template_preprocess_context_block_editable_region(&$vars) {
   if (!empty($vars['editable'])) {
     // Show when empty?
-    $vars['show_always'] = variable_get('context_reaction_block_all_regions', FALSE);
+    if (variable_get('context_reaction_block_all_regions', FALSE) || (isset($_SESSION['context-reaction-showall']) && $_SESSION['context-reaction-showall'] === TRUE)) {
+      $vars['show_always'] = TRUE;
+    } else {
+      $vars['show_always'] = FALSE;
+    }

     // Provide the user-friendly name of the region
     global $theme_key;