lalala 4.0.0.dev.202 → 4.0.0.dev.208
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/lalala/modules/init.module.js +3 -1
- data/app/assets/javascripts/lalala/modules/sorted_pages_tree.module.js +70 -0
- data/app/assets/stylesheets/lalala/modules/_index-as-tree-table.css.scss +21 -1
- data/lalala-assets.gemspec +1 -1
- data/lalala.gemspec +8 -8
- data/lib/lalala/admin/pages.rb +19 -0
- data/lib/lalala/version.rb +1 -1
- data/lib/lalala/views/tree_table_for.rb +1 -1
- data/test/dummy/app/pages/basic_page.rb +19 -0
- data/test/dummy/app/pages/home_page.rb +19 -0
- data/test/dummy/db/migrate/20130729125648_create_home_page.rb +8 -0
- data/test/dummy/db/schema.rb +1 -1
- data/test/integration/aricles_test.rb +1 -1
- metadata +60 -53
    
        checksums.yaml
    CHANGED
    
    | @@ -1,7 +1,7 @@ | |
| 1 1 | 
             
            ---
         | 
| 2 2 | 
             
            SHA1:
         | 
| 3 | 
            -
              metadata.gz:  | 
| 4 | 
            -
              data.tar.gz:  | 
| 3 | 
            +
              metadata.gz: 2deb8767037511560c7a67f618679b3e9e62f9e6
         | 
| 4 | 
            +
              data.tar.gz: 0d51aa1c96fa54b4733e29c23fbed06f62ff84a2
         | 
| 5 5 | 
             
            SHA512:
         | 
| 6 | 
            -
              metadata.gz:  | 
| 7 | 
            -
              data.tar.gz:  | 
| 6 | 
            +
              metadata.gz: a84af05eb2a8ea36fc2aac2765be1ceb1c95c5299b8ac79de60069d2271959ea3e0316fba327cd5a1451c97b9e38349a739c85b09d093b1a203a07ada0ef271d
         | 
| 7 | 
            +
              data.tar.gz: fc1cc8327395b9bf50e54a4dab529b412b9680fa5d25f22f38b4db9d4458631410c190b6145377794b49e894c199af0af140e924b14e6917189985c7d0f15975
         | 
| @@ -2,13 +2,15 @@ var console = require('browser/console'), | |
| 2 2 | 
             
                calendar = require('lalala/modules/calendar'),
         | 
| 3 3 | 
             
                editor = require('lalala/modules/editor'),
         | 
| 4 4 | 
             
                grid = require('lalala/modules/grid'),
         | 
| 5 | 
            -
                locale_chooser = require("lalala/modules/locale_chooser") | 
| 5 | 
            +
                locale_chooser = require("lalala/modules/locale_chooser"),
         | 
| 6 | 
            +
                sorted_pages_tree = require("lalala/modules/sorted_pages_tree");
         | 
| 6 7 |  | 
| 7 8 | 
             
            $(function(){
         | 
| 8 9 | 
             
              locale_chooser.init();
         | 
| 9 10 | 
             
              editor.init();
         | 
| 10 11 | 
             
              calendar.init();
         | 
| 11 12 | 
             
              grid.init();
         | 
| 13 | 
            +
              sorted_pages_tree.init();
         | 
| 12 14 |  | 
| 13 15 | 
             
              $('select').chosen();
         | 
| 14 16 | 
             
            });
         | 
| @@ -0,0 +1,70 @@ | |
| 1 | 
            +
             | 
| 2 | 
            +
            var subtrees = null;
         | 
| 3 | 
            +
             | 
| 4 | 
            +
            exports.init = function(){
         | 
| 5 | 
            +
              $('table#index_tree_table_pages tbody > tr')
         | 
| 6 | 
            +
                .not(':has(td.subtree)')
         | 
| 7 | 
            +
                .addClass('enabled');
         | 
| 8 | 
            +
             | 
| 9 | 
            +
              $('table#index_tree_table_pages tbody')
         | 
| 10 | 
            +
                .sortable({
         | 
| 11 | 
            +
                  // axis:   "y",
         | 
| 12 | 
            +
                  items:  "> tr.enabled",
         | 
| 13 | 
            +
                  helper: fix_helper,
         | 
| 14 | 
            +
                  update: on_update,
         | 
| 15 | 
            +
                  start:  on_start,
         | 
| 16 | 
            +
                  stop:   on_stop
         | 
| 17 | 
            +
                })
         | 
| 18 | 
            +
                .disableSelection();
         | 
| 19 | 
            +
            };
         | 
| 20 | 
            +
             | 
