puffer_pages 0.0.4 → 0.0.5

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem 'rails', '~> 3.0.3'
 gem 'liquid'
 gem 'nested_set'
-gem 'puffer', '>= 0.0.15'
+gem 'puffer', '>= 0.0.17'
 
 group :development, :test do
   gem "capybara", ">= 0.4.0"

data/Gemfile.lock

@@ -82,7 +82,7 @@ GEM
       railties (>= 3.0.0)
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    puffer (0.0.15)
+    puffer (0.0.17)
       cells (~> 3.4.4)
       rails (~> 3.0.3)
       will_paginate (~> 3.0.pre2)
@@ -147,7 +147,7 @@ DEPENDENCIES
   liquid
   mongrel
   nested_set
-  puffer (>= 0.0.15)
+  puffer (>= 0.0.17)
   rails (~> 3.0.3)
   rspec-rails
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/app/controllers/puffer_pages/layouts_controller.rb

@@ -1,7 +1,7 @@
 class PufferPages::LayoutsController < Puffer::Base
   unloadable
 
-  configure do
+  setup do
     group :cms
   end
 

data/app/controllers/puffer_pages/pages_controller.rb

@@ -4,7 +4,7 @@ class PufferPages::PagesController < Puffer::TreeBase
   view_paths_fallbacks_prepend :puffer_pages
   helper :puffer_pages
 
-  configure do
+  setup do
     group :cms
   end
 

data/app/controllers/puffer_pages/snippets_controller.rb

@@ -1,7 +1,7 @@
 class PufferPages::SnippetsController < Puffer::Base
   unloadable
 
-  configure do
+  setup do
     group :cms
   end
 

data/lib/generators/puffer_pages/install/templates/controllers/layouts_controller.rb

@@ -1,4 +1,3 @@
 class Admin::LayoutsController < PufferPages::LayoutsController
-  before_filter :i_didnt_forget_to_protect_this
 
 end

data/lib/generators/puffer_pages/install/templates/controllers/pages_controller.rb

@@ -1,4 +1,3 @@
 class Admin::PagesController < PufferPages::PagesController
-  before_filter :i_didnt_forget_to_protect_this
 
 end

data/lib/generators/puffer_pages/install/templates/controllers/snippets_controller.rb

@@ -1,4 +1,3 @@
 class Admin::SnippetsController < PufferPages::SnippetsController
-  before_filter :i_didnt_forget_to_protect_this
 
 end

data/puffer_pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-02-10}
+  s.date = %q{2011-02-12}
   s.description = %q{Puffer pages is integratable rails CMS with puffer admin interface}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -71,6 +71,8 @@ Gem::Specification.new do |s|
     "spec/dummy/app/controllers/admin/pages_controller.rb",
     "spec/dummy/app/controllers/admin/snippets_controller.rb",
     "spec/dummy/app/controllers/application_controller.rb",
+    "spec/dummy/app/controllers/puffer/dashboard_controller.rb",
+    "spec/dummy/app/controllers/puffer/sessions_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
     "spec/dummy/app/views/layouts/application.html.erb",
     "spec/dummy/config.ru",
@@ -136,6 +138,8 @@ Gem::Specification.new do |s|
     "spec/dummy/app/controllers/admin/pages_controller.rb",
     "spec/dummy/app/controllers/admin/snippets_controller.rb",
     "spec/dummy/app/controllers/application_controller.rb",
+    "spec/dummy/app/controllers/puffer/dashboard_controller.rb",
+    "spec/dummy/app/controllers/puffer/sessions_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
     "spec/dummy/config/application.rb",
     "spec/dummy/config/boot.rb",
@@ -172,7 +176,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.3"])
       s.add_runtime_dependency(%q<liquid>, [">= 0"])
       s.add_runtime_dependency(%q<nested_set>, [">= 0"])
-      s.add_runtime_dependency(%q<puffer>, [">= 0.0.15"])
+      s.add_runtime_dependency(%q<puffer>, [">= 0.0.17"])
       s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
@@ -185,7 +189,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>, ["~> 3.0.3"])
       s.add_dependency(%q<liquid>, [">= 0"])
       s.add_dependency(%q<nested_set>, [">= 0"])
-      s.add_dependency(%q<puffer>, [">= 0.0.15"])
+      s.add_dependency(%q<puffer>, [">= 0.0.17"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
@@ -199,7 +203,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, ["~> 3.0.3"])
     s.add_dependency(%q<liquid>, [">= 0"])
     s.add_dependency(%q<nested_set>, [">= 0"])
-    s.add_dependency(%q<puffer>, [">= 0.0.15"])
+    s.add_dependency(%q<puffer>, [">= 0.0.17"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])

data/spec/dummy/app/controllers/puffer/dashboard_controller.rb

@@ -0,0 +1,7 @@
+class Puffer::DashboardController < Puffer::DashboardBase
+
+  def index
+    p Rails.application.routes.puffer
+  end
+
+end

data/spec/dummy/app/controllers/puffer/sessions_controller.rb

@@ -0,0 +1,29 @@
+class Puffer::SessionsController < Puffer::SessionsBase
+  # This is example session controller for puffer authentication.
+  # You can define your own actions.
+  # Also, you can redefine <tt>new<tt> action view as you wish,
+  # but more effectively will be definig fields with standart
+  # puffer DSL:
+  #   create do
+  #     field :login
+  #     field :password
+  #     field :remember_me
+  #   end
+  #
+  # By default defined <tt>email<tt> and <tt>password<tt> fields.
+
+  def new
+    # @record = UserSession.new
+  end
+
+  def create
+    # @record = UserSession.new params[:user_session]
+    # respond_with record, :location => puffer_root_url
+  end
+
+  def destroy
+    # @record = UserSession.find
+    # @record.destroy
+  end
+
+end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,10 @@
 Dummy::Application.routes.draw do
 
+  namespace :puffer do
+    root :to => 'dashboard#index'
+    resource :session
+  end
+
   namespace :admin do
     resources :pages
     resources :layouts

data/spec/dummy/public/puffer/javascripts/puffer.js

@@ -1,5 +1,5 @@
 var association_done = function(event) {
-  current = this.first('li.current')
+  current = this.first('li.current');
   this.input.next('input[type=hidden]').value(current.get('data-id'));
   this.input.value(current.find('.title').first().html().stripTags()).disable();
 }

data/spec/dummy/public/puffer/stylesheets/puffer.css

@@ -26,6 +26,12 @@ h1
     margin-bottom: 10px;
 }
 
