Diff
Modified: branches/wf4ever/app/controllers/folders_controller.rb (3265 => 3266)
--- branches/wf4ever/app/controllers/folders_controller.rb 2012-12-14 16:56:06 UTC (rev 3265)
+++ branches/wf4ever/app/controllers/folders_controller.rb 2012-12-14 16:56:15 UTC (rev 3266)
@@ -5,7 +5,7 @@
BASE_URI = "http://sandbox.wf4ever-project.org/rodl/ROs/"
API_KEY = "32801fc0-1df1-4e34-b"
- def folder
+ def index
@structure = {}
if params[:ro_uri].blank?
render :text => "Please supply an RO URI."
@@ -38,3 +38,4 @@
# Renders folder_contents.js.erb
end
+end
Deleted: branches/wf4ever/app/views/folders/folder.html.erb (3265 => 3266)
--- branches/wf4ever/app/views/folders/folder.html.erb 2012-12-14 16:56:06 UTC (rev 3265)
+++ branches/wf4ever/app/views/folders/folder.html.erb 2012-12-14 16:56:15 UTC (rev 3266)
@@ -1,28 +0,0 @@
-<div class="header">
- <%= render "folders/header" %>
-</div>
-
-<div class="content">
-
- <div class="navigation">
- <%= render "folders/navigation" %>
- </div>
- <div class="main">
- <div id="demo" class="yui-navset">
- <div class="yui-content">
- <h3><-- Click on a folder to expand it and see its contents.</h3>
- <%= form_tag mockups_folder_url do %>
- <p>
- <strong>RO URI</strong>:<br/>
- <%= text_field_tag(:ro_uri, params[:ro_uri], :size => 100) %> <%= submit_tag("Go") %>
- </p>
- <% end %>
- <p>
- <strong>Selected resource URI:</strong> <span id="open-url">-</span>
- </p>
- </div>
- </div>
- </div>
-
-</div>
-
Copied: branches/wf4ever/app/views/folders/index.html.erb (from rev 3265, branches/wf4ever/app/views/folders/folder.html.erb) (0 => 3266)
--- branches/wf4ever/app/views/folders/index.html.erb (rev 0)
+++ branches/wf4ever/app/views/folders/index.html.erb 2012-12-14 16:56:15 UTC (rev 3266)
@@ -0,0 +1,28 @@
+<div class="header">
+ <%= render "folders/header" %>
+</div>
+
+<div class="content">
+
+ <div class="navigation">
+ <%= render "folders/navigation" %>
+ </div>
+ <div class="main">
+ <div id="demo" class="yui-navset">
+ <div class="yui-content">
+ <h3><-- Click on a folder to expand it and see its contents.</h3>
+ <%= form_tag mockups_folder_url do %>
+ <p>
+ <strong>RO URI</strong>:<br/>
+ <%= text_field_tag(:ro_uri, params[:ro_uri], :size => 100) %> <%= submit_tag("Go") %>
+ </p>
+ <% end %>
+ <p>
+ <strong>Selected resource URI:</strong> <span id="open-url">-</span>
+ </p>
+ </div>
+ </div>
+ </div>
+
+</div>
+
Modified: branches/wf4ever/config/routes.rb (3265 => 3266)
--- branches/wf4ever/config/routes.rb 2012-12-14 16:56:06 UTC (rev 3265)
+++ branches/wf4ever/config/routes.rb 2012-12-14 16:56:15 UTC (rev 3266)
@@ -202,12 +202,17 @@
map.research_object_resources '/research_objects/:id/resources', :controller => 'research_objects', :action ="" 'resource_index', :conditions => { :method => :get }
map.research_object_resource '/research_objects/:id/resources/:resource_path', :controller => 'research_objects', :action ="" 'resource_show', :conditions => { :method => :get }, :requirements => { :resource_path => /.*/ }
+ # Finn's folder stuff'
+ map.resources :folders
+
+
# content_types
map.resources :content_types
# all downloads and viewings
map.resources :downloads, :viewings
+
# messages
map.resources :messages, :collection => { :sent => :get, :delete_all_selected => :delete }