chaltron 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b0fe3df9d17f0db477b913f4ed19300753254565
4
- data.tar.gz: d54a1cbe476d113c5d27dd60fe9aa15aab52f7a3
3
+ metadata.gz: fe253c545a570d0c0ac2fd32428e8c3dca008533
4
+ data.tar.gz: 87028397cfd5cdc255ffb56caf9366e29fa25544
5
5
  SHA512:
6
- metadata.gz: ebf40cf18b315eb791b0bfd705c00324965b7a687535901654ee4074a07b1d379b751ed241823b94569f2188bb521011f94cfb2a9b1816a593647fef6af2aa8c
7
- data.tar.gz: ba10dd2f156c3d6b94b6d84ea70f4021acdad503c7cb9e15b64e95c3695270992b764d875c612ba7e0e5de495bc616eaa2f57a03f9542a11ce75dd0455e5889a
6
+ metadata.gz: d9a793bf210317cdb1f22296f01d09198b93ca2e3e2f3e758ea1c2f60d750409bf35467541f325c580691152526d283db11fd64f34369800e289df9e2b8d0bc3
7
+ data.tar.gz: 4a86568c2542143b584b4f60cd0ca4118f323d77bfd416846e58bc0c03ad499586181025f00dcd3785a6aac72a3a324642fe341d11e68ef35ac7a49661cf1af8
@@ -12,3 +12,8 @@
12
12
  //= require nprogress-ajax
13
13
 
14
14
  //= require_tree ./chaltron
15
+
16
+
17
+ NProgress.configure({
18
+ showSpinner: false,
19
+ });
@@ -40,7 +40,7 @@ class NavbarBuilder
40
40
  render_icon_a: (item) ->
41
41
  el = jQuery(item)
42
42
  if el.attr('icon')
43
- el.html("<i class=\"fa fa-fw fa-#{el.attr('icon')}\"></i>&nbsp;#{el.text()}")
43
+ el.html("<i class=\"fas fa-#{el.attr('icon')}\"></i>&nbsp;#{el.text()}")
44
44
 
45
45
  $(document).on 'turbolinks:load', ->
46
46
  navbar = new NavbarBuilder
@@ -24,11 +24,3 @@
24
24
  margin-top: 100px;
25
25
  max-width: 650px;
26
26
  }
27
-
28
- #nprogress .spinner {
29
- display: block;
30
- position: fixed;
31
- z-index: 1031;
32
- top: 12px;
33
- right: 5px;
34
- }
@@ -25,11 +25,11 @@ module ChaltronHelper
25
25
 
26
26
  def back_link(opts = {})
27
27
  klass = opts[:class] || 'btn btn-primary'
28
- text = opts[:text] || t('chaltron.common.back')
29
- ic = opts[:icon] || 'arrow-left'
28
+ text = opts[:text] || t('chaltron.common.back')
29
+ ic = opts[:icon] || 'arrow-left '
30
30
 
31
31
  link_to :back, class: klass do
32
- icon(ic, text)
32
+ icon(:fas, ic, text)
33
33
  end
34
34
  end
35
35
 
@@ -14,7 +14,7 @@
14
14
  </div>
15
15
  <hr>
16
16
  <%= link_to users_path, class: 'btn btn-primary' do %>
17
- <%= icon 'arrow-left', t('chaltron.common.back') %>
17
+ <%= icon :fas, 'arrow-left', t('chaltron.common.back') %>
18
18
  <% end %>
19
19
  </div>
20
20
 
@@ -24,7 +24,7 @@
24
24
  <ul class='list-group list-group-flush'>
25
25
  <% @created.each do |u| %>
26
26
  <%= content_tag :li, class: 'list-group-item list-group-item-success' do %>
27
- <%= icon :check, u.display_name %>
27
+ <%= icon :fas, :check, u.display_name %>
28
28
  <% end %>
29
29
  <% end %>
30
30
  </ul>
@@ -14,7 +14,7 @@
14
14
  <div class='col-sm-10'>
15
15
  <%= submit_tag t('.submit_text'), class: 'btn btn-primary' %>
16
16
  <%= link_to users_path, class: 'btn btn-link pull-right' do %>
17
- <%= icon :times, t('chaltron.common.cancel') %>
17
+ <%= icon :fas, :times, t('chaltron.common.cancel') %>
18
18
  <% end %>
19
19
  </div>
20
20
  </div>
@@ -15,6 +15,6 @@
15
15
 
16
16
  <fieldset class='mt-4'>
17
17
  <%= link_to nil, class: 'pull-right' do %>
18
- <strong><%= icon :remove, t('chaltron.common.clear_filter') %></strong>
18
+ <strong><%= icon :far, :remove, t('chaltron.common.clear_filter') %></strong>
19
19
  <% end %>
20
20
  </fieldset>
@@ -9,7 +9,7 @@
9
9
  <div class='dropdown pull-right'>
10
10
  <%= content_tag :button, type: 'button', class: 'btn btn-primary dropdown-toggle',
11
11
  data: {toggle: 'dropdown'}, aria: {expanded: false, haspopup: true}, id: 'new_user_button' do %>
12
- <%= icon :plus, t('.new_user') %>
12
+ <%= icon :fas, :plus, t('.new_user') %>
13
13
  <% end %>
14
14
 
15
15
  <%= content_tag :div, class: 'dropdown-menu', aria: {labelledby: 'new_user_button'} do %>
@@ -19,7 +19,7 @@
19
19
  </div>
20
20
  <% else %>
21
21
  <%= link_to new_user_path, class: 'btn btn-primary pull-right' do %>
22
- <%= icon :plus, t('.new_local_user') %>
22
+ <%= icon :fas, :plus, t('.new_local_user') %>
23
23
  <% end %>
24
24
  <% end %>
25
25
 
@@ -20,7 +20,7 @@
20
20
  <div class='col-sm-10'>
21
21
  <%= f.submit t('.submit'), class: 'btn btn-primary' %>
22
22
  <%= link_to self_show_users_path, class: 'btn btn-link pull-right' do %>
23
- <%= icon :times, t('chaltron.common.cancel') %>
23
+ <%= icon :far, :times, t('chaltron.common.cancel') %>
24
24
  <% end %>
25
25
  </div>
26
26
  </div>
@@ -48,7 +48,7 @@
48
48
  </div>
49
49
 
50
50
  <%= link_to self_edit_users_path, class: 'btn btn-primary mt-4' do %>
51
- <%= icon 'edit', t('.edit') %>
51
+ <%= icon :far, :edit, t('.edit') %>
52
52
  <% end %>
53
53
 
54
54
  </div>
@@ -60,17 +60,17 @@
60
60
 
61
61
  <hr>
62
62
  <%= link_to users_path, class: 'btn btn-primary' do %>
63
- <%= icon 'arrow-left', t('chaltron.common.back') %>
63
+ <%= icon :fas, 'arrow-left', t('chaltron.common.back') %>
64
64
  <% end %>
65
65
 
66
- <div class='pull-right'>
66
+ <div class='float-right'>
67
67
  <%= link_to edit_user_path(@user), class: 'btn btn-primary' do %>
68
- <%= icon :edit, t('.edit') %>
68
+ <%= icon :fas, :edit, t('.edit') %>
69
69
  <% end %>
70
70
  <%= link_to @user, method: :delete, class: 'btn btn-danger',
71
71
  disabled: current_user == @user,
72
72
  data: { confirm: t('.destroy_confirm', user: @user.username) } do %>
73
- <%= icon :trash, t('.destroy') %>
73
+ <%= icon :fas, :trash, t('.destroy') %>
74
74
  <% end %>
75
75
  </div>
76
76
  </div>
@@ -16,10 +16,10 @@ SimpleNavigation::Configuration.run do |navigation|
16
16
  link_html: { icon: 'user' },
17
17
  highlights_on: /\/self_(show|edit|update)/
18
18
  user.item :logout, 'Logout', destroy_user_session_path, method: :delete,
19
- link_html: { icon: 'sign-out' }
19
+ link_html: { icon: 'sign-out-alt' }
20
20
  end
21
21
  else
22
- primary.item :login, 'Login', new_user_session_path, link_html: { icon: 'sign-in' }
22
+ primary.item :login, 'Login', new_user_session_path, link_html: { icon: 'sign-in-alt' }
23
23
  end
24
24
  end
25
25
  end
@@ -1,3 +1,3 @@
1
1
  module Chaltron
2
- VERSION = '1.0.1'
2
+ VERSION = '1.0.2'
3
3
  end
@@ -6,23 +6,68 @@
6
6
  </h1>
7
7
 
8
8
  <div class='card-deck'>
