adva-core 0.0.1 → 0.0.2

data/app/controllers/admin/pages_controller.rb

@@ -1,9 +1,7 @@
 class Admin::PagesController < Admin::SectionsController
   purges :create, :update
-  
+
   def update
-    update! do |success, failure|
-      failure.html { render :show }
-    end
+    update! { |success, failure| failure.html { render :show } }
   end
 end

data/app/controllers/admin/sections_controller.rb

@@ -1,4 +1,7 @@
 class Admin::SectionsController < Admin::BaseController
+  respond_to :html
+  respond_to :json, :only => :update
+
   belongs_to :site
 
   before_filter :set_params_for_nested_resources, :only => [:new, :create, :edit, :update]
@@ -29,7 +32,7 @@ class Admin::SectionsController < Admin::BaseController
 
     def protect_last_section
       if site.sections.count == 1
-        flash[:error] = t(:'flash.actions.destroy.alert', :resource_name => resource.class.model_name)
+        resource.errors[:error] = [:last_section_cant_be_destroyed]
         respond_with(resources)
       end
     end

data/app/controllers/admin/sites_controller.rb

@@ -1,4 +1,7 @@
 class Admin::SitesController < Admin::BaseController
+  respond_to :html
+  respond_to :json, :only => :update
+
   purges :update, :destroy
 
   before_filter :set_params_for_nested_resources, :only => [:new, :edit]

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

@@ -0,0 +1,17 @@
+class Admin::Contents::Menu < Adva::View::Menu::Admin::Actions
+  include do
+    def main
+      resource_section_label
+      index
+      edit_parent
+    end
+
+    def right
+      new
+      if persisted?
+        edit
+        destroy
+      end
+    end
+  end
+end

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

@@ -1,30 +1,10 @@
-class Admin::Pages::Menu < Adva::View::Menu::Admin::Actions
-  include do
-    def main
-      if resource.try(:persisted?)
-        label(resource.name)
-        item(:'.show', show_path)
-      else
-        item(:'.sections', index_path)
-      end
-    end
+require_dependency 'admin/sections/_menu.html'
 
+class Admin::Pages::Menu < Admin::Sections::Menu
+  include do
     def right
-      if resource.try(:persisted?)
-        item(:'.view', public_url)
-        item(:'.destroy', resource_path, :method => :delete, :confirm => t(:'.confirm_destroy', :model_name => resource.class.model_name.human))
-      else
-        item(:'.new', new_path)
-      end
+      super
+      destroy if show?
     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
-      end
   end
 end

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

@@ -1,12 +1,45 @@
+# Base menu for sections. Also used on admin/sections/new.
 class Admin::Sections::Menu < Adva::View::Menu::Admin::Actions
   include do
     def main
-      item(:'.sections', index_path)
+      if collection?
+        index
+      else
+        resource_label
+        show
+        edit unless page?
+      end
     end
-  
+
     def right
-      item(:'.new', new_path)
-      item(:'.reorder', index_path, :activate => false)
+      new if collection?
+      destroy if edit?
+      reorder if index? # TODO should only happen if we actually have more than 1 category
     end
+
+    protected
+
+      def index
+        item(:".sections", index_parent_path(:sections))
+      end
+
+      def reorder
+        super( :'data-resource_type' => 'site', :'data-sortable_type' => 'sections')
+      end
+
+      def page?
+        resource.is_a?(Page)
+      end
+
+      def edit
+        item(:'.edit_section', edit_path)
+      end
+
+      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
+      end
   end
-end
+end

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

@@ -18,11 +18,11 @@ class Admin::Sections::Index < Minimal::Template
     end
 
     def link_to_view(section)
-      capture { link_to(:'.view', public_url_for([section]), :class => :view) }
+      capture { link_to(:'.actions.view', public_url_for([section]), :class => :view) }
     end
 
     def status(section)
       capture { span(t(:'.published'), :title => t(:'.published'), :class => 'status published') }
     end
   end
-end
+end

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

@@ -1,6 +1,2 @@
 class Admin::Sites::Menu < Adva::View::Menu::Admin::Actions
-  include do
-    def right
-    end
-  end
-end
+end

data/app/views/layouts/admin/_top.rb

