flms 0.0.1 → 0.0.2

data/README.md

@@ -1,3 +1,3 @@
-= Flms
+= Flms [![Build Status](https://travis-ci.org/Originate-Inc/flms.png?branch=travis)](https://travis-ci.org/Originate-Inc/flms) [![Code Climate](https://codeclimate.com/github/Originate-Inc/flms.png)](https://codeclimate.com/github/Originate-Inc/flms)
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.

data/app/assets/javascripts/flms/{flms.js → admin.js}

@@ -13,5 +13,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui
+//= require modularity/modularity
 //= require_tree .
 //= require bootstrapSwitch

data/app/assets/javascripts/flms/blocks/index/block.coffee

@@ -0,0 +1,28 @@
+# A single block on the blocks index page.
+class @Block extends modularity.Module
+
+  constructor: ->
+    super
+
+    # The 'active' switch.
+    @active_switch = @$('.switch')
+
+
+  # Returns the id of this block.
+  id: ->
+    @container.data('block-id')
+
+
+  # Returns whether this block is activated.
+  active: ->
+    @active_switch.bootstrapSwitch('status')
+
+
+  # Returns the data for this block.
+  get_data: ->
+    {
+      id: @id(),
+      active: @active()
+    }
+
+

data/app/assets/javascripts/flms/blocks/index/block_list.coffee

@@ -0,0 +1,20 @@
+# The list of blocks on a page.
+class @BlockList extends modularity.Module
+
+  constructor: ->
+    super
+
+    # Make block list sortable.
+    $('.block_list').sortable(stop: @sorting_finished)
+    $('.block_list').disableSelection()
+
+
+  # Returns the data of the blocks.
+  get_data: ->
+    for tr in @$('tr')
+      new Block($(tr)).get_data()
+
+
+  # Called when the sorting is done.
+  sorting_finished: =>
+    @fire 'sorting_finished'

data/app/assets/javascripts/flms/blocks/index/index.coffee

@@ -0,0 +1,42 @@
+# Page controller for the 'index' page for blocks.
+class @BlocksIndexPage extends modularity.Module
+
+  constructor: ->
+    super 'body'
+
+    # The list of blocks.
+    @block_list = new BlockList @$('.block_list')
+    @block_list.on 'sorting_finished', @sorting_finished
+
+    # The 'save' button.
+    @save_button = @$('#save')
+    @save_button.click @save_button_clicked
+
+    @$('.switch').on 'switch-change', @active_switch_changed
+
+
+  # Called when the 'active' checkbox of a block is changed.
+  active_switch_changed: =>
+    @save_button.fadeIn()
+
+
+  # Called when the 'save' button is clicked.
+  save_button_clicked: =>
+    @save_changes_to_server()
+
+
+  # Save the changes to the server.
+  save_changes_to_server: ->
+    $.ajax
+      url: document.url
+      method: 'PUT'
+      contentType: 'application/json'
+      data: JSON.stringify({block_data: @block_list.get_data()})
+      success: =>
+        @save_button.fadeOut()
+
+
+  # Called when the user has changed the sorting of the blocks.
+  sorting_finished: =>
+    @save_button.fadeIn()
+

data/app/assets/stylesheets/flms/blocks/index.sass

@@ -26,3 +26,7 @@ body.blocks.index
     background-color: red
     border: 2px solid yellow
     height: 47px
+
+  #save
+    float: right
+    display: none

data/app/assets/stylesheets/flms/blocks/show.sass

@@ -0,0 +1,5 @@
+body.blocks.show
+
+  #save
+    float: right
+    display: none

data/app/assets/stylesheets/flms/login.sass

@@ -1,32 +1,38 @@
-body.user_sessions.new,
+body.sessions.new,
+body.sessions.create,
 body.user_passwords.new
   background-color: #f5f5f5
 
-.login
+  .login
 
-  padding-top: 40px
+    padding-top: 20px
 
-  .form-signin
-    max-width: 300px
-    padding: 19px 29px 29px
-    margin: 0 auto 20px
-    background-color: #fff
-    border: 1px solid #e5e5e5
-    -webkit-border-radius: 5px
-    -moz-border-radius: 5px
-    border-radius: 5px
-    -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05)
-    -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05)
-    box-shadow: 0 1px 2px rgba(0,0,0,.05)
+    .form-signin
+      max-width: 300px
+      padding: 19px 29px 29px
+      margin: 0 auto 20px
+      background-color: #fff
+      border: 1px solid #e5e5e5
+      -webkit-border-radius: 5px
+      -moz-border-radius: 5px
+      border-radius: 5px
+      -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05)
+      -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05)
+      box-shadow: 0 1px 2px rgba(0,0,0,.05)
 
