chaltron 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e9ae962f2dd9c241da700b59ffff814b0e10483
-  data.tar.gz: 738cf12df8205c411047c8e245e4580d86b95204
+  metadata.gz: b0fe3df9d17f0db477b913f4ed19300753254565
+  data.tar.gz: d54a1cbe476d113c5d27dd60fe9aa15aab52f7a3
 SHA512:
-  metadata.gz: ab99ee8301b42f336a2f9f844978787b456fc8ada3bc422cf49ad244a93396a9f63dcbefc7748f7438e535d27de11ee30d979062aade8d5ef98e267e0f34c73e
-  data.tar.gz: 3120ad2fd6985cbeda1e4ace7e7e0eaf319ee6e8cc81af4a80d2907f0f520e5952609bb192cbba90d1ab6f0a38dd98c72ef67fc37064310c2c290bb9b6ccddae
+  metadata.gz: ebf40cf18b315eb791b0bfd705c00324965b7a687535901654ee4074a07b1d379b751ed241823b94569f2188bb521011f94cfb2a9b1816a593647fef6af2aa8c
+  data.tar.gz: ba10dd2f156c3d6b94b6d84ea70f4021acdad503c7cb9e15b64e95c3695270992b764d875c612ba7e0e5de495bc616eaa2f57a03f9542a11ce75dd0455e5889a

data/README.md

