grandstand 0.2.7 → 0.3.0

data/app/views/grandstand/pages/_form.html.erb

@@ -1,16 +1,15 @@
-<%= render :partial => 'left' %>
 <% content_for :head do -%>
   <%= stylesheet_link_tag '/grandstand/stylesheets/wysiwyg.css' %>
 <% end -%>
 <% wrap_grandstand_form do -%>
-  <div class="field">
+  <!-- <div class="field">
     <%= form.label :parent_id %>
-    <%#= form.collection_select :parent_id, Page.tree, :id, :tree_name %>
-  </div>
+    <%#= form.collection_select :parent_id, Grandstand::Page.tree, :id, :tree_name %>
+  </div> -->
   <div class="field">
     <%= form.label :name %>
     <%= form.text_field :name, :class => 'oversized text' %>
-    <%= errors_on :page, :name %>
+    <%= form.errors_on :name %>
   </div>
   <div class="tabset">
     <ul class="tabs">

data/app/views/grandstand/pages/_row.html.erb

@@ -1,9 +1,10 @@
-<tr class="row <%= cycle 'one', 'two' %><%= " child-of-#{page.parent_id}" if page.parent_id %>">
+<tr class="row <%= cycle 'one', 'two' %><%= " child-of-#{page.parent_id}" if page.parent_id %><%= ' parent' if page.children.empty? %>" id="pages_<%= page.id %>">
   <td style="padding-left:<%= indent * 10 + 5 %>;"><%= link_to page.name, grandstand_page_path(page) %></td>
-  <td><%= link_to url = page_url(page.url), url %></td>
+  <td><%= link_to url = page_url(page.url), url, :class => 'external icon' %></td>
   <td class="actions">
     <%= button_link_to 'Edit', edit_grandstand_page_path(page), :icon => :edit %>
-    <%= button_link_to 'Delete', delete_grandstand_page_path(page), :icon => :delete %>
+    <%= button_link_to 'Delete', delete_grandstand_page_path(page), :class => 'remote', :icon => :delete %>
   </td>
+  <td class="handle"></td>
 </tr>
 <%= render :partial => 'row', :collection => page.children, :as => :page, :locals => {:indent => indent.next} %>

data/app/views/grandstand/pages/delete.html.erb

@@ -2,7 +2,7 @@
 <% form_for(@page, :as => :page, :html => {:method => :delete}, :url => grandstand_page_path(@page)) do %>
   <div class="field">You cannot undo this once it's done! This page will be dead. Not undead, like a zombie. Just plain dead.</div>
   <div class="toolbar">
-    <%= button('Delete') %>
-    <%= button_link_to('Cancel', grandstand_pages_path, :class => 'cancel') %>
+    <%= button 'Delete', :default => true %>
+    <%= button_link_to 'Cancel', grandstand_pages_path, :class => 'cancel' %>
   </div>
 <% end %>

data/app/views/grandstand/pages/edit.html.erb

@@ -1,8 +1,11 @@
-<h1 class="pages icon"><%= @page.name %></h1>
+<% content_for :title do %>
+  <%= button_link_to('Cancel', return_path || grandstand_page_path(@page)) %>
+<% end %>
+<h2><%= @page.name %></h2>
 <% form_for(@page, :as => :page, :url => grandstand_page_path(@page)) do |form| -%>
   <%= render :partial => 'form', :locals => {:form => form} %>
   <div class="toolbar">
-    <%= button 'Save' %>
-    <%= button_link_to('Cancel', grandstand_pages_path, :class => 'cancel') %>
+    <%= button 'Save', :default => true %>
+    <%= button_link_to 'Cancel', grandstand_pages_path, :class => 'cancel' %>
   </div>
 <% end -%>

data/app/views/grandstand/pages/index.html.erb

