grandstand 0.2.4 → 0.2.6

data/app/controllers/posts_controller.rb

@@ -1,5 +1,5 @@
 class PostsController < ApplicationController
   def show
-    return not_found unless @post = Post.where("#{Post.extract_year('created_at')} = ? AND #{Post.extract_month('created_at')} = ? AND url = ?", params[:year], params[:month].rjust(2, '0'), params[:id]).first
+    return not_found unless @post = Grandstand::Post.posted_on(params[:year], params[:month]).where(:url => params[:id]).first
   end
 end

data/app/helpers/galleries_helper.rb

@@ -0,0 +1,2 @@
+module GalleriesHelper
+end

data/app/helpers/grandstand/galleries_helper.rb

@@ -0,0 +1,2 @@
+module Grandstand::GalleriesHelper
+end

data/app/helpers/grandstand/images_helpers.rb

@@ -0,0 +1,2 @@
+module Grandstand::ImagesHelper
+end

data/app/helpers/grandstand/main_helper.rb

@@ -0,0 +1,74 @@
+module Grandstand::MainHelper
+  # Renders a <button> tag. Helpful for forms and the like.
+  # 
+  #   <%= button("Save Changes", :class => "blue") %>
+  # 
+  # ... produces
+  # 
+  #   <button class="button blue"><span class="inner"><span>Save Changes</span></span></button>
+  def button(*args)
+    label = args.shift
+    options = {:name => 'submit', :value => label}.merge(args.extract_options! || {})
+    options, icon = button_options(options)
+    content_tag(:button, options) { content_tag(:span, :class => icon ? "#{icon} icon" : nil) { label } }
+  end
+
+  # Similar to button, but generates a link instead of a button element. Useful for providing
+  # buttons to GET actions:
+  # 
+  #   <%= button_link_to("Get Help", support_path, :icon => "help") %>
+  # 
+  # ... produces
+  # 
+  #   <a class="button blue" href="/support"><span class="inner"><span class="help icon">Get Help</span></span></button>
+  # 
+  # The extra spans are for any sliding door styling you may be interested in adding. Adding :icon to the options will
+  # give the inner-most span a class of "#{options[:icon]} icon", allowing you to add extra images inside of your button.
+  def button_link_to(*args)
+    options, icon = button_options(args.extract_options! || {})
+    link_to(content_tag(:span, :class => icon ? "#{icon} icon" : nil) { args.shift }, *args.push(options))
+  end
+
+  def button_options(options)
+    classes = %w(button)
+    if icon = options.delete(:icon)
+      classes.push('has-icon')
+    end
+    if options.delete(:default)
+      classes.push('default')
+    end
+    classes.push(options[:class].to_s.split(' ')) if options[:class]
+    options[:class] = classes.uniq.join(' ')
+    [options, icon]
+  end
+
+  def expand(*controllers)
+    options = controllers.extract_options!
+    options[:class] = Array(options[:class]).compact
+    options[:class].push(:expandable)
+    section = controllers.first
+    controllers.map!(&:to_s)
+    if controllers.include?(controller_name) || !((session[:expand] ||= []) & controllers).empty?
+      options[:class].push(:expanded)
+    end
+    raw %( class="#{options[:class].join(' ')}")
+  end
+
+  def expand_link(section)
+    link_to(raw('<span></span>'), '#', :class => 'expand', :rel => section)
+  end
+
+  def hide(condition)
+    raw ' style="display:none;"' if condition
+  end
+
+  # A form wrapper that's used to override the default field_error_proc in a thread-safeish way.
+  # The new field_error_proc returns a <div> with class "errors" on it, instead of an irritating
+  # "fieldWithErrors" classname that nobody likes or wants to use. Only used in admin at the moment.
+  def wrap_grandstand_form(&block)
+    field_error_proc = ActionView::Base.field_error_proc
+    ActionView::Base.field_error_proc = Proc.new {|html_tag, instance| raw("<div class=\"errors\">#{html_tag}</div>") }
+    concat(capture(&block))
+    ActionView::Base.field_error_proc = field_error_proc
+  end
+end