-    .form-signin-heading, .checkbox
-      margin-bottom: 10px
+      .form-signin-heading, .checkbox
+        margin-bottom: 10px
 
-  input[type="text"],
-  input[type="password"],
-  input[type="email"]
-    font-size: 16px
-    height: auto
-    margin-bottom: 15px
-    padding: 7px 9px
+    input[type="text"],
+    input[type="password"],
+    input[type="email"]
+      font-size: 16px
+      height: auto
+      margin-bottom: 15px
+      padding: 7px 9px
 
+  .alert,
+  .notice
+    text-align: center
+    width: 500px
+    margin: 0 auto

data/app/controllers/flms/blocks_controller.rb

@@ -2,30 +2,25 @@ require_dependency "flms/application_controller"
 
 module Flms
   class BlocksController < ApplicationController
-    before_filter :authenticate_user!
     layout 'flms/admin'
+    before_filter :authenticate_user!
+    before_filter :load_page
+    before_filter :load_block, only: [:show, :edit, :update, :delete]
 
     def index
-      @page = Flms::Page.find_by_url params[:page_id]
-      @blocks = @page.blocks
     end
 
     def show
-      @block = Block.find(params[:id])
     end
 
     def new
-      @page = Page.find_by_url params[:page_id]
       @block = Block.new
     end
 
     def edit
-      @page = Page.find_by_url params[:page_id]
-      @block = Block.find(params[:id])
     end
 
     def create
-      @page = Page.find_by_url params[:page_id]
       @block = Block.new(params[:block])
       if @block.save
         @block.pages << @page
@@ -36,8 +31,6 @@ module Flms
     end
 
     def update
-      @page = Page.find_by_url params[:page_id]
-      @block = Block.find(params[:id])
       if @block.update_attributes(params[:block])
         redirect_to [@page, :blocks], notice: 'Block was successfully updated.'
       else
@@ -45,11 +38,30 @@ module Flms
       end
     end
 
+    def update_all
+      params[:block_data].each_with_index do |block_data, pos|
+        position = @page.position_for_block block_data[:id].to_i
+        position.active = block_data[:active]
+        position.ordering = pos
+        position.save!
+      end
+      render text: ''
+    end
+
     def destroy
-      @page = Page.find_by_url params[:page_id]
-      @block = Block.find params[:id]
       @block.destroy
       redirect_to page_blocks_path(@page), notice: 'Block deleted'
     end
+
+
+    private
+
+    def load_page
+      @page = Page.find_by_url params[:page_id]
+    end
+
+    def load_block
+      @block = Block.find params[:id]
+    end
   end
 end

data/app/controllers/flms/layers_controller.rb

@@ -0,0 +1,73 @@
+require_dependency "flms/application_controller"
+
+module Flms
+  class LayersController < ApplicationController
+    layout 'flms/admin'
+    before_filter :authenticate_user!
+    before_filter :load_page
+    before_filter :load_block
+    before_filter :load_layer, only: [:show, :edit, :update, :delete]
+
+    def index
+    end
+
+    def show
+    end
+
+    def new
+      @layer = Layer.new
+    end
+
+    def edit
+    end
+
+    def create
+      @layer = Layer.new params[:layer]
+      @layer.block = @block
+      if @layer.save
+        redirect_to page_block_path(@page, @block), notice: 'Layer created'
+      else
+        render action: "new"
+      end
+    end
+
+    def update
+      if @layer.update_attributes(params[:layer])
+        redirect_to [@page, @block], notice: 'Layer updated'
+      else
+        render action: "edit"
+      end
+    end
+
+    def update_all
+      params[:layer_data].each_with_index do |layer_data, pos|
+        position = @page.position_for_layer layer_data[:id].to_i
+        position.active = layer_data[:active]
+        position.ordering = pos
+        position.save!
+      end
+      render text: ''
+    end
+
+    def destroy
+      @layer.destroy
+      redirect_to page_layers_path(@page), notice: 'Layer deleted'
+    end
+
+
+    private
+
+    def load_page
+      @page = Page.find_by_url params[:page_id]
+    end
+
+    def load_block
+      @block = Block.find params[:block_id]
+    end
+
+    def load_layer
+      @layer = Layer.find params[:id]
+    end
+  end
+end
+