| 21 | 
            +
            function on_start(e, ui) {
         | 
| 22 | 
            +
              subtrees = ui.item.siblings(':has(td.subtree)');
         | 
| 23 | 
            +
             | 
| 24 | 
            +
              subtrees.each(function(){
         | 
| 25 | 
            +
                var _this = $(this), id;
         | 
| 26 | 
            +
                if (_this.prev()[0] == ui.placeholder[0]) {
         | 
| 27 | 
            +
                  id = ui.helper.attr("id");
         | 
| 28 | 
            +
                } else {
         | 
| 29 | 
            +
                  id = _this.prev().attr("id");
         | 
| 30 | 
            +
                }
         | 
| 31 | 
            +
                _this.data("prev-id", id);
         | 
| 32 | 
            +
              });
         | 
| 33 | 
            +
             | 
| 34 | 
            +
              subtrees.detach();
         | 
| 35 | 
            +
            }
         | 
| 36 | 
            +
             | 
| 37 | 
            +
            function on_stop(e, ui) {
         | 
| 38 | 
            +
              if (subtrees) {
         | 
| 39 | 
            +
                var p = $(e.target);
         | 
| 40 | 
            +
             | 
| 41 | 
            +
                subtrees.each(function(){
         | 
| 42 | 
            +
                  var _this = $(this);
         | 
| 43 | 
            +
                  var prev  = $("#"+_this.data("prev-id"),p);
         | 
| 44 | 
            +
                  prev.first().after(_this);
         | 
| 45 | 
            +
                });
         | 
| 46 | 
            +
             | 
| 47 | 
            +
                subtrees = null;
         | 
| 48 | 
            +
              }
         | 
| 49 | 
            +
            }
         | 
| 50 | 
            +
             | 
| 51 | 
            +
            function fix_helper(e, ui) {
         | 
| 52 | 
            +
              ui.children().each(function() {
         | 
| 53 | 
            +
                $(this).width($(this).width());
         | 
| 54 | 
            +
              });
         | 
| 55 | 
            +
              return ui;
         | 
| 56 | 
            +
            }
         | 
| 57 | 
            +
             | 
| 58 | 
            +
            function on_update(e, ui) {
         | 
| 59 | 
            +
              var ids = [];
         | 
| 60 | 
            +
             | 
| 61 | 
            +
              $(e.target).children("tr.enabled").each(function(){
         | 
| 62 | 
            +
                ids.push($(this).data("id"));
         | 
| 63 | 
            +
              });
         | 
| 64 | 
            +
             | 
| 65 | 
            +
              $.ajax({
         | 
| 66 | 
            +
                type: "PUT",
         | 
| 67 | 
            +
                url:  window.location.href + "/order",
         | 
| 68 | 
            +
                data: {"ordered_ids":ids}
         | 
| 69 | 
            +
              });
         | 
| 70 | 
            +
            }
         | 
