loft 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 049efac06fc061a1704ec78f052a144808f7b299
-  data.tar.gz: 9ff6c16f45161886d0e28e84987f6bdf725e0999
+  metadata.gz: a805f7d8ef5af5bd61c9d7138616c681c3c8abed
+  data.tar.gz: d3395c88f3e62ac78f9ef732463b1a8a22ad5f87
 SHA512:
-  metadata.gz: 939a7e37b35497db342b853efa61481c33f134c8b2889eee39c80c749706a02b0031de67c93eef2fc588370824e464ce481cf72a2262f2b217a3ffb834e6ba93
-  data.tar.gz: 5efff09de3ccaac18039e763d43f5f67c5581e3950c01a5e6ba0e70232f0442e9bc49d7653f53ce97ce6a65344e765b701322d54dba3e51666213793fdc2a28b
+  metadata.gz: f7d6f1fba61f3b602ffa1f6a36e7fdfd264939b56cc39538feca0b61d939d535f97b39b22d4da7339d8e4bb2fd938c1f2716086a568ec9790e61fe1a92a6418a
+  data.tar.gz: 7b762f23b23ced06b01ab4f328d740251396f7248b0ca5a1fc137438c902a0328075be090f62dae7bc51fc19db02e159491d56bab27af2541dd2ec203cbf5f8f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    loft (0.2.7)
+    loft (0.2.8)
       ants (>= 0.2.0)
       carrierwave-mongoid (>= 0.7.1)
       chr (>= 0.4.19)
@@ -49,7 +49,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ants (0.3.2)
+    ants (0.3.3)
       devise
       mongoid (>= 4.0)
       mongoid-slug (>= 4.0.0)
@@ -69,7 +69,7 @@ GEM
       carrierwave (>= 0.8.0, < 0.11.0)
       mongoid (>= 3.0, < 6.0)
       mongoid-grid_fs (>= 1.3, < 3.0)
-    chr (0.4.19)
+    chr (0.4.25)
       bourbon
       coffee-rails (>= 4.0)
       font-awesome-rails
@@ -96,9 +96,9 @@ GEM
     erubis (2.7.0)
     execjs (2.6.0)
     fast-stemmer (1.0.2)
-    font-awesome-rails (4.4.0.0)
+    font-awesome-rails (4.5.0.0)
       railties (>= 3.2, < 5.0)
-    formagic (0.3.1)
+    formagic (0.3.3)
       bourbon (>= 3.2)
       normalize-rails (>= 3.0)
     globalid (0.3.6)
@@ -124,7 +124,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.6.2)
+    mime-types (2.99)
     mini_magick (4.3.6)
     mini_portile (0.6.2)
     minitest (5.8.3)
@@ -207,7 +207,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sprockets (3.4.0)
+    sprockets (3.4.1)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)

data/app/assets/javascripts/loft/module.coffee

@@ -55,6 +55,9 @@ class @Loft
   _initialize_module: (module) ->
     @module = module
     @store  = @module.nestedLists.loft_all.config.arrayStore
+    @nestedLists = @module.nestedLists
+    moduleName = @module.name
+    firstNestedListPath = _firstNonEmptyValue(@nestedLists).path
 
     # API method
     @module.showModal = (assetType, selectMultipleAssets, callback, closeOnAccept) =>
@@ -85,6 +88,12 @@ class @Loft
     if ! chr.isMobile()
       @module.$el.addClass('grid-mode')
 
+    @module.$el.addClass("module-categories")
+    if chr.isDesktop()
+      chr.$mainMenu
+        .find(".menu-#{moduleName}")
+        .attr("href", firstNestedListPath)
+
 
   _nested_list_config: (moduleName, assetType) ->
     storeConfig = {}
@@ -119,7 +128,10 @@ class @Loft
     list.groupActions = new LoftGroupActions(list, this)
 
     # grid/list checkbox
