sbdevcore 0.2.2 → 0.2.4

data/app/assets/javascripts/sbdev-ajax.js

@@ -8,7 +8,6 @@ $.ajaxSetup({
 function ajax_complete_defaults(data){
   $("#main").removeClass('ajax-loader');
   $("#main").html(data);
-  bind_functions("#main");
   $('title').html($("#content_for_title").html());
   $("#content_for_title").remove();
   $("meta[name='description']").attr("content",$("#content_for_page_description").html());
@@ -17,6 +16,9 @@ function ajax_complete_defaults(data){
   $("#content_for_keywords").remove();
   $('#sidebar').html($("#content_for_sidebar").html());
   $("#content_for_sidebar").remove();
+  $('#post_content').html($("#content_for_post_content").html());
+  $("#content_for_post_content").remove();
+  bind_functions("#main");
 }
 
 $(document).ready(function (){
@@ -25,11 +27,9 @@ $(document).ready(function (){
   });
 
   $("a[data-remote]").live('ajax:complete', function(status, xhr) {
-    ajax_complete_defaults(xhr.responseText);
-    $($(this).closest('div')).find('.current').removeClass('current');
-    $(this).addClass('current');
     ajaxed = true;
     History.pushState(null,'',$(this).attr('href'));
+    ajax_complete_defaults(xhr.responseText);
   });
 
   $(window).bind('statechange',function(){

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

@@ -1,49 +1,16 @@
 $.tools.tabs.addEffect("myAjax", function(tabIndex, done) {
- $.get(
-   this.getTabs().eq(tabIndex).attr('href'),
-   {},
-   done,
-   "script"
- );
-});
-
-jQuery.fn.submitWithAjax = function () {
-  this.submit(function () {
-    $.post($(this).attr('action'), $(this).serialize(), null, "script");
-    return false;
-  });
-};
-
-jQuery.fn.ajaxDelete = function () {
-  this.click( function(event) {
-    event.preventDefault();
-    $.post(
-      this.href,
-      { _method: 'delete' },
-      null,
-      'script'
-    );
-    $(this).closest('li').hide();
+  $.ajax({
+    url: this.getTabs().eq(tabIndex).attr('href'),
+    beforeSend: function(){$("#gallery_wrap_inner").addClass('ajax-loader');},
+    success: [
+      function(data){$('#gallery_wrap_inner').html(data);},
+      function(){bind_functions("#gallery_wrap_inner")},
+      function(){$("#gallery_wrap_inner").removeClass('ajax-loader');},
+      function(){$(this).addClass('current');},
+      done
+    ]
   });
-  return false;
-};
-
-jQuery.fn.ajaxLink = function () {
-  this.click( function(event) {
-    event.preventDefault();
-    if ($(this).hasClass("current")) { return; }
-    if($(this).hasClass('button')) {
-      $($(this).closest('.ajax-nav')).find('.current').removeClass('current');
-      $(this).addClass('current');
-    }
-    $.get(
-      this.href,
-      {},
-      null,
-      "script"
-    );
-  });
-};
+});
 
 jQuery.fn.toggleable = function () {
   this.click( function(event) {
@@ -71,28 +38,8 @@ jQuery.fn.highlightDiv = function(){
   );
 };
 
-function remove_fields(link) {
-    $(link).parent().prev("input[type=hidden]").val("1");
-    $(link).closest(".nested_fields").hide();
-}
-
-function add_nested(link, association, content, hide) {
-  var new_id = new Date().getTime();
-  var regexp = new RegExp("new_" + association, "g");
-  $(link).parent().before(content.replace(regexp, new_id));
-  if(hide){
-    $(link).hide();
-  }
-  if (content.match(/mceEditor/i)){
-    var id = $(".mceEditor", content.replace(regexp, new_id)).attr("id");
-    tinyMCE.execCommand('mceAddControl', true, id);
-  }
-  if (content.match(/date/i)){
-    $(".date").dateinput({min: 0, yearRange: [0,2], format: 'ddd, mmmm d, yyyy'});
-  }
-}
-
 function set_currents(){
+  $(".button").not("#gallery .button").removeClass('current');
   $('[href="'+window.location.pathname.match(/\/\w*/i)+'"]').addClass("current");
   $('[href="'+window.location.pathname+'"]').addClass("current");
   if(window.location.pathname === '/') {
@@ -108,6 +55,7 @@ function setOverlay(context){
   $(".overlayed", context).overlay({
     fixed: false,
     target: '#overlay',
+    top: 0,
 		onBeforeLoad: function() {
 			var wrap = this.getOverlay().find(".contentWrap");
 			var url = this.getTrigger().attr("href");
@@ -153,10 +101,10 @@ function bind_functions(context){
   setOverlay(context);
   spellcheck(context);
   $('form[data-validate]', context).validate();
+  set_currents();
   $(".scrollable", context).scrollable();
+  $(".items", context).tabs("#gallery_wrap_inner", {effect: 'myAjax', rotate: true}).slideshow({clickable: false});
   paginateAjax(context);
-  $(".items", context).tabs("#gallery_wrap div", {effect: 'myAjax', history: true, rotate: true}).slideshow({clickable: false, history: true});
-  set_currents();
 }
 
 $(document).ready(function (){

data/app/assets/javascripts/sbdevcore.js

@@ -13,5 +13,5 @@
 //= require history.adapter.jquery
 //= require history
 //= require history.html4
-//= require sbdev-ajax.js
 //= require sbdevcore-tools.js
+//= require sbdev-ajax.js

data/app/assets/stylesheets/_forms.scss

@@ -11,7 +11,6 @@
   textarea {
     margin: 3px;
     display: inline;
-    width: auto;
   }
 
   label {

data/app/assets/stylesheets/_gallery.scss

@@ -1,129 +1,91 @@
 #gallery {
-  width: 676px;
-  margin: 10px auto;
-  display: block;
-}
-
-#gallery_wrap {
-  /* dimensions */
-  margin: 0 auto;
-  /* centered */
-  text-align:center;
-  min-height: 666px;
+  a.browse {
+    background:url(/assets/hori_large.png) no-repeat;
+    display:block;
+    width:30px;
+    height:30px;
+    cursor:pointer;
+    font-size:1px;
+  }
+  a.right         { background-position: 0 -30px; clear:right; margin-right: 0px; float: right;}
+  a.right:hover     { background-position:-30px -30px; }
+  a.right:active   { background-position:-60px -30px; }
+
+
+  /* left */
+  a.left        { margin-left: 0px; }
+  a.left:hover      { background-position:-30px 0; }
+  a.left:active    { background-position:-60px 0; }
+
+  a.disabled {
+    visibility:hidden !important;
+  }
 }
 
 #gallery_wrap a.browse {
-  margin-top: 300px !important;
+  margin: 15px 10px 0;
 }
+
 #gallery_wrap_inner {
-  width: 596px;
-  margin: 0;
-}
-#gallery_wrap img {
-  max-width: 566px;
-  max-height: 660px;
+  width: 90%;
+  margin: 0 auto;
+  .title {
+    width: 100%;
+    margin: 0 auto;
+    left: 0;
+    padding: 10px 0;
+    @include corners-all($corner-radius);
+    text-align: center;
+  }
+  img {
+    max-width: 566px;
+    max-height: 660px;
+  }
 }
 
 .scroll_nav {
   margin: 0 auto;
-  width: 676px;
+  width: 700px;
+  a.browse {
+    margin: 62.5px 10px 0;
+  }
+
 }
-/*
-	root element for the scrollable.
-	when scrolling occurs this element stays still.
-*/
+
 .scrollable {
 
-	/* required settings */
-	position:relative;
-	overflow:hidden;
-	width: 596px;
-	height:160px;
+  position:relative;
+  overflow:hidden;
+  width: 620px;
+  height:155px;
   padding: 0;
   margin: 0;
   float:left;
-  
-	/* custom decorations */
   background-color: transparent;
-}
-
-.items div {
-	float:left;
-	width:600px;
-}
-
-/* single scrollable item */
-.scrollable .button {
-	float:left;
-	margin: 7px;
-  padding: 5px !important;
-  height:130px;
-  width:125px;
-  border: none;
-}
-
-.scrollable img {
-  max-height:120px;
-  max-width:125px;
-  margin: 0;
-  padding: 0;
-}
-
-
-/*
-	root element for scrollable items. Must be absolutely positioned
-	and it should have a extremely large width to accomodate scrollable items.
-	it's enough that you set the width and height for the root element and
-	not for this element.
-*/
-.scrollable .items {
-	/* this cannot be too large */
-	width:20000em;
-	position:absolute;
-	clear:both;
-}
-
-/* prev, next, prevPage and nextPage buttons */
-a.browse {
-	background:url(../images/hori_large.png) no-repeat;
-	display:block;
-	width:30px;
-	height:30px;
-	float:left;
-	margin:50px 10px 0;
-	cursor:pointer;
-	font-size:1px;
-}
-
-/* right */
-a.right 				{ background-position: 0 -30px; clear:right; margin-right: 0px;}
-a.right:hover 		{ background-position:-30px -30px; }
-a.right:active 	{ background-position:-60px -30px; }
-
-
-/* left */
-a.left				{ margin-left: 0px; }
-a.left:hover  		{ background-position:-30px 0; }
-a.left:active  	{ background-position:-60px 0; }
-
-/* up and down */
-/*a.up, a.down		{*/
-	/*background:url(../img/scrollable/arrow/vert_large.png) no-repeat;*/
-	/*float: none;*/
-	/*margin: 10px 50px;*/
-/*}*/
-
-/* up */
-/*a.up:hover  		{ background-position:-30px 0; }*/
-/*a.up:active  		{ background-position:-60px 0; }*/
-
-/* down */
-/*a.down 				{ background-position: 0 -30px; }*/
-/*a.down:hover  		{ background-position:-30px -30px; }*/
-/*a.down:active  	{ background-position:-60px -30px; }*/
-
-
-/* disabled navigational button */
-a.disabled {
-	visibility:hidden !important;
+  .button {
+    float:left;
+    padding: 5px !important;
+    height:125px;
+    width:125px;
+    border: none;
+    overflow: hidden;
+  }
+
+  img {
+    max-height:125px;
+    max-width:125px;
+    margin: 0;
+    padding: 0;
+  }
+
+  .items {
+    /* this cannot be too large */
+    width:20000em;
+    position:absolute;
+    clear:both;
+    div {
+      float:left;
+      width:620px;
+    }
+  }
 }

data/app/assets/stylesheets/_overlay.scss

@@ -11,7 +11,6 @@
   width: $content-width - 100px;
   padding: 20px;
   min-height:200px;
-  top: 0 !important;
   @include box-shadow(50px);
   @include corners-all(10px);
 }

data/app/assets/stylesheets/_sbdev_core.scss

@@ -53,23 +53,32 @@ body {
 #sidebar {
   width: 30%;
   float: right;
+  margin-left: 5px;
   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);
+      font-size: 101%;
       float: right;
-      right: -20px;
+      right: -10px;
       @include box-shadow(0);
+      text-align: left;
     }
     .secondary {
-      width: 88%;
+      width: 84%;
+      float: left;
+      margin-left: 20px;
       border-top: 1px dashed silver;
       @include corners-all(0);
     }
+    li:hover {
+      & .tertiary_nav {
+        display: inline;
+      }
+    }
   }
 }
 
@@ -81,7 +90,7 @@ body {
   margin: 0;
   color: $content-background-color;
   position: relative;
-  left: -10px;
+  left: -15px;
   @include corners-right($corner-radius);
 }
 

data/app/assets/stylesheets/_yui_base.scss

@@ -111,11 +111,11 @@ ol, ul, dl {
 
 ol li {
   /*giving OL's LIs generated numbers*/
-  list-style: decimal outside; }
+  list-style: decimal inside; }
 
 ul li {
   /*giving UL's LIs generated disc markers*/
-  list-style: disc outside; }
+  list-style: disc inside; }
 
 dl dd {
   /*providing spacing for definition terms*/

data/app/controllers/galleries_controller.rb

@@ -1,5 +1,5 @@
 class GalleriesController < SbdevCoreController
   before_filter :authenticate_admin!
   skip_before_filter :get_index
-  belongs_to :index, :optional => true
+  nested_belongs_to :index, :optional => true, :singleton => true
 end

data/app/controllers/indices_controller.rb

@@ -1,3 +1,4 @@
 class IndicesController < SbdevCoreController
   before_filter :authenticate_admin!, :only => [:index]
+  nested_belongs_to :gallery, :polymorphic => true, :optional => true
 end

data/app/controllers/sbdev_core_controller.rb

@@ -39,6 +39,6 @@ class SbdevCoreController < InheritedResources::Base
   private
 
   def get_index
-    @index = Index.find_by_name(controller_name)
+    @index = Index.find(controller_name)
   end
 end

data/app/models/gallery.rb

@@ -1,7 +1,14 @@
 class Gallery < ActiveRecord::Base
+  attr_accessible :title
   belongs_to :index
 
-  has_many :indices, :as => :owner, :dependent => :destroy, :order => "priority ASC"
+  has_many :indices, :as => :owner, :dependent => :destroy
 
   accepts_nested_attributes_for :indices, :allow_destroy => true
+
+  validates_presence_of :title
+
+  def name
+    title.downcase.gsub(" ", "_")
+  end
 end

data/app/models/index.rb

@@ -1,12 +1,24 @@
 class Index < ActiveRecord::Base
   attr_accessible :name, :title, :page_title, :keywords, :page_description, :texts_attributes, :photos_attributes, :videos_attributes, :downloadables_attributes, :gallery_attributes
 
-  has_many :indices, :as => :owner, :dependent => :destroy
-  belongs_to :owner, :polymorphic => true
+  delegate :asset, :to => :"photos.first", :allow_nil => true
+  alias_method :photo, :asset
+
+  before_validation :default_name
 
   extend FriendlyId
   friendly_id :name, :use => :slugged
 
+  include ActsAsPrioritizable
+  acts_as_prioritizable("owner", "indices")
+  default_scope :order => 'priority ASC'
+  after_initialize do
+    self.priority ||= lowest_priority + 1
+  end
+
+  has_many :indices, :as => :owner, :dependent => :destroy
+  belongs_to :owner, :polymorphic => true
+
   has_one :gallery, :dependent => :destroy
 
   has_many :texts, :dependent => :destroy
@@ -21,7 +33,13 @@ class Index < ActiveRecord::Base
 
   accepts_nested_attributes_for :gallery, :allow_destroy => true
 
+  validates_presence_of :title
+
   def assets
     (texts + photos + videos + downloadables).sort_by{|a| a.priority || 99}
   end
+
+  def default_name
+    self.name ||= self.title.tableize
+  end
 end

data/app/models/photo.rb

@@ -6,8 +6,11 @@ class Photo < ActiveRecord::Base
 
   include ActsAsPrioritizable
   acts_as_prioritizable("index", "assets")
-
-  after_initialize :defaults
+  default_scope :order => 'priority ASC'
+  after_initialize do
+    self.klass ||= "center"
+    self.priority ||= lowest_priority + 1
+  end
 
   has_attached_file :asset,
     :styles => {
@@ -56,8 +59,4 @@ 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,4 +1,4 @@
 #secondary_nav
-  = link_to @index.title.titleize, collection_url, :class => 'button current', :remote => true
+  = link_to @index.title.titleize, @index.title, :class => 'button current', :remote => true
   -collection.each do |page|
     = link_to page.index.title.titleize, page, :class => 'button secondary', :remote => true

data/app/views/downloadables/new.html.haml

@@ -1,4 +1,2 @@
-= simple_form_for @index, :validate => true, :html => { :multipart => true} do |f|
-  = f.simple_fields_for :downloadables, @downloadable do |downloadable_form|
-    = render "downloadables/form", :locals => {:f => downloadable_form}
-  = f.button :submit
+= simple_form_for [@index, @downloadable], :validate => true, :html => { :multipart => true} do |f|
+  = render "downloadables/form", :locals => {:f => f}

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

@@ -1,22 +1,2 @@
 - f ||= local_assigns[:locals][:f]
-.nested_fields
-  .nested_fields
-    %p
-      = f.label "Gallery Title"
-      %br/
-      = f.text_field :title
-  .nested_fields
-    %h4 Gallery Photos
-    #photos
-      = f.fields_for :photos do |photo_form|
-      = render "photos/form", :locals => {:f => photo_form}
-      %p= link_to_add_nested('Add Photo', f, :photos, 'photos')
-  .nested_fields
-    %h4 Gallery Videos
-    #videos
-      = f.fields_for :videos do |video_form|
-      = render "videos/form", :locals => {:f => video_form}
-      %p= link_to_add_nested('Add Video', f, :videos, 'videos')
-  - unless f.object.new_record?
-  = f.hidden_field :_destroy
-  %p= link_to_function "Remove Gallery", "remove_fields(this)", :class => "remove"
+= f.input :title

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

@@ -0,0 +1,15 @@
+- indices ||= local_assigns[:indices]
+#gallery.clearfix
+  #gallery_wrap.clearfix
+    %a{:class => "#{'no_back ' unless (indices.size > 1)}backward browse left"}
+    %a{:class => "#{'no_back ' unless (indices.size > 1)}forward browse right"}
+    #gallery_wrap_inner
+  .scroll_nav.clearfix
+    %a{:class => "#{'no_back ' unless (indices.size > 4)}prev browse left"}
+    .scrollable.corner-all.nav
+      .items.ajax-nav
+        - indices.each_with_index do |index, i|
+          =raw '<div>' if i%4 == 0
+          = link_to image_tag(index.photo.try(:url,:thumb), :alt => index.title), index, :class => "button#{' current' if index.id == indices.first.id}"
+          =raw '</div>' if (i%4 == 3 || i == indices.size-1)
+    %a{:class => "#{'no_back ' unless (indices.size > 4)}next browse right"}

data/app/views/galleries/edit.html.haml

@@ -1,10 +1,5 @@
-- title "Edit Gallery"
 = simple_form_for @gallery, :validate => true, :html => { :multipart => true } do |f|
   = f.error_messages
   = f.button :submit
   = render :partial => 'form'
-  = f.button :submit
-%p
-  = link_to "Show", @gallery
-  |
-  \#{link_to "View All", galleries_path}
+  = f.button :submit

data/app/views/galleries/new.html.haml

@@ -1,3 +1,3 @@
-= simple_form_for @gallery, :validate => true, :html => { :multipart => true } do |f|
-  = render :partial => 'form'
+= simple_form_for [@index, @gallery], :url => index_gallery_path(@index), :validate => true, :html => { :multipart => true} do |f|
+  = render "galleries/form", :locals => {:f => f}
   = f.button :submit

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

@@ -1,43 +1,8 @@
 - f ||= local_assigns[:locals][:f]
 - index ||= f.object
-- seo ||= (local_assigns[:locals][:seo] rescue true)
-- side ||= (local_assigns[:locals][:side] rescue true)
-- gallery ||= (local_assigns[:locals][:gallery] rescue true)
-%p
-  = index.name
-%h4 Content Sections
-.pane.clearfix
-  = f.fields_for :content_sections, index.content_sections do |section_form|
-  = render "sections/form", :locals => {:f => section_form, :alignment => true}
-  %p= link_to_add_nested('Add Section', f, :content_sections, 'sections')
-- if seo
-  %h4 Search Engine Info
-  .pane.clearfix
-    %p
-      = f.label :page_title
-      %br/
-      = f.text_field :page_title
-    %p
-      = f.label :keywords
-      %br/
-      = f.text_area :keywords, :rows => 5
-    %p
-      = f.label :page_description
-      %br/
-      = f.text_area :page_description, :rows => 10
-- if side
-  %h4 Side Bar Section
-  - if index.side_section.nil?
-    %p= link_to_add_nested('Add Side Section', f, :side_section, 'sections', false, true)
-  - else
-    .pane.clearfix
-      = f.fields_for :side_section, index.side_section do |section_form|
-      = render "sections/form", :locals => {:f => section_form}
-- if side
-  %h4 Gallery
-  - if index.gallery.nil?
-    %p= link_to_add_nested('Add Gallery', f, :gallery, 'galleries', false, true)
-  - else
-    .pane.clearfix
-      = f.fields_for :gallery, index.gallery do |section_form|
-      = render "galleries/form", :locals => {:f => section_form}
+%div{:id => f.object.id.to_s}
+  = f.input :title
+  = f.input(:page_title) unless index.owner.is_a?(Gallery)
+  = f.input(:keywords, :input_html => { :rows => 5 }) unless index.owner.is_a?(Gallery)
+  = f.input(:page_description, :input_html => { :rows => 5 }) unless index.owner.is_a?(Gallery)
+  = render("shared/prioritizable_fields", :locals => {:f => f}) unless index.owner.nil?

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

@@ -1,6 +1,6 @@
 - index ||= local_assigns[:index]
 - render_seo index
-%div{:id => "index#{index.id}"}
+.asset
   %h1.title=index.title.titleize
   = render :partial => 'shared/asset_show', :collection => index.assets, :as => :asset
   - if admin_signed_in?
@@ -10,12 +10,21 @@
         = link_to "Add Photo", new_index_photo_path(index.id), :rel=>"#overlay", :class => "overlayed"
         = link_to "Add Video", new_index_video_path(index.id), :rel=>"#overlay", :class => "overlayed"
         = link_to "Add Downloadable File", new_index_downloadable_path(index.id), :rel=>"#overlay", :class => "overlayed"
-  - unless index.gallery.nil?
-    - content_for :post_content do
-      .content.corner-all.box-shadow
-        = render :partial => "shared/gallery", :locals => {:objs => index.gallery.assets}
-- if request.xhr?
+        = link_to "Add Gallery", new_index_gallery_path(index.id), :rel=>"#overlay", :class => "overlayed" if (index.gallery.nil? && !index.owner.is_a?(Gallery))
+    %p.asset-admin
+      = link_to "Edit Page", edit_index_path(index.id), :rel=>"#overlay", :class => "overlayed"
+      = link_to("Remove Page", index, :confirm => 'Are you sure?', :method => :delete) if index.owner.is_a?(Gallery) 
+- unless index.gallery.nil?
+  =content_for(:post_content) do
+    - if admin_signed_in?
+      .asset
+        %p.asset-admin
+        = link_to "Add Gallery Page", new_gallery_index_path(index.gallery.id), :rel=>"#overlay", :class => "overlayed"
+    = render(:partial => "galleries/show", :object => index.gallery.indices, :as => :indices) unless index.gallery.indices.empty?
+- if(request.xhr?)
   .content_for.hidden
+    #content_for_post_content
+      =@view_flow.get(:post_content)
     #content_for_title
       =@view_flow.get(:title)
     #content_for_keywords

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

@@ -0,0 +1,3 @@
+= simple_form_for [@gallery, @index], :html => { :multipart => true} do |f|
+  = render "indices/form", :locals => {:f => f}
+  = f.button :submit

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

@@ -1,9 +1,9 @@
 =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
+    = link_to nav.title.titleize, "/" + nav.name, :class => 'button current', :remote => true
     -nav.indices.each do |page|
-      = link_to page.title.titleize, page.name, :class => 'button secondary', :remote => true
+      = 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?

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

@@ -21,6 +21,7 @@
             = yield(:sidebar)
           #main
             = yield
+            = yield(:post_content)
         = render 'application/footer'
       #overlay.overlay
         .contentWrap

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

@@ -1,4 +1,3 @@
-= simple_form_for @index, :validate => true, :html => { :multipart => true} do |f|
-  = f.simple_fields_for :photos, @photo do |photo_form|
-    = render "photos/form", :locals => {:f => photo_form}
+= simple_form_for [@index, @photo], :validate => true, :html => { :multipart => true} do |f|
+  = render "photos/form", :locals => {:f => f}
   = f.button :submit

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

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

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

@@ -1,2 +1,2 @@
-=(render :partial => 'show', :object => resource, :as => resource_class.to_s.downcase.to_sym)
 =(render :partial => 'indices/show', :object => resource.index, :as => :index)
+=(render :partial => 'show', :object => resource, :as => resource_class.to_s.downcase.to_sym)

data/app/views/texts/new.html.haml

@@ -1,4 +1,3 @@
-= simple_form_for @index, :html => { :multipart => true} do |f|
-  = f.simple_fields_for :texts, @text do |text_form|
-    = render "texts/form", :locals => {:f => text_form}
+= simple_form_for [@index, @text], :html => { :multipart => true} do |f|
+  = render "texts/form", :locals => {:f => f}
   = f.button :submit

data/app/views/videos/new.html.haml

@@ -1,4 +1,2 @@
-= simple_form_for @index, :validate => true, :html => { :multipart => true} do |f|
-  = f.simple_fields_for :videos, @video do |video_form|
-    = render "videos/form", :locals => {:f => video_form}
-  = f.button :submit
+= simple_form_for [@index, @video], :validate => true, :html => { :multipart => true} do |f|
+  = render "videos/form", :locals => {:f => video_form}

data/config/initializers/simple_form.rb

@@ -56,14 +56,14 @@ SimpleForm.setup do |config|
   # config.label_class = nil
 
   # You can define the class to use on all forms. Default is simple_form.
-   config.form_class = "simple_form"
+   config.form_class = "simple_form validate"
 
   # Whether attributes are required by default (or not). Default is true.
-   config.required_by_default = false
+   config.required_by_default = true
 
   # Tell browsers whether to use default HTML5 validations (novalidate option).
   # Default is enabled.
-   config.browser_validations = false
+   config.browser_validations = true
 
   # Determines whether HTML5 types (:email, :url, :search, :tel) and attributes
   # (e.g. required) are used or not. True by default.

data/db/migrate/20110811000613_create_indices.rb

@@ -5,6 +5,7 @@ class CreateIndices < ActiveRecord::Migration
       t.string :title
       t.string :slug
       t.string :page_title
+      t.integer :priority
       t.text :keywords
       t.text :page_description
       t.integer :owner_id

data/lib/generators/sbdevcore/install_generator.rb

@@ -5,6 +5,8 @@ module Sbdevcore
       argument :app_name, :type => :string
 
       def remove_bs
+        puts "foo\n\n\n"
+        directory "config", "config", :force => true
         remove_file 'public/index.html'
         remove_file 'public/images/rails.png'
         remove_file 'app/views/layouts/application.html.erb'
@@ -12,7 +14,6 @@ module Sbdevcore
       end
 
       def database
-        directory "config", "config", :force => true
         template  'database.yml', 'config/database.yml', :force => true
         rake "db:drop:all"
         rake "db:create"
@@ -26,7 +27,7 @@ module Sbdevcore
       def set_routes
         route "Sbdevcore::Routes.draw(self)"
         statics = <<-STR
-  root :to => "indices#show", :id => (Index.find_by_name('home').id rescue 1)
+  root :to => "indices#show", :id => ('home')
   match "(:id)" => "indices#show"
         STR
         route statics

data/lib/generators/sbdevcore/templates/sass.scss

@@ -9,7 +9,6 @@ $side_bar-width: 0;
 $padding: 10px;
 $content-width: $window-width - $side_bar-width - 2*($shadow-radius) - 2*$padding;
 @import 'sbdev_core';
-@import 'bar_nav';
 
 body {
   background: url("/assets/background.jpg") repeat fixed center top $background-color;

data/lib/sbdevcore.rb

@@ -14,7 +14,9 @@ module Sbdevcore
         resources :videos
         resources :downloadables
         resources :texts
-        resources :galleries
+        resources :galleries do
+          resources :indices
+        end
 
         resources :indices do
           resources :photos

data/lib/sbdevcore/version.rb

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

data/sbdevcore.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('tinymce-rails')
-  s.add_dependency('prioritizable')
+  s.add_dependency('prioritizable', ">= 0.0.3")
   s.add_dependency('devise')
   s.add_dependency('paperclip')
   s.add_dependency('haml-edge')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sbdevcore
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2011-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
-  requirement: &2153469800 !ruby/object:Gem::Requirement
+  requirement: &2156854500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153469800
+  version_requirements: *2156854500
 - !ruby/object:Gem::Dependency
   name: prioritizable
-  requirement: &2153469320 !ruby/object:Gem::Requirement
+  requirement: &2156854000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153469320
+  version_requirements: *2156854000
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2153468800 !ruby/object:Gem::Requirement
+  requirement: &2156853520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153468800
+  version_requirements: *2156853520
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2153468320 !ruby/object:Gem::Requirement
+  requirement: &2156853060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153468320
+  version_requirements: *2156853060
 - !ruby/object:Gem::Dependency
   name: haml-edge
-  requirement: &2153467880 !ruby/object:Gem::Requirement
+  requirement: &2156852620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153467880
+  version_requirements: *2156852620
 - !ruby/object:Gem::Dependency
   name: sitemap_generator
-  requirement: &2153397660 !ruby/object:Gem::Requirement
+  requirement: &2156852200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153397660
+  version_requirements: *2156852200
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &2153397140 !ruby/object:Gem::Requirement
+  requirement: &2156851760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153397140
+  version_requirements: *2156851760
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &2153396680 !ruby/object:Gem::Requirement
+  requirement: &2156851340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153396680
+  version_requirements: *2156851340
 - !ruby/object:Gem::Dependency
   name: client_side_validations
-  requirement: &2153396140 !ruby/object:Gem::Requirement
+  requirement: &2156850900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153396140
+  version_requirements: *2156850900
 - !ruby/object:Gem::Dependency
   name: formalize-rails
-  requirement: &2153395660 !ruby/object:Gem::Requirement
+  requirement: &2156850460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153395660
+  version_requirements: *2156850460
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &2153395120 !ruby/object:Gem::Requirement
+  requirement: &2156849940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.0.pre4
   type: :runtime
   prerelease: false
-  version_requirements: *2153395120
+  version_requirements: *2156849940
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2153394660 !ruby/object:Gem::Requirement
+  requirement: &2156849520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153394660
+  version_requirements: *2156849520
 - !ruby/object:Gem::Dependency
   name: rubyist-aasm
-  requirement: &2153394080 !ruby/object:Gem::Requirement
+  requirement: &2156849060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153394080
+  version_requirements: *2156849060
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &2153393620 !ruby/object:Gem::Requirement
+  requirement: &2156848640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153393620
+  version_requirements: *2156848640
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &2153393000 !ruby/object:Gem::Requirement
+  requirement: &2156848120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,7 +175,7 @@ dependencies:
         version: 4.0.0.beta8
   type: :runtime
   prerelease: false
-  version_requirements: *2153393000
+  version_requirements: *2156848120
 description: Core
 email:
 - aosalias@gmail.com
@@ -273,6 +273,7 @@ files:
 - app/views/downloadables/edit.html.haml
 - app/views/downloadables/new.html.haml
 - app/views/galleries/_form.html.haml
+- app/views/galleries/_show.html.haml
 - app/views/galleries/edit.html.haml
 - app/views/galleries/index.html.haml
 - app/views/galleries/new.html.haml
@@ -280,6 +281,7 @@ files:
 - app/views/indices/_form.html.haml
 - app/views/indices/_show.html.haml
 - app/views/indices/edit.html.haml
+- app/views/indices/new.html.haml
 - app/views/indices/show.html.haml
 - app/views/layouts/application.html.haml
 - app/views/layouts/bar_nav.html.haml
@@ -316,7 +318,6 @@ files:
 - config.ru
 - config/initializers/client_side_validations.rb
 - config/initializers/custom_validators.rb
-- config/initializers/load_app_config.rb
 - config/initializers/simple_form.rb
 - config/locales/en.yml
 - db/migrate/20110125174343_create_contacts.rb
@@ -343,7 +344,6 @@ files:
 - lib/generators/sbdevcore/templates/config/initializers/devise.rb
 - lib/generators/sbdevcore/templates/config/initializers/load_app_config.rb
 - lib/generators/sbdevcore/templates/config/initializers/mailer_setup.rb
-- lib/generators/sbdevcore/templates/config/initializers/simple_form.rb
 - lib/generators/sbdevcore/templates/config/s3.yml
 - lib/generators/sbdevcore/templates/database.yml
 - lib/generators/sbdevcore/templates/new_contact.html.haml

data/config/initializers/load_app_config.rb

@@ -1,2 +0,0 @@
-raw_config = File.read(Rails.root.join("config", "app_config.yml"))
-APP_CONFIG = (YAML.load(raw_config)[Rails.env].merge YAML.load(raw_config)['shared']).symbolize_keys   

data/lib/generators/sbdevcore/templates/config/initializers/simple_form.rb

@@ -1,93 +0,0 @@
-# Use this setup block to configure all options available in SimpleForm.
-SimpleForm.setup do |config|
-  # Components used by the form builder to generate a complete input. You can remove
-  # any of them, change the order, or even add your own components to the stack.
-   config.components = [ :placeholder, :label_input, :hint, :error ]
-
-  # Default tag used on hints.
-  # config.hint_tag = :span
-
-  # CSS class to add to all hint tags.
-  # config.hint_class = :hint
-
-  # CSS class used on errors.
-  # config.error_class = :error
-
-  # Default tag used on errors.
-  # config.error_tag = :span
-
-  # Method used to tidy up errors.
-  # config.error_method = :first
-
-  # Default tag used for error notification helper.
-  # config.error_notification_tag = :p
-
-  # CSS class to add for error notification helper.
-  # config.error_notification_class = :error_notification
-
-  # ID to add for error notification helper.
-  # config.error_notification_id = nil
-
-  # You can wrap all inputs in a pre-defined tag.
-  # config.wrapper_tag = :div
-
-  # CSS class to add to all wrapper tags.
-  # config.wrapper_class = :input
-
-  # CSS class to add to the wrapper if the field has errors.
-  # config.wrapper_error_class = :field_with_errors
-
-  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
-  # config.collection_wrapper_tag = nil
-
-  # You can wrap each item in a collection of radio/check boxes with a tag, defaulting to span.
-  # config.item_wrapper_tag = :span
-
-  # Series of attempts to detect a default label method for collection.
-  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
-
-  # Series of attempts to detect a default value method for collection.
-  # config.collection_value_methods = [ :id, :to_s ]
-
-  # How the label text should be generated altogether with the required text.
-   config.label_text = lambda { |label, required| "#{label} #{required}" }
-
-  # You can define the class to use on all labels. Default is nil.
-  # config.label_class = nil
-
-  # You can define the class to use on all forms. Default is simple_form.
-   config.form_class = "simple_form validate"
-
-  # Whether attributes are required by default (or not). Default is true.
-   config.required_by_default = true
-
-  # Tell browsers whether to use default HTML5 validations (novalidate option).
-  # Default is enabled.
-   config.browser_validations = true
-
-  # Determines whether HTML5 types (:email, :url, :search, :tel) and attributes
-  # (e.g. required) are used or not. True by default.
-  # Having this on in non-HTML5 compliant sites can cause odd behavior in
-  # HTML5-aware browsers such as Chrome.
-  # config.html5 = true
-
-  # Custom mappings for input types. This should be a hash containing a regexp
-  # to match as key, and the input type that will be used when the field name
-  # matches the regexp as value.
-  # config.input_mappings = { /count/ => :integer }
-
-  # Collection of methods to detect if a file type was given.
-  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
-
-  # Default priority for time_zone inputs.
-  # config.time_zone_priority = nil
-
-  # Default priority for country inputs.
-  # config.country_priority = nil
-
-  # Default size for text inputs.
-   config.default_input_size = 50
-
-  # When false, do not use translations for labels, hints or placeholders.
-   config.translate = true
-end