data/app/models/flms/block.rb

@@ -2,8 +2,9 @@ module Flms
   class Block < ActiveRecord::Base
     attr_accessible :active, :name
 
-    has_many :blocks_pages, class_name: 'Flms::BlocksPage'
+    has_many :blocks_pages, class_name: 'Flms::BlocksPage', dependent: :destroy
     has_many :pages, through: :blocks_pages, class_name: 'Flms::Page'
+    has_many :layers
 
     validates :name, presence: true
   end

data/app/models/flms/blocks_page.rb

@@ -1,6 +1,6 @@
 module Flms
   class BlocksPage < ActiveRecord::Base
-    attr_accessible :block_id, :page_id
+    attr_accessible :block_id, :block, :page_id, :page, :ordering, :active
 
     belongs_to :block, class_name: 'Flms::Block'
     belongs_to :page, class_name: 'Flms::Page'

data/app/models/flms/layer.rb

@@ -0,0 +1,7 @@
+module Flms
+  class Layer < ActiveRecord::Base
+    attr_accessible :name, :type
+
+    belongs_to :block
+  end
+end

data/app/models/flms/page.rb

@@ -2,11 +2,22 @@ module Flms
   class Page < ActiveRecord::Base
     attr_accessible :title, :url
 
-    has_many :blocks_pages
+    has_many :blocks_pages, dependent: :destroy
     has_many :blocks, through: :blocks_pages
 
     validates :title, :url, presence: true
 
+    # Returns the blocks_pages of this page, in the right order to display them.
+    def ordered_blocks_pages
+      blocks_pages.order('ordering').includes(:block)
+    end
+
+    # Returns the BlocksPage object for the given block on this page.
+    def position_for_block block_id
+      blocks_pages.where(block_id: block_id).first
+    end
+
+    # For creating URLs.
     def to_param
       url
     end

data/app/views/flms/blocks/index.html.haml

@@ -10,16 +10,22 @@
 %table.table.table-striped.table-hover
   %thead
     %tr
+      %th Active
       %th Name
-      %th
+      %th Actions
 
-  %tbody.blocks
-    - @blocks.each do |block|
-      %tr.ui-state-default
+  %tbody.block_list
+    - @page.ordered_blocks_pages.each do |blocks_page|
+      - block = blocks_page.block
+      %tr.ui-state-default{'data-block-id' => block.id}
 
+        -# "Active" switch.
         %td.action
           .switch.switch-mini
-            %input{type: 'checkbox'}
+            - if blocks_page.active
+              %input{id: "active_#{block.id}", type: 'checkbox', checked: 'checked'}
+            - else
+              %input{id: "active_#{block.id}", type: 'checkbox'}
 
         %td.name
           = link_to block.name, page_block_path(@page, block)
@@ -38,4 +44,6 @@
   %i.icon-plus.icon-white
   New Block
 
-
+%button#save.btn.btn-primary
+  %i.icon-hdd.icon-white
+  Save

data/app/views/flms/blocks/show.html.haml

@@ -1 +1,35 @@
-Block
+
+
+
+%h4 Layers in block '#{@block.name}'
+
+%table.table.table-striped.table-hover
+  %thead
+    %tr
+      %th Name
+      %th Actions
+
+  %tbody.layer_list
+    - @block.layers.each do |layer|
+      %tr.ui-state-default{'data-layer-id' => layer.id}
+
+        %td.name
+          = layer.name
+
+        %td.action
+          = link_to edit_page_block_layer_path(@page, @block, layer), class: 'btn', title: 'edit' do
+            %i.icon-pencil
+
+        %td.action
+          = link_to page_block_layer_path(@page, @block, layer), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn', title: 'delete' do
+            %i.icon-trash
+
+%br
+
+= link_to new_page_block_layer_path(@page, @block), class: 'btn btn-success' do
+  %i.icon-plus.icon-white
+  New Layer
+
+%button#save.btn.btn-primary
+  %i.icon-hdd.icon-white
+  Save