Merge from wombleton:feature/440_sparkly_admin_css

Includes a couple of additional fixes:

 * Remember to HTML-quote things that could come from users
 * Fix form post action for editing users

1 files changed, 6 insertions, 3 deletions

diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb
index 201e60746..72b92d462 100644
--- a/app/models/censor_rule.rb
+++ b/app/models/censor_rule.rb
@@ -51,7 +51,10 @@ class CensorRule < ActiveRecord::Base
             errors.add("Censor must apply to an info request a user or a body; ")
         end
     end
-end
-
-
 
+  def for_admin_column
+    self.class.content_columns.each do |column|
+      yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
+    end
+  end
+end