| @@ -1,4 +1,4 @@ | |
| 1 | 
            -
            .index_as_tree_table {
         | 
| 1 | 
            +
            #active_admin_content .index_as_tree_table {
         | 
| 2 2 | 
             
              @extend %table-wrapper;
         | 
| 3 3 |  | 
| 4 4 | 
             
              table {
         | 
| @@ -9,6 +9,26 @@ | |
| 9 9 |  | 
| 10 10 | 
             
                td {
         | 
| 11 11 | 
             
                  background-color: white;
         | 
| 12 | 
            +
             | 
| 13 | 
            +
                  &.selectable {
         | 
| 14 | 
            +
                    padding-right: 0;
         | 
| 15 | 
            +
                    width: 16px;
         | 
| 16 | 
            +
                  }
         | 
| 17 | 
            +
             | 
| 18 | 
            +
                  &.position {
         | 
| 19 | 
            +
                    padding-left: 0;
         | 
| 20 | 
            +
                    width: 16px;
         | 
| 21 | 
            +
             | 
| 22 | 
            +
                    .drag-handle {
         | 
| 23 | 
            +
                      display: inline-block;
         | 
| 24 | 
            +
                      height: 16px;
         | 
| 25 | 
            +
                      margin: 0 3px;
         | 
| 26 | 
            +
                      text-indent: -9999px;
         | 
| 27 | 
            +
                      width: 16px;
         | 
| 28 | 
            +
             | 
| 29 | 
            +
                      @include icon("text_align_justify");
         | 
| 30 | 
            +
                    }
         | 
| 31 | 
            +
                  }
         | 
| 12 32 | 
             
                }
         | 
| 13 33 |  | 
| 14 34 | 
             
              }
         | 
    
        data/lalala-assets.gemspec
    CHANGED
    
    | @@ -33,7 +33,7 @@ Gem::Specification.new do |gem| | |
| 33 33 | 
             
              gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
         | 
| 34 34 | 
             
              gem.add_runtime_dependency 'compass',              '= 0.13.alpha.0'
         | 
| 35 35 | 
             
              gem.add_runtime_dependency 'compass-rails',        '= 1.0.3'
         | 
| 36 | 
            -
              gem.add_runtime_dependency 'sass',                 '= 3.2. | 
| 36 | 
            +
              gem.add_runtime_dependency 'sass',                 '= 3.2.10'
         | 
| 37 37 | 
             
              gem.add_runtime_dependency 'sass-rails',           '= 3.2.6'
         | 
| 38 38 | 
             
              gem.add_runtime_dependency 'sprockets-commonjs',   '= 0.0.5'
         | 
| 39 39 | 
             
              gem.add_runtime_dependency 'uglifier',             '= 1.3.0'
         | 
    
        data/lalala.gemspec
    CHANGED
    
    | @@ -30,22 +30,22 @@ Gem::Specification.new do |gem| | |
| 30 30 |  | 
| 31 31 |  | 
| 32 32 | 
             
              # generic
         | 
| 33 | 
            +
              gem.add_runtime_dependency 'activeadmin',               '= 0.6.0'
         | 
| 33 34 | 
             
              gem.add_runtime_dependency 'carrierwave',               '= 0.8.0'
         | 
| 35 | 
            +
              gem.add_runtime_dependency 'closure_tree',              '= 3.10.2'
         | 
| 36 | 
            +
              gem.add_runtime_dependency 'country-select',            '= 1.1.1'
         | 
| 37 | 
            +
              gem.add_runtime_dependency 'dalli',                     '= 2.6.3'
         | 
| 34 38 | 
             
              gem.add_runtime_dependency 'fog',                       '= 1.10.0'
         | 
| 35 39 | 
             
              gem.add_runtime_dependency 'globalize3',                '= 0.3.0'
         | 
| 40 | 
            +
              gem.add_runtime_dependency 'i18n-country-translations', '= 0.0.9'
         | 
| 36 41 | 
             
              gem.add_runtime_dependency 'jquery-rails',              '= 2.2.1'
         | 
| 37 42 | 
             
              gem.add_runtime_dependency 'meta_search',               '= 1.1.3'
         | 
| 38 43 | 
             
              gem.add_runtime_dependency 'mini_magick',               '= 3.6.0'
         | 
| 39 44 | 
             
              gem.add_runtime_dependency 'pg',                        '= 0.15.1'
         | 
| 40 | 
            -
              gem.add_runtime_dependency 'rails',                     '= 3.2.13'
         | 
| 41 | 
            -
              gem.add_runtime_dependency 'redcarpet',                 '= 2.3.0'
         | 
| 42 45 | 
             
              gem.add_runtime_dependency 'puma',                      '= 2.0.1'
         | 
| 43 | 
            -
              gem.add_runtime_dependency ' | 
| 46 | 
            +
              gem.add_runtime_dependency 'rails',                     '= 3.2.14'
         | 
| 44 47 | 
             
              gem.add_runtime_dependency 'rails-i18n',                '= 0.7.3'
         | 
| 45 | 
            -
              gem.add_runtime_dependency ' | 
| 46 | 
            -
              gem.add_runtime_dependency ' | 
| 47 | 
            -
              gem.add_runtime_dependency 'closure_tree',              '= 3.10.2'
         | 
| 48 | 
            -
              gem.add_runtime_dependency 'activeadmin',               '= 0.6.0'
         | 
| 49 | 
            -
              gem.add_runtime_dependency 'country-select',            '= 1.1.1'
         | 
| 48 | 
            +
              gem.add_runtime_dependency 'redcarpet',                 '= 2.3.0'
         | 
| 49 | 
            +
              gem.add_runtime_dependency 'stringex',                  '= 1.5.1'
         | 
| 50 50 |  | 
| 51 51 | 
             
            end
         | 
    
        data/lib/lalala/admin/pages.rb
    CHANGED
    
    | @@ -8,6 +8,11 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage) | |
| 8 8 |  | 
| 9 9 | 
             
                index as: :tree_table, paginator: false, download_links: false do
         | 
| 10 10 | 
             
                  selectable_column
         | 
| 11 | 
            +
             | 
| 12 | 
            +
                  column :position, label: "" do
         | 
| 13 | 
            +
                    %[<i class="drag-handle"></i>].html_safe
         | 
| 14 | 
            +
                  end
         | 
| 15 | 
            +
             | 
| 11 16 | 
             
                  column :title
         | 
| 12 17 |  | 
| 13 18 | 
             
                  actions defaults: false do |page|
         | 
| @@ -49,6 +54,20 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage) | |
| 49 54 | 
             
                  h
         | 
| 50 55 | 
             
                end
         | 
| 51 56 |  | 
| 57 | 
            +
                collection_action :order, :method => :put do
         | 
| 58 | 
            +
                  unless Array === params[:ordered_ids]
         | 
| 59 | 
            +
                    render status: 422
         | 
| 60 | 
            +
                    return
         | 
| 61 | 
            +
                  end
         | 
| 62 | 
            +
             | 
| 63 | 
            +
                  # update the pages
         | 
| 64 | 
            +
                  params[:ordered_ids].each_with_index do |id, idx|
         | 
| 65 | 
            +
                    ApplicationPage.update_all({position: idx}, {id: id.to_i})
         | 