@@ -1,19 +1,22 @@
-<%= render :partial => 'left' %>
-<h1 class="pages icon">Pages</h1>
+<% content_for :title do %>
+  <%= button_link_to('Add a Page', new_grandstand_page_path, :icon => 'add') %>
+<% end %>
+
+<h2>Pages</h2>
 <% if @pages.empty? -%>
-<div class="inset">
-  <h2>You haven't created any pages!</h2>
-  <b class="grey">Get started:</b> <%= button_link_to('Add a Page', new_grandstand_page_path, :icon => 'add') %>
+<div class="pad">
+  <h3>You haven't created any pages!</h3>
+  <%= button_link_to('Add One Now?', new_grandstand_page_path, :icon => 'add') %>
 </div>
 <% else -%>
 <table class="grid">
   <thead>
     <tr>
       <th>Name</th>
-      <th colspan="2">URL</th>
+      <th colspan="3">URL</th>
     </tr>
   </thead>
-  <tbody>
+  <tbody class="sortable pages">
     <%= render :partial => 'row', :collection => @pages, :as => :page, :locals => {:indent => 0} %>
   </tbody>
 </table>

data/app/views/grandstand/pages/new.html.erb

@@ -1,8 +1,11 @@
-<h1 class="pages icon">New Page</h1>
+<% content_for :title do %>
+  <%= button_link_to('Cancel', return_path || grandstand_page_path(@page)) %>
+<% end %>
+<h2>New Page</h2>
 <%= form_for(@page, :as => :page, :url => grandstand_pages_path) do |form| %>
   <%= render :partial => 'form', :locals => {:form => form} %>
   <div class="toolbar">
-    <%= button 'Add Page' %>
-    <%= button_link_to('Cancel', grandstand_pages_path, :class => 'cancel') %>
+    <%= button 'Add Page', :default => true %>
+    <%= button_link_to 'Cancel', grandstand_pages_path, :class => 'cancel' %>
   </div>
 <% end =%>

data/app/views/grandstand/pages/show.html.erb

@@ -1,3 +1,25 @@
-<%= render :partial => 'left' %>
-<h1 class="pages icon"><%= @page.name %> <%= button_link_to('Edit', edit_grandstand_page_path(@page), :icon => 'edit') %></h1>
-<div class="quiet"><%= link_to url = page_url(@page.url), url %></div>
+<% content_for :title do %>
+  <%= button_link_to('Edit', edit_grandstand_page_path(@page), :icon => 'edit') %>
+<% end %>
+<h2><%= @page.name %> <%= link_to url = page_url(@page.url), url, :class => 'external icon' %></h2>
+<% if @page.page_sections.size == 1 -%>
+<div class="pad">
+  <%= page_content(@page.page_sections.first) %>
+</div>
+<% else -%>
+<div class="tabset pad">
+  <ul class="tabs">
+    <% @page.page_sections.each do |page_section| -%>
+    <li>
+      <a href="#page-section-<%= page_section.id %>"><%= page_section.section.titleize %></a>
+    </li>
+    <% content_for :page_sections do -%>
+  <div class="page-section" id="page-section-<%= page_section.id %>">
+    <%= page_content(page_section) %>
+  </div>
+    <% end -%>
+  <% end -%>
+  </ul>
+  <%= yield :page_sections %>
+</div>
+<% end -%>

data/app/views/grandstand/posts/_form.html.erb

@@ -1,4 +1,3 @@
-<%= render :partial => 'left' %>
 <% content_for :head do -%>
 <%= stylesheet_link_tag '/grandstand/stylesheets/wysiwyg.css' %>
 <% end -%>
@@ -6,10 +5,9 @@
   <div class="field">
     <%= form.label :name %>
     <%= form.text_field :name, :class => 'oversized text' %>
-    <%= form.errors_on(:post, :name) %>
+    <%= form.errors_on(:name) %>
   </div>
   <div class="field">
-    <%= form.label :body %>
     <%= form.text_area :body, :class => 'wysiwyg' %>
   </div>
 <% end -%>

