chr 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f731549e404ffdd9f1623583ddfe872e08b38aea
-  data.tar.gz: 490af2234f3464422866fdcdc1dc9026672752f9
+  metadata.gz: 78fff44ae30cacabc5c9ad629bd9524c59f6aa43
+  data.tar.gz: 1a2c7b4f80cf9014d7bec93a353e34afc6dac650
 SHA512:
-  metadata.gz: 9edd09db6f3f410be71d8aecefca3b31170ee6521785fa1cd1deee18f11b3121efbecba25f7b05fb41a4afbc2c0859935642448759a1d56a4102e5c465263f1b
-  data.tar.gz: a256d972fadde06a5836df52db3d274400a528e92053cef9455a10d7b683e18c07ed11ee83a638c17ca091fb13fae5d780641578d7301fe724d574df173a62d6
+  metadata.gz: 09513cd3c2b323fbffdc1f1c21b136b0f10aa6ddff4824871e7d81acc47c967bbf22adab2853ebf446d0e4adae63b87e9c277df98b8cece601f82f61274bd4a8
+  data.tar.gz: 21c87d145c886ff97d9215c7dc6fdb70b7617fd2fd83c9f513c0783c5b17e52a65c6649b028c0ef0678f151be26c3523efec99586e250b72b709d0d1e9153e6d

data/app/assets/javascripts/chr/chr.coffee

@@ -73,13 +73,22 @@ class @Chr
       return $(this).trigger('hashchange')
 
     if ! @isMobile()
-      return @updateHash('#/' + Object.keys(@modules)[0])
+      firstMenuItemPath = @$mainMenu.find(".menu-#{ Object.keys(@modules)[0] }").attr('href')
+      return @updateHash(firstMenuItemPath)
 
 
   # PUBLIC ================================================
 
   isMobile: ->
-    $(window).width() < 760
+    $(window).width() < 768
+
+
+  isTablet: ->
+    ! @isMobile() && ! @isDesktop()
+
+
+  isDesktop: ->
+    $(window).width() >= 1024
 
 
   updateHash: (path, @skipRoute=false) ->
@@ -97,8 +106,10 @@ class @Chr
     @$el.append(@$navBar)
 
     for name, config of @config.modules
-      @modules[name] = new Module(this, name, config)
-      @_add_menu_item(name, @modules[name].menuTitle)
+      m = new Module(this, name, config)
+      @_add_menu_item(name, m.menuTitle)
+      m.onModuleInit()
+      @modules[name] = m
 
     @_bind_hashchange()
     @_on_start()

data/app/assets/javascripts/chr/list_config.coffee

@@ -10,7 +10,11 @@
   # PRIVATE ===============================================
 
   _add_item: (path, object, position, config, type) ->
-    item = new @itemClass(@module, path, object, config, type)
+    if type == 'folder'
+      item = new Item(@module, path, object, config, type)
+    else
+      item = new @itemClass(@module, path, object, config, type)
+
     @items[object._id] = item
     @_update_item_position(item, position)
 

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

@@ -14,6 +14,7 @@
 #   menuTitle            - title used for the menu link
 #   showNestedListsAside - show module root list on the left and all nested
 #                          lists on the right side for desktop
+#   onModuleInit         - after module is initialized callback
 #
 # Public methods:
 #   addNestedList (listName, config, parentList)
@@ -39,11 +40,13 @@ class @Module
     @menuTitle  = @config.menuTitle ? @config.title
     @menuTitle ?= @name.titleize()
 
-    @config.onModuleInit?(this)
-
 
   # PUBLIC ================================================
 
+  onModuleInit: ->
+    @config.onModuleInit?(this)
+
+
   addNestedList: (name, config, parentList) ->
     path = [ parentList.path, name ].join('/')
     @nestedLists[name] = new List(this, path, name, config, parentList)

data/app/assets/javascripts/stores/rails-form-object-parser.coffee

@@ -29,7 +29,7 @@
       # special case for LIST inputs, values separated with comma
       if attr_name.indexOf('[__LIST__') > -1
         attr_name = attr_name.replace('__LIST__', '')
-        values    = attr_value.split(',')
+        values    = attr_value.split('|||')
 
         for value in values
           formDataObject.append("#{ @config.resource }#{ attr_name }[]", value)

data/app/assets/stylesheets/chr/layout.scss

@@ -23,7 +23,7 @@ a        { text-decoration: none; }
 
 /* Header ------------------------------------------------------------------ */
 .header {
-  height     : 40px;
+  height     : 41px;
   text-align : center;
 }
 