@@ -5,6 +5,14 @@
 [![PullReview stats](https://www.pullreview.com/github/vicvega/chaltron/badges/master.svg?)](https://www.pullreview.com/github/vicvega/chaltron/reviews/master)
 [![security](https://hakiri.io/github/vicvega/chaltron/master.svg)](https://hakiri.io/github/vicvega/chaltron/master)
 
+## Important note
+
+**The latest chaltron release (1.x) targets bootstrap v4.**
+
+If you are using bootstrap v3, refer to the  [bootstrap3](https://github.com/vicvega/chaltron/tree/bootstrap3) branch (chaltron version 0.x).
+
+## Usage
+
 In a fresh new rails application simply add to your `Gemfile`
 ```ruby
 gem 'chaltron'
@@ -44,7 +52,7 @@ Chaltron is powered by
 
  * [devise](https://github.com/plataformatec/devise/)
  * [cancancan](https://github.com/CanCanCommunity/cancancan/)
- * [bootstrap](https://github.com/twbs/bootstrap-sass)
+ * [bootstrap](https://github.com/twbs/bootstrap-rubygem)
  * [font-awesome](https://github.com/FortAwesome/font-awesome-sass)
  * [datatables](http://datatables.net/)
 

data/app/assets/javascripts/chaltron/navbar.js.coffee

@@ -21,8 +21,9 @@ class NavbarBuilder
     links = el.find('li a')
 
     klass = 'dropdown-menu'
-    klass += ' dropdown-menu-right' if el.hasClass('dropdown-menu-right')
-    div = $('<div></div>').addClass('dropdown-menu').attr('aria-labelledby': 'navbarDropdown').append(links)
+    klass += ' dropdown-menu-right' if el.parent().hasClass('dropdown-menu-right')
+
+    div = $('<div></div>').addClass(klass).attr('aria-labelledby': 'navbarDropdown').append(links)
     el.replaceWith(div)
 
   prepend_class: (item, klass) ->

data/app/assets/stylesheets/chaltron.scss

@@ -22,9 +22,6 @@
 @import 'nprogress';
 @import 'nprogress-bootstrap';
 
-// Core variables and mixins
-@import 'chaltron/mixins';
-
 // Core CSS
 @import 'chaltron/layout';
 

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

@@ -1,11 +1,3 @@
-body {
-}
-
-div#content {
-  margin-top: 2.5rem;
-  margin-bottom: 2.5rem;
-}
-
 /**
  * Flash messages
  *
@@ -15,13 +7,12 @@ div#content {
   margin: 0;
   text-align: center;
   position: fixed;
-  top: 2.5rem;
+  top: 2.5em;
   width: 100%;
   opacity: 0.8;
   z-index: 100;
   .alert {
     margin: 0;
-    border-radius: 0;
   }
 }
 
@@ -31,7 +22,7 @@ div#content {
  */
 .login-box{
   margin-top: 100px;
-  @include form-box(650px);
+  max-width: 650px;
 }
 
 #nprogress .spinner {

data/app/helpers/chaltron_helper.rb

@@ -17,7 +17,7 @@ module ChaltronHelper
   end
 
   def flash_message(message, type)
-    content_tag(:div, message, class: "alert #{bootstrap_class_for(type)}") do
+    content_tag(:div, message, class: "alert #{bootstrap_class_for(type)} rounded-0") do
       content_tag(:strong, I18n.t("chaltron.flash.#{type}") + ': ') +
       message
     end

data/config/chaltron_navigation.rb

@@ -10,10 +10,10 @@ SimpleNavigation::Configuration.run do |navigation|
         admin.item :logs, I18n.t('chaltron.menu.logs'), logs_path, link_html: { icon: 'book' },
            highlights_on: /\/logs/ if can?(:read, Log)
       end if can?(:manage, User) or can?(:read, Log)
-      primary.item :logged, current_user.display_name.html_safe, '#' do |user|
-        user.dom_class = 'dropdown-menu-right'
+      primary.item :logged, current_user.display_name.html_safe, '#',
+        html: { class: 'dropdown-menu-right' } do |user|
         user.item :self_edit, I18n.t('chaltron.menu.self_show'), self_show_users_path,
-          link_html: { icon: 'user'},
+          link_html: { icon: 'user' },
           highlights_on: /\/self_(show|edit|update)/
         user.item :logout, 'Logout', destroy_user_session_path, method: :delete,
           link_html: { icon: 'sign-out' }

data/lib/chaltron/version.rb

@@ -1,3 +1,3 @@
 module Chaltron
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/generators/chaltron/install_generator.rb

@@ -74,6 +74,7 @@ RUBY
 
     def setup_chaltron
       copy_file 'config/initializers/chaltron.rb'
+      copy_file 'app/assets/stylesheets/chaltron_custom.scss'
     end
 
     def setup_authorization

data/lib/generators/chaltron/templates/app/assets/stylesheets/chaltron_custom.scss

@@ -0,0 +1,22 @@
+/*
+ * See http://getbootstrap.com/docs/4.0/getting-started/theming to learn customization
+ */
+
+ $font-size-base: 0.85rem;
+
+// $theme-colors: (
+//   'primary': #343A40,   // Bootstrap dark color
+//   'primary': #6C757D    // Bootstrap secondary color
+// );
+
+ @import 'chaltron';
+
+ // to keep space for navbars (top and bottom)
+ div#content {
+   margin-top: 2.7em;
+   margin-bottom: 2.7em;
+ }
+
+ .flash-container {
+   top: 4em;
+ }

data/lib/generators/chaltron/templates/app/assets/stylesheets/home.scss

@@ -2,8 +2,6 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-@import 'chaltron';
-
 #main-carousel {
   img {
     height: 400px;

data/lib/generators/chaltron/templates/app/views/home/_carousel.html.erb

@@ -1,4 +1,4 @@
-<div id='main-carousel' class='carousel slide border-bottom border-primary' data-ride='carousel'>
+<div id='main-carousel' class='carousel slide img-thumbnail' data-ride='carousel'>
 
   <ol class="carousel-indicators">
     <li data-target="#main-carousel" data-slide-to="0" class="active"></li>

data/lib/generators/chaltron/templates/app/views/home/_panel.html.erb

@@ -4,15 +4,20 @@
   link_text ||= 'Learn more'
 %>
 
-<div class='col-md-4'>
-  <div class='card'>
-    <h5 class='card-header text-white bg-primary'>
+<div class='card'>
+  <%= image_tag('700x300.gif', class: 'card-img-top') %>
+  <div class='card-body'>
+    <h5 class='card-title'>
         <%= icon(icon) %>
         <%= title %>
     </h5>
-    <div class='card-body'>
-      <p><%= raw body %> </p>
-      <%= link_to link_text, link, class: 'btn btn-primary' %>
-    </div>
+    <p class='card-text'><%= raw body %> </p>
+    <%= link_to link_text, link, class: 'btn btn-primary' %>
+  </div>
+  <div class='card-footer'>
+    <small class='text-muted'>
+      <%= icon('thumbs-o-up') %>
+      <%= raw footer %>
+    </small>
   </div>
 </div>

data/lib/generators/chaltron/templates/app/views/home/index.html.erb

@@ -1,34 +1,44 @@
-<%= render 'carousel' %>
 <div class='container-fluid'>
   <div class='row'>
     <div class='col-lg-12'>
       <h1 class='pt-4'>
         Welcome to Chaltron! <small> aka Muffaster reloaded</small>
       </h1>
+
+      <div class='card-deck'>
+        <%= render 'panel', title: 'Bootstrap v4',
+            link: 'http://getbootstrap.com', icon: 'check',
+            body: 'Bootstrap rocks! And there are lots of good template ready to ' \
+                  'use, and free. Just as this one ;-)',
+            footer: 'Bootstrap rocks!'
+        %>
+        <%= render 'panel', title: 'Free &amp; Open Source'.html_safe,
+            icon: 'github', link_text: 'Fork me on GitHub',
+            body: "It's all free and open and much is still to do. " \
+                  'So pull request are very welcome',
+            footer: 'Open source rocks!'
+        %>
+        <%= render 'panel', title: 'Easy to use', icon: 'compass',
+            body: "It's so easy to build up and running web applications in a " \
+                  'few seconds. Try by yourself', link_text: 'Have a look',
+            footer: 'Chaltron rocks!'
+        %>
+      </div>
+
     </div>
-    <%= render 'panel', title: 'Bootstrap v4',
-        link: 'http://getbootstrap.com', icon: 'check',
-        body: 'Bootstrap rocks! And there are lots of good template ready to ' \
-              'use, and free. Just as this one ;-)'
-    %>
-    <%= render 'panel', title: 'Free &amp; Open Source'.html_safe,
-        icon: 'github', link_text: 'Fork me on GitHub',
-        body: "It's all free and open and much is still to do. " \
-              'So pull request are very welcome'
-    %>
-    <%= render 'panel', title: 'Easy to use', icon: 'compass',
-        body: "It's so easy to build up and running web applications in a " \
-              'few seconds. Try by yourself', link_text: 'Have a look'
-    %>
   </div>
 
   <hr>
 
   <div class='row'>
-    <div class='col-lg-12'>
-      <h2 class='pt-4'>Main features</h2>
+    <div class='col-md-7'>
+      <%= render 'carousel' %>
     </div>
-    <div class='col-md-6'>
+    <div class='col-md-5'>
+      <h2 class='pt-4'>
+        <%= icon('hand-o-down') %>
+        Main features
+      </h2>
       <p>Chaltron provides:</p>
       <ul class='fa-ul'>
         <li>
@@ -52,10 +62,8 @@
       <p>
         Try
         <strong><%= link_to 'Chaltron', 'https://github.com/vicvega/chaltron' %></strong>,
-        taste <strong>L</strong>ight <strong>S</strong>peed <strong>A</strong>pplication <strong>D</strong>evelopment!</p>
-    </div>
-    <div class='col-md-6'>
-      <%= image_tag('700x300.gif', class: 'img-responsive img-thumbnail border border-primary') %>
+        taste <strong>L</strong>ight <strong>S</strong>peed <strong>A</strong>pplication <strong>D</strong>evelopment!
+      </p>
     </div>
   </div>
 
@@ -63,7 +71,10 @@
 
   <div class='row'%>
     <div class='col-lg-12'>
-      <h2 class='pt-4'>FAQ</h2>
+      <h2 class='pt-4'>
+        <%= icon('question-circle') %>
+        FAQ
+      </h2>
     </div>
   </div>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chaltron
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - vicvega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -394,7 +394,6 @@ files:
 - app/assets/stylesheets/chaltron.scss
 - app/assets/stylesheets/chaltron/layout.scss
 - app/assets/stylesheets/chaltron/logs.scss
-- app/assets/stylesheets/chaltron/mixins.scss
 - app/controllers/chaltron/ldap_controller.rb
 - app/controllers/chaltron/logs_controller.rb
 - app/controllers/chaltron/omniauth_callbacks_controller.rb
@@ -463,6 +462,7 @@ files:
 - lib/generators/chaltron/templates/app/assets/images/slide2.gif
 - lib/generators/chaltron/templates/app/assets/images/slide3.gif
 - lib/generators/chaltron/templates/app/assets/javascripts/home.js.coffee
+- lib/generators/chaltron/templates/app/assets/stylesheets/chaltron_custom.scss
 - lib/generators/chaltron/templates/app/assets/stylesheets/home.scss
 - lib/generators/chaltron/templates/app/controllers/home_controller.rb
 - lib/generators/chaltron/templates/app/models/ability.rb

data/app/assets/stylesheets/chaltron/mixins.scss

@@ -1,30 +0,0 @@
-/**
- * Generic mixins
- */
- @mixin box-shadow($shadow) {
-  -webkit-box-shadow: $shadow;
-  -moz-box-shadow: $shadow;
-  -ms-box-shadow: $shadow;
-  -o-box-shadow: $shadow;
-  box-shadow: $shadow;
-}
-
-@mixin border-radius($radius) {
-  -webkit-border-radius: $radius;
-  -moz-border-radius: $radius;
-  -ms-border-radius: $radius;
-  -o-border-radius: $radius;
-  border-radius: $radius;
-}
-
-@mixin border-radius-left($radius) {
-  @include border-radius($radius 0 0 $radius)
-}
-
-/**
- * Form boxes
- */
-
-@mixin form-box($width){
-  max-width: $width;
-}