chr 0.5.1 → 0.5.3

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

@@ -94,22 +94,27 @@ a { text-decoration: none; }
 
 
 .item.has-subtitle { padding: 0.6em 2em 0.6em 1em; }
-.item.has-thumbnail { padding-left: 4.1em; }
+.item.has-thumbnail { padding-left: 4.5em; }
 .item.has-thumbnail .item-title { line-height: 2.15; }
-.item.has-thumbnail.has-subtitle { padding: 1em 2em .75em 4.1em; }
+.item.has-thumbnail.has-subtitle { padding: 1em 2em .75em 4em; }
 .item.has-thumbnail.has-subtitle .item-title { line-height : 1.2; }
 
+.item-title { @include ellipsis; display: block; }
+.item-subtitle { @include ellipsis; font-size: 0.8em; }
+.item-thumbnail {
+  @include position(absolute, 0.75em null null 0.8em);
+  width: 2.5em;
+  height: 2.5em;
+}
+.item-thumbnail img { width: 100%; border-radius: 1.55em; }
+
 .item.reorderable {
   padding-left: 2em;
-  &:after {
-    left: 2em;
-  }
-}
 
-.item-title         { @include ellipsis; display: block; }
-.item-subtitle      { @include ellipsis; font-size: .8em; }
-.item-thumbnail     { @include position(absolute, .5em 0 0 .5em); width: 3.1em; height: 3.1em; }
-.item-thumbnail img { width: 100%; border-radius: 1.55em; }
+  .item-thumbnail { left: 1.8em; }
+  &.has-thumbnail.has-subtitle { padding-left: 5em; }
+  &:after { left: 2em; }
+}
 
 /* Search ------------------------------------------------------------------ */
 .search {
@@ -160,9 +165,8 @@ a { text-decoration: none; }
 .header-tabs {
   @include position(relative, 0.45em null null null);
   border-radius : 4px;
-  overflow      : hidden;
-  display       : inline-block;
-  z-index       : 1;
+  overflow: hidden;
+  display: inline-block;
 
   a { display : inline-block; }
 }

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

@@ -37,10 +37,6 @@ html {
   color: $base-font-color;
 }
 
-body {
-  background-color: $bg-color;
-}
-
 a {
   color: $positive-color;
 }
@@ -58,8 +54,7 @@ a {
   font-size: .9em;
 }
 
-.header .title,
-.header .save {
+.header .title {
   font-weight : $semibold;
 }
 
@@ -125,6 +120,7 @@ a {
   border : 1px solid $positive-color;
 
   a {
+    background-color: $white-color;
     border-right : 1px solid $positive-color;
     font-weight  : $regular;
     line-height  : 1;
@@ -137,10 +133,10 @@ a {
     }
 
     &.active {
-      background-color : $positive-color;
-      color            : $white-color;
+      background-color: $positive-color;
+      color: $white-color;
       &:hover {
-        color : $white-color;
+        color: $white-color;
       }
     }
   }
@@ -159,10 +155,6 @@ a {
     padding    : 0 1em;
   }
 
-  .alert {
-    color : $assertive-color;
-  }
-
   h2 {
     text-align : center;
     font-size  : 1em;
@@ -207,13 +199,21 @@ a {
 
 .header .back,
 .header .close {
+  color: $secondary-font-color;
   &:before {
     content: 'Close';
   }
+  &:hover {
+    color: $base-font-color;
+  }
 }
 
 /* Layouts ----------------------------------------------------------------- */
 @media #{$tablet} {
+  body {
+    background-color: $bg-color;
+  }
+
   .sidebar {
     background-color: $sidebar-bg-color;
   }

data/lib/chr/version.rb

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

data/templates/character_admin.coffee.erb

@@ -10,7 +10,7 @@
     loft: new Loft()
     settings:
       items:
-        admins:    new AntsAdminUsers()
+        admins: new AntsAdminUsers()
         redirects: new AntsRedirects()
 
   return { modules: modules }

data/test/integration/article_fullsize_test.rb

@@ -1,22 +1,22 @@
   #-------------------------------------------------------------------------------------
-  
+
   ## Config
 
   # disableNewItems:  true - do not show new item button in list header
   # showWithParent:   true - show list on a aside from parent
-  # disableFormCache: true 
+  # disableFormCache: true
   # searchable:       true - add search button
   # reorderable:      true - permit reorder items
   # disableDelete:    true - do not add delete button below the form
-  # disableSave:      true - do not add save button in header    
+  # disableSave:      true - do not add save button in header
   # fullsizeView:     true - use fullsize layout in desktop mode
   # urlParams:        Article.sport_articles  - additional parameter to be included into request
   # sortReverse:      true - reverse objects sorting (descending order), default: false
-  
+
   # compoundModule:   true - add this, if module is compound (add extra test)
   # pagination:       true - add this, if there are many objects (add extra test)
   # uploaderImage:    true - run tests, for checking uploader
-  
+
   #-------------------------------------------------------------------------------------
 
 require 'test_helper'

data/test/integration/article_test.rb

@@ -1,5 +1,5 @@
   #-------------------------------------------------------------------------------------
-  
+
   ## Config
 
   # disableNewItems:  true - do not show new item button in list header
@@ -8,7 +8,7 @@
   # searchable:       true - add search button
   # reorderable:      true - permit reorder items
   # disableDelete:    true - do not add delete button below the form
-  # disableSave:      true - do not add save button in header    
+  # disableSave:      true - do not add save button in header
   # fullsizeView:     true - use fullsize layout in desktop mode
   # urlParams:        Article.sport_articles  - additional parameter to be included into request
   # sortReverse:      true - reverse objects sorting (descending order), default: false

data/test/integration/magazine_article_test.rb

@@ -1,14 +1,14 @@
   #-------------------------------------------------------------------------------------
-  
+
   ## Config
 
   # disableNewItems:  true - do not show new item button in list header
   # showWithParent:   true - show list on a aside from parent
-  # disableFormCache: true 
+  # disableFormCache: true
   # searchable:       true - add search button
   # reorderable:      true - permit reorder items
   # disableDelete:    true - do not add delete button below the form
-  # disableSave:      true - do not add save button in header    
+  # disableSave:      true - do not add save button in header
   # fullsizeView:     true - use fullsize layout in desktop mode
   # urlParams:        Article.sport_articles  - additional parameter to be included into request
   # sortReverse:      true - reverse objects sorting (descending order), default: false
@@ -23,11 +23,11 @@ require 'test_helper'
 class MagazineArticleFrontEndTest < ActionDispatch::IntegrationTest
 
   factory_name      = 'article'
-  class_name        = Article  
+  class_name        = Article
   list_of_modules   = ['magazine', 'pages', 'articles']
   config            = {compoundModule: true, sortReverse: true}
   character_front_end(factory_name, class_name, list_of_modules, config)
-  
+
 end
 
 

data/test/integration/restricted_article_test.rb

@@ -1,14 +1,14 @@
   #-------------------------------------------------------------------------------------
-  
+
   ## Config
 
   # disableNewItems:  true - do not show new item button in list header
   # showWithParent:   true - show list on a aside from parent
-  # disableFormCache: true 
+  # disableFormCache: true
   # searchable:       true - add search button
   # reorderable:      true - permit reorder items
   # disableDelete:    true - do not add delete button below the form
-  # disableSave:      true - do not add save button in header    
+  # disableSave:      true - do not add save button in header
   # fullsizeView:     true - use fullsize layout in desktop mode
   # urlParams:        Article.sport_articles  - additional parameter to be included into request
   # sortReverse:      true - reverse objects sorting (descending order), default: false

data/test/integration/sport_article_test.rb

@@ -1,5 +1,5 @@
   #-------------------------------------------------------------------------------------
-  
+
   ## Config
 
   # disableNewItems:  true - do not show new item button in list header
@@ -8,7 +8,7 @@
   # searchable:       true - add search button
   # reorderable:      true - permit reorder items
   # disableDelete:    true - do not add delete button below the form
-  # disableSave:      true - do not add save button in header    
+  # disableSave:      true - do not add save button in header
   # fullsizeView:     true - use fullsize layout in desktop mode
   # urlParams:        Article.sport_articles  - additional parameter to be included into request
   # sortReverse:      true - reverse objects sorting (descending order), default: false

data/test/rails_app/.gitignore

@@ -0,0 +1,15 @@
+!.keep
+*.DS_Store
+*.swo
+*.swp
+/.bundle
+/.env
+/.foreman
+/coverage/*
+/db/*.sqlite3
+/log/*
+/public/system
+/public/assets
+/public/loft
+/tags
+/tmp/*

data/test/rails_app/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/test/rails_app/.sample.env

@@ -0,0 +1,6 @@
+# http://ddollar.github.com/foreman/
+ASSET_HOST       = localhost:3000
+APPLICATION_HOST = localhost:3000
+RACK_ENV         = development
+SECRET_KEY_BASE  = development_secret
+EXECJS_RUNTIME   = Node

data/test/rails_app/Procfile

@@ -0,0 +1 @@
+web: bundle exec puma -p $PORT -C ./config/puma.rb

data/test/rails_app/README.md

@@ -0,0 +1,45 @@
+# Rails app
+
+
+## Getting Started
+
+After you have cloned this repo, run this setup script to set up your machine
+with the necessary dependencies to run and test this app:
+
+    % ./bin/setup
+
+It assumes you have a machine equipped with Ruby, Postgres, etc. If not, set up
+your machine with [this script].
+
+[this script]: https://github.com/thoughtbot/laptop
+
+After setting up, you can run the application using [foreman]:
+
+    % foreman start
+
+If you don't have `foreman`, see [Foreman's install instructions][foreman]. It
+is [purposefully excluded from the project's `Gemfile`][exclude].
+
+[foreman]: https://github.com/ddollar/foreman
+[exclude]: https://github.com/ddollar/foreman/pull/437#issuecomment-41110407
+
+
+## Deploying to Heroku
+
+This project is ready to deploy to [Heroku](https://heroku.com), still before that
+please install plugins for mongodb, email & make sure these variables are set
+in your app ENV:
+
+    MONGODB_URI
+    ASSET_HOST
+    AWS_ACCESS_KEY_ID
+    AWS_SECRET_ACCESS_KEY
+    FOG_DIRECTORY
+    HOST
+    SMTP_ADDRESS
+    SMTP_DOMAIN
+    SMTP_PASSWORD
+    SMTP_USERNAME
+
+
+Good luck, have fun, program well and program in style!

data/test/rails_app/Rakefile

@@ -3,4 +3,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-Rails.application.load_tasks
+Rails.application.load_tasks

data/test/rails_app/app/assets/javascripts/admin.coffee

@@ -1,133 +1,113 @@
 #= require jquery
 #= require jquery_ujs
-#= require chr
-
-# ----------------------------------------------------------------------------------------
-# TEST NOTES
-# ----------------------------------------------------------------------------------------
-
-## Module
-# showNestedListsAside  - We don`t use it anymore? — Yes, we do, please add to tests.
-
-## List
-# disableNewItems:  true  tested
-# showWithParent:   true  tested
-
-## View
-# disableDelete     - do not add delete button below the form  tested
-# disableSave       - do not add save button in header         tested
-# fullsizeView      — use fullsize layout in desktop mode      tested
-# onViewShow        - on show callback
-# defaultNewObject  - used to generate new form
 
-## Rest-Array
-# urlParams:        true  tested
-# searchable:       true  tested
-
-## Array
-#   sortBy       — objects field name which is used for sorting, does not sort
-#                  when parameter is not provided, default: nil
-#   sortReverse  — reverse objects sorting (descending order), default: false
-# reorderable             tested
+#= require chr
 
-# ----------------------------------------------------------------------------------------
+@getConfig = (data) ->
+  modules =
+    fullsize_articles:
+      fullsizeView: true
 
-$ ->
-  config =
-    modules:
-      fullsize_articles:
-        fullsizeView: true
+      arrayStore: new RailsArrayStore({
+        resource:    'article'
+        path:        '/admin/articles'
+      })
 
-        arrayStore: new RailsArrayStore({
-          resource:    'article'
-          path:        '/admin/articles'
-        })
 
+      formSchema:
+        title: { type: 'string' }
+        description:  { type: 'text'   }
+        body_html:    { type: 'text'   }
 
-        formSchema:
-          title: { type: 'string' }
-          description:  { type: 'text'   }
-          body_html:    { type: 'text'   }
+    restricted_articles:
 
-      restricted_articles:
+      disableNewItems: true
+      disableDelete: true
+      disableSave: true
 
-        disableNewItems: true
-        disableDelete: true
-        disableSave: true
+      arrayStore: new RailsArrayStore({
+        resource:    'article'
+        path:        '/admin/articles'
+      })
 
-        arrayStore: new RailsArrayStore({
-          resource:    'article'
-          path:        '/admin/articles'
-        })
 
+      formSchema:
+        title: { type: 'string' }
+        description:  { type: 'text'   }
+        body_html:    { type: 'text'   }
 
-        formSchema:
-          title: { type: 'string' }
-          description:  { type: 'text'   }
-          body_html:    { type: 'text'   }
 
+    articles:
 
-      articles:
+      arrayStore: new RailsArrayStore({
+        resource:    'article'
+        path:        '/admin/articles'
+        searchable: true
+        reorderable: { positionFieldName: '_position' }
+      })
 
-        arrayStore: new RailsArrayStore({
-          resource:    'article'
-          path:        '/admin/articles'
-          searchable: true
-          reorderable: { positionFieldName: '_position' }
-        })
 
+      formSchema:
+        title: { type: 'string' }
+        description:  { type: 'text'   }
+        _position:    { type: 'float'  }
+        body_html:    { type: 'text'   }
+        image:        { type: 'image', label: 'Image <small>(600x375)</small>', thumbnail: (o) -> o.image.thumbnail_2x.url }
 
-        formSchema:
-          title: { type: 'string' }
-          description:  { type: 'text'   }
-          _position:    { type: 'float'  }
-          body_html:    { type: 'text'   }
-          image:        { type: 'image', label: 'Image <small>(600x375)</small>', thumbnail: (o) -> o.image.thumbnail_2x.url }
 
+    magazine:
+      title: 'Magazine'
+      items:
+        pages:
+          title: 'Pages'
+          showWithParent: true
+          items:
+            articles:
 
-      magazine:
-        title: 'Magazine'
-        items:
-          pages:
-            title: 'Pages'
-            showWithParent: true
-            items:
-              articles:
+              arrayStore: new RailsArrayStore({
+                resource:    'article'
+                path:        '/admin/articles'
+                sortBy:      '_position'
+                sortReverse: true
+                searchable: true
+              })
 
-                arrayStore: new RailsArrayStore({
-                  resource:    'article'
-                  path:        '/admin/articles'
-                  sortBy:      '_position'
-                  sortReverse: true
-                  searchable: true
-                })
 
+              formSchema:
+                title: { type: 'string' }
+                description:  { type: 'text'   }
+                _position:    { type: 'float'  }
+                body_html:    { type: 'text'   }
 
-                formSchema:
-                  title: { type: 'string' }
-                  description:  { type: 'text'   }
-                  _position:    { type: 'float'  }
-                  body_html:    { type: 'text'   }
+    sport_articles:
 
-      sport_articles:
+      arrayStore: new RailsArrayStore({
+        resource:    'article'
+        path:        '/admin/articles'
+        urlParams:   { sport_articles: true }
+        searchable: true
+        reorderable: { positionFieldName: '_position' }
+      })
 
-        arrayStore: new RailsArrayStore({
-          resource:    'article'
-          path:        '/admin/articles'
-          urlParams:   { sport_articles: true }
-          searchable: true
-          reorderable: { positionFieldName: '_position' }
-        })
 
+      formSchema:
+        title: { type: 'string' }
+        description:  { type: 'text'   }
+        _position:    { type: 'float'  }
+        body_html:    { type: 'text'   }
 
-        formSchema:
-          title: { type: 'string' }
-          description:  { type: 'text'   }
-          _position:    { type: 'float'  }
-          body_html:    { type: 'text'   }
-
-  chr.start('Test', config)
 
+    # loft: new Loft()
+    # settings:
+    #   items:
+    #     admins:    new AntsAdminUsers()
+    #     redirects: new AntsRedirects()
 
+  return { modules: modules }
 
+$ ->
+  $.get '/admin/bootstrap.json', (response) ->
+    config = getConfig(response)
 
+    chr.start('test_chr', config)
+    # new AntsProfile()