Set up screen views

app/assets/stylesheets/application/controls/buttons.scss.erb

@@ -63,10 +63,10 @@
 .btn, .button, form .submit_bar input {
   // Button Base
   display: inline-block;
-  padding: 4px 10px 4px;
+  padding: 2px 10px;
   @include no-box-shadow;
   @include border-radius(4px);
-  font-size: $basefont - 1;
+  font-size: $basefont - 2;
   cursor: pointer;
   font-weight: bold;
   color: $white;
@@ -126,7 +126,7 @@
   }
   &.small {
     padding: 0px 5px;
-    font-size: $basefont - 2px; 
+    font-size: $basefont - 3px; 
     //font-size: $baseFontSize - 2px;
     //line-height: $baseLineHeight - 2px;
   }
@@ -204,6 +204,10 @@
 
 }
 
+form .submit_bar input {
+  padding: 4px 10px;
+}
+
 // Help Firefox not be a jerk about adding extra padding to buttons
 button.btn,
 input[type="submit"].btn {

app/views/screens/_screen_body.html.erb

@@ -0,0 +1,35 @@
+<article>
+  <h1>See screen preview and modify subscriptions</h1>
+</article>
+
+<aside>
+
+  <div>
+    <%= link_to 'Edit Screen Details', edit_screen_path(@screen), :class => "btn" %>
+    <br /><br />
+
+    <p><b>Location:</b> <%= @screen.location %></p>
+
+    <p><b>Owned by:</b> <%= @screen.owner ? @screen.owner.name : 'No Group' %></p>
+
+    <p>
+      <b>Current Subscriptions:</b>
+
+      <ul>
+        <% @screen.fields.each do |field| %>
+          <li><%= field.name %></li>
+          <% if !field.subscriptions.empty? %>
+            <ul>
+              <% field.subscriptions.each do |subscription| %>
+                <li><%= link_to subscription.feed.name, subscription.feed %><%= " - #{subscription.weight}" unless subscription.weight.blank?%></li>
+              <% end %>
+            </ul>
+          <% end %>
+        <% end %>
+      </ul>
+    </p>
+  </div>
+
+</aside>
+
+<div class="clear"></div>

app/views/screens/_screen_header.html.erb

@@ -0,0 +1,4 @@
+<h1>
+  <%= link_to "All Screens", screens_path %> &gt; 
+  <%= @screen.name %>
+</h1>

app/views/screens/edit.html.erb

@@ -1,6 +1,6 @@
 <section class="C no">
 	<header>
-		<%= back_button screens_path %>
+		<%= back_button :back %>
 		<h1>Edit Screen</h1>
 	</header>
 	<div class="C-cont">
@@ -9,4 +9,4 @@
 		</article>
 		<div class="clear"></div>
 	</div>
-</section>
+</section>

app/views/screens/show.html.erb

@@ -1,45 +1,8 @@
-<p>
-  <b>Name:</b>
-  <%= @screen.name %>
-</p>
-
-<p>
-  <b>Location:</b>
-  <%= @screen.location %>
-</p>
-
-<p>
-  <b>Is public:</b>
-  <%= @screen.is_public %>
-</p>
-
-<p>
-  <b>Owner:</b>
-  <%= @screen.owner.name %>
-</p>
-
-<p>
-  <b>Template:</b>
-  <%= link_to @screen.template.name, @screen.template %>
-</p>
-<p>
-  <b>resolution</b>
-  <%= @screen.width %> X <%= @screen.height %> (<%= @screen.aspect_ratio["width"] %>:<%=  @screen.aspect_ratio["height"] %>)
-</p>
-<p>
-  <b>Current Subscriptions:</a>
-  <ul>
-    <% @screen.fields.each do |field| %>
-      <li><%= field.name %></li>
-      <% if !field.subscriptions.empty? %>
-        <ul>
-          <% field.subscriptions.each do |subscription| %>
-            <li><%= link_to subscription.feed.name, subscription.feed %><%= " - #{subscription.weight}" unless subscription.weight.blank?%></li>
-          <% end %>
-        </ul>
-      <% end %>
-    <% end %>
-  </ul>
-</p>
-<%= link_to 'Edit', edit_screen_path(@screen) %> |
-<%= link_to 'Back', screens_path %>
+<section class="C">
+  <header id="screens-header">
+    <%= render :partial => "screens/screen_header" %>
+  </header>
+  <div id="screens-body" class="C-cont">
+    <%= render :partial => "screens/screen_body" %>
+  </div>
+</section>

app/views/submissions/show.html.erb

@@ -1,8 +1,8 @@
 <section class="C">
 	<header id="browse-header">
-		<h1 id="contentlist"><%= @submission.content.name %></h1>
+		<%= render :partial => "submissions/content_header" %>
 	</header> 
 	<div id="browse-body" class="C-cont">
 		<%= render :partial => "submissions/content_body" %>
 	</div>
-</section>
+</section>