| 66 | 
            +
                  end
         | 
| 67 | 
            +
             | 
| 68 | 
            +
                  render json: { status: "OK" }, status: 200
         | 
| 69 | 
            +
                end
         | 
| 70 | 
            +
             | 
| 52 71 | 
             
                controller do
         | 
| 53 72 |  | 
| 54 73 | 
             
                  def new
         | 
    
        data/lib/lalala/version.rb
    CHANGED
    
    
| @@ -55,7 +55,7 @@ module ActiveAdmin | |
| 55 55 | 
             
                    tbody do
         | 
| 56 56 | 
             
                      # Build enough rows for our collection (and the sub trees)
         | 
| 57 57 | 
             
                      collection.each do |node|
         | 
| 58 | 
            -
                        tr(:class => cycle('odd', 'even'), :id => dom_id(node))
         | 
| 58 | 
            +
                        tr(:class => cycle('odd', 'even'), :id => dom_id(node), :'data-id' => node.id.to_s)
         | 
| 59 59 | 
             
                        build_subtree(node.children)
         | 
| 60 60 | 
             
                      end
         | 
| 61 61 | 
             
                    end
         | 
| @@ -0,0 +1,19 @@ | |
| 1 | 
            +
            class BasicPage < ApplicationPage
         | 
| 2 | 
            +
             | 
| 3 | 
            +
              # self.route            = nil # slug
         | 
| 4 | 
            +
              # self.allow_create     = true
         | 
| 5 | 
            +
              # self.allow_destroy    = true
         | 
| 6 | 
            +
              # self.minimum_children = nil
         | 
| 7 | 
            +
              # self.minimum_children = nil
         | 
| 8 | 
            +
              self.allowed_children = ['BasicPage']
         | 
| 9 | 
            +
             | 
| 10 | 
            +
              # form do |f|
         | 
| 11 | 
            +
              #   f.inputs
         | 
| 12 | 
            +
              #   f.buttons
         | 
| 13 | 
            +
              # end
         | 
| 14 | 
            +
             | 
| 15 | 
            +
              # def static_children
         | 
| 16 | 
            +
              #   {}
         | 
| 17 | 
            +
              # end
         | 
| 18 | 
            +
             | 
| 19 | 
            +
            end
         | 
| @@ -0,0 +1,19 @@ | |
| 1 | 
            +
            class HomePage < ApplicationPage
         | 
| 2 | 
            +
             | 
| 3 | 
            +
              # self.route            = nil # slug
         | 
| 4 | 
            +
              self.allow_create     = false
         | 
| 5 | 
            +
              self.allow_destroy    = false
         | 
| 6 | 
            +
              # self.minimum_children = nil
         | 
| 7 | 
            +
              # self.minimum_children = nil
         | 
| 8 | 
            +
              self.allowed_children = ['BasicPage']
         | 
| 9 | 
            +
             | 
| 10 | 
            +
              # form do |f|
         | 
| 11 | 
            +
              #   f.inputs
         | 
| 12 | 
            +
              #   f.buttons
         | 
| 13 | 
            +
              # end
         | 
| 14 | 
            +
             | 
| 15 | 
            +
              # def static_children
         | 
| 16 | 
            +
              #   {}
         | 
| 17 | 
            +
              # end
         | 
| 18 | 
            +
             | 
| 19 | 
            +
            end
         | 
    
        data/test/dummy/db/schema.rb
    CHANGED
    
    | @@ -11,7 +11,7 @@ | |
| 11 11 | 
             
            #
         | 
| 12 12 | 
             
            # It's strongly recommended to check this file into your version control system.
         | 
