Index: openacs-4/packages/acs-object-management/catalog/acs-object-management.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/catalog/acs-object-management.en_US.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-object-management/catalog/acs-object-management.en_US.ISO-8859-1.xml	27 Nov 2009 00:38:50 -0000	1.3
+++ openacs-4/packages/acs-object-management/catalog/acs-object-management.en_US.ISO-8859-1.xml	29 Nov 2009 16:22:31 -0000	1.4
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-object-management" locale="en_US" charset="ISO-8859-1">
+
   <msg key="acs_object_types_admin">ACS Object Types Management</msg>
   <msg key="Action">Action</msg>
   <msg key="add">add</msg>
@@ -8,8 +9,8 @@
   <msg key="add_element">Add a Form element</msg>
   <msg key="add_form">Add Form</msg>
   <msg key="add_type">Add Type</msg>
-  <msg key="add_widget">add widget</msg>
   <msg key="add_view">Add a View</msg>
+  <msg key="add_widget">add widget</msg>
   <msg key="attribute">Attribute</msg>
   <msg key="attribute_add">Add Attribute</msg>
   <msg key="attribute_default">Default Value</msg>
@@ -28,10 +29,10 @@
   <msg key="create_type">Create Type</msg>
   <msg key="create_view">Create View</msg>
   <msg key="customize_widget">Customize Widget</msg>
-  <msg key="delete">delete</msg>
-  <msg key="Delete">Delete</msg>
   <msg key="datatype">Datatype</msg>
   <msg key="datatype_help"></msg>
+  <msg key="Delete">Delete</msg>
+  <msg key="delete">delete</msg>
   <msg key="delete_checked_attributes">Delete checked attributes</msg>
   <msg key="dynamic_types">Dynamic Types</msg>
   <msg key="edit_form">Edit Form Name</msg>
@@ -40,22 +41,22 @@
   <msg key="element_name_help">Chose the attrbiute for this widget.</msg>
   <msg key="elements">Form elements</msg>
   <msg key="export">Export</msg>
+  <msg key="form">Form</msg>
   <msg key="form_elements">Form Elements</msg>
   <msg key="form_name">Form Name</msg>
   <msg key="form_one">Form &quot;%form_name%&quot;</msg>
-  <msg key="form">Form</msg>
-  <msg key="forms">Forms</msg>
   <msg key="form_widget">Form Widget</msg>
+  <msg key="forms">Forms</msg>
   <msg key="help_text">Help Text</msg>
   <msg key="inherited_attributes">Inherited Attributes</msg>
   <msg key="is_required">Is Required</msg>
-  <msg key="remove_widget">remove widget</msg>
   <msg key="manage_form">Manage Form</msg>
+  <msg key="move_down_attribute">move down</msg>
+  <msg key="move_up_attribute">move up</msg>
   <msg key="must_supply_either_multirow_or_indexed_array">you must supply either -multirow or -indexed_array</msg>
-  <msg key="node_element_must_have">node 'element' must have either a 'name' attribute or an 'attribute' attribute.</msg>
   <msg key="No">No</msg>
+  <msg key="node_element_must_have">node 'element' must have either a 'name' attribute or an 'attribute' attribute.</msg>
   <msg key="object_type">Object Type</msg>
-  <msg key="view">View</msg>
   <msg key="param_name">Parameter</msg>
   <msg key="param_one">Parameter &quot;%param%&quot;</msg>
   <msg key="param_source">Source</msg>
@@ -74,6 +75,7 @@
   <msg key="preview_widget">Preview Widget</msg>
   <msg key="remove">Remove</msg>
   <msg key="remove_element">Remove Element from Form</msg>
+  <msg key="remove_widget">remove widget</msg>
   <msg key="required_p">Required?</msg>
   <msg key="supertype">Supertype</msg>
   <msg key="types">Types</msg>