data/app/views/grandstand/posts/_list.html.erb

@@ -18,7 +18,7 @@
       <td><%= post.posted_at.to_date %>
       <td class="actions">
         <%= button_link_to 'Edit', edit_grandstand_post_path(post), :icon => :edit %>
-        <%= button_link_to 'Delete', delete_grandstand_post_path(post), :icon => :delete %>
+        <%= button_link_to 'Delete', delete_grandstand_post_path(post), :class => 'remote', :icon => :delete %>
       </td>
     </tr>
     <% end -%>

data/app/views/grandstand/posts/delete.html.erb

@@ -1,9 +1,8 @@
-<%= render :partial => 'left' %>
 <h2>Are you sure you want to do this?</h2>
 <% form_for(@post, :as => :post, :html => {:method => :delete}, :url => grandstand_post_path(@post)) do %>
   <div class="field">You cannot undo this once it's done! This post, and all the creative ideas therein, will be gone forever.</div>
   <div class="toolbar">
-    <%= button('Delete') %>
+    <%= button 'Delete', :default => true %>
     <%= button_link_to('Cancel', grandstand_posts_path, :class => 'cancel') %>
   </div>
 <% end %>

data/app/views/grandstand/posts/edit.html.erb

@@ -1,8 +1,11 @@
-<h1 class="posts icon"><%= @post.name %></h1>
+<% content_for :title do %>
+  <%= button_link_to('Cancel', return_path || grandstand_post_path(@post)) %>
+<% end %>
+<h2><%= @post.name %></h2>
 <%= form_for(@post, :as => :post, :html => {:method => :put}, :url => grandstand_post_path(@post)) do |form| %>
   <%= render :partial => 'form', :locals => {:form => form} %>
   <div class="toolbar">
-    <%= button 'Save' %>
+    <%= button 'Save', :default => true %>
     <%= button_link_to('Cancel', return_path || grandstand_posts_path, :class => 'cancel') %>
   </div>
 <% end =%>

data/app/views/grandstand/posts/index.html.erb

@@ -1,9 +1,14 @@
-<%= render :partial => 'left' %>
-<h1 class="posts icon">Blog Posts</h1>
+<% content_for :title do %>
+  <% if blog_images = Grandstand::Gallery.where(:published => false).first -%>
+  <%= button_link_to('Image Library', grandstand_gallery_path(blog_images), :icon => 'image-library') %>
+  <% end -%>
+  <%= button_link_to('Add a Post', new_grandstand_post_path, :icon => 'add') %>
+<% end %>
+<h2>Blog Posts</h2>
 <% if @posts.empty? -%>
-<div class="inset">
-  <h2>You haven't written any posts!</h2>
-  <b class="grey">Get started:</b> <%= button_link_to('Add a Post', new_grandstand_post_path, :icon => 'add') %>
+<div class="pad">
+  <h3>You haven't written any posts!</h3>
+  <%= button_link_to('Add One Now?', new_grandstand_post_path, :icon => 'add') %>
 </div>
 <% else -%>
 <%= render :partial => 'list', :locals => {:posts => @posts} %>

data/app/views/grandstand/posts/new.html.erb

@@ -1,8 +1,11 @@
-<h1 class="posts icon">New Blog Post</h1>
+<% content_for :title do %>
+  <%= button_link_to('Cancel', return_path || grandstand_post_path(@post)) %>
+<% end %>
+<h2>New Blog Post</h2>
 <% form_for(@post, :as => :post, :url => grandstand_posts_path) do |form| -%>
   <%= render :partial => 'form', :locals => {:form => form} %>
   <div class="toolbar">
-    <%= button 'Add Post' %>
+    <%= button 'Add Post', :default => true %>
     <%= button_link_to('Cancel', grandstand_posts_path, :class => 'cancel') %>
   </div>
 <% end -%>

data/app/views/grandstand/posts/show.html.erb

