adva-blog 0.0.1 → 0.0.2

data/app/controllers/admin/blogs_controller.rb

@@ -2,8 +2,10 @@ class Admin::BlogsController < Admin::SectionsController
   purges :create, :update, :destroy
 
   def show
-    # TODO needs to be here because the admin top section drop down menu links to section#show.
-    # might want to invent a concept of default_action for a section type or something else.
+    # TODO need to do an internal redirect here because the admin top section drop down menu
+    # links to section#show. Might want to invent a concept of default_action for a section
+    # type. Also might want to invent a :preserve_flash => true concept or something like that
+    # when redirecting through http (which otherwise looses the flash after, e.g. blog#create)
     internal_redirect_to 'admin/posts#index', params.merge(:blog_id => params.delete(:id))
   end
 end

data/app/views/admin/blogs/_menu.html.rb

@@ -1,32 +1,25 @@
-class Admin::Blogs::Menu < Adva::View::Menu::Admin::Actions
+require_dependency 'admin/sections/_menu.html'
+
+class Admin::Blogs::Menu < Admin::Sections::Menu
   include do
     def main
-      if persisted?
-        label(resource.name)
-        item(:'.show', index_path(:posts))
-        item(:'.edit', edit_path)
-        item(:'.categories', index_path(:categories)) if Adva.engine?(:categories)
-      else
-        item(:'.sections', index_path)
-      end
+      super
+      categories if persisted? && Adva.engine?(:categories)
     end
 
     def right
-      if persisted?
-        item(:'.new_item', new_path(:post))
-        item(:'.destroy', resource_path, :method => :delete, :confirm => t(:'.confirm_destroy', :model_name => resource.class.model_name.human))
-      else
-        item(:'.new', new_path)
-      end
+      new_item if persisted?
+      super
     end
 
     protected
 
-      def active?(url, options)
-        # hmmm ...
-        types = Section.types.map { |type| type.underscore.pluralize }.join('|')
-        return false if url =~ %r(/admin/sites/\d+/#{types}/\d+$) && request.path != url
-        super
+      def show
+        item(:'.posts', index_path(:posts))
+      end
+
+      def new_item
+        item(:'.new_post', new_path(:post))
       end
   end
 end

data/app/views/admin/categories/_menu_slice.html.rb

@@ -0,0 +1,22 @@
+require_dependency 'admin/categories/_menu.html'
+
+Admin::Categories::Menu.class_eval do
+  include do
+    def main
+      super
+      posts if blog?
+    end
+
+    protected
+
+      def posts
+        item(:'.posts', index_parent_path(:posts), :before => :'.categories')
+      end
+
+      def blog?
+        resource.section.is_a?(Blog)
+      end
+  end
+end
+
+

data/app/views/admin/posts/_menu.html.rb

@@ -1,18 +1,10 @@
-class Admin::Posts::Menu < Adva::View::Menu::Admin::Actions
+require_dependency 'admin/contents/_menu.html'
+
+class Admin::Posts::Menu < Admin::Contents::Menu
   include do
     def main
-      label(resource.section.name)
-      item(:'.show', index_path)
-      item(:'.edit_parent', edit_parent_path)
-    end
-
-    def right
-      item(:'.new', new_path)
-      if persisted?
-        item(:'.view', public_url)
-        item(:'.edit', edit_path)
-        item(:'.destroy', resource_path, :method => :delete, :confirm => t(:'.confirm_destroy', :model_name => resource.class.model_name.human))
-      end
+      super
+      categories(index_parent_path(:categories), :before => :'.edit_section') if Adva.engine?(:categories)
     end
   end
 end

data/app/views/admin/posts/index.html.rb

@@ -31,11 +31,11 @@ class Admin::Posts::Index < Minimal::Template
     end
 
     def link_to_view(post)
-      capture { link_to(options[:text] || :'.view', public_url_for([blog, post]), :class => :view) }
+      capture { link_to(options[:text] || :'.actions.view', public_url_for([blog, post]), :class => :view) }
     end
 
     def status(post)
-      capture { span(t(:'.published'), :title => t(:'.published'), :class => 'status published') }
+      capture { span(t(:'.status.published'), :title => t(:'.status.published'), :class => 'status published') }
     end
   end
 end

data/config/locales/en.yml

@@ -2,58 +2,37 @@ en:
   time:
     formats:
       post: "%a, %d %b %Y"
+
   section:
     types:
       blog: Blog
-  layouts:
-    blog:
-      made_with: "Made with <a href=\"http://github.com/svenfuchs/adva-cms2\">adva cms 2</a>"
-      feed: Atom Feed
+
+  menu:
+    posts: Posts
+    new_post: New Post
+
+  columns:
+    post: Post
+    comments: Comments
+
   posts:
     index:
       continue: Read the rest of this post
     meta:
       info: "posted on %{date}"
-    columns:
-      post: Post
-      comments: Comments
-      published: Published
-      author: Author
-      actions: ""
+
   admin:
     blogs:
       new:
         title: Create a New Section
       edit:
         title: Settings
-      menu:
-        sections: Sections
-        categories: Categories
-        show: Posts
-        new: New
-        edit: Settings
-        destroy: Delete
-        new_item: New Post
-        confirm_destroy: "Do you really want to delete this %{model_name}?"
     posts:
       index:
-        view: View
-        edit: Edit
-        destroy: Delete
-        published: Published
         empty: "There are no posts. %{link}"
         create_item: "Create one now &raquo;"
-        confirm_destroy: "Do you really want to delete this %{model_name}?"
       new:
         title: Write a new blog post
       edit:
         title: Edit Post
         delete: Delete
-      menu:
-        show: Posts
-        edit_parent: Settings
-        new: New Post
-        view: View
-        edit: Edit
-        destroy: Delete
-        confirm_destroy: "Do you really want to delete this %{model_name}?"

data/config/redirects.rb

@@ -1,4 +1,6 @@
 Adva::Registry.set :redirect, {
+  # see comment in admin/blog_controller
+  # 'admin/blogs#show'    => lambda { |c| c.index_path(:posts) },
   'admin/blogs#update'  => lambda { |c| c.edit_url },
   'admin/posts#create'  => lambda { |c| c.edit_url },
   'admin/posts#update'  => lambda { |c| c.edit_url },

data/lib/adva_blog/version.rb

@@ -0,0 +1,3 @@
+module AdvaBlog
+  VERSION = "0.0.2"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adva-blog
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ingo Weiss
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +02:00
+date: 2010-11-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-description: "[description]"
+description: Blog engine for adva-cms2
 email: nobody@adva-cms.org
 executables: []
 
@@ -59,6 +59,7 @@ files:
 - app/controllers/posts_controller.rb
 - app/controllers/admin/blogs_controller.rb
 - app/controllers/admin/posts_controller.rb
+- app/views/admin/categories/_menu_slice.html.rb
 - app/views/admin/blogs/show.html.rb
 - app/views/admin/blogs/edit.html.rb
 - app/views/admin/blogs/new.html.rb
@@ -78,6 +79,7 @@ files:
 - config/redirects.rb
 - config/routes.rb
 - config/locales/en.yml
+- lib/adva_blog/version.rb
 - lib/adva/blog.rb
 - lib/testing/factories.rb
 - lib/testing/paths.rb
@@ -116,6 +118,6 @@ rubyforge_project: "[none]"
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: "[summary]"
+summary: Blog engine for adva-cms2
 test_files: []