data/app/helpers/grandstand/pages_helper.rb

@@ -0,0 +1,2 @@
+module Grandstand::PagesHelper
+end

data/app/helpers/grandstand/posts_helper.rb

@@ -0,0 +1,2 @@
+module Grandstand::PostsHelper
+end

data/app/helpers/grandstand/sessions_helper.rb

@@ -0,0 +1,2 @@
+module Grandstand::SessionsHelper
+end

data/app/helpers/grandstand/templates_helper.rb

@@ -0,0 +1,2 @@
+module Grandstand::TemplatesHelper
+end

data/app/helpers/grandstand/users_helper.rb

@@ -0,0 +1,2 @@
+module Grandstand::UsersHelper
+end

data/app/models/{gallery.rb → grandstand/gallery.rb}

@@ -1,4 +1,4 @@
-class Gallery < ActiveRecord::Base
+class Grandstand::Gallery < ActiveRecord::Base
   before_save :set_url
   belongs_to :user
   default_scope order('position, id')
@@ -8,7 +8,7 @@ class Gallery < ActiveRecord::Base
   validates_uniqueness_of :name, :message => 'A gallery with that name already exists'
 
   def cover_image
-    images.first || Image.new
+    images.first || Grandstand::Image.new
   end
 
   # def to_param

data/app/models/{image.rb → grandstand/image.rb}

@@ -1,18 +1,19 @@
-class Image < ActiveRecord::Base
+class Grandstand::Image < ActiveRecord::Base
   belongs_to :gallery
   belongs_to :user
   default_scope order('position, id')
 
   has_attached_file :file,
-    :default_url => "http://dummyimage.com/:dimensions",
-    :path => '/images/:padded_id-:style.:extension',
+    :convert_options => Hash[*(Grandstand.image_sizes.keys + [:grandstand_icon, :grandstand_medium]).map {|key| [key, '-gravity North']}.flatten],
+    :default_url => "http://dummyimage.com/:dimensions/fff/888&text=No+Images!",
+    :path => '/images/:gallery_id/:padded_id-:style.:extension',
     :styles => {
-      :admin_icon => '16x16#',
-      :admin_medium => '200x200#'
-    }.merge(Grandstand::Application.image_sizes),
+      :grandstand_icon => '16x16#',
+      :grandstand_medium => '200x200#'
+    }.merge(Grandstand.image_sizes),
     :storage => :s3,
-    :s3_credentials => Grandstand::Application.s3[:credentials],
-    :bucket => Grandstand::Application.s3[:bucket]
+    :s3_credentials => Grandstand.s3[:credentials],
+    :bucket => Grandstand.s3[:bucket]
 
   delegate :url, :to => :file
 
@@ -27,7 +28,7 @@ class Image < ActiveRecord::Base
     def sizes
       return @sizes if defined? @sizes
       sorted_sizes = ActiveSupport::OrderedHash.new
-      Image.attachment_definitions[:file][:styles].reject {|style, dimensions| style.to_s =~ /^admin_/ }.inject({}) do |sizes, style_definition|
+      Grandstand::Image.attachment_definitions[:file][:styles].reject {|style, dimensions| style.to_s =~ /^grandstand_/ }.inject({}) do |sizes, style_definition|
         style, dimensions = style_definition
         width, height = dimensions.gsub(/[^0-9x]/, '').split('x').map(&:to_i)
         width ||= 0

data/app/models/{page.rb → grandstand/page.rb}

@@ -1,4 +1,4 @@
-class Page < ActiveRecord::Base
+class Grandstand::Page < ActiveRecord::Base
   attr_writer :new_parent_slug
 
   after_update :update_children

data/app/models/grandstand/page_section.rb