@@ -1,8 +1,6 @@
-<%= render :partial => 'left' %>
-<h1 class="posts icon">
-  <%= @post.name %>
+<% content_for :title do %>
   <%= button_link_to('Edit', edit_grandstand_post_path(@post), :icon => 'edit') %>
   <%= button_link_to('Delete', delete_grandstand_post_path(@post), :class => 'remote', :icon => 'delete') %>
-</h1>
-<div class="quiet"><%= link_to url = post_url(@post.posted_at.year, @post.posted_at.month, @post.url), url %></div>
+<% end %>
+<h2><%= @post.name %> <%= link_to url = post_url(@post.posted_at.year, @post.posted_at.month, @post.url), url, :class => 'external icon' %></h2>
 <%= raw @post.body %>

data/app/views/grandstand/sessions/forgot.html.erb

@@ -1,8 +1,8 @@
-<h1>Forgot Password</h1>
+<h2>Forgot Password</h2>
 <% form_tag(reset_grandstand_session_path) do %>
   <p>
     <label for="email">E-mail</label>
     <%= text_field_tag(:email, '', :class => 'oversized text') %>
   </p>
-  <%= button 'Reset Password', :class => 'grey' %> <%= button_link_to 'Return to Log In', grandstand_session_path %>
+  <%= button 'Reset Password', :default => true %> <%= button_link_to 'Return to Log In', grandstand_session_path %>
 <% end %>

data/app/views/grandstand/sessions/show.html.erb

@@ -1,4 +1,4 @@
-<h1>Log In</h1>
+<h2>Log In</h2>
 <% form_tag(grandstand_session_path) do %>
   <p>
     <label for="email">E-mail</label>
@@ -8,5 +8,5 @@
     <label for="password">Password</label>
     <%= password_field_tag(:password, '', :class => 'oversized text') %>
   </p>
-  <%= button 'Log In', :class => 'grey' %> <%= button_link_to 'Forgot Your Password?', forgot_grandstand_session_path %>
+  <%= button 'Log In', :default => true %> <%= button_link_to 'Forgot Your Password?', forgot_grandstand_session_path %>
 <% end %>

data/app/views/grandstand/shared/_footer.html.erb

@@ -0,0 +1 @@
+Powered by <a href="http://grandstand.x451.com/">Grandstand</a> from <a href="http://x451.com">Flip Sasser</a>

data/app/views/grandstand/users/_form.html.erb

@@ -3,14 +3,18 @@
     <%= form.label :first_name %>
     <%= form.text_field :first_name, :class => 'half oversized text' %>
     <%= form.text_field :last_name, :class => 'half oversized text' %>
-    <%= form.errors_on(:user, :first_name) %>
+    <%= form.errors_on :first_name %>
   </div>
   <div class="field">
     <%= form.label :email %>
     <%= form.text_field :email, :class => 'text' %>
   </div>
   <div class="field">
-    <%= form.label :password %>
-    <%= form.text_field :password, :autocomplete => 'off', :class => 'text' %>
+    <%= form.label :password, @user.new_record? ? nil : 'New password' %>
+    <%= form.password_field :password, :autocomplete => 'off', :class => 'text' %>
+  </div>
+  <div class="field">
+    <%= form.label :password_confirmation, 'Password (again!)' %>
+    <%= form.password_field :password_confirmation, :autocomplete => 'off', :class => 'text' %>
   </div>
 <% end -%>

data/app/views/grandstand/users/delete.html.erb

@@ -4,7 +4,7 @@
     You cannot undo this once it's done! This user will be gone, and so will their posts and galleries. Be careful! This could have dire effects.
   </div>
   <div class="toolbar">
-    <%= button('Delete') %>
+    <%= button('Delete', :default => true) %>
     <%= button_link_to('Cancel', grandstand_users_path, :class => 'cancel') %>
   </div>
 <% end %>

data/app/views/grandstand/users/edit.html.erb