9
- <%= render 'panel', title: 'Bootstrap v4',
10
- link: 'http://getbootstrap.com', icon: 'check',
11
- body: 'Bootstrap rocks! And there are lots of good template ready to ' \
12
- 'use, and free. Just as this one ;-)',
13
- footer: 'Bootstrap rocks!'
14
- %>
15
- <%= render 'panel', title: 'Free &amp; Open Source'.html_safe,
16
- icon: 'github', link_text: 'Fork me on GitHub',
17
- body: "It's all free and open and much is still to do. " \
18
- 'So pull request are very welcome',
19
- footer: 'Open source rocks!'
20
- %>
21
- <%= render 'panel', title: 'Easy to use', icon: 'compass',
22
- body: "It's so easy to build up and running web applications in a " \
23
- 'few seconds. Try by yourself', link_text: 'Have a look',
24
- footer: 'Chaltron rocks!'
25
- %>
9
+ <div class='card'>
10
+ <%= image_tag('700x300.gif', class: 'card-img-top') %>
11
+ <div class='card-body'>
12
+ <h5 class='card-title'>
13
+ <%= icon(:fas, :check) %>
14
+ Bootstrap v4
15
+ </h5>
16
+ <p class='card-text'>
17
+ Bootstrap rocks! And there are lots of good template ready to use, and free.
18
+ Just as this one ;-)
19
+ </p>
20
+ <%= link_to 'Learn more', 'http://getbootstrap.com', class: 'btn btn-primary' %>
21
+ </div>
22
+ <div class='card-footer'>
23
+ <small class='text-muted'>
24
+ <%= icon(:far, 'thumbs-o-up') %>
25
+ Bootstrap rocks!
26
+ </small>
27
+ </div>
28
+ </div>
29
+
30
+ <div class='card'>
31
+ <%= image_tag('700x300.gif', class: 'card-img-top') %>
32
+ <div class='card-body'>
33
+ <h5 class='card-title'>
34
+ <%= icon(:fab, :github) %>
35
+ Free &amp; Open Source
36
+ </h5>
37
+ <p class='card-text'>
38
+ It's all free and open and much is still to do.
39
+ So pull request are very welcome
40
+ </p>
41
+ <%= link_to 'Fork me on GitHub', 'https://github.com/vicvega/chaltron', class: 'btn btn-primary' %>
42
+ </div>
43
+ <div class='card-footer'>
44
+ <small class='text-muted'>
45
+ <%= icon(:far, 'thumbs-o-up') %>
46
+ Open source rocks!
47
+ </small>
48
+ </div>
49
+ </div>
50
+
51
+ <div class='card'>
52
+ <%= image_tag('700x300.gif', class: 'card-img-top') %>
53
+ <div class='card-body'>
54
+ <h5 class='card-title'>
55
+ <%= icon(:fas, :compass) %>
56
+ Easy to use
57
+ </h5>
58
+ <p class='card-text'>
59
+ It's so easy to build up and running web applications in a few seconds.
60
+ Try by yourself
61
+ </p>
62
+ <%= link_to 'Have a look', 'https://github.com/vicvega/chaltron', class: 'btn btn-primary' %>
63
+ </div>
64
+ <div class='card-footer'>
65
+ <small class='text-muted'>
66
+ <%= icon(:far, 'thumbs-o-up') %>
67
+ Chaltron rocks!
68
+ </small>
69
+ </div>
70
+ </div>
26
71
  </div>
27
72
 
28
73
  </div>
@@ -36,24 +81,24 @@
36
81
  </div>
37
82
  <div class='col-md-5'>
38
83
  <h2 class='pt-4'>
39
- <%= icon('hand-o-down') %>
84
+ <%= icon(:far, 'hand-point-down') %>
40
85
  Main features
41
86
  </h2>
42
87
  <p>Chaltron provides:</p>
43
88
  <ul class='fa-ul'>
44
89
  <li>
45
- <%= icon('check-square', '', class: 'fa-li') %>
90
+ <%= icon(:far, 'check-square', '', class: 'fa-li') %>
46
91
  Compatibility with
47
92
  <strong><%= link_to 'Bootstrap v4', 'http://getbootstrap.com' %></strong> and
48
- <strong><%= link_to 'Font Awesome v4', 'http://fortawesome.github.io/Font-Awesome/' %></strong>
93
+ <strong><%= link_to 'Font Awesome v5', 'https://fontawesome.com' %></strong>
49
94
  </li>
50
95
  <li>
51
- <%= icon('check-square', '', class: 'fa-li') %>
96
+ <%= icon(:far, 'check-square', '', class: 'fa-li') %>
52
97
  Authentication (local and LDAP users) and authorization with
53
98
  <strong><%= link_to 'devise', 'https://github.com/plataformatec/devise/' %></strong>
