Deleted: trunk/app/views/blogs/_subnav.rhtml ( => )
Deleted: trunk/app/views/pictures/_subnav.rhtml
===================================================================
--- trunk/app/views/pictures/_subnav.rhtml 2011-11-09 10:26:44 UTC (rev 2790)
+++ trunk/app/views/pictures/_subnav.rhtml 2011-11-09 10:30:21 UTC (rev 2791)
@@ -1,16 +0,0 @@
-<% case controller.action_name.to_s; when "index" %>
-
- <!-- no subnav options -->
-
-<% when "show" %>
-
- <ul class="sectionIcons">
-o <li><%= link_to 'Edit Picture', edit_user_picture_path(@picture.user_id, @picture) %></li>
- <li><%= link_to 'Remove Picture', user_picture_path(@picture.user_id, @picture), :confirm => 'Are you sure?', :method => :delete %></li>
- </ul>
-
-<% else %>
-
- <!-- no subnav options -->
-
-<% end %>
Modified: trunk/config/environment.rb (2790 => 2791)
--- trunk/config/environment.rb 2011-11-09 10:26:44 UTC (rev 2790)
+++ trunk/config/environment.rb 2011-11-09 10:30:21 UTC (rev 2791)
@@ -112,6 +112,7 @@
load 'config/environment_private.rb' if FileTest.exist?('config/environment_private.rb')
+# Fix for Ruby 1.8.7 when using Rails < 2.2
module ActionView
module Helpers
module TextHelper
Modified: trunk/db/schema.rb (2790 => 2791)
--- trunk/db/schema.rb 2011-11-09 10:26:44 UTC (rev 2790)
+++ trunk/db/schema.rb 2011-11-09 10:30:21 UTC (rev 2791)
@@ -2,7 +2,7 @@
# migrations feature of ActiveRecord to incrementally modify your database, and
# then regenerate this schema definition.
-ActiveRecord::Schema.define(:version => 93) do
+ActiveRecord::Schema.define(:version => 95) do
create_table "activity_limits", :force => true do |t|
t.column "contributor_type", :string, :null => false
@@ -168,6 +168,7 @@
t.column "downloads_count", :integer, :default => 0
t.column "site_viewings_count", :integer, :default => 0
t.column "contributable_id", :integer
+ t.column "layout", :string
end
add_index "contributions", ["contributable_id", "contributable_type"], :name => "index_contributions_on_contributable_id_and_contributable_type"
@@ -193,6 +194,12 @@
t.column "updated_at", :datetime
end
+ create_table "data_sets", :force => true do |t|
+ t.column "workflow_id", :integer
+ t.column "title", :string
+ t.column "description", :text
+ end
+
create_table "downloads", :force => true do |t|
t.column "kind", :string
t.column "created_at", :datetime
@@ -749,6 +756,12 @@
t.column "description", :text
end
+ create_table "workflow_ports", :force => true do |t|
+ t.column "workflow_id", :integer
+ t.column "port_type", :string
+ t.column "name", :string
+ end
+
create_table "workflow_processors", :force => true do |t|
t.column "name", :string
t.column "wsdl_operation", :string