dorsale 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417a3baaae1d0c4f0a571105f17f905d2f184ec7
-  data.tar.gz: 4f130e0a775040d72f956e142e609044e362817b
+  metadata.gz: 2b7376b6c7d46d198bbede8be8663db10631de53
+  data.tar.gz: 6b83f90d10b65ccc90b864f6f4fd0aaeb795d732
 SHA512:
-  metadata.gz: 19ca08bba926fe3318e8c75cb8766982ad74a832ac05553fdd77f34b0fc222d43a67533d199364083272adf7724810838b3cb040138bc429a3e9f334958d4767
-  data.tar.gz: 33b096a575ecb4b74529e19abe20811c3fbf87dbea5c131f48210934021f8df678910dc40b3163edcae198c313d88ded0150e57888408b768868eadf4ac4545f
+  metadata.gz: 57aef075a9310b76cca63a2f7da3b3e9e6edfb5d2e7b25689c78800e2d14f3bb452fb0c177f52c88287df18aeb70a452deb0ebc44399b1551025723fc235b33a
+  data.tar.gz: 24765f16d7bba8aef49ffe422c7f506e01b265beda6eebf86a292886819b95447ce1e5fc30c49edb5ca54bf23d9a4cd605f71aa21524a593cdc40a84fe85059e

data/app/assets/javascripts/dorsale/modals.coffee

@@ -0,0 +1,75 @@
+window.modal =
+  i18n:
+    loading: "Loading..."
+    error: "Error."
+
+  template: """
+    <div id='modal' class='modal'>
+      <div class='modal-overlay modal-close'></div>
+      <button class='modal-close'></button>
+      <div class='modal-body'>
+        {{content}}
+      </div>
+    </div>
+  """
+
+  _generateModalHTML: (content) ->
+    $(modal.template.replace("{{content}}", content))
+
+  open: (content) ->
+    modal.close()
+    $("body").addClass("modal-open")
+    $("body").append(modal._generateModalHTML(content))
+    $(document).trigger("modal:open")
+
+  close: ->
+    $("#modal").remove()
+    $("body").removeClass("modal-open")
+    $(document).trigger("modal:close")
+    return false
+
+  openUrl: (url, type = "GET", data = {}) ->
+    modal.open(modal.i18n.loading)
+
+    $.ajax
+      url: url
+      type: type
+      data: data
+      dataType: "html"
+      success: (data) ->
+        modal.open(data)
+      error: ->
+        modal.open(modal.i18n.error)
+
+  _callbacks:
+    links: ->
+      modal.openUrl(this.href)
+      return false
+
+    forms: ->
+      modal.openUrl(this.href, this.action, $(this).serialize())
+      return false
+
+    escape: (event) ->
+      modal.close() if event.keyCode == 27
+
+  setup: ->
+    $(document)
+      .off("keyup", modal._callbacks.escape)
+      .on("keyup", modal._callbacks.escape)
+
+    $(".modal-close")
+      .off("click", modal.close)
+      .on("click", modal.close)
+
+    $("a[data-modal=1], .modal-body a:not([data-modal=0])")
+      .off("click", modal._callbacks.links)
+      .on("click", modal._callbacks.links)
+
+    $("form[data-modal=1], .modal-body form:not([data-modal=0])")
+      .off("submit", modal._callbacks.forms)
+      .on("submit", modal._callbacks.forms)
+
+
+$(document).on "ready page:load modal:open", ->
+  modal.setup()

data/app/assets/stylesheets/dorsale/all.sass

@@ -4,6 +4,7 @@
 @import font-awesome
 @import bootstrap-datepicker3
 
+@import dorsale/modals
 @import dorsale/comments
 @import dorsale/contexts
 @import dorsale/filters

data/app/assets/stylesheets/dorsale/modals.sass

@@ -0,0 +1,38 @@
+body.modal-open
+  height: 100%
+  overflow: hidden
+
+.modal
+  display: block !important // override bootstrap
+
+  &, .modal-overlay
+    position: fixed
+    top: 0
+    right: 0
+    bottom: 0
+    left: 0
+    overflow: auto
+
+  .modal-overlay
+    background: rgba(0, 0, 0, 0.85)
+
+  .modal-body
+    position: relative
+    margin: 10vh auto
+    padding: 2em
+    width: auto
+    min-width: 50%
+    max-width: 980px
+    background: white
+    z-index: 9999
+
+  button.modal-close:after
+    content: "×"
+    color: white
+    position: absolute
+    font-size: 4em
+    line-height: 0.5em
+    top: 0.25em
+    right: 0.25em
+    border: none
+    background: none

data/app/controllers/dorsale/application_controller.rb

@@ -3,5 +3,13 @@ module Dorsale
     def current_user_scope
       @current_user_scope ||= UserScope.new(current_user)
     end
+
+    layout -> {
+      if request.xhr?
+        false
+      else
+        "application"
+      end
+    }
   end
 end

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -442,6 +442,7 @@ files:
 - app/assets/javascripts/dorsale/datepicker.coffee
 - app/assets/javascripts/dorsale/flyboy/all.coffee
 - app/assets/javascripts/dorsale/forms.coffee
+- app/assets/javascripts/dorsale/modals.coffee
 - app/assets/javascripts/dorsale/tabs_loader.coffee
 - app/assets/stylesheets/dorsale/all.sass
 - app/assets/stylesheets/dorsale/billing_machine/all.sass
@@ -453,6 +454,7 @@ files:
 - app/assets/stylesheets/dorsale/flash.sass
 - app/assets/stylesheets/dorsale/flyboy/all.sass
 - app/assets/stylesheets/dorsale/forms.sass
+- app/assets/stylesheets/dorsale/modals.sass
 - app/assets/stylesheets/dorsale/pagination.sass
 - app/assets/stylesheets/dorsale/styles.sass
 - app/assets/stylesheets/dorsale/tables.sass