@@ -27,6 +27,7 @@ class Layouts::Admin::Top < Adva::View::Menu::Admin
               item(site.name, url_for([:admin, site])) unless site.new_record?
             end
             item(:'.new_site', url_for([:new, :admin, :site]))
+            render_items
           end
         end
       end
@@ -38,6 +39,7 @@ class Layouts::Admin::Top < Adva::View::Menu::Admin
               item(section.name, url_for([:admin, site, section]), :class => :section)
             end
             item(:'.new_section', url_for([:new, :admin, site, :section]))
+            render_items
           end
         end
       end

data/app/views/layouts/default.rb

@@ -5,27 +5,41 @@ class Layouts::Default < Layouts::Base
     end
 
     def body
+      page
+      footer
+    end
+
+    def page
       div :id => :page do
-        div :id => :header do
-          h1 site.title
-          h4 site.subtitle unless site.subtitle.blank?
-          render :partial => 'layouts/default/menu'
-        end
+        header
         div :id => :main do
           content
         end
+        sidebar
       end
-      div :id => :footer do
-        footer
+    end
+
+    def header
+      div :id => :header do
+        h1 site.title
+        h4 site.subtitle unless site.subtitle.blank?
+        render :partial => 'layouts/default/menu'
       end
     end
 
     def footer
-      ul :class => :left do
-        li :'.made_with'
-      end
-      ul :class => :right do
+      div :id => :footer do
+        ul :class => :left do
+          li :'.made_with'
+        end
+        ul :class => :right do
+        end
       end
     end
+
+    def sidebar
+      sidebar = capture { block.call(:sidebar) }
+      div sidebar, :id => 'sidebar', :class => 'left' unless sidebar.blank?
+    end
   end
-end
+end

data/app/views/layouts/default/_menu.rb

@@ -1,24 +1,19 @@
 class Layouts::Default::Menu < Adva::View::Menu
   include do
-    def to_html
+    def build
       ul(:id => :menu) do
         site.sections.each do |section|
           item(section.name, url_for(section))
         end
+        render_items
       end
     end
-  
+
     protected
 
       def active?(url, options)
         return false if url =~ %r(/admin/sites(/\d+)?$) && request.fullpath != url
         super
       end
-    
-      # def path_and_parents(path)
-      #   paths = super
-      #   paths.detect { |path| path.gsub!(/(#{Section.types.map(&:tableize).join('|')})$/) { 'sections' } }
-      #   paths
-      # end
   end
-end
+end

data/config/locales/en.yml

@@ -1,20 +1,49 @@
 en:
   a_or_b: '%{a} or %{b}'
+
   flash:
-    actions:
-      create:
-        notice: '%{resource_name} successfully created.'
-        alert:  '%{resource_name} could not be created.'
-      update:
-        notice: '%{resource_name} successfully updated.'
-        alert:  '%{resource_name} could not be updated.'
-      destroy:
-        notice: '%{resource_name} successfully deleted.'
-        alert:  '%{resource_name} could not be deleted.'
+    create:
+      notice: '%{resource_name} successfully created.'
+      alert:  '%{resource_name} could not be created.'
+    update:
+      notice: '%{resource_name} successfully updated.'
+      alert:  '%{resource_name} could not be updated.'
+    destroy:
+      notice: '%{resource_name} successfully deleted.'
+      alert:  '%{resource_name} could not be deleted.'
     installation:
       protected: "Installation for %{host} is already complete. Please log in with your admin account."
-  confirm:
-    delete: 'Do you really want to delete this %{model_name}?'
+
+  confirmations:
+    destroy: 'Do you really want to delete this %{model_name}?'
+
+  menu:
+    sections: Sections
+    page: Page
+    view: View
+    new: New
+    edit: Edit
+    edit_section: Settings
+    destroy: Delete
+    reorder: Reorder
+    confirm_destroy: "Do you really want to delete this %{model_name}?"
+
+  columns:
+    published: Published
+    author: Author
+
+  status:
+    published: Published
+
+  actions:
+    view: View
+    edit: Edit
+    destroy: Delete
+
+  section:
+    types:
+      page: Page
+    default_name: Home
 
   installations:
     new:
@@ -29,11 +58,6 @@ en:
       confirm: You have successfully created your site. Enjoy!
       link_to_admin: "Manage your new site »"
 
-  sections:
-    columns:
-      section: Section
-      actions: ""
-
   admin:
     sites:
       index:
@@ -48,48 +72,21 @@ en:
           new: New Section
         site:
           new: New Site
-        sections: All Sections
-      menu:
-        new: New Site
-        edit: Edit
-        destroy: Delete
-        new_item: New Section
-        confirm_destroy: "Do you really want to delete this %{model_name}?"
     sections:
       index:
         title: Sections
-        view: View
-        edit: Edit
-        destroy: Delete
         published: Published
-        confirm_destroy: "Do you really want to delete this %{model_name}?"
       new:
         title: Create a New Section
-      show:
-        title: Settings
-      menu:
-        sections: Sections
-        new: New
-        reorder: Reorder
     pages:
       show:
         title: Edit Page
       new:
         title: Create a New Section
-      menu:
-        sections: Sections
-        new: New
-        show: Page
-        view: View
-        destroy: Delete
-        confirm_destroy: "Do you really want to delete this %{model_name}?"
-    posts:
-      edit:
-        title: Settings
-
     tabs:
       options: Options
       assets: Assets
+
   layouts:
     default:
       made_with: "Made with <a href=\"http://github.com/svenfuchs/adva-cms2\">adva cms 2</a>"
@@ -108,11 +105,6 @@ en:
         change_language: "Change language:"
         website: "Website »"
 
-  section:
-    types:
-      page: Page
-    default_name: Home
-
   simple_form:
     "yes": 'Yes'
     "no": 'No'

data/lib/adva/core.rb

@@ -10,14 +10,15 @@ require 'has_many_polymorphs'
 require 'minimal'
 require 'silence_log_tailer'
 
-require 'routing_filter'
+require 'adva/i18n'
 require 'adva/routing_filters/section_path'
 require 'adva/routing_filters/section_root'
 require 'adva/controller/abstract_actions'
 require 'adva/controller/references'
 require 'adva/active_record/has_options'
-require 'adva/view/tabs'
 require 'adva/view/form'
+require 'adva/view/helper/i18n'
+require 'adva/view/tabs'
 
 require 'core_ext/ruby/module/include_anonymous'
 require 'core_ext/rails/action_view/has_many_through_collection_helpers'

data/lib/adva/i18n.rb

