Added moderate index page linked through top menu and altered content…

… cell headers to move padding outside of the header class itself
concerto · Jul 8, 2012 · c632e36 · c632e36
1 parent 253a2b2
commit c632e36
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 17 deletions.
diff --git a/app/assets/stylesheets/application/layout/alerts-badges.scss.erb b/app/assets/stylesheets/application/layout/alerts-badges.scss.erb
@@ -9,6 +9,10 @@
   font-size: 10px;
   font-weight: bold;
   padding: 1px 4px;
+
+  &.alert {
+    background-color: $red;
+  }
 }
 
 .link-hl .badge {

diff --git a/app/assets/stylesheets/application/layout/contentcell.scss.erb b/app/assets/stylesheets/application/layout/contentcell.scss.erb
@@ -15,25 +15,37 @@ section.C {
    	@include border-radius-corners(8px, 8px, 0px, 0px);
     background: #FFF image-url('layout/C/header_bg.png') bottom left repeat-x;
     display: block;
-   	padding: 8px 14px 6px 14px;
-   	padding-bottom: 5px;
-   	border: solid 1px #ababab;
+    padding: 0px;
+    border: solid 1px #ababab;
    	border-bottom: 0px;
 
    	h1 {
-   		color: #666;
+   		color: #333;
    		font-size: 1.4em;
    		letter-spacing: 0.05em;
    		text-shadow: 0 1px #eee;
 		}
 
+    .default-padding {
+      padding: 8px 14px 5px 14px;
+    }
+
 		// element inside the header that can be optionally used for right-aligned
 		// contextual buttons relevant to this section of the page
 		.C-header_right {
 	  	float: right;
 	  	margin-left: 20px;
 		}
 
+    // status element that fits a label and a value, usually a count
+    // often aligned or floated to the right side of .C-header_right
+    .status-block {
+      background: $grayLightest;
+      height: 100%;
+      padding: 4px 8px;
+      border-left: solid 1px $gray;
+    }
+
 		// this element is only included when the back_button helper is used to place a back button
 		.C-header_back {
 	  	float: left;

diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
@@ -13,6 +13,16 @@ def index
     end
   end
 
+  def moderate
+    @feeds = Feed.all
+    auth!
+
+    respond_to do |format|
+      format.js { }
+      format.html { }
+    end
+  end
+
   # GET /feeds/1
   # GET /feeds/1.xml
   def show

diff --git a/app/views/contents/new.html.erb b/app/views/contents/new.html.erb
@@ -12,8 +12,8 @@
   <div class="span10">
     <section class="C">
     	<header class="C-header">
-    		<div class="C-header_right"><a class="button" href="#"><%=t(:design_graphic)%></a></div>
-    		<h1><%= t(:add) + " " + @content.class.to_s + " " + t(:content) %></h1>
+    		<div class="C-header_right default-padding"><a class="button" href="#"><%=t(:design_graphic)%></a></div>
+    		<h1 class="default-padding"><%= t(:add) + " " + @content.class.to_s + " " + t(:content) %></h1>
     	</header> 
     	<div class="C-cont">
     		<%= render 'form' %>

diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb
@@ -1,6 +1,6 @@
 <section class="C">
   <header class="C-header">
-    <h1><%= t(:dashboard) %></h1>
+    <h1 class="default-padding"><%= t(:dashboard) %></h1>
   </header> 
   <div class="C-cont">
     <%= form_tag "/dashboard/update" do %>

diff --git a/app/views/elements/_topmenu_contents.html.erb b/app/views/elements/_topmenu_contents.html.erb
@@ -47,7 +47,7 @@
     <div class="TM-sectop">
       <%= link_to t(:browse), feeds_path, :class => "btn #{ current_page?(feeds_path) || (controller.controller_name == 'submissions' && ['index', 'show'].include?(controller.action_name)) ? 'selected' : '' }" %>
       <%= link_to t(:add), new_content_path, :class => "btn #{ current_page?(new_content_path) ? 'selected' : '' }" if can? :create, Content %>
-      <%= link_to '#', :class => "btn" do %>
+      <%= link_to moderate_path, :class => "btn" do %>
         <%= t(:moderate) %>&nbsp;<span class="badge alert">##</span>
       <% end %>
     </div>

diff --git a/app/views/feeds/_browse_header.html.erb b/app/views/feeds/_browse_header.html.erb
@@ -1 +1 @@
-  <h1><%=t :browse_content %></h1>
+  <h1 class="default-padding"><%=t :browse_content %></h1>
diff --git a/app/views/feeds/index.html.erb b/app/views/feeds/index.html.erb
@@ -14,7 +14,7 @@
     <% if user_signed_in? %>
     <section class="C">
       <header class="C-header">
-        <h3>My Concerto</h3>
+        <h1 class="default-padding">My Concerto</h1>
       </header>
       <div class="C-cont">
         <div class="default-padding">
@@ -35,7 +35,7 @@
 
     <section class="C">
       <header class="C-header">
-        <h3>Network Vitals</h3>
+        <h1 class="default-padding">Network Vitals</h1>
       </header>
       <div class="C-cont">
         <div class="default-padding">

diff --git a/app/views/feeds/moderate.html.erb b/app/views/feeds/moderate.html.erb
@@ -0,0 +1,32 @@
+<section class="C">
+  <header id="browse-header" class="C-header">
+    <div class="C-header_right">
+      <div class="status-block">
+        <label>PENDING</label>
+        <span>14</span>
+      </div>
+    </div>
+    <div class="default-padding">
+      <h1>Contents Pending Your Moderation</h1>
+    </div>
+  </header>
+  <div id="browse-body" class="C-cont">
+    <div class="default-padding">
+      <h2><%= @feeds.count %> feeds with pending content</h2>
+    </div>
+
+    <ul class="SL">
+      <% @feeds.each do |pending_feed| %>
+        <li>
+          <h3>
+            <%= link_to feed_submissions_path(pending_feed), :remote => true, :class => "link-hl" do %>
+              <span class="badge alert"><%= pending_feed.pending_contents.count %></span> <%= pending_feed.name %>
+            <% end %>
+          </h3>
+        </li>
+      <% end %>
+    </ul>
+
+    <div class="clear"></div>
+  </div>
+</section>
diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
@@ -2,7 +2,7 @@
 	<div class="span9">
 		<section class="C">
 			<header class="C-header">
-				<h1>All Groups <%= link_to 'New Group', new_group_path, :class => "button" %></h1>
+				<h1 class="default-padding">All Groups <%= link_to 'New Group', new_group_path, :class => "button" %></h1>
 			</header>
 			<div class="C-cont">
 				<div class="subnav clearfix">
@@ -55,7 +55,7 @@
 	<div class="span3">
 		<section class="C">
 			<header class="C-header">
-				<h1><%= t(:users) %></h1>
+				<h1 class="default-padding"><%= t(:users) %></h1>
 			</header>
 			<div class="C-cont">
 				&nbsp;

diff --git a/app/views/screens/index.html.erb b/app/views/screens/index.html.erb
@@ -2,7 +2,7 @@
   <div class="span9">
     <section class="C">
       <header class="C-header" id="screens-header">
-        <h1>All Screens <%= link_to 'New Screen', new_screen_path, :class => "btn" if can? :create, Screen %></h1>
+        <h1 class="default-padding">All Screens <%= link_to 'New Screen', new_screen_path, :class => "btn" if can? :create, Screen %></h1>
       </header>
       <div id="screens-body" class="C-cont">
         <%= render :partial => "screens/index_body" %>
@@ -13,7 +13,7 @@
   <div class="span3">
     <section class="C">
       <header class="C-header">
-        <h1>Templates <%= link_to 'New Template', new_template_path, :class => "btn" if can? :create, Template %></h1>
+        <h1 class="default-padding">Templates <%= link_to 'New Template', new_template_path, :class => "btn" if can? :create, Template %></h1>
       </header>
       <div class="C-cont">
         <%= render :partial => "templates/index_body" %>

diff --git a/app/views/submissions/_index_header.html.erb b/app/views/submissions/_index_header.html.erb
@@ -1,4 +1,4 @@
-<h1 id="contentlist">
+<h1 class="default-padding" id="contentlist">
   <%= link_to "All Feeds", feeds_path, :remote => true %> &gt; 
   <% @feed.ancestors.reverse.each do |ancestor_feed| %>
     <%= link_to ancestor_feed.name, feed_submissions_path(ancestor_feed), :remote => true %> &gt; 

diff --git a/app/views/submissions/_show_header.html.erb b/app/views/submissions/_show_header.html.erb
@@ -1,4 +1,4 @@
-<h1 id="contentlist">
+<h1 class="default-padding" id="contentlist">
   <%= link_to "All Feeds", feeds_path, :remote => true %> &gt; 
   <% @submission.feed.ancestors.reverse.each do |ancestor_feed| %>
   <%= link_to ancestor_feed.name, feed_submissions_path(ancestor_feed), :remote => true %> &gt; 

diff --git a/config/routes.rb b/config/routes.rb
@@ -64,6 +64,8 @@
     resources :fields
   end
 
+  match "moderate/" => "feeds#moderate"
+
   resources :feeds do
     resources :submissions, :only => [:index, :show, :update]
   end