@@ -102,8 +102,7 @@ a        { text-decoration: none; }
 
   .search {
     @include position(absolute, 0 null null null);
-    width      : 100%;
-    background : white;
+    width : 100%;
 
     input       { display: block;  }
     .cancel     { display: inline-block; }
@@ -120,8 +119,8 @@ a        { text-decoration: none; }
 /* Mobile ------------------------------------------------------------------ */
 .header {
   @include position(fixed, 0 null null null);
-  width   : 100%;
   z-index : 10;
+  width   : 100%;
 }
 
 .view, .list {
@@ -153,8 +152,7 @@ a        { text-decoration: none; }
 
   .sidebar {
     @include position(absolute, 0 null 0 0);
-    width        : 9em;
-    border-right : 1px solid;
+    width : 9em;
   }
 
   .module {
@@ -163,9 +161,9 @@ a        { text-decoration: none; }
   }
 
   .view, .list {
-    bottom      : 0;
     padding-top : 0px;
     overflow    : hidden;
+    bottom      : 0;
   }
 
   .header { @include position(relative); }

data/app/assets/stylesheets/chr/themes/basic.scss

@@ -2,16 +2,26 @@
 
 $base-font-family : 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif !default;
 
-$light   : 300 !default;
-$regular : 400 !default;
-$medium  : 500 !default;
-$bold    : 600 !default;
-$black   : 800 !default;
-
-$base-font-color : rgb( 89, 89, 89) !default;
-$positive-color  : rgb( 74,135,238) !default;
-$assertive-color : rgb(239, 78, 58) !default;
-$border-color    : rgb(246,246,246) !default;
+$thin      : 100 !default;
+$light     : 300 !default;
+$regular   : 400 !default;
+$medium    : 500 !default;
+$semibold  : 600 !default;
+$bold      : 700 !default;
+$extrabold : 800 !default;
+$black     : 900 !default;
+
+$base-font-color : #2e2e2e !default;
+$positive-color  : #4a87ee !default;
+$assertive-color : #ee5f4a !default;
+$border-color    : #f6f6f6 !default;
+
+$sidebar-color           : #aaa    !default;
+$sidebar-bg-color        : #222    !default;
+$sidebar-active-color    : white   !default;
+$sidebar-active-bg-color : #1a1a1a !default;
+
+$list-bg-color : #fafafa !default;
 
 $formagic-base-color      : $base-font-color;
 $formagic-positive-color  : $positive-color;
@@ -32,19 +42,12 @@ a {
 .menu a {
   color   : $base-font-color;
   padding : .75em 1em;
-  &.active { background-color: $border-color; }
-}
-
-.header a {
-  &:hover {
-    opacity : .5;
-  }
 }
 
 .menu-title,
 .header .title,
 .header .save {
-  font-weight : $medium;
+  font-weight : $semibold;
 }
 
 .header {
@@ -141,8 +144,8 @@ a {
 
 .header .new { @include icon-plus($positive-color); }
 
-.item .icon-reorder { @include icon-reorder(lighten($base-font-color, 50%)); }
-.item .icon-folder  { @include icon-folder(lighten($base-font-color, 50%)); }
+.icon-reorder { @include icon-reorder(lighten($base-font-color, 50%)); }
+.icon-folder  { @include icon-folder(lighten($base-font-color, 50%)); }
 
 .slip-reordering > .icon-reorder:before,
 .slip-reordering > .icon-reorder:after { background-color: $positive-color; }
@@ -153,24 +156,59 @@ a {
 
 @media #{$tablet} {
   .sidebar {
-    border-color : $border-color;
+    background-color : $sidebar-bg-color;
+  }
+
+  .menu a {
+    border-left : 2px solid $sidebar-bg-color;
+    color       : $sidebar-color;
+    &:hover {
+      background-color : $sidebar-active-bg-color;
+      border-color     : $sidebar-active-bg-color;
+      color            : $sidebar-active-color;
+    }
+    &.active {
+      background-color : $sidebar-active-bg-color;
+      border-color     : $positive-color;
+      color            : $sidebar-active-color;
+    }
+  }
+
+  .menu-title {
+    font-weight : $regular;
+    color       : white;
   }
+
+  .admin-devise_overrides-sessions {
+    background-color : $list-bg-color;
+  }
+
   .signin-modal {
-    max-width : 26em;
-    border    : 1px solid $border-color;
-    margin    : 5em auto 1em;
+    background : white;
+    max-width  : 26em;
+    border     : 1px solid $border-color;
+    margin     : 5em auto 1em;
 
     form {
       margin-left: .5em;
     }
   }
+
+  .list {
+    background-color : $list-bg-color;
+    .header {
+      background-color : $list-bg-color;
+    }
+    &.list-aside {
+      background-color : white;
+      .header {
+        background-color : white;
+      }
+    }
+  }
 }
 
 @media #{$desktop} {
   .list .header { border-color: $border-color; }
-  .input-text textarea, .content, .items { @include custom-scrollbar(rgba($base-font-color, .5), $border-color, 3px); }
+  .input-text textarea, .content, .items { @include custom-scrollbar(rgba($base-font-color, .25), $border-color, 3px); }
 }
-
-
-
-

data/lib/chr/app_builder.rb

@@ -323,7 +323,7 @@ module Chr
     def initialize_mongoid
       generate 'mongoid:config'
       append_file "config/mongoid.yml", """\nproduction:
-  sessions:
+  clients:
     default:
       uri: <%= ENV['MONGODB_URI'] %>"""
     end

data/lib/chr/version.rb

@@ -1,5 +1,5 @@
 module Chr
   RAILS_VERSION = "~> 4.2.4"
   RUBY_VERSION  = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION       = "0.4.12"
+  VERSION       = "0.4.13"
 end

data/templates/Gemfile.erb

@@ -12,11 +12,15 @@ gem 'rack-canonical-host'
 gem 'meta-tags'
 gem 'asset_sync'
 gem 'awesome_print'
-gem 'mongoid'
+gem 'bson_ext'
+gem 'mongoid', '~> 5.0.0'
+# This `autoinc` branch supports mongoid 5.0, required by Loft
+gem 'mongoid-autoinc', github: 'suweller/mongoid-autoinc'
 gem 'mongosteen'
 gem 'chr'
 gem 'ants'
 gem 'loft'
+gem 'carrierwave-mongoid'
 
 group :development do
   gem 'spring'

data/templates/application_gitignore

@@ -10,5 +10,6 @@
 /log/*
 /public/system
 /public/assets
+/public/loft
 /tags
 /tmp/*

data/templates/character_admin.coffee.erb

@@ -5,24 +5,21 @@
 #= require loft
 #= require ants
 
-@settingsConfig = ->
-  items:
-    admins:    Ants.adminsConfig()
-    redirects: Ants.redirectsConfig()
+@getConfig = (data) ->
+  modules =
+    loft: new Loft()
+    settings:
+      items:
+        admins:    new AntsAdmins()
+        redirects: new AntsRedirects()
 
-@getChrConfig = (data) ->
-  modules     = {}
-  all_modules =
-    loft:      new Loft('Files', 'asset', '/admin/assets')
-    settings:  settingsConfig()
-
-  return { modules: all_modules }
+  return { modules: modules }
 
 $ ->
   $.get '/admin/bootstrap.json', (response) ->
-    chrConfig = getChrConfig(response)
+    config = getConfig(response)
 
-    chr.start('<%= app_name %>', chrConfig)
+    chr.start('<%= app_name %>', config)
 
     # append signout button to the end of sidebar menu
     $('a[data-method=delete]').appendTo(".sidebar .menu").show()

data/templates/{character_admin_layout.html.erb → character_admin_layout.html.erb.erb}

@@ -8,14 +8,14 @@
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
-  <%= display_meta_tags site: 'hello-world', title: 'CMS' %>
+  <%%= display_meta_tags site: '<%= app_name %>', title: 'CMS' %>
 
-  <%= csrf_meta_tags %>
-  <%= stylesheet_link_tag :admin, media: 'all' %>
+  <%%= csrf_meta_tags %>
+  <%%= stylesheet_link_tag :admin, media: 'all' %>
 </head>
 
 <body class='<%= body_class %>'>
-  <%= yield %>
+  <%%= yield %>
 </body>
 
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chr
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Alexander Kravets
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -343,7 +343,7 @@ files:
 - templates/character_admin.coffee.erb
 - templates/character_admin.scss
 - templates/character_admin_index.html.erb
-- templates/character_admin_layout.html.erb
+- templates/character_admin_layout.html.erb.erb
 - templates/character_base_controller.rb
 - templates/development_seeds.rb
 - templates/devise_overrides_passwords_controller.rb