@@ -2,7 +2,7 @@
 <% form_for(@user, :as => :user, :url => grandstand_user_path(@user)) do |form| -%>
   <%= render :partial => 'form', :locals => {:form => form} %>
   <div class="toolbar">
-    <%= button 'Save' %>
+    <%= button 'Save', :default => true %>
     <%= button_link_to('Cancel', grandstand_users_path, :class => 'cancel') %>
   </div>
 <% end -%>

data/app/views/grandstand/users/index.html.erb

@@ -1,5 +1,7 @@
-<%= render :partial => 'left' %>
-<h1 class="users icon">Users</h1>
+<% content_for :title do %>
+  <%= button_link_to('Add a User', new_grandstand_user_path, :class => 'remote', :icon => 'add') %>
+<% end %>
+<h2>Users</h2>
 <table class="grid">
   <thead>
     <tr>

data/app/views/grandstand/users/new.html.erb

@@ -2,7 +2,7 @@
 <% form_for(@user, :as => :user, :url => grandstand_users_path) do |form| -%>
   <%= render :partial => 'form', :locals => {:form => form} %>
   <div class="toolbar">
-    <%= button 'Add User' %>
+    <%= button 'Add User', :default => true %>
     <%= button_link_to('Cancel', grandstand_users_path, :class => 'cancel') %>
   </div>
 <% end -%>

data/app/views/grandstand/users/show.html.erb

@@ -1,11 +1,14 @@
-<%= render :partial => 'left' %>
-<h1 class="users icon"><%= @user.name %> <%= button_link_to('Edit', edit_grandstand_user_path(@user), :class => 'remote', :icon => 'edit') %></h1>
+<% content_for :title do %>
+  <%= button_link_to('Edit', edit_grandstand_user_path(@user), :class => 'remote', :icon => 'edit') %>
+  <%= button_link_to('Delete', delete_grandstand_user_path(@user), :class => 'remote', :icon => 'delete') unless @user.id == current_user.id %>
+<% end %>
+<h2><%= @user.name %></h2>
 <% unless @user.posts.empty? -%>
-<h2>Blog Posts</h2>
+<h3>Blog Posts</h3>
 <%= render :partial => 'grandstand/posts/list', :locals => {:posts => @user.posts} %>
 <% end -%>
 <% unless @user.galleries.empty? -%>
-<h2>Galleries</h2>
+<h3>Galleries</h3>
 <div class="galleries">
   <%= render :partial => 'grandstand/galleries/list', :locals => {:galleries => @user.galleries} %>
 </div>

data/app/views/layouts/grandstand.html.erb

@@ -5,71 +5,33 @@
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
   <title>Grandstand Admin</title>
   <%= javascript_include_tag('/grandstand/javascripts/jquery', '/grandstand/javascripts/application') %>
-  <%= stylesheet_link_tag('/grandstand/stylesheets/global', '/grandstand/stylesheets/application') %>
+  <%= stylesheet_link_tag('/grandstand/stylesheets/application') %>
   <%= csrf_meta_tag %>
   <%= yield :head %>
 </head>
 <body class="grandstand">
   <%= render :partial => 'grandstand/shared/flash', :locals => {:flash => flash} %>
-  <div id="header">
-    <div class="float-left">
-      <%= link_to(image_tag('/grandstand/images/logo.png', :alt => Grandstand.app_name), grandstand_root_path, :id => 'logo') %>
-    </div>
-    <div class="float-right">
-      <%= link_to('View Site', '/', :target => :new) %>
-      <%= link_to('Logout', grandstand_session_path, :method => :delete) %>
-    </div>
+  <h1 id="logo"><%= link_to('Grandstand', grandstand_root_path) %></h1>
+  <ul id="menu">
+    <li id="posts"><%= link_to 'Posts', grandstand_posts_path, active_on(:controller => :posts) %></li>
+    <li id="galleries"><%= link_to 'Galleries', grandstand_galleries_path, active_on(:controller => %w(galleries images)) %></li>
+    <li id="pages"><%= link_to 'Pages', grandstand_pages_path, active_on(:controller => :pages) %></li>
+    <li id="users"><%= link_to 'Users', grandstand_users_path, active_on(:controller => :users) %></li>
+  </ul>
   </div>
   <div id="content">