-    list.$switchMode =$ "<a class='assets-switch-mode' href='#'></a>"
+    list.$switchMode =$ """<a class='assets-switch-mode' href='#'>
+                             <i class='fa fa-fw fa-th-large'></i>
+                             <i class='fa fa-fw fa-th-list'></i>
+                           </a>"""
     list.$backBtn.after list.$switchMode
     list.$switchMode.on 'click', (e) => e.preventDefault() ; @module.$el.toggleClass('grid-mode')
 

data/app/assets/stylesheets/loft.scss

@@ -2,11 +2,9 @@
 // Basic styles for Loft Character CMS plugin, this should be included in
 // admin.scss (default)
 // -----------------------------------------------------------------------
-
 @import "inputs/loft-image";
 
 // MIXINS
-
 @mixin loft-icon-label($title) {
   &:before {
     display: block; margin-top: 2.6em;
@@ -22,7 +20,6 @@
 }
 
 // ASSET TYPE ICONS
-
 .loft .list:first-child .items {
   .item {
     .item-title { margin-left: 2.05em; }
@@ -59,9 +56,7 @@
   }
 }
 
-
 // LIST MODE
-
 .loft .list:not(:first-child) .items .item.asset {
   padding-left: 6.25em; // 100px;
 
@@ -105,14 +100,10 @@
   &.edit-name .asset-name { display: block; }
 }
 
-
 // LIST-GRID MODE SWITCHER
-
 .assets-switch-mode { display: none; }
 
-
 // GROUP ACTIONS
-
 .assets-group-actions {
   @include position(absolute, 0 0 0 0); background: white;
   .accept   { color: $positive-color;  float: right; margin-right: 1em; }
@@ -124,9 +115,7 @@
 .module-modal .assets-group-actions .accept { display: inline; }
 .module-modal .assets-group-actions .delete { display: none;   }
 
-
 // UPLOAD BUTTON
-
 .loft .list-aside .header:before {
   @include position(absolute, 0px 0px null null);
   @include header-icon-base;
@@ -149,9 +138,7 @@
 .list.list-search header .asset-upload + .search { @include position(absolute, 0 0 null 0); }
 .loft.assets-uploading .list:not(:first-child) header .spinner { display: inline-block; }
 
-
 // MODAL MODE
-
 .loft {
   .modal-close { display: none; }
   &.module-modal {
@@ -172,7 +159,6 @@
   }
 }
 
-
 /* Tablet ------------------------------------------------------------------ */
 @media #{$tablet} {
   // ITEMS
@@ -191,17 +177,20 @@
   .loft.module-modal { @include position(absolute, 1.5em 1.5em 0em 1.5em) }
   .loft.module-modal .header { top: 0; left: 0; right: 0; width: auto; }
 
-
   // GRID MODE
   .assets-switch-mode {
     @include position(absolute, null null null 1em);
     display: inline; line-height: 2.5; left: 3em;
-    &:before { content: 'Grid'; color: lighten($base-font-color, 50%); margin-right: .25em; }
-    &:after  { content: 'List'; color: lighten($base-font-color, 35%); }
+    i:first-child { color: $border-color; }
+    i:last-child { color: rgba($base-font-color, .4); }
+    // &:before { content: 'Grid'; color: lighten($base-font-color, 50%); margin-right: .25em; }
+    // &:after  { content: 'List'; color: lighten($base-font-color, 35%); }
   }
   .loft.grid-mode .assets-switch-mode {
-    &:before { color: lighten($base-font-color, 35%); }
-    &:after  { color: lighten($base-font-color, 50%);  }
+    i:first-child { color: rgba($base-font-color, .4); }
+    i:last-child { color: $border-color; }
+    // &:before { color: lighten($base-font-color, 35%); }
+    // &:after  { color: lighten($base-font-color, 50%);  }
   }
 
   .loft.grid-mode {
@@ -245,7 +234,6 @@
   }
 }
 
-
 /* Desktop ----------------------------------------------------------------- */
 @media #{$desktop} {
   // BACK
@@ -254,7 +242,3 @@
   // GRID MODE
   .assets-switch-mode { left: 1em; }
 }
-
-
-
-

data/lib/loft/version.rb

@@ -1,3 +1,3 @@
 module Loft
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loft
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Alexander Kravets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chr