@@ -0,0 +1,6 @@
+class Grandstand::PageSection < ActiveRecord::Base
+  belongs_to :page
+  Grandstand.page_sections.each do |section|
+    scope section.to_sym, where(:section => section)
+  end
+end

data/app/models/{post.rb → grandstand/post.rb}

@@ -1,9 +1,13 @@
-class Post < ActiveRecord::Base
+class Grandstand::Post < ActiveRecord::Base
   before_save :set_url
+  before_validation :set_posted_at
   belongs_to :user
-  default_scope order('created_at DESC')
+  default_scope order('posted_at DESC, created_at DESC, id DESC')
+
+  scope :posted_on, lambda {|year, month| where("#{extract_year('posted_at')} = ? AND #{extract_month('posted_at')} = ?", year, month.to_s.rjust(2, '0')) }
 
   validates_presence_of :name, :message => 'Your post needs a name'
+  validates_presence_of :posted_at
   validates_uniqueness_of :name, :message => 'A post with that name already exists'
 
   class << self
@@ -30,11 +34,19 @@ class Post < ActiveRecord::Base
     end
   end
 
+  def to_html
+    @to_html ||= Mustache.render(Grandstand::Template.post, as_json)
+  end
+
   # def to_param
   #   url
   # end
 
   protected
+  def set_posted_at
+    self.posted_at ||= Time.now
+  end
+
   def set_url
     self.url ||= name.parameterize
   end

data/app/models/{template.rb → grandstand/template.rb}

@@ -1,4 +1,4 @@
-class Template
+class Grandstand::Template
   class << self
     def [](name)
       @templates ||= {}
@@ -30,4 +30,4 @@ class Template
   def render
     @body.freeze
   end
-end
+end

data/app/models/{user.rb → grandstand/user.rb}

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class Grandstand::User < ActiveRecord::Base
   attr_accessor :password
   attr_accessible :email, :first_name, :last_name, :password, :password_confirmation
 

data/app/stylesheets/application.less

@@ -3,7 +3,7 @@
   for the editor UI ONLY. It relies heavily on global.less, which provides all form element styling and much
   of the generic UI found in the app - including during inline editing and the like.
 */
-@import url('_buttons');
+@import url('_buttons.less');
 
 /* Layout Elements */
 