+h2
+{
+    font-size: 17px;
+    margin-bottom: 10px;
+}
+
 .body
 {
 	position: relative;
@@ -49,7 +55,7 @@ h1
     left: 20px;
 }
 
-.logo a
+.logo a, .logo span
 {
     color: #ddd;
     font-size: 30pt;
@@ -58,6 +64,13 @@ h1
     text-shadow: #0A2337 -1px -1px 0;
 }
 
+.logout
+{
+    position: absolute;
+    top: 35px;
+    right: 10px;
+}
+
 .navigation
 {
     position: absolute;
@@ -65,7 +78,19 @@ h1
     bottom: 20px;
 }
 
-.navigation li
+.namespaces
+{
+    position: absolute;
+    right: 10px;
+    top: 0;
+}
+
+.dashboard .navigation
+{
+    margin-bottom: 10px;
+}
+
+.navigation > li, .namespaces > li
 {
     display: inline-block;
     *display: inline;
@@ -74,7 +99,13 @@ h1
     border-radius: 3px;
 }
 
-.navigation li:hover, .navigation li.selected
+.namespaces > li
+{
+    -moz-border-radius: 0 0 3px 3px;
+    border-radius: 0 0 3px 3px;
+}
+
+.navigation > li:hover, .navigation > li.selected, .namespaces > li:hover, .namespaces > li.selected
 {
     -moz-box-shadow: -1px -1px 0 #0A2337;
     -webkit-box-shadow: -1px -1px 0 #0A2337;
@@ -82,7 +113,7 @@ h1
     background: #536C80;
 }
 
-.navigation li>a
+.navigation > li > a, .navigation > li > span, .namespaces > li > a, .namespaces > li > span
 {
     display: inline-block;
     *display: inline;
@@ -94,23 +125,50 @@ h1
     text-shadow: #304759 -1px -1px 0;
 }
 
-.sidebar .navigation
+.namespaces > li > a, .namespaces > li > span
+{
+    padding: 5px 12px;
+}
+
+.sidebar .navigation, .dashboard .navigation
 {
     position: static;
 }
 
-.sidebar .navigation li
+.sidebar .navigation > li, .dashboard .navigation > li
 {
     display: block;
     margin-bottom: 5px;
 }
 
-.sidebar .navigation li>a
+.dashboard .navigation > li
+{
+    background: #536C80;
+}
+
+.dashboard .navigation > li:hover, .dashboard .navigation > li.selected
+{
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+
+.sidebar .navigation > li > a
 {
     display: block;
 }
 
-.sidebar .navigation li .additional
+.sidebar .navigation > li .additional dt
+{
+    margin-bottom: 2px;
+}
+
+.sidebar .navigation > li .additional dd
+{
+    margin-bottom: 8px;
+}
+
+.sidebar .navigation > li .additional, .dashboard .navigation > li ul.additional
 {
     padding: 10px 12px;
     background: #eee;
@@ -120,14 +178,21 @@ h1
     border-bottom-right-radius: 3px;
 }
 
-.sidebar .navigation li .additional dt
+.dashboard .navigation > li ul.additional
 {
-    margin-bottom: 2px;
+    padding: 6px 6px;
 }
 
-.sidebar .navigation li .additional dd
+.dashboard .navigation > li ul.additional li
 {
-    margin-bottom: 8px;
+    list-style: none;
+    padding: 5px 12px;
+}
+
+.dashboard .navigation > li ul.additional li > a
+{
+    color: #222;
+    font-size: 10pt;
 }
 
 .columns
@@ -183,6 +248,19 @@ h1
     padding: 30px;
 }
 
+.sessions
+{
+    min-height: 10px;
+    margin: 50px auto 0 auto;
+    width: 400px;
+}
+
+.dashboard
+{
+    min-height: 10px;
+    margin-left: 20px;
+}
+
 .list_table
 {
     width: 100%;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +03:00
+date: 2011-02-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,12 +69,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 61
         segments: 
         - 0
         - 0
-        - 15
-        version: 0.0.15
+        - 17
+        version: 0.0.17
   requirement: *id004
   prerelease: false
   name: puffer
@@ -258,6 +258,8 @@ files:
 - spec/dummy/app/controllers/admin/pages_controller.rb
 - spec/dummy/app/controllers/admin/snippets_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/puffer/dashboard_controller.rb
+- spec/dummy/app/controllers/puffer/sessions_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
@@ -352,6 +354,8 @@ test_files:
 - spec/dummy/app/controllers/admin/pages_controller.rb
 - spec/dummy/app/controllers/admin/snippets_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/puffer/dashboard_controller.rb
+- spec/dummy/app/controllers/puffer/sessions_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb