lalala 4.0.0.dev.202 → 4.0.0.dev.208

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2506a0f60991040be77089c51447d7966b1a6c7e
-  data.tar.gz: 6e4ef2459dcc14fffcb39fff23741a72d112ce5b
+  metadata.gz: 2deb8767037511560c7a67f618679b3e9e62f9e6
+  data.tar.gz: 0d51aa1c96fa54b4733e29c23fbed06f62ff84a2
 SHA512:
-  metadata.gz: f9ee7f40dbefef6c2a557c0ba0312bc4dbc9f3ac09c193d9258e2be98576f4fbe047bf22335c27c1f2160e70f12d10efcc3dbfc582ca7c570c677c015a358e5d
-  data.tar.gz: 2661049e2c418519fe384c0a0ecee2a7c157dbb31114ad7a48699db0841b46e563279088c0e756f0a9b2ff47e0e6bf37b83885399c6adc326b5673707e344ae5
+  metadata.gz: a84af05eb2a8ea36fc2aac2765be1ceb1c95c5299b8ac79de60069d2271959ea3e0316fba327cd5a1451c97b9e38349a739c85b09d093b1a203a07ada0ef271d
+  data.tar.gz: fc1cc8327395b9bf50e54a4dab529b412b9680fa5d25f22f38b4db9d4458631410c190b6145377794b49e894c199af0af140e924b14e6917189985c7d0f15975

data/app/assets/javascripts/lalala/modules/init.module.js

@@ -2,13 +2,15 @@ var console = require('browser/console'),
     calendar = require('lalala/modules/calendar'),
     editor = require('lalala/modules/editor'),
     grid = require('lalala/modules/grid'),
-    locale_chooser = require("lalala/modules/locale_chooser");
+    locale_chooser = require("lalala/modules/locale_chooser"),
+    sorted_pages_tree = require("lalala/modules/sorted_pages_tree");
 
 $(function(){
   locale_chooser.init();
   editor.init();
   calendar.init();
   grid.init();
+  sorted_pages_tree.init();
 
   $('select').chosen();
 });

data/app/assets/javascripts/lalala/modules/sorted_pages_tree.module.js

@@ -0,0 +1,70 @@
+
+var subtrees = null;
+
+exports.init = function(){
+  $('table#index_tree_table_pages tbody > tr')
+    .not(':has(td.subtree)')
+    .addClass('enabled');
+
+  $('table#index_tree_table_pages tbody')
+    .sortable({
+      // axis:   "y",
+      items:  "> tr.enabled",
+      helper: fix_helper,
+      update: on_update,
+      start:  on_start,
+      stop:   on_stop
+    })
+    .disableSelection();
+};
+
+function on_start(e, ui) {
+  subtrees = ui.item.siblings(':has(td.subtree)');
+
+  subtrees.each(function(){
+    var _this = $(this), id;
+    if (_this.prev()[0] == ui.placeholder[0]) {
+      id = ui.helper.attr("id");
+    } else {
+      id = _this.prev().attr("id");
+    }
+    _this.data("prev-id", id);
+  });
+
+  subtrees.detach();
+}
+
+function on_stop(e, ui) {
+  if (subtrees) {
+    var p = $(e.target);
+
+    subtrees.each(function(){
+      var _this = $(this);
+      var prev  = $("#"+_this.data("prev-id"),p);
+      prev.first().after(_this);
+    });
+
+    subtrees = null;
+  }
+}
+
+function fix_helper(e, ui) {
+  ui.children().each(function() {
+    $(this).width($(this).width());
+  });
+  return ui;
+}
+
+function on_update(e, ui) {
+  var ids = [];
+
+  $(e.target).children("tr.enabled").each(function(){
+    ids.push($(this).data("id"));
+  });
+
+  $.ajax({
+    type: "PUT",
+    url:  window.location.href + "/order",
+    data: {"ordered_ids":ids}
+  });
+}

data/app/assets/stylesheets/lalala/modules/_index-as-tree-table.css.scss

@@ -1,4 +1,4 @@
-.index_as_tree_table {
+#active_admin_content .index_as_tree_table {
   @extend %table-wrapper;
 
   table {
@@ -9,6 +9,26 @@
 
     td {
       background-color: white;
+
+      &.selectable {
+        padding-right: 0;
+        width: 16px;
+      }
+
+      &.position {
+        padding-left: 0;
+        width: 16px;
+
+        .drag-handle {
+          display: inline-block;
+          height: 16px;
+          margin: 0 3px;
+          text-indent: -9999px;
+          width: 16px;
+
+          @include icon("text_align_justify");
+        }
+      }
     }
 
   }

data/lalala-assets.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
   gem.add_runtime_dependency 'compass',              '= 0.13.alpha.0'
   gem.add_runtime_dependency 'compass-rails',        '= 1.0.3'
-  gem.add_runtime_dependency 'sass',                 '= 3.2.9'
+  gem.add_runtime_dependency 'sass',                 '= 3.2.10'
   gem.add_runtime_dependency 'sass-rails',           '= 3.2.6'
   gem.add_runtime_dependency 'sprockets-commonjs',   '= 0.0.5'
   gem.add_runtime_dependency 'uglifier',             '= 1.3.0'

data/lalala.gemspec

@@ -30,22 +30,22 @@ Gem::Specification.new do |gem|
 
 
   # generic
+  gem.add_runtime_dependency 'activeadmin',               '= 0.6.0'
   gem.add_runtime_dependency 'carrierwave',               '= 0.8.0'
+  gem.add_runtime_dependency 'closure_tree',              '= 3.10.2'
+  gem.add_runtime_dependency 'country-select',            '= 1.1.1'
+  gem.add_runtime_dependency 'dalli',                     '= 2.6.3'
   gem.add_runtime_dependency 'fog',                       '= 1.10.0'
   gem.add_runtime_dependency 'globalize3',                '= 0.3.0'
+  gem.add_runtime_dependency 'i18n-country-translations', '= 0.0.9'
   gem.add_runtime_dependency 'jquery-rails',              '= 2.2.1'
   gem.add_runtime_dependency 'meta_search',               '= 1.1.3'
   gem.add_runtime_dependency 'mini_magick',               '= 3.6.0'
   gem.add_runtime_dependency 'pg',                        '= 0.15.1'
-  gem.add_runtime_dependency 'rails',                     '= 3.2.13'
-  gem.add_runtime_dependency 'redcarpet',                 '= 2.3.0'
   gem.add_runtime_dependency 'puma',                      '= 2.0.1'
-  gem.add_runtime_dependency 'stringex',                  '= 1.5.1'
+  gem.add_runtime_dependency 'rails',                     '= 3.2.14'
   gem.add_runtime_dependency 'rails-i18n',                '= 0.7.3'
-  gem.add_runtime_dependency 'i18n-country-translations', '= 0.0.9'
-  gem.add_runtime_dependency 'dalli',                     '= 2.6.3'
-  gem.add_runtime_dependency 'closure_tree',              '= 3.10.2'
-  gem.add_runtime_dependency 'activeadmin',               '= 0.6.0'
-  gem.add_runtime_dependency 'country-select',            '= 1.1.1'
+  gem.add_runtime_dependency 'redcarpet',                 '= 2.3.0'
+  gem.add_runtime_dependency 'stringex',                  '= 1.5.1'
 
 end

data/lib/lalala/admin/pages.rb

@@ -8,6 +8,11 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage)
 
     index as: :tree_table, paginator: false, download_links: false do
       selectable_column
+
+      column :position, label: "" do
+        %[<i class="drag-handle"></i>].html_safe
+      end
+
       column :title
 
       actions defaults: false do |page|
@@ -49,6 +54,20 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage)
       h
     end
 
+    collection_action :order, :method => :put do
+      unless Array === params[:ordered_ids]
+        render status: 422
+        return
+      end
+
+      # update the pages
+      params[:ordered_ids].each_with_index do |id, idx|
+        ApplicationPage.update_all({position: idx}, {id: id.to_i})
+      end
+
+      render json: { status: "OK" }, status: 200
+    end
+
     controller do
 
       def new

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "202"
+  BUILD   = "208"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/lib/lalala/views/tree_table_for.rb

@@ -55,7 +55,7 @@ module ActiveAdmin
         tbody do
           # Build enough rows for our collection (and the sub trees)
           collection.each do |node|
-            tr(:class => cycle('odd', 'even'), :id => dom_id(node))
+            tr(:class => cycle('odd', 'even'), :id => dom_id(node), :'data-id' => node.id.to_s)
             build_subtree(node.children)
           end
         end

data/test/dummy/app/pages/basic_page.rb

@@ -0,0 +1,19 @@
+class BasicPage < ApplicationPage
+
+  # self.route            = nil # slug
+  # self.allow_create     = true
+  # self.allow_destroy    = true
+  # self.minimum_children = nil
+  # self.minimum_children = nil
+  self.allowed_children = ['BasicPage']
+
+  # form do |f|
+  #   f.inputs
+  #   f.buttons
+  # end
+
+  # def static_children
+  #   {}
+  # end
+
+end

data/test/dummy/app/pages/home_page.rb

@@ -0,0 +1,19 @@
+class HomePage < ApplicationPage
+
+  # self.route            = nil # slug
+  self.allow_create     = false
+  self.allow_destroy    = false
+  # self.minimum_children = nil
+  # self.minimum_children = nil
+  self.allowed_children = ['BasicPage']
+
+  # form do |f|
+  #   f.inputs
+  #   f.buttons
+  # end
+
+  # def static_children
+  #   {}
+  # end
+
+end

data/test/dummy/db/migrate/20130729125648_create_home_page.rb

@@ -0,0 +1,8 @@
+class CreateHomePage < ActiveRecord::Migration
+  def up
+    HomePage.create!
+  end
+
+  def down
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130528092721) do
+ActiveRecord::Schema.define(:version => 20130729125648) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false

data/test/integration/aricles_test.rb

@@ -19,7 +19,7 @@ class ArticlesTest < ActionDispatch::IntegrationTest
     click_on('New Article')
     assert_equal('/lalala/articles/new', current_path)
 
-    fill_in('Title',                             with: 'My Article')
+    fill_in('Title', with: 'My Article')
     attach_file('Image', File.expand_path('../../fixtures/files/image.png', __FILE__))
     click_on('Create Article')
     page.save_page

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.202
+  version: 4.0.0.dev.208
 platform: ruby
 authors:
 - Simon Menke
@@ -13,246 +13,246 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: globalize3
+  name: closure_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 3.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 3.10.2
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: country-select
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: meta_search
+  name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: globalize3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: i18n-country-translations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: meta_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
-  name: stringex
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
-  name: rails-i18n
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
-  name: i18n-country-translations
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: dalli
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
-  name: closure_tree
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
-  name: activeadmin
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: country-select
+  name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.5.1
 description: 'Lalala: Probably the best CMS in the world'
 email:
 - hello@mrhenry.be
@@ -1298,6 +1298,7 @@ files:
 - app/assets/javascripts/lalala/modules/grid.module.js
 - app/assets/javascripts/lalala/modules/init.module.js
 - app/assets/javascripts/lalala/modules/locale_chooser.module.js
+- app/assets/javascripts/lalala/modules/sorted_pages_tree.module.js
 - app/assets/javascripts/lalala/modules/storage.module.js
 - app/assets/stylesheets/lalala/_base.css.scss
 - app/assets/stylesheets/lalala/base/_base.css.scss
@@ -1462,6 +1463,8 @@ files:
 - test/dummy/app/models/file_asset.rb
 - test/dummy/app/models/image_asset.rb
 - test/dummy/app/pages/application_page.rb
+- test/dummy/app/pages/basic_page.rb
+- test/dummy/app/pages/home_page.rb
 - test/dummy/app/uploaders/file_uploader.rb
 - test/dummy/app/uploaders/image_uploader.rb
 - test/dummy/app/views/layouts/application.html.erb
@@ -1485,6 +1488,7 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/db/.gitkeep
 - test/dummy/db/migrate/20130528092721_create_articles.rb
+- test/dummy/db/migrate/20130729125648_create_home_page.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -1549,6 +1553,8 @@ test_files:
 - test/dummy/app/models/file_asset.rb
 - test/dummy/app/models/image_asset.rb
 - test/dummy/app/pages/application_page.rb
+- test/dummy/app/pages/basic_page.rb
+- test/dummy/app/pages/home_page.rb
 - test/dummy/app/uploaders/file_uploader.rb
 - test/dummy/app/uploaders/image_uploader.rb
 - test/dummy/app/views/layouts/application.html.erb
@@ -1572,6 +1578,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/db/.gitkeep
 - test/dummy/db/migrate/20130528092721_create_articles.rb
+- test/dummy/db/migrate/20130729125648_create_home_page.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep