sbdevcore 0.2.0 → 0.2.2

data/app/assets/javascripts/sbdevcore-tools.js

@@ -93,10 +93,10 @@ function add_nested(link, association, content, hide) {
 }
 
 function set_currents(){
-  $('#nav [href="'+window.location.pathname.match(/\/\w*/i)+'"]').addClass("current");
-  $('#nav [href="'+window.location.pathname+'"]').addClass("current");
+  $('[href="'+window.location.pathname.match(/\/\w*/i)+'"]').addClass("current");
+  $('[href="'+window.location.pathname+'"]').addClass("current");
   if(window.location.pathname === '/') {
-    $('#nav [href="/home"]').addClass("current");
+    $('[href="/home"]').addClass("current");
   }
 }
 
@@ -156,11 +156,11 @@ function bind_functions(context){
   $(".scrollable", context).scrollable();
   paginateAjax(context);
   $(".items", context).tabs("#gallery_wrap div", {effect: 'myAjax', history: true, rotate: true}).slideshow({clickable: false, history: true});
+  set_currents();
 }
 
 $(document).ready(function (){
   bind_functions(document);
   init_tinymce();
-  set_currents();
 });
  

data/app/assets/javascripts/sbdevcore.js

@@ -10,5 +10,8 @@
 //= require tiny_mce_config.js
 //= require jquery.formalize
 //= require tinymce.jquery
+//= require history.adapter.jquery
+//= require history
+//= require history.html4
 //= require sbdev-ajax.js
 //= require sbdevcore-tools.js

data/app/assets/stylesheets/_buttons.scss

@@ -1,9 +1,4 @@
 /*Buttons*/
-.nav .button {
-  width: 210px;
-  padding: 5px 0 !important;
-}
-
 img.button {
   border: none;
 }

data/app/assets/stylesheets/_mixins.scss

@@ -63,6 +63,29 @@
   behavior: url(/stylesheets/PIE.htc);
 }
 
+@mixin corners-right($radius) {
+  -moz-border-radius-topright: $radius;
+  -webkit-border-top-right-radius: $radius;
+  border-top-right-radius: $radius;
+  -moz-border-radius-bottomright: $radius;
+  -webkit-border-bottom-right-radius: $radius;
+  border-bottom-right-radius: $radius;
+
+  behavior: url(/stylesheets/PIE.htc);
+}
+
+@mixin corners-left($radius) {
+  @include corners-all(0);
+  -moz-border-radius-topleft: $radius;
+  -webkit-border-top-left-radius: $radius;
+  border-top-left-radius: $radius;
+  -moz-border-radius-bottomleft: $radius;
+  -webkit-border-bottom-left-radius: $radius;
+  border-bottom-left-radius: $radius;
+
+  behavior: url(/stylesheets/PIE.htc);
+}
+
 @mixin arrow-up($size, $color){
   width: 0;
   height: 0;

data/app/assets/stylesheets/_sbdev_core.scss

@@ -47,14 +47,42 @@ body {
 }
 
 #main {
-  width: 75%;
-  float: left;
+//  float: left;
 }
 
-#side_bar {
-  width: 24%;
-  float: left;
+#sidebar {
+  width: 30%;
+  float: right;
+  background-color: $content-background-color;
   border-left: 1px dashed silver;
+  #secondary_nav {
+    .button {
+      position: relative;
+      width: 90%;
+      padding-right: 20px;
+      @include corners-left($corner-radius);
+      float: right;
+      right: -20px;
+      @include box-shadow(0);
+    }
+    .secondary {
+      width: 88%;
+      border-top: 1px dashed silver;
+      @include corners-all(0);
+    }
+  }
+}
+
+.title {
+  width: 67%;
+  background-color: $button-background-color;
+  padding: 10px;
+  padding-left: 20px;
+  margin: 0;
+  color: $content-background-color;
+  position: relative;
+  left: -10px;
+  @include corners-right($corner-radius);
 }
 
 .content {
@@ -181,6 +209,10 @@ form {
   border: solid 1px #C66;
 }
 
+#flash_notice, #flash_error{
+  margin: 10px;
+}
+
 .fieldWithErrors {
   display: inline;
 }
