forge-cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93164ce3ded841c7e1386103fdafe25682b7a2e2
-  data.tar.gz: 9d915a573f35fec067b6ca3ebe472c2e22f776bf
+  metadata.gz: 3b3d1320e7a05a69b6ece89788ed2e3482339a41
+  data.tar.gz: 3cff55052ce0d38c2fcff392b91f4f2e5a200f67
 SHA512:
-  metadata.gz: 9fedc0a81b91b7332ef5c28a43bae50d195c4eba255e30d0f4c793d928120bc7933a856f8dd2002f1c5dabd857c2eb41ddf567d3be75d5337c0527cfa5f39653
-  data.tar.gz: ac85e5eeffc9069a8af2e23d055439d2bd42af70969df7b95d0ebe1f8e6dc46f81f503ab7d9a9a4402d296f438ef04453d64e23d29e20040afaaf14815998bc6
+  metadata.gz: 7500f26b32b9112a8e86dafe52f6d9e4df8b3a596db8fe820306f2bd1d0d53e9f61ed4b84bdd151dc136272e8d4562f060363011e676578cf7dd4480b4c0d3ee
+  data.tar.gz: c8b04edd0fe995318206e7e02c4937a9275418811f610d2006cdf11819da358fa4e5d93ef7f37fff47a45171357b1d4166d72c39e7930a93798e34c7372c4e81

data/lib/forge-cli/version.rb

@@ -1,3 +1,3 @@
 class ForgeCLI
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/forge/app/controllers/forge/pages_controller.rb

@@ -9,9 +9,10 @@ class Forge::PagesController < ForgeController
         @pages = @pages.order(:lft)
       }
       format.js {
-        ids = Page.where("title LIKE :q OR content LIKE :q", {:q => "%#{params[:q]}%"}).collect {|p| p.top_parent.id}
+        params[:q] ||= ''
+        ids = Page.where("LOWER(title) LIKE :q OR LOWER(content) LIKE :q", {:q => "%#{params[:q].downcase}%"}).collect {|p| p.top_parent.id}
         @pages = Page.top.where("id IN (?)", ids)
-        render :partial => "page", :collection => @pages
+        render :partial => "page_list", :locals => { :pages => @pages }
       }
     end
   end

data/lib/forge/app/controllers/forge/posts_controller.rb

@@ -7,7 +7,8 @@ class Forge::PostsController < ForgeController
     respond_to do |format|
       format.html { @posts = Post.paginate(:per_page => 10, :page => params[:page]) }
       format.js  {
-        @posts = Post.where("title LIKE :q OR content LIKE :q", {:q => "%#{params[:q]}%"})
+        params[:q] ||= ''
+        @posts = Post.where("LOWER(title) LIKE :q OR LOWER(content) LIKE :q", {:q => "%#{params[:q].downcase}%"})
         render :partial => "post", :collection => @posts
       }
     end

data/lib/forge/app/controllers/posts_controller.rb

@@ -30,6 +30,7 @@ class PostsController < ApplicationController
 
   def show
     @post, @page_title = get_post
+    flash.now[:notice] = "This post is not yet posted and will not appear on your live website." unless @post.posted?
     @comment = Comment.create_comment(@post, session[:comment]) if @post.allow_comments?
     respond_to do |format|
       format.html {}
@@ -51,7 +52,7 @@ class PostsController < ApplicationController
 
   private
     def get_post
-      post = Post.posted.find(params[:id])
+      post = current_user.blank? ? Post.posted.find(params[:id]) : Post.find(params[:id])
       page_title = post.seo_title.blank? ? post.title : post.seo_title
       return post, page_title
     end

data/lib/forge/app/helpers/forge/tree_helper.rb

@@ -5,7 +5,7 @@ module Forge::TreeHelper
 
     return '' if objects.size == 0
 
-    output = %{<ul id="item-list">\n<li class="top">\n<div class="item-content">\n}
+    output = %{<li class="top">\n<div class="item-content">\n}
     path = [nil]
 
     objects.each_with_index do |o, i|
@@ -41,7 +41,7 @@ module Forge::TreeHelper
       if p
         output << %{\n</li>\n</ul>}
       else
-        output << %{\n</div>\n</li>\n</ul>}
+        output << %{\n</div>\n</li>}
       end
     end
 
@@ -84,4 +84,4 @@ module Forge::TreeHelper
       end
     end
   end
-end
+end

data/lib/forge/app/models/post.rb

@@ -54,6 +54,10 @@ class Post < ActiveRecord::Base
     Post.where("created_at < ?", created_at)[0]
   end
 
+  def posted?
+    self.published && self.created_at <= Time.now
+  end
+
   private
   def set_created_at
     created_at_date && created_at_time && self.created_at = "#{created_at_date} #{created_at_time}"

data/lib/forge/app/views/forge/pages/index.html.haml

@@ -17,10 +17,5 @@
 %p.info These are all of the regular pages in your site.  You can drag & drop pages and subpages to change their order.
 
 = render :partial => "forge/shared/section_header", :locals => {:item => Page}
-= sorted_nested_li(@pages, :list_order) do |page|
-  - page = page[0] if page.is_a?(Array)
-  - if page.parent_id
-    = render "subpage", :subpage => page
-  - else
-    = render "page", :page => page
-#item-list-bottom
+%ul#item-list= render :partial => "page_list", :locals => { :pages => @pages }
+#item-list-bottom

data/lib/forge/app/views/pages/_page_list.html.haml

@@ -0,0 +1,6 @@
+= sorted_nested_li(pages, :list_order) do |page|
+  - page = page[0] if page.is_a?(Array)
+  - if page.parent_id
+    = render "subpage", :subpage => page
+  - else
+    = render "page", :page => page

data/lib/forge/vendor/assets/javascripts/jquery.quickSearch.js.erb

@@ -17,8 +17,8 @@
     });
     
     function runUpdate() {
-      var currentValue = $(this).attr('value');
-      
+      var currentValue = $(this).val();
+
       // Do nothing if the search hasn't changed
       if (currentValue == previousValue) {
         return;
@@ -73,7 +73,5 @@
         $('#item-list-bottom div.regular').fadeIn('fast');
       });
     }
-   
-    
   }
 })(jQuery);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forge-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -539,6 +539,7 @@ files:
 - lib/forge/app/views/orders/checkout.html.haml
 - lib/forge/app/views/orders/edit_cart.html.haml
 - lib/forge/app/views/orders/paid.html.haml
+- lib/forge/app/views/pages/_page_list.html.haml
 - lib/forge/app/views/pages/show.html.haml
 - lib/forge/app/views/posts/_archive_months.html.haml
 - lib/forge/app/views/posts/_categories.html.haml