@@ -17,7 +17,7 @@ body {
   background-image:-webkit-gradient(linear, left top, left bottom, from(#eee), to(#ddd));
   border-bottom:1px solid #eee;
   border-top:1px solid #fff;
-  height:32px;
+  height:35px;
   left:0;
   padding:0 10px;
   position:absolute;
@@ -27,11 +27,11 @@ body {
   -moz-box-sizing:border-box;
   -ms-box-sizing:border-box;
   -webkit-box-sizing:border-box;
-  -moz-box-shadow:#111 0 2px 2px;
-  -webkit-box-shadow:#999 0 1px 2px;  
+  -moz-box-shadow:#999 0 1px 2px;
+  -webkit-box-shadow:#999 0 1px 2px;
 
   .float-right {
-    line-height:30px;
+    line-height:35px;
   /*  margin-top:11px;*/
   }
 
@@ -49,13 +49,13 @@ body {
 
 #logo {
   display:inline-block;
-  padding-top:0;
+  padding-top:1px;
 }
 
 #content {
   height:100%;
   overflow:hidden;
-  padding:31px 0 0 0;
+  padding:36px 0 0 0;
   position:absolute;
   width:100%;
   box-sizing:border-box;
@@ -88,10 +88,13 @@ body {
     li.first {
       > a {
         border-top-color:#d4d4d4;
+        -moz-border-radius-topleft:2px;
         -webkit-border-top-left-radius:2px;
       }
 
       a.expand {
+        -moz-border-radius-topleft:0;
+        -moz-border-radius-topright:2px;
         -webkit-border-top-left-radius:0;
         -webkit-border-top-right-radius:2px;
       }
@@ -156,6 +159,8 @@ body {
     }
 
     li.last a {
+      -moz-border-radius-bottomleft:2px;
+      -moz-border-radius-bottomright:2px;
       -webkit-border-bottom-left-radius:2px;
       -webkit-border-bottom-right-radius:2px;
     }
@@ -194,20 +199,32 @@ body {
   z-index:2;
 }
 
-#pulldown {
+#cover.loading {
+  background-image:url(../images/spinner-dark.gif);
+  background-position:center center;
+  background-repeat:no-repeat;
+}
+
+#dialog {
   left:50%;
   margin-left:-200px;
   position:fixed;
   top:0;
   width:400px;
   z-index:3;
+  -moz-border-radius-bottomleft:5px;
+  -moz-border-radius-bottomright:5px;
+  -webkit-border-bottom-left-radius:5px;
+  -webkit-border-bottom-right-radius:5px;
+  -moz-box-shadow:#333 0 1px 2px;
+  -webkit-box-shadow:#333 0 1px 2px;
 
   h2 {
     background:#fafafa;
     border-bottom:1px solid #ddd;
     color:#555;
     font-size:10pt;
-    margin-bottom:0;
+    margin:0 !important;
     padding:5px;
     text-shadow:#fff 0 1px 0;
   }
@@ -217,14 +234,80 @@ body {
     margin:0;
   }
 
-  form .field {
+  form.two-pane {
+    background:#d9dfe8;
+    border-top-width:0;
+    -moz-border-radius-bottomleft:5px;
+    -moz-border-radius-bottomright:5px;
+    -webkit-border-bottom-left-radius:5px;
+    -webkit-border-bottom-right-radius:5px;
+  }
+
+  .destination {
+    background-color:#fff;
+    border-left:1px solid #aaa;
+    height:100%;
+    margin-left:200px;
+  }
+
+  .field {
     background:#f0f0f0;
     padding:10px;
   }
 
+  .image {
+    cursor:pointer;
+  }
+
+  .scrollable {
+    /*    height:100%;*/
+    overflow-x:hidden;
+    overflow-y:auto;
+    padding:10px 0;
+    width:100%;
+    -moz-box-sizing:border-box;
+    -ms-box-sizing:border-box;
+    -webkit-box-sizing:border-box;
+  }
+
+  .source {
+    float:left;
+    height:100%;
+    overflow-x:hidden;
+    overflow-y:auto;
+    width:200px;
+
+    .header {
+      background-color:transparent !important;
+      background-image:none !important;
+      border-width:0 !important;
+      color:#505d81;
+      font-weight:bold;
+      padding:10px 10px 5px 10px;
+      text-shadow:#f1f5f8 0 1px 0;
+      text-transform:uppercase;
+    }
+
+    a {
+      border-top:1px solid #d9dfe8;
+      color:#000;
+      display:block;
+      padding:5px 5px 5px 20px;
+      text-decoration:none;
+    }
+
+    a.active {
+      background:-webkit-gradient(linear, left top, left bottom, from(#63a4e2), to(#0066c0));
+      border-top:1px solid #4691d6;
+      color:#fff;
+      text-shadow:#000 0 1px 0;
+    }
+  }
+
   .toolbar {
     #grandstand > .styled-toolbar;
     border-top:1px solid #888;
+    clear:both;
     text-align:right;
     -moz-border-radius-bottomleft:5px;
     -moz-border-radius-bottomright:5px;
@@ -236,3 +319,13 @@ body {
     }
   }
 }
+
+#dialog.large {
+  margin-left:-450px;
+  width:900px;
+}
+
+#dialog.medium {
+  margin-left:-300px;
+  width:600px;
+}

data/app/stylesheets/global.less

@@ -1,15 +1,15 @@
 /*
-  global.less contains the styling for rendering the admin UI in any context, assuming
-  it lives somewhere underneath a .admin item. This will allow you to take global UI
+  global.less contains the styling for rendering the grandstand UI in any context, assuming
+  it lives somewhere underneath a .grandstand item. This will allow you to take global UI
   elements and apply them externally or internally - whatever you feel like.
 */
-@import url('_buttons');
+@import url('_buttons.less');
 
 body, html {
   min-height:100%;
 }
 
-body.admin {
+body.grandstand {
   background-color:#fff;
   background-image:-moz-linear-gradient(top, #fff, #eee);
   background-image:-webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
@@ -18,7 +18,7 @@ body.admin {
   padding:0;
 }
 
-.admin {
+.grandstand {
   /* HTML Tags (excluding form input elements) */
   a {
     cursor:pointer;
@@ -30,7 +30,7 @@ body.admin {
   }
 
   form {
-    label {
+    label, .label {
       color:#666;
       display:block;
       font:bold 12px Arial;
@@ -39,6 +39,7 @@ body.admin {
 
     .field {
       margin:0;
+      overflow:hidden;
       padding:10px 5px;
     }
   }
@@ -58,6 +59,7 @@ body.admin {
   }
 
   h2 {
+    display:block !important;
     margin:0 0 5px 0;
     font-size:14pt;
   }
@@ -219,22 +221,27 @@ body.admin {
     #grandstand > .button-hover;
   }
 
-  .button:active {
+  .button:active, .button.active {
+    #grandstand > .button-hover;
     #grandstand > .button-active;
   }
 
-  .button.grey {
+  .button.default {
     #grandstand > .button-grey;
   }
 
-  .button.grey:hover {
+  .button.default:hover {
     #grandstand > .button-grey-hover;
   }
 
-  .button.grey:active {
+  .button.default:active {
     #grandstand > .button-grey-active;
   }
 
+  .center {
+    text-align:center;
+  }
+
   .error {
     margin-top:5px;
   }
@@ -247,25 +254,6 @@ body.admin {
     border:1px solid #f00;
   }
 
-  .flash {
-    bottom:20px;
-    position:fixed;
-    text-align:center;
-    width:100%;
-    z-index:4;
-  }
-
-  .flash .inner {
-    background:rgba(0, 0, 0, 0.7);
-    color:#fff;
-    display:inline-block;
-    font-size:24pt;
-    margin:0 auto;
-    padding:10px 20px;
-    -moz-border-radius:70px;
-    -webkit-border-radius:70px;
-  }
-
   .float-left {
     float:left;
   }
@@ -330,6 +318,11 @@ body.admin {
     background-image:url(../images/icons/posts.png);
   }
 
+  .icon.processing {
+    background-image:url(../images/icons/processing.gif);
+    background-position:left bottom;
+  }
+
   .icon.upload {
     background-image:url(../images/icons/upload.png);
   }
@@ -344,12 +337,17 @@ body.admin {
   }
 
   .inset {
-    background-color:#f0f0f0;
+    background-color:#f5f5f5;
     padding:10px;
     -moz-border-radius:5px;
     -webkit-border-radius:5px;
     -moz-box-shadow:inset #888 0 1px 2px;
     -webkit-box-shadow:inset #888 0 1px 2px;
+
+    .button {
+      -moz-box-shadow:rgba(255, 255, 255, 0.6) 0 1px 0;
+      -webkit-box-shadow:rgba(255, 255, 255, 0.6) 0 1px 0;
+    }
   }
 
   .inset.icon {
@@ -358,6 +356,25 @@ body.admin {
     padding-left:68px;
   }
 
+  .notification {
+    bottom:20px;
+    position:fixed;
+    text-align:center;
+    width:100%;
+    z-index:4;
+  }
+
+  .notification .inner {
+    background:rgba(0, 0, 0, 0.7);
+    color:#fff;
+    display:inline-block;
+    font-size:24pt;
+    margin:0 auto;
+    padding:10px 20px;
+    -moz-border-radius:70px;
+    -webkit-border-radius:70px;
+  }
+
   .progress-bar {
     background:url(../images/background-progress-bar.png) repeat-x left center;
     margin:0;