@@ -226,7 +258,12 @@ td {
 
 .ajax-loader {
   background: url('/assets/ajax-loader.gif') center center no-repeat;
-  * {
-    opacity: .5;
+  z-index: 1;
+  *{
+    opacity: .8;
   }
+}
+
+.hidden {
+  display: none;
 }

data/app/controllers/sbdev_core_controller.rb

@@ -8,6 +8,10 @@ class SbdevCoreController < InheritedResources::Base
 
   layout "application"
 
+  def index
+    index!(:layout => !request.xhr?)
+  end
+
   def show
     show!(:layout => !request.xhr?)
   end

data/app/helpers/sbdev_core_helper.rb

@@ -0,0 +1,11 @@
+# These helper methods can be called in your template to set variables to be used in the layout
+# This module should be included in all views globally,
+# to do so you may need to add this line to your ApplicationController
+#   helper :layout
+module SbdevCoreHelper
+  def render_seo(index)
+    content_for(:title, index.try("page_title"))
+    content_for(:keywords, index.try("keywords"))
+    content_for(:page_description, index.try("page_description"))
+  end
+end

data/app/models/photo.rb

@@ -7,6 +7,8 @@ class Photo < ActiveRecord::Base
   include ActsAsPrioritizable
   acts_as_prioritizable("index", "assets")
 
+  after_initialize :defaults
+
   has_attached_file :asset,
     :styles => {
       :original => "1000>",
@@ -54,4 +56,8 @@ class Photo < ActiveRecord::Base
     filename = asset_file_name.gsub(/\.#{extension}$/, '')
     self.asset.instance_write(:file_name, "#{transliterate(filename)}.#{transliterate(extension)}")
   end
+
+  def defaults
+    self.klass ||= "center"
+  end
 end

data/app/views/application/_secondary_nav.html.haml

@@ -1,3 +1,4 @@
 #secondary_nav
-  -obj.indices.each do |page|
-    = link_to page.title, page.title, :class => 'button', :remote => true, :rel => '#main'
+  = link_to @index.title.titleize, collection_url, :class => 'button current', :remote => true
+  -collection.each do |page|
+    = link_to page.index.title.titleize, page, :class => 'button secondary', :remote => true

data/app/views/indices/_show.html.haml

@@ -1,9 +1,8 @@
--logger.info local_assigns
 - index ||= local_assigns[:index]
 - render_seo index
 %div{:id => "index#{index.id}"}
-  %h2.title=index.title.titleize
-  .clearfix= render :partial => 'shared/asset_show', :collection => index.assets, :as => :asset
+  %h1.title=index.title.titleize
+  = render :partial => 'shared/asset_show', :collection => index.assets, :as => :asset
   - if admin_signed_in?
     .asset
       %p.asset-admin
@@ -15,3 +14,11 @@
     - content_for :post_content do
       .content.corner-all.box-shadow
         = render :partial => "shared/gallery", :locals => {:objs => index.gallery.assets}
+- if request.xhr?
+  .content_for.hidden
+    #content_for_title
+      =@view_flow.get(:title)
+    #content_for_keywords
+      =@view_flow.get(:keywords)
+    #content_for_page_description
+      =@view_flow.get(:page_description)

data/app/views/indices/show.html.haml

@@ -0,0 +1,12 @@
+=content_for(:sidebar) do
+  #secondary_nav
+    - nav = resource.owner.nil? ? resource : resource.owner
+    = link_to nav.title.titleize, nav.title, :class => 'button current', :remote => true
+    -nav.indices.each do |page|
+      = link_to page.title.titleize, page.name, :class => 'button secondary', :remote => true
+
+=(render :partial => 'show', :object => resource, :as => resource_class.to_s.downcase.to_sym)
+- if request.xhr?
+  .content_for.hidden
+    #content_for_sidebar
+      =@view_flow.get(:sidebar)

data/app/views/layouts/application.html.haml

@@ -1,8 +1,8 @@
 %html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en")
   %head
-    %title=yield(:title) || APP_CONFIG[:app_name]
-    %meta{:name => 'description', :content => "#{(yield(:description) || APP_CONFIG[:app_name])}"}
-    %meta{:name => 'keywords', :content => "#{(yield(:keywords) || APP_CONFIG[:app_name])}"}
+    %title=yield(:title)
+    %meta{:name => 'description', :content => yield(:description)}
+    %meta{:name => 'keywords', :content => yield(:keywords)}
     = stylesheet_link_tag 'application'
     = javascript_include_tag 'application'
     = csrf_meta_tag
@@ -14,13 +14,13 @@
     #container
       #main_container
         = render 'application/nav'
+        - flash.each do |name, msg|
+          = content_tag :div, msg, :id => "flash_#{name}"
         .content.clearfix
-          #main
-            - flash.each do |name, msg|
-              = content_tag :div, msg, :id => "flash_#{name}"
-            = yield
           #sidebar
             = yield(:sidebar)
+          #main
+            = yield
         = render 'application/footer'
       #overlay.overlay
         .contentWrap

data/app/views/photos/_form.html.haml

@@ -2,9 +2,9 @@
 - f ||= local_assigns[:locals][:f]
 %div{:id => f.object.id.to_s}
   - if f.object.asset_file_name
-    = image_tag f.object.asset.url(:thumb), :width => "100"
+    = image_tag f.object.asset.url(:thumb), :width => "100", :class => "left"
   = f.input :name
-  = f.input :asset, :required => (f.object.asset_file_name.blank? ? true : false), :as => :file, :label => "Photo"
+  = f.input :asset, :as => :file, :label => "Photo", :input_html => {:validate => ( f.object.asset_file_name.blank? ? true : false) }
   = f.input :description, :input_html => { :cols => 70, :rows => 3 }
   = f.input :klass, :as => :radio, :collection => ["left", "right", "center"], :label => "Alignment"
   = render "shared/prioritizable_fields", :locals => {:f => f}

data/app/views/sbdev_core/index.html.haml

@@ -1 +1,8 @@
-= render :partial => 'indices/show', :object => @index, :as => :index
+=content_for(:sidebar) do
+  =render :partial => "application/secondary_nav", :collection => collection
+
+=(render :partial => 'indices/show', :object => @index, :as => :index)
+- if request.xhr?
+  .content_for.hidden
+    #content_for_sidebar
+      =@view_flow.get(:sidebar)

data/app/views/sbdev_core/show.html.haml

@@ -1,4 +1,2 @@
-=content_for(:sidebar) do 
-  =render :partial => "application/secondary_nav", :object => resource, :as => :obj
-
 =(render :partial => 'show', :object => resource, :as => resource_class.to_s.downcase.to_sym)
+=(render :partial => 'indices/show', :object => resource.index, :as => :index)

data/app/views/shared/_prioritizable_fields.html.haml

@@ -2,4 +2,4 @@
 - if(f.object.prioritizables.empty? rescue true)
   = f.hidden_field :priority
 - else
-  = f.input :priority, :as => :select, :collection => (f.object.prioritizables.each_with_index.map{|p,i| [(i+1).ordinalize, p.priority]} + [['Last',f.object.lowest_priority+1]]), :include_blank => false
+  = f.input :priority, :collection => (f.object.prioritizables.each_with_index.map{|p,i| [(i+1).ordinalize, p.priority]} + [['Last',f.object.lowest_priority+1]]), :include_blank => false

data/db/migrate/20110815163647_create_photos.rb

@@ -3,7 +3,7 @@ class CreatePhotos < ActiveRecord::Migration
     create_table :photos do |t|
       t.string :name
       t.text :description
-      t.string :klass
+      t.string :klass, :default => "center"
       t.string :asset_file_name
       t.string :asset_content_type
       t.integer :asset_file_size

data/db/seeds.rb

@@ -36,9 +36,9 @@ Index.all.each(&:destroy)
 [statics + dynamics].flatten.each do |index|
   attr = {
     :name => index,
-    :title => index,
-    :page_title => APP_CONFIG[:app_name] + " - " + index.capitalize,
-    :page_description => APP_CONFIG[:app_name] + " - " + index.capitalize,
+    :title => index.titleize,
+    :page_title => APP_CONFIG[:app_name] + " - " + index.titleize,
+    :page_description => APP_CONFIG[:app_name] + " - " + index.titleize,
     :keywords => index,
     :texts_attributes => {
       (id += 1).to_s =>{
@@ -55,9 +55,9 @@ statics.each do |index|
     sub_index = index + "_#{i.to_s}"
     attr = {
       :name => sub_index,
-      :title => sub_index,
-      :page_title => APP_CONFIG[:app_name] + " - " + sub_index.capitalize,
-      :page_description => APP_CONFIG[:app_name] + " - " + sub_index.capitalize,
+      :title => sub_index.titleize,
+      :page_title => APP_CONFIG[:app_name] + " - " + sub_index.titleize,
+      :page_description => APP_CONFIG[:app_name] + " - " + sub_index.titleize,
       :keywords => sub_index,
       :texts_attributes => {
         (id += 1).to_s =>{

data/lib/generators/sbdevcore/install_generator.rb

@@ -26,10 +26,8 @@ module Sbdevcore
       def set_routes
         route "Sbdevcore::Routes.draw(self)"
         statics = <<-STR
-Index.find_all_by_name(APP_CONFIG[:static_pages]).each do |page|
-    match page.name => "indices#show", :id => page.id, :as => page.name.to_sym
-  end rescue true
   root :to => "indices#show", :id => (Index.find_by_name('home').id rescue 1)
+  match "(:id)" => "indices#show"
         STR
         route statics
       end

data/lib/generators/sbdevcore/templates/application/_nav.html.haml

@@ -1,4 +1,4 @@
 #nav
-  =link_to 'Home', home_path, :class => 'button'
-  =link_to 'About', about_path, :class => 'button'
+  =link_to 'Home', "/home", :class => 'button'
+  =link_to 'About', "/about", :class => 'button'
   =link_to 'Contact', new_contact_path, :class => 'button', :rel=>"#overlay"

data/lib/sbdevcore/version.rb

@@ -1,3 +1,3 @@
 module Sbdevcore
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end