Index: openacs-4/packages/acs-object-management/tcl/view-attribute-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/tcl/view-attribute-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-object-management/tcl/view-attribute-procs.tcl	27 Nov 2009 00:38:50 -0000	1.3
+++ openacs-4/packages/acs-object-management/tcl/view-attribute-procs.tcl	29 Nov 2009 16:22:32 -0000	1.4
@@ -41,6 +41,7 @@
     @param object_view:required
     @param attribute_id:required
 } {
+    db_dml reorder {}
     db_dml delete {}
     object_view::flush_cache -object_view $object_view
     set var_list [list [list object_view $object_view]]
Index: openacs-4/packages/acs-object-management/tcl/view-attribute-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/tcl/view-attribute-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-object-management/tcl/view-attribute-procs.xql	27 Nov 2009 00:38:50 -0000	1.2
+++ openacs-4/packages/acs-object-management/tcl/view-attribute-procs.xql	29 Nov 2009 16:22:32 -0000	1.3
@@ -6,7 +6,7 @@
       insert into acs_view_attributes
         (attribute_id, view_attribute, object_view, pretty_name, col_expr, sort_order)
       select attribute_id, view_attribute, :to_object_view, pretty_name, col_expr,
-        (select coalesce(max(sort_order), 1)
+        (select coalesce(max(sort_order)+1, 1)
          from acs_view_attributes
          where object_view = :to_object_view)
       from acs_view_attributes
@@ -23,6 +23,18 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="object_view::attribute::delete.reorder">
+    <querytext>
+      update acs_view_attributes
+        set sort_order = sort_order - 1
+      where object_view = :object_view
+        and sort_order > (select sort_order
+                            from acs_view_attributes
+                           where object_view = :object_view
+                             and attribute_id = :attribute_id)
+    </querytext>
+  </fullquery>
+
   <fullquery name="object_view::attribute::get.get">
     <querytext>
       select aa.object_type, aa.datatype, aa.default_value, aova.view_attribute,
Index: openacs-4/packages/acs-object-management/www/admin/view-attributes-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/view-attributes-move.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-object-management/www/admin/view-attributes-move.tcl	29 Nov 2009 16:23:20 -0000	1.1
@@ -0,0 +1,27 @@
+ad_page_contract {
+    Move an attribute up or down in the view.
+} {
+    object_view:sql_identifier,notnull
+    attribute_id:integer,multiple
+    return_url:notnull
+    direction:notnull
+} -validate {
+    direction_validate {
+        if {$direction ne "up" && $direction ne "down"} {
+           ad_complain "direction must be up or down."
+        }
+    }    
+}
+
+if {$direction eq "up"} {
+    set displacement 1
+} elseif {$direction eq "down"} {
+    set displacement -1
+}
+
+db_dml move_up {}
+
+object_view::flush_cache -object_view $object_view
+
+ad_returnredirect $return_url
+ad_script_abort
\ No newline at end of file
Index: openacs-4/packages/acs-object-management/www/admin/view-attributes-move.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/view-attributes-move.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-object-management/www/admin/view-attributes-move.xql	29 Nov 2009 16:23:20 -0000	1.1
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<queryset>
+
+  <fullquery name="move_up">
+    <querytext>
+
+      update acs_view_attributes
+         set sort_order = sort_order + :displacement
+      where object_view = :object_view
+        and attribute_id = (select attribute_id
+                              from acs_view_attributes
+                             where object_view = :object_view
+                               and sort_order = (select sort_order - :displacement
+                                                   from acs_view_attributes
+                                                  where object_view = :object_view
+                                                    and attribute_id = :attribute_id));
+      update acs_view_attributes
+         set sort_order = sort_order - :displacement
+      where object_view = :object_view
+        and attribute_id = :attribute_id;
+
+    </querytext>
+  </fullquery>
+  
+</queryset>
Index: openacs-4/packages/acs-object-management/www/admin/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/view.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-object-management/www/admin/view.tcl	27 Nov 2009 00:38:50 -0000	1.3
+++ openacs-4/packages/acs-object-management/www/admin/view.tcl	29 Nov 2009 16:23:20 -0000	1.4
@@ -46,15 +46,27 @@
             display_template "
                 <a class=\"button\" href=\"@view_attributes.delete_url@\" title=\"[_ acs-object-management.delete]\">
                   [_ acs-object-management.delete]
-                </a>
+                </a>&nbsp;
+                <if @view_attributes.rownum@ gt 1>
+                  <a class=\"button\" href=\"@view_attributes.move_up_url@\" title=\"[_ acs-object-management.move_up_attribute]\">
+                    [_ acs-object-management.move_up_attribute]
+                  </a>&nbsp;
+                </if>
+                <if @view_attributes.rownum@ lt @view_attributes:rowcount@>
+                  <a class=\"button\" href=\"@view_attributes.move_down_url@\" title=\"[_ acs-object-management.move_down_attribute]\">
+                    [_ acs-object-management.move_down_attribute]
+                  </a>
+                </if>
             "
         }
     }
 
 db_multirow -cache_pool acs_metadata -cache_key v::${object_view}::get_view_attributes \
-    -extend {attribute_url delete_url manage_form_url} \
+    -extend {attribute_url delete_url manage_form_url move_up_url move_down_url} \
     view_attributes get_view_attributes {} {
     set delete_url [export_vars -base view-attributes-delete {object_view return_url attribute_id}]
+    set move_up_url [export_vars -base view-attributes-move {object_view return_url attribute_id {direction up}}]
+    set move_down_url [export_vars -base view-attributes-move {object_view return_url attribute_id {direction down}}]
 }
 
 list::create \