Started to redo the screen subscriptions views for #35 - we are now g…

…oing back to the manage.html.erb views

app/assets/stylesheets/application/layout/forms.scss.erb

@@ -69,7 +69,7 @@ textarea,
 select,
 .uneditable-input {
   display: inline-block;
-  width: 210px;
+  width: 300px;
   height: $baseline;
   padding: 4px;
   font-size: $basefont;

app/controllers/screens_controller.rb

@@ -37,6 +37,7 @@ def new
   # GET /screens/1/edit
   def edit
     @screen = Screen.find(params[:id])
+    @template = Template.new
 
     @templates = Template.all
     #@templates_bestfit = Template.find(:all, :conditions => "width / height = #{screen_aspect_ratio}")

app/controllers/subscriptions_controller.rb

@@ -18,6 +18,7 @@ def index
 
   # GET /screen/:screen_id/subscriptions/manage
   def manage
+    @this_field = Field.find(params[:field_id])
     @fields = @screen.template.positions.collect{|p| p.field}
 
     respond_to do |format|

app/views/screens/_show_body.html.erb

@@ -5,6 +5,7 @@
       <% @screen.template.positions.each do |pos| %>
         <div class="pos" style="top: <%= pos.top * 100 %>%; left: <%= pos.left * 100 %>%; width: <%= (pos.right - pos.left) * 100 %>%; height: <%= (pos.bottom - pos.top) * 100 %>%; <%= pos.style %>">
           <%= pos.id %>
+          <%= link_to "Change Subscriptions", manage_screen_field_subscriptions_path(@screen, pos.field), :class => "btn info" %>
         </div>
       <% end %>
     </div>

app/views/subscriptions/_subscription.html.erb

@@ -0,0 +1 @@
+<%= subscription.feed.name %>

app/views/subscriptions/manage.html.erb

@@ -1,8 +1,7 @@
-<% @fields.each do |field| %>
-  <h1><%= field.name %></h1>
-  <% field.subscriptions.where(:screen_id => @screen.id).each do |subscription| %>
-    <%= render :partial => 'manage', :locals => {:screen => @screen, :subscription => subscription} %>
-  <% end %>
-  <% feeds = Feed.subscribable(@screen, field) %>
-  <%= render :partial => 'manage', :locals => {:screen => @screen, :subscription => Subscription.new(:field => field), :feeds => feeds} unless feeds.empty? %>
+<h1><%= @this_field.name %></h1>
+<% @this_field.subscriptions.where(:screen_id => @screen.id).each do |subscription| %>
+  <%= render subscription %>
+  <!-- :partial => 'manage', :locals => {:screen => @screen, :subscription => subscription} %> -->
 <% end %>
+<% feeds = Feed.subscribable(@screen, @this_field) %>
+<%#= render :partial => 'manage', :locals => {:screen => @screen, :subscription => Subscription.new(:field => @this_field), :feeds => feeds} unless feeds.empty? %>

config/routes.rb

@@ -37,10 +37,12 @@
   end
 
   resources :screens do
-    resources :subscriptions do
-      collection do
-        get :manage
-        put :save
+    resources :fields do
+      resources :subscriptions do
+        collection do
+          get :manage
+          put :save
+        end
       end
     end
   end