@@ -0,0 +1,73 @@
+require 'i18n/exceptions'
+
+I18n.module_eval do
+  self.exception_handler = :log_missing_translations
+
+  class << self
+    attr_writer :missing_translations
+
+    def missing_translations
+      @missing_translations ||= MemoryLogger.new
+    end
+
+    def log_missing_translations(exception, locale, key, options)
+      missing_translations.log(exception.keys) if I18n::MissingTranslationData === exception
+      default_exception_handler(exception, locale, key, options)
+    end
+  end
+
+  class MemoryLogger < Hash
+    def initialize
+      at_exit { dump } if Rails.env.test?
+    end
+
+    def log(keys)
+      log = self
+      keys.each_with_index do |key, ix|
+        key = key.to_s
+        if ix < keys.size - 1
+          log = log.key?(key) ? log[key] : (log[key] = {})
+        else
+          log[key] = key.to_s.titleize
+        end
+      end
+    end
+
+    def dump
+      require 'yaml'
+      puts YAML.dump(Hash[*to_a.flatten]) unless empty?
+    end
+  end
+end
+
+# TODO move to I18n
+I18n.module_eval do
+  class << self
+    def handle_exception(exception, locale, key, options)
+      case handler = options[:exception_handler] || config.exception_handler
+      when Symbol
+        send(handler, exception, locale, key, options)
+      else
+        handler.call(exception, locale, key, options)
+      end
+    end
+
+    def wrap_exception(exception, locale, key, options)
+      case exception
+      when MissingTranslationData
+        %(<span class="translation_missing">#{exception.keys.join('.')}</span>)
+      else
+        raise exception
+      end
+    end
+  end
+end
+
+I18n::MissingTranslationData.class_eval do
+  def keys
+    options.each { |k, v| options[k] = v.inspect if v.is_a?(Proc) }
+    keys = I18n.normalize_keys(locale, key, options[:scope])
+    keys << 'no key' if keys.size < 2
+    keys
+  end
+end

data/lib/adva/responder/redirect.rb

@@ -28,4 +28,4 @@ module Adva
       end
     end
   end
-end
+end

data/lib/adva/routing_filters/section_path.rb

@@ -1,4 +1,4 @@
-require 'routing_filter/filter'
+require 'routing_filter'
 
 # If the path is, aside from a slash and an optional locale, the leftmost part
 # of the path, replace it by "sections/:id" segments.

data/lib/adva/routing_filters/section_root.rb

@@ -1,4 +1,4 @@
-require 'routing_filter/filter'
+require 'routing_filter'
 
 module RoutingFilter
   class SectionRoot < Filter

data/lib/adva/view/helper/i18n.rb

@@ -0,0 +1,26 @@
+I18n::Backend::Simple.send(:include, I18n::Backend::Cascade)
+
+# TODO no idea how to use a module here :/
+ActionView::Base.class_eval do
+  def translate(key, options = {})
+    # TODO must be fixed in I18n::Backend::Cascade
+    options.merge!(:cascade => { :step => 1, :offset => 2, :skip_root => false }) if key.to_s.include?('.')
+    super(key, options)
+  end
+  alias t translate
+end
+
+# TODO submit a Rails patch
+ActionView::Helpers::TranslationHelper.module_eval do
+  def translate(key, options = {})
+    options.merge!(:wrap_exception => true) unless options.key?(:wrap_exception)
+    translation = I18n.translate(scope_key_by_partial(key), options)
+    if html_safe_translation_key?(key) && translation.respond_to?(:html_safe)
+      translation.html_safe
+    else
+      translation
+    end
+  end
+  alias :t :translate
+end
+

data/lib/adva/view/menu.rb

@@ -2,25 +2,47 @@ module Adva
   module View
     class Menu < Minimal::Template
       autoload :Admin, 'adva/view/menu/admin'
+      autoload :Items, 'adva/view/menu/items'
+
+      def to_html
+        build
+        render_items
+      end
 
       def item(text, url = nil, options = {}, &block)
-        options.merge!(:class => text.to_s.gsub('.', '')) if text.is_a?(Symbol)
-        url = url_for(url) unless url.is_a?(String)
-        li(:class => active?(url, options) ? 'active' : nil) do
-          options[:type] == :label ? h4(text, options) : link_to(text, url, options)
-          self << capture { instance_eval(&block) } if block_given?
-        end
+        items.insert(text, url, options, block)
       end
 
       def label(text, url = nil, options = {}, &block)
         item(text, url, options.merge(:type => :label), &block)
       end
 
-      def link(text, url = '#', options = {}, &block)
-        item(text, url, options.merge(:type => :link), &block)
-      end
-
       protected
+        def items
+          @items ||= Items.new
+        end
+
+        def render_items
+          items, @items = self.items, Items.new
+          items.each { |args| render_item(*args) }
+        end
+
+        def render_item(text, url, options, block)
+          options.merge!(:class => text.to_s.split('.').last) if text.is_a?(Symbol)
+          url = url_for(url) unless url.is_a?(String) || options[:type] == :label
+
+          li(:class => active?(url, options) ? 'active' : nil) do
+            options[:type] == :label ? h4(text, options) : link_to(text, url, options)
+            render_block(block) if block
+          end
+        end
+
+        def render_block(block)
+          self << capture do
+            instance_eval(&block)
+            render_items
+          end
+        end
 
         def name
           @name ||= self.class.name.demodulize.underscore

data/lib/adva/view/menu/admin.rb

@@ -12,18 +12,16 @@ module Adva
           id :actions
         end
 
-        def to_html
+        def build
           div :id => id, :class => 'menus' do
-            menus
-          end
-        end
-
-        def menus
-          ul :class => 'menu main' do
-            main
-          end
-          ul :class => 'menu right' do
-            right
+            ul :class => 'menu main' do
+              main
+              render_items
+            end
+            ul :class => 'menu right' do
+              right
+              render_items
+            end
           end
         end
 
@@ -39,9 +37,63 @@ module Adva
             self.class.read_inheritable_attribute(:id)
           end
 
+          def resource_label
+            label("#{resource.name}:")
+          end
+
+          def resource_section_label
+            label("#{resource.section.name}:")
+          end
+
+          def parent_resource_label
+            label("#{parent_resource.name}:")
+          end
+
+          def index
+            item(:".#{resource.class.name.pluralize.underscore}", index_path)
+          end
+
+          def show
+            item(:".#{resource.class.name.underscore}", show_path)
+          end
+
+          def edit
+            item(:'.edit', edit_path)
+          end
+
+          def edit_parent
+            item(:".edit_#{parent_resource.class.base_class.name.underscore}", edit_parent_path)
+          end
+
+          def categories(url = nil, options = { :before => :'.edit_section' })
+            item(:'.categories', url || index_path(:categories), options)
+          end
+
+          def new
+            item(:'.new', new_path)
+          end
+
+          def reorder(options = {})
+            item(:'.reorder', index_path, options.merge(:activate => false))
+          end
+
+          def destroy
+            item(:'.destroy', resource_path, :method => :delete, :confirm => t(:'.confirm_destroy', :model_name => resource.class.model_name.human))
+          end
+
           def persisted?
             resource.try(:persisted?)
           end
+
+          def collection?
+            index? || new? || create?
+          end
+
+          %w(index show new create edit update).each do |action|
+            define_method(:"#{action}?") do
+              params[:action] == action
+            end
+          end
       end
     end
   end

data/lib/adva/view/menu/items.rb

@@ -0,0 +1,26 @@
+module Adva
+  module View
+    class Menu
+      class Items < Array
+        def insert(text, url, options, block)
+          item = [text, url, options, block]
+          if ix = options.delete(:at)
+            super(ix, item)
+          elsif ix = index(options.delete(:before))
+            super(ix, item)
+          elsif ix = index(options.delete(:after))
+            super(ix + 1, item)
+          elsif ix = index(options.delete(:replace))
+            self[ix] = item
+          else
+            push(item)
+          end
+        end
+
+        def index(text)
+          each_with_index { |item, ix| return ix if item[0] == text } and nil
+        end
+      end
+    end
+  end
+end

data/lib/adva_core/version.rb

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

data/lib/patches/responders/flash_responder.rb

@@ -0,0 +1,17 @@
+require 'responders/flash_responder'
+
+Responders::FlashResponder.class_eval do
+  def flash_defaults_by_namespace(status)
+    defaults = []
+    slices   = controller.controller_path.split('/')
+
+    while slices.size > 0
+      defaults << :"flash.#{slices.fill(controller.controller_name, -1).join('.')}.#{controller.action_name}.#{status}"
+      defaults << :"flash.#{slices.join('.')}.#{controller.action_name}.#{status}"
+      slices.shift
+    end
+
+    defaults << :"flash.#{controller.action_name}.#{status}"
+    defaults.uniq << ""
+  end
+end

data/lib/testing/step_definitions/transforms.rb

@@ -14,11 +14,18 @@ objectify = lambda do |table|
   table.transpose
 end
 
+TRANSFORM_FOREIGN_KEY_TYPES = Section.types.map(&:underscore) << 'section' << 'site'
+TRANSFORM_FOREIGN_KEY_MAP = {}
+
 foreign_keyify = lambda do |table|
-  types = Section.types.map(&:underscore) << 'section' << 'site'
-  keys = types.map { |type| "#{type}_id" }
+  keys = TRANSFORM_FOREIGN_KEY_TYPES.map { |type| "#{type}_id" }
   keys = table.headers.select { |header| keys.include?(header) }
-  keys.each { |key| table.map_column!(key) { |value| key.gsub('_id', '').classify.constantize.find_by_name(value).try(:id).to_s } }
+  keys.each do |key|
+    table.map_column!(key) do |value|
+      klass = TRANSFORM_FOREIGN_KEY_MAP[key] || key.gsub('_id', '').classify.constantize
+      Array(klass.find_by_name(value)).first.try(:id).to_s
+    end
+  end
   table.transpose
 end
 

data/public/javascripts/adva-core/admin.js

@@ -5,7 +5,8 @@ $(document).ready(function() {
 
   $('a.reorder').click(function(event) {
     $(this).parent().toggleClass('active');
-    TableTree.toggle($('table.list'), $(this).attr('data-resource_type'), $(this).attr('data-sortable_type'), this.href);
+    var url = this.href.split('/').slice(0, -1).join('/');
+    TableTree.toggle($('table.list'), $(this).attr('data-resource_type'), $(this).attr('data-sortable_type'), url);
     event.preventDefault();
     return false;
   })

data/public/javascripts/adva-core/jquery/jquery.table_tree.js

@@ -23,12 +23,12 @@ TableTree = {
 			return $(row).ttnode() ? true : false;
 		}
 	},
-	toggle: function(table, resource_type, sortable_type, collection_url) {
-		TableTree.current_table ? TableTree.teardown(table) : TableTree.setup(table, resource_type, sortable_type, collection_url);
+	toggle: function(table, resource_type, sortable_type, remote_url) {
+		TableTree.current_table ? TableTree.teardown(table) : TableTree.setup(table, resource_type, sortable_type, remote_url);
 	},
-	setup: function(table, resource_type, sortable_type, collection_url) {
+	setup: function(table, resource_type, sortable_type, remote_url) {
 		$('tbody', table).tableDnD(TableTree.tableDnDOptions);
-		TableTree.current_table = new TableTree.Table($(table).get(0), resource_type, sortable_type, collection_url);
+		TableTree.current_table = new TableTree.Table($(table).get(0), resource_type, sortable_type, remote_url);
 		TableTree.current_table.setSortable();
 	},
 	teardown: function(table) {
@@ -54,13 +54,13 @@ TableTree = {
 		}
 	},
 	Base: function() {},
-	Table: function(table, resource_type, sortable_type, collection_url) {
+	Table: function(table, resource_type, sortable_type, remote_url) {
 		this.is_tree = $(table).hasClass('tree')
 		this.table = table; //$('tbody', table)
 		this.resource_type = resource_type;
 		this.sortable_type = sortable_type;
 		this.level = -1;
-		this.collection_url = collection_url;
+		this.remote_url = remote_url;
 		this.rebuild();
 	},
 	Node: function(parent, element, level) {
@@ -156,7 +156,8 @@ TableTree.Table.prototype = jQuery.extend(new TableTree.Base(), {
 		this.show_spinner(row);
 		$.ajax({
 		  type: "POST",
-			url: this.collection_url,
+			url: this.remote_url,
+      dataType: 'json',
 			data: jQuery.extend(this.serialize(row), { authenticity_token: window._auth_token, '_method': 'put' }),
 			success: function(msg) { _this.hide_spinner(row); },
 			error:   function(msg) { _this.hide_spinner(row); }
@@ -167,13 +168,13 @@ TableTree.Table.prototype = jQuery.extend(new TableTree.Base(), {
 		var data = {};
     var key = this.resource_type + '[' + this.sortable_type + '_attributes][0]'
 		data[key + '[id]'] = row.id() || '';
-		data[key + '[parent_id]'] = row.parent_id() || '';
-		data[key + '[left_id]'] = row.left_id() || '';
+		data[key + '[parent_id]'] = row.parent_id() || 'null';
+		data[key + '[left_id]'] = row.left_id() || 'null';
 		return data;
 	},
 	show_spinner: function(row) {
 		img = document.createElement('img');
-		img.src = '/images/adva_cms/indicator.gif';
+		img.src = '/images/adva-core/indicator.gif';
 		img.className = 'spinner';
 		$('td', row)[0].appendChild(img);
 	},
@@ -257,12 +258,15 @@ TableTree.Node.prototype = jQuery.extend(new TableTree.Base(), {
 
 		this.level = level;
 		this.children.each(function() { this.update_level(event, level + 1); });
+
+    TableTree.current_table.dirty = true;
 	},
 	adjust_level: function() {
 		var prev = $(this.element).prev().ttnode();
 		if(!prev) {
 			this.update_level(null, 0);
 		} else if(prev.level + 1 < this.level) {
+    // } else {
 			this.update_level(null, prev.level + 1);
 		}
 	},

data/public/stylesheets/adva-core/admin/navigation.css

@@ -191,7 +191,7 @@
   font-weight: normal;
 }
 #actions h4:after {
-  content: ':';
+  /* content: ':'; */
 }
 #actions .main li a {
   -webkit-border-top-left-radius: 5px;

data/public/stylesheets/adva-core/admin/styles.css

@@ -121,6 +121,14 @@ p.active a {
   -moz-border-radius:4px 4px 4px 4px;
 }
 
+.tree .drag {
+  background-color: lightyellow;
+}
+.tree .spinner {
+  float: right;
+  padding-top: 2px;
+}
+
 /* TODO move to adva-assets */
 
 ul#uploaded_images {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adva-core
 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 
@@ -91,12 +91,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 0
         - 0
-        - 13
-        version: 0.0.13
+        - 14
+        version: 0.0.14
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -155,12 +155,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 11
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 10
+        version: 0.0.10
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -171,12 +171,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 57
         segments: 
         - 0
         - 0
-        - 15
-        version: 0.0.15
+        - 19
+        version: 0.0.19
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -211,7 +211,7 @@ dependencies:
         version: 0.0.1
   type: :runtime
   version_requirements: *id012
-description: "[description]"
+description: Core engine for adva-cms2
 email: nobody@adva-cms.org
 executables: []
 
@@ -244,6 +244,7 @@ files:
 - app/views/pages/show.html.rb
 - app/views/installations/show.html.rb
 - app/views/installations/new.html.rb
+- app/views/admin/contents/_menu.html.rb
 - app/views/admin/pages/show.html.rb
 - app/views/admin/pages/new.html.rb
 - app/views/admin/pages/_menu.html.rb
@@ -285,6 +286,7 @@ files:
 - lib/patches/rails/url_for.rb
 - lib/patches/rails/sti_associations.rb
 - lib/patches/inherited_resources.rb
+- lib/patches/responders/flash_responder.rb
 - lib/patches/simple_form.rb
 - lib/patches/thor/group/symbolized_options.rb
 - lib/patches/thor/core_ext/hash.rb
@@ -318,6 +320,7 @@ files:
 - lib/adva/active_record/has_options.rb
 - lib/adva/rack/static.rb
 - lib/adva/rack.rb
+- lib/adva/i18n.rb
 - lib/adva/view.rb
 - lib/adva/testing/engine.rb
 - lib/adva/responder.rb
@@ -325,8 +328,10 @@ files:
 - lib/adva/routing_filters/section_path.rb
 - lib/adva/view/tabs.rb
 - lib/adva/view/menu/admin.rb
+- lib/adva/view/menu/items.rb
 - lib/adva/view/form.rb
 - lib/adva/view/menu.rb
+- lib/adva/view/helper/i18n.rb
 - lib/adva/view/form/tabs.rb
 - lib/adva/controller.rb
 - lib/adva/engine.rb
@@ -341,6 +346,7 @@ files:
 - lib/testing/factories.rb
 - lib/testing/assertions.rb
 - lib/testing/paths.rb
+- lib/adva_core/version.rb
 - public/stylesheets/adva-core/common/styles.css
 - public/stylesheets/adva-core/common/layout.css
 - public/stylesheets/adva-core/common/reset.css
@@ -481,13 +487,11 @@ files:
 - public/images/adva-core/icons/bullet_yellow.png
 - public/images/adva-core/icons/bullet_white.png
 - public/images/adva-core/asset_selected.png
-- public/images/adva-core/sortable_tree/drag.png
 - public/images/adva-core/avatar.gif
 - public/images/adva-core/lines.png
 - public/images/adva-core/feed.mini.png
 - public/images/adva-core/indicator.gif
 - public/images/adva-core/preview.png
-- public/images/adva-core/rails.png
 - public/images/adva-core/admin/section_menu_bg.png
 - public/images/adva-core/admin/tab_action_active.png
 - public/images/adva-core/admin/tab_sidebar_active.png
@@ -531,6 +535,6 @@ rubyforge_project: "[none]"
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: "[summary]"
+summary: Core engine for adva-cms2
 test_files: []