54
99
  </li>
55
100
  <li>
56
- <%= icon('check-square', '', class: 'fa-li') %>
101
+ <%= icon(:far, 'check-square', '', class: 'fa-li') %>
57
102
  <strong><%= link_to 'Datatables', 'https://datatables.net/' %></strong>
58
103
  integration
59
104
  </li>
@@ -72,7 +117,7 @@
72
117
  <div class='row'%>
73
118
  <div class='col-lg-12'>
74
119
  <h2 class='pt-4'>
75
- <%= icon('question-circle') %>
120
+ <%= icon(:far, 'question-circle') %>
76
121
  FAQ
77
122
  </h2>
78
123
  </div>
@@ -1,6 +1,6 @@
1
1
  <nav class='navbar fixed-bottom navbar-dark bg-dark py-0'>
2
2
  <%= content_tag :div, class: 'navbar-text' do %>
3
- <%= icon('github') %>
3
+ <%= icon(:fab, :github) %>
4
4
  Created with
5
5
  <%= link_to 'chaltron', 'https://github.com/vicvega/chaltron', class: 'navbar-link' %>
6
6
  <% end %>
@@ -54,14 +54,13 @@ SimpleNavigation::Configuration.run do |navigation|
54
54
  # when the item should be highlighted, you can set a regexp which is matched
55
55
  # against the current URI. You may also use a proc, or the symbol <tt>:subpath</tt>.
56
56
  #
57
-
58
57
  primary.item :news, 'Link 1', home_test1_path, link_html: { icon: 'bullhorn' }
59
- primary.item :concerts, 'Link 2', home_test2_path, link_html: { icon: 'line-chart' }
58
+ primary.item :concerts, 'Link 2', home_test2_path, link_html: { icon: 'chart-line' }
60
59
  primary.item :video, 'Link 3', home_test3_path, link_html: { icon: 'book' }
61
- primary.item :info, 'Submenu', '#', link_html: { icon: 'hand-o-down' } do |info_nav|
60
+ primary.item :info, 'Submenu', '#', link_html: { icon: 'hand-point-down' } do |info_nav|
62
61
  info_nav.item :main_info_page, 'Link 4', home_test4_path, link_html: { icon: 'paw' }
63
62
  info_nav.item :about_info_page, 'Link 5', home_test5_path, link_html: { icon: 'headphones' }
64
- info_nav.item :contact_info_page, 'Link 6', home_test6_path, link_html: { icon: 'soccer-ball-o' }
63
+ info_nav.item :contact_info_page, 'Link 6', home_test6_path, link_html: { icon: 'futbol' }
65
64
  end
66
65
  primary.item :user, 'Link7', home_test7_path, link_html: { icon: 'user' }
67
66
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chaltron
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - vicvega
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-02-01 00:00:00.000000000 Z
11
+ date: 2018-02-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -468,7 +468,6 @@ files:
468
468
  - lib/generators/chaltron/templates/app/models/ability.rb
469
469
  - lib/generators/chaltron/templates/app/views/home/_carousel.html.erb
470
470
  - lib/generators/chaltron/templates/app/views/home/_faq.html.erb
471
- - lib/generators/chaltron/templates/app/views/home/_panel.html.erb
472
471
  - lib/generators/chaltron/templates/app/views/home/index.html.erb
473
472
  - lib/generators/chaltron/templates/app/views/home/test.html.erb
474
473
  - lib/generators/chaltron/templates/app/views/layouts/_flash.html.erb
@@ -1,23 +0,0 @@
1
- <%
2
- body ||= 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Itaque, optio corporis quae nulla aspernatur in alias at numquam rerum ea excepturi expedita tenetur assumenda voluptatibus eveniet incidunt dicta nostrum quod?'
3
- link ||= 'https://github.com/vicvega/chaltron'
4
- link_text ||= 'Learn more'
5
- %>
6
-
7
- <div class='card'>
8
- <%= image_tag('700x300.gif', class: 'card-img-top') %>
9
- <div class='card-body'>
10
- <h5 class='card-title'>
11
- <%= icon(icon) %>
12
- <%= title %>
13
- </h5>
14
- <p class='card-text'><%= raw body %> </p>
15
- <%= link_to link_text, link, class: 'btn btn-primary' %>
16
- </div>
17
- <div class='card-footer'>
18
- <small class='text-muted'>
19
- <%= icon('thumbs-o-up') %>
20
- <%= raw footer %>
21
- </small>
22
- </div>
23
- </div>