| 13 13 |  | 
| 14 | 
            -
            ActiveRecord::Schema.define(:version =>  | 
| 14 | 
            +
            ActiveRecord::Schema.define(:version => 20130729125648) do
         | 
| 15 15 |  | 
| 16 16 | 
             
              create_table "active_admin_comments", :force => true do |t|
         | 
| 17 17 | 
             
                t.string   "resource_id",   :null => false
         | 
| @@ -19,7 +19,7 @@ class ArticlesTest < ActionDispatch::IntegrationTest | |
| 19 19 | 
             
                click_on('New Article')
         | 
| 20 20 | 
             
                assert_equal('/lalala/articles/new', current_path)
         | 
| 21 21 |  | 
| 22 | 
            -
                fill_in('Title', | 
| 22 | 
            +
                fill_in('Title', with: 'My Article')
         | 
| 23 23 | 
             
                attach_file('Image', File.expand_path('../../fixtures/files/image.png', __FILE__))
         | 
| 24 24 | 
             
                click_on('Create Article')
         | 
| 25 25 | 
             
                page.save_page
         | 
    
        metadata
    CHANGED
    
    | @@ -1,7 +1,7 @@ | |
| 1 1 | 
             
            --- !ruby/object:Gem::Specification
         | 
| 2 2 | 
             
            name: lalala
         | 
| 3 3 | 
             
            version: !ruby/object:Gem::Version
         | 
| 4 | 
            -
              version: 4.0.0.dev. | 
| 4 | 
            +
              version: 4.0.0.dev.208
         | 
| 5 5 | 
             
            platform: ruby
         | 
| 6 6 | 
             
            authors:
         | 
| 7 7 | 
             
            - Simon Menke
         | 
| @@ -13,246 +13,246 @@ authors: | |
| 13 13 | 
             
            autorequire: 
         | 
| 14 14 | 
             
            bindir: bin
         | 
| 15 15 | 
             
            cert_chain: []
         | 
| 16 | 
            -
            date: 2013-07- | 
| 16 | 
            +
            date: 2013-07-30 00:00:00.000000000 Z
         | 
| 17 17 | 
             
            dependencies:
         | 
| 18 18 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 19 | 
            -
              name:  | 
| 19 | 
            +
              name: activeadmin
         | 
| 20 20 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 21 21 | 
             
                requirements:
         | 
| 22 22 | 
             
                - - '='
         | 
| 23 23 | 
             
                  - !ruby/object:Gem::Version
         | 
| 24 | 
            -
                    version: 0. | 
| 24 | 
            +
                    version: 0.6.0
         | 
| 25 25 | 
             
              type: :runtime
         | 
| 26 26 | 
             
              prerelease: false
         | 
| 27 27 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 28 28 | 
             
                requirements:
         | 
| 29 29 | 
             
                - - '='
         | 
| 30 30 | 
             
                  - !ruby/object:Gem::Version
         | 
| 31 | 
            -
                    version: 0. | 
| 31 | 
            +
                    version: 0.6.0
         | 
| 32 32 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 33 | 
            -
              name:  | 
| 33 | 
            +
              name: carrierwave
         | 
| 34 34 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 35 35 | 
             
                requirements:
         | 
| 36 36 | 
             
                - - '='
         | 
| 37 37 | 
             
                  - !ruby/object:Gem::Version
         | 
| 38 | 
            -
                    version:  | 
| 38 | 
            +
                    version: 0.8.0
         | 
| 39 39 | 
             
              type: :runtime
         | 
| 40 40 | 
             
              prerelease: false
         | 
| 41 41 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 42 42 | 
             
                requirements:
         | 
| 43 43 | 
             
                - - '='
         | 
| 44 44 | 
             
                  - !ruby/object:Gem::Version
         | 
| 45 | 
            -
                    version:  | 
| 45 | 
            +
                    version: 0.8.0
         | 
| 46 46 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 47 | 
            -
              name:  | 
| 47 | 
            +
              name: closure_tree
         | 
| 48 48 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 49 49 | 
             
                requirements:
         | 
| 50 50 | 
             
                - - '='
         | 
| 51 51 | 
             
                  - !ruby/object:Gem::Version
         | 
| 52 | 
            -
                    version:  | 
| 52 | 
            +
                    version: 3.10.2
         | 
| 53 53 | 
             
              type: :runtime
         | 
| 54 54 | 
             
              prerelease: false
         | 
| 55 55 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 56 56 | 
             
                requirements:
         | 
| 57 57 | 
             
                - - '='
         | 
| 58 58 | 
             
                  - !ruby/object:Gem::Version
         | 
| 59 | 
            -
                    version:  | 
| 59 | 
            +
                    version: 3.10.2
         | 
| 60 60 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 61 | 
            -
              name:  | 
| 61 | 
            +
              name: country-select
         | 
| 62 62 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 63 63 | 
             
                requirements:
         | 
| 64 64 | 
             
                - - '='
         | 
| 65 65 | 
             
                  - !ruby/object:Gem::Version
         | 
| 66 | 
            -
                    version:  | 
| 66 | 
            +
                    version: 1.1.1
         | 
| 67 67 | 
             
              type: :runtime
         | 
| 68 68 | 
             
              prerelease: false
         | 
| 69 69 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 70 70 | 
             
                requirements:
         | 
| 71 71 | 
             
                - - '='
         | 
| 72 72 | 
             
                  - !ruby/object:Gem::Version
         | 
| 73 | 
            -
                    version:  | 
| 73 | 
            +
                    version: 1.1.1
         | 
| 74 74 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 75 | 
            -
              name:  | 
| 75 | 
            +
              name: dalli
         | 
| 76 76 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 77 77 | 
             
                requirements:
         | 
| 78 78 | 
             
                - - '='
         | 
| 79 79 | 
             
                  - !ruby/object:Gem::Version
         | 
| 80 | 
            -
                    version:  | 
| 80 | 
            +
                    version: 2.6.3
         | 
| 81 81 | 
             
              type: :runtime
         | 
| 82 82 | 
             
              prerelease: false
         | 
| 83 83 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 84 84 | 
             
                requirements:
         | 
| 85 85 | 
             
                - - '='
         | 
| 86 86 | 
             
                  - !ruby/object:Gem::Version
         | 
| 87 | 
            -
                    version:  | 
| 87 | 
            +
                    version: 2.6.3
         | 
| 88 88 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 89 | 
            -
              name:  | 
| 89 | 
            +
              name: fog
         | 
| 90 90 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 91 91 | 
             
                requirements:
         | 
| 92 92 | 
             
                - - '='
         | 
| 93 93 | 
             
                  - !ruby/object:Gem::Version
         | 
| 94 | 
            -
                    version:  | 
| 94 | 
            +
                    version: 1.10.0
         | 
| 95 95 | 
             
              type: :runtime
         | 
| 96 96 | 
             
              prerelease: false
         | 
| 97 97 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 98 98 | 
             
                requirements:
         | 
| 99 99 | 
             
                - - '='
         | 
| 100 100 | 
             
                  - !ruby/object:Gem::Version
         | 
| 101 | 
            -
                    version:  | 
| 101 | 
            +
                    version: 1.10.0
         | 
| 102 102 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 103 | 
            -
              name:  | 
| 103 | 
            +
              name: globalize3
         | 
| 104 104 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 105 105 | 
             
                requirements:
         | 
| 106 106 | 
             
                - - '='
         | 
| 107 107 | 
             
                  - !ruby/object:Gem::Version
         | 
| 108 | 
            -
                    version: 0. | 
| 108 | 
            +
                    version: 0.3.0
         | 
| 109 109 | 
             
              type: :runtime
         | 
| 110 110 | 
             
              prerelease: false
         | 
| 111 111 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 112 112 | 
             
                requirements:
         | 
| 113 113 | 
             
                - - '='
         | 
| 114 114 | 
             
                  - !ruby/object:Gem::Version
         | 
| 115 | 
            -
                    version: 0. | 
| 115 | 
            +
                    version: 0.3.0
         | 
| 116 116 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 117 | 
            -
              name:  | 
| 117 | 
            +
              name: i18n-country-translations
         | 
| 118 118 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 119 119 | 
             
                requirements:
         | 
| 120 120 | 
             
                - - '='
         | 
| 121 121 | 
             
                  - !ruby/object:Gem::Version
         | 
| 122 | 
            -
                    version:  | 
| 122 | 
            +
                    version: 0.0.9
         | 
| 123 123 | 
             
              type: :runtime
         | 
| 124 124 | 
             
              prerelease: false
         | 
| 125 125 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 126 126 | 
             
                requirements:
         | 
| 127 127 | 
             
                - - '='
         | 
| 128 128 | 
             
                  - !ruby/object:Gem::Version
         | 
| 129 | 
            -
                    version:  | 
| 129 | 
            +
                    version: 0.0.9
         | 
| 130 130 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 131 | 
            -
              name:  | 
| 131 | 
            +
              name: jquery-rails
         | 
| 132 132 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 133 133 | 
             
                requirements:
         | 
| 134 134 | 
             
                - - '='
         | 
| 135 135 | 
             
                  - !ruby/object:Gem::Version
         | 
| 136 | 
            -
                    version: 2. | 
| 136 | 
            +
                    version: 2.2.1
         | 
| 137 137 | 
             
              type: :runtime
         | 
| 138 138 | 
             
              prerelease: false
         | 
| 139 139 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 140 140 | 
             
                requirements:
         | 
| 141 141 | 
             
                - - '='
         | 
| 142 142 | 
             
                  - !ruby/object:Gem::Version
         | 
| 143 | 
            -
                    version: 2. | 
| 143 | 
            +
                    version: 2.2.1
         | 
| 144 144 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 145 | 
            -
              name:  | 
| 145 | 
            +
              name: meta_search
         | 
| 146 146 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 147 147 | 
             
                requirements:
         | 
| 148 148 | 
             
                - - '='
         | 
| 149 149 | 
             
                  - !ruby/object:Gem::Version
         | 
| 150 | 
            -
                    version:  | 
| 150 | 
            +
                    version: 1.1.3
         | 
| 151 151 | 
             
              type: :runtime
         | 
| 152 152 | 
             
              prerelease: false
         | 
| 153 153 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 154 154 | 
             
                requirements:
         | 
| 155 155 | 
             
                - - '='
         | 
| 156 156 | 
             
                  - !ruby/object:Gem::Version
         | 
| 157 | 
            -
                    version:  | 
| 157 | 
            +
                    version: 1.1.3
         | 
| 158 158 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 159 | 
            -
              name:  | 
| 159 | 
            +
              name: mini_magick
         | 
| 160 160 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 161 161 | 
             
                requirements:
         | 
| 162 162 | 
             
                - - '='
         | 
| 163 163 | 
             
                  - !ruby/object:Gem::Version
         | 
| 164 | 
            -
                    version:  | 
| 164 | 
            +
                    version: 3.6.0
         | 
| 165 165 | 
             
              type: :runtime
         | 
| 166 166 | 
             
              prerelease: false
         | 
| 167 167 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 168 168 | 
             
                requirements:
         | 
| 169 169 | 
             
                - - '='
         | 
| 170 170 | 
             
                  - !ruby/object:Gem::Version
         | 
| 171 | 
            -
                    version:  | 
| 171 | 
            +
                    version: 3.6.0
         | 
| 172 172 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 173 | 
            -
              name:  | 
| 173 | 
            +
              name: pg
         | 
| 174 174 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 175 175 | 
             
                requirements:
         | 
| 176 176 | 
             
                - - '='
         | 
| 177 177 | 
             
                  - !ruby/object:Gem::Version
         | 
| 178 | 
            -
                    version: 0. | 
| 178 | 
            +
                    version: 0.15.1
         | 
| 179 179 | 
             
              type: :runtime
         | 
| 180 180 | 
             
              prerelease: false
         | 
| 181 181 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 182 182 | 
             
                requirements:
         | 
| 183 183 | 
             
                - - '='
         | 
| 184 184 | 
             
                  - !ruby/object:Gem::Version
         | 
| 185 | 
            -
                    version: 0. | 
| 185 | 
            +
                    version: 0.15.1
         | 
| 186 186 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 187 | 
            -
              name:  | 
| 187 | 
            +
              name: puma
         | 
| 188 188 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 189 189 | 
             
                requirements:
         | 
| 190 190 | 
             
                - - '='
         | 
| 191 191 | 
             
                  - !ruby/object:Gem::Version
         | 
| 192 | 
            -
                    version:  | 
| 192 | 
            +
                    version: 2.0.1
         | 
| 193 193 | 
             
              type: :runtime
         | 
| 194 194 | 
             
              prerelease: false
         | 
| 195 195 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 196 196 | 
             
                requirements:
         | 
| 197 197 | 
             
                - - '='
         | 
| 198 198 | 
             
                  - !ruby/object:Gem::Version
         | 
| 199 | 
            -
                    version:  | 
| 199 | 
            +
                    version: 2.0.1
         | 
| 200 200 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 201 | 
            -
              name:  | 
| 201 | 
            +
              name: rails
         | 
| 202 202 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 203 203 | 
             
                requirements:
         | 
| 204 204 | 
             
                - - '='
         | 
| 205 205 | 
             
                  - !ruby/object:Gem::Version
         | 
| 206 | 
            -
                    version: 2. | 
| 206 | 
            +
                    version: 3.2.14
         | 
| 207 207 | 
             
              type: :runtime
         | 
| 208 208 | 
             
              prerelease: false
         | 
| 209 209 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 210 210 | 
             
                requirements:
         | 
| 211 211 | 
             
                - - '='
         | 
| 212 212 | 
             
                  - !ruby/object:Gem::Version
         | 
| 213 | 
            -
                    version: 2. | 
| 213 | 
            +
                    version: 3.2.14
         | 
| 214 214 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 215 | 
            -
              name:  | 
| 215 | 
            +
              name: rails-i18n
         | 
| 216 216 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 217 217 | 
             
                requirements:
         | 
| 218 218 | 
             
                - - '='
         | 
| 219 219 | 
             
                  - !ruby/object:Gem::Version
         | 
| 220 | 
            -
                    version:  | 
| 220 | 
            +
                    version: 0.7.3
         | 
| 221 221 | 
             
              type: :runtime
         | 
| 222 222 | 
             
              prerelease: false
         | 
| 223 223 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 224 224 | 
             
                requirements:
         | 
| 225 225 | 
             
                - - '='
         | 
| 226 226 | 
             
                  - !ruby/object:Gem::Version
         | 
| 227 | 
            -
                    version:  | 
| 227 | 
            +
                    version: 0.7.3
         | 
| 228 228 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 229 | 
            -
              name:  | 
| 229 | 
            +
              name: redcarpet
         | 
| 230 230 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 231 231 | 
             
                requirements:
         | 
| 232 232 | 
             
                - - '='
         | 
| 233 233 | 
             
                  - !ruby/object:Gem::Version
         | 
| 234 | 
            -
                    version:  | 
| 234 | 
            +
                    version: 2.3.0
         | 
| 235 235 | 
             
              type: :runtime
         | 
| 236 236 | 
             
              prerelease: false
         | 
| 237 237 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 238 238 | 
             
                requirements:
         | 
| 239 239 | 
             
                - - '='
         | 
| 240 240 | 
             
                  - !ruby/object:Gem::Version
         | 
| 241 | 
            -
                    version:  | 
| 241 | 
            +
                    version: 2.3.0
         | 
| 242 242 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 243 | 
            -
              name:  | 
| 243 | 
            +
              name: stringex
         | 
| 244 244 | 
             
              requirement: !ruby/object:Gem::Requirement
         | 
| 245 245 | 
             
                requirements:
         | 
| 246 246 | 
             
                - - '='
         | 
| 247 247 | 
             
                  - !ruby/object:Gem::Version
         | 
| 248 | 
            -
                    version: 1. | 
| 248 | 
            +
                    version: 1.5.1
         | 
| 249 249 | 
             
              type: :runtime
         | 
| 250 250 | 
             
              prerelease: false
         | 
| 251 251 | 
             
              version_requirements: !ruby/object:Gem::Requirement
         | 
| 252 252 | 
             
                requirements:
         | 
| 253 253 | 
             
                - - '='
         | 
| 254 254 | 
             
                  - !ruby/object:Gem::Version
         | 
| 255 | 
            -
                    version: 1. | 
| 255 | 
            +
                    version: 1.5.1
         | 
| 256 256 | 
             
            description: 'Lalala: Probably the best CMS in the world'
         | 
| 257 257 | 
             
            email:
         | 
| 258 258 | 
             
            - hello@mrhenry.be
         | 
| @@ -1298,6 +1298,7 @@ files: | |
| 1298 1298 | 
             
            - app/assets/javascripts/lalala/modules/grid.module.js
         | 
| 1299 1299 | 
             
            - app/assets/javascripts/lalala/modules/init.module.js
         | 
| 1300 1300 | 
             
            - app/assets/javascripts/lalala/modules/locale_chooser.module.js
         | 
| 1301 | 
            +
            - app/assets/javascripts/lalala/modules/sorted_pages_tree.module.js
         | 
| 1301 1302 | 
             
            - app/assets/javascripts/lalala/modules/storage.module.js
         | 
| 1302 1303 | 
             
            - app/assets/stylesheets/lalala/_base.css.scss
         | 
| 1303 1304 | 
             
            - app/assets/stylesheets/lalala/base/_base.css.scss
         | 
| @@ -1462,6 +1463,8 @@ files: | |
| 1462 1463 | 
             
            - test/dummy/app/models/file_asset.rb
         | 
| 1463 1464 | 
             
            - test/dummy/app/models/image_asset.rb
         | 
| 1464 1465 | 
             
            - test/dummy/app/pages/application_page.rb
         | 
| 1466 | 
            +
            - test/dummy/app/pages/basic_page.rb
         | 
| 1467 | 
            +
            - test/dummy/app/pages/home_page.rb
         | 
| 1465 1468 | 
             
            - test/dummy/app/uploaders/file_uploader.rb
         | 
| 1466 1469 | 
             
            - test/dummy/app/uploaders/image_uploader.rb
         | 
| 1467 1470 | 
             
            - test/dummy/app/views/layouts/application.html.erb
         | 
| @@ -1485,6 +1488,7 @@ files: | |
| 1485 1488 | 
             
            - test/dummy/config/routes.rb
         | 
| 1486 1489 | 
             
            - test/dummy/db/.gitkeep
         | 
| 1487 1490 | 
             
            - test/dummy/db/migrate/20130528092721_create_articles.rb
         | 
| 1491 | 
            +
            - test/dummy/db/migrate/20130729125648_create_home_page.rb
         | 
| 1488 1492 | 
             
            - test/dummy/db/schema.rb
         | 
| 1489 1493 | 
             
            - test/dummy/lib/assets/.gitkeep
         | 
| 1490 1494 | 
             
            - test/dummy/log/.gitkeep
         | 
| @@ -1549,6 +1553,8 @@ test_files: | |
| 1549 1553 | 
             
            - test/dummy/app/models/file_asset.rb
         | 
| 1550 1554 | 
             
            - test/dummy/app/models/image_asset.rb
         | 
| 1551 1555 | 
             
            - test/dummy/app/pages/application_page.rb
         | 
| 1556 | 
            +
            - test/dummy/app/pages/basic_page.rb
         | 
| 1557 | 
            +
            - test/dummy/app/pages/home_page.rb
         | 
| 1552 1558 | 
             
            - test/dummy/app/uploaders/file_uploader.rb
         | 
| 1553 1559 | 
             
            - test/dummy/app/uploaders/image_uploader.rb
         | 
| 1554 1560 | 
             
            - test/dummy/app/views/layouts/application.html.erb
         | 
| @@ -1572,6 +1578,7 @@ test_files: | |
| 1572 1578 | 
             
            - test/dummy/config/routes.rb
         | 
| 1573 1579 | 
             
            - test/dummy/db/.gitkeep
         | 
| 1574 1580 | 
             
            - test/dummy/db/migrate/20130528092721_create_articles.rb
         | 
| 1581 | 
            +
            - test/dummy/db/migrate/20130729125648_create_home_page.rb
         | 
| 1575 1582 | 
             
            - test/dummy/db/schema.rb
         | 
| 1576 1583 | 
             
            - test/dummy/lib/assets/.gitkeep
         | 
| 1577 1584 | 
             
            - test/dummy/log/.gitkeep
         |