-    <div id="left">
-      <%= yield :left %>
-      <ul>
-        <li<%= expand(:posts, :class => 'first') %>>
-          <%= expand_link(:posts) unless no_posts = Grandstand::Post.count.zero? %>
-          <%= link_to('Blog Posts', grandstand_posts_path) %>
-          <% unless no_posts -%>
-          <ul>
-            <% Grandstand::Post.limit(10).each do |post| -%>
-            <li><%= link_to(post.name, grandstand_post_path(post)) %></li>
-            <% end -%>
-          </ul>
-          <% end -%>
-        </li>
-        <li<%= expand(:galleries, :images) %>>
-          <%= expand_link(:galleries) unless no_galleries = Grandstand::Gallery.count.zero? %>
-          <%= link_to('Galleries', grandstand_galleries_path) %>
-          <% unless no_galleries -%>
-          <ul>
-            <% Grandstand::Gallery.limit(10).each do |gallery| -%>
-            <li><%= link_to(gallery.name, grandstand_gallery_path(gallery)) %></li>
-            <% end -%>
-          </ul>
-          <% end -%>
-        </li>
-        <% if false -%>
-        <li<%= expand(:pages) %>>
-          <%= expand_link(:pages) %>
-          <%= link_to('Pages', grandstand_pages_path) %>
-          <% unless Page.roots.count.zero? -%>
-          <ul>
-            <% Grandstand::Page.roots.limit(10).each do |page| -%>
-            <li><%= link_to(page.name, grandstand_page_path(page)) %></li>
-            <% end -%>
-          </ul>
-          <% end -%>
-        </li>
-        <% end -%>
-        <li class="last">
-          <%= link_to('Users', grandstand_users_path) %>
-        </li>
-      </ul>
+    <% unless (title = yield(:title)).blank? -%>
+    <div id="toolbar">
+      <%= title %>
     </div>
-    <div id="main">
-      <%= yield %>
+    <% end -%>
+    <%= yield %>
+    <div id="footer">
+      <%= render :partial => 'grandstand/shared/footer' %> |
+      <%= link_to('View Site', '/', :class => 'external') %> |
+      <%= link_to('Logout', grandstand_session_path, :method => :delete) %>
     </div>
   </div>
-  <div id="footer">
-  </div>
   <div id="cover" style="display:none;"></div>
   <div id="dialog" style="display:none;"></div>
 </body>

data/app/views/layouts/{grandstand_login.html.erb → grandstand_minimal.html.erb}

@@ -5,13 +5,16 @@
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
   <title><% if current_page %><%= current_page.title %> - <% end %>Grandstand</title>
   <%= javascript_include_tag('/grandstand/javascripts/jquery', '/grandstand/javascripts/application') %>
-  <%= stylesheet_link_tag('/grandstand/stylesheets/global', '/grandstand/stylesheets/login') %>
+  <%= stylesheet_link_tag('/grandstand/stylesheets/login') %>
 </head>
 <body class="grandstand">
   <%= render :partial => 'grandstand/shared/flash', :locals => {:flash => flash} %>
-  <%= link_to(image_tag('/grandstand/images/logo.png', :alt => Grandstand.app_name), grandstand_root_path, :id => 'logo') %>
+  <h1 id="logo"><%= link_to(Grandstand.app_name, grandstand_root_path) %></h1>
   <div class="inset" id="login">
     <%= yield %>
+    <div id="footer">
+      <%= render :partial => 'grandstand/shared/footer' %>
+    </div>
   </div>
 </body>
 </html>