tkh_admin_panel 0.0.2 → 0.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. data/CHANGELOG.md +7 -0
  2. data/README.md +1 -1
  3. data/app/assets/javascripts/custom.js.coffee +3 -3
  4. data/app/assets/stylesheets/admin.css.scss +4 -3
  5. data/app/views/layouts/admin.html.erb +18 -13
  6. data/lib/tkh_admin_panel.rb +1 -0
  7. data/lib/tkh_admin_panel/version.rb +1 -1
  8. data/tkh_admin_panel.gemspec +1 -0
  9. metadata +18 -2
data/CHANGELOG.md CHANGED
@@ -1,6 +1,13 @@
1
1
  # TKH Admin Panel
2
2
 
3
3
 
4
+ ## 0.0.3
5
+
6
+ * Enabled popover and tooltip javascript functionality
7
+ * Added simple_form dependency to handle all admin forms
8
+ * Added a couple sections such as language switcher, footer, sidebar to the layout
9
+
10
+
4
11
  ## 0.0.2
5
12
 
6
13
  * It is not anymore necessary to have the bootstrap-sass gem in the host application Gemfile
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # TKH Admin Panel
2
2
 
3
- This is a Rails engine with an admin panel layout, assets and basic functionality.
3
+ This is a Rails engine with an admin panel layout, assets and basic functionality. Powered by Twitter Bootstrap + SASS for a modern responsive design.
4
4
 
5
5
  Primarily developed for Ten Thousand Hours but we are happy to share if anybody finds it useful.
6
6
 
data/app/assets/javascripts/custom.js.coffee CHANGED
@@ -1,4 +1,4 @@
1
1
  jQuery ->
2
- # $("a[rel=popover]").popover()
3
- # $(".tooltip").tooltip()
4
- # $("a[rel=tooltip]").tooltip()
2
+ $("a[rel=popover]").popover()
3
+ $(".tooltip").tooltip()
4
+ $("a[rel=tooltip]").tooltip()
data/app/assets/stylesheets/admin.css.scss CHANGED
@@ -33,9 +33,10 @@
33
33
  //
34
34
  //a { text-decoration: underline; }
35
35
  //
36
- //footer {
37
- // text-align: center;
38
- //}
36
+ footer {
37
+ margin: 2em 1em .5em;
38
+ text-align: center;
39
+ }
39
40
  //
40
41
  //.navbar { margin-bottom: 0; }
41
42
  //
data/app/views/layouts/admin.html.erb CHANGED
@@ -21,31 +21,36 @@
21
21
  <body>
22
22
 
23
23
  <div class="container-fluid">
24
- <div class="row-fluid">
25
-
26
- <div id="main-content" class="span12">
27
- <p>
28
- <%= I18n.locale == :en ? link_to('switch to Spanish', locale: :es) : link_to('switch to English', locale: :en) %>
29
- </p>
24
+ <div class="row-fluid">
25
+ <div class="span12">
26
+ <p><b><%= I18n.locale == :en ? link_to('switch to Spanish', locale: :es) : link_to('switch to English', locale: :en) %></b></p>
30
27
  <h1>Admin Panel<%= " for #{SETTINGS['site_name']}" if SETTINGS['site_name'] %></h1>
28
+
31
29
  <% flash.each do |name, msg| %>
32
30
  <div class="alert alert-<%= name == :notice ? "success" : "error" %>">
33
31
  <a class="close" data-dismiss="alert">×</a>
34
32
  <%= msg %>
35
33
  </div>
36
34
  <% end %>
37
-
35
+ </div>
36
+ </div>
37
+
38
+ <div class="row-fluid">
39
+ <div id="main-content" class="span9">
38
40
  <%= yield %>
39
41
  </div>
40
-
42
+ <div id="sidebar" class="span3">
43
+ <%= yield :admin_sidebar %>
44
+ </div>
41
45
  </div><!--/row-->
42
46
  </div> <!-- /container -->
43
47
 
44
- <div id="footer">
45
- <div id="ohlala-name">
46
- <p><%= SETTINGS['web_firm_name'] || "Ten Thousand Hours" %></p>
47
- </div>
48
- <p><%= SETTINGS['web_firm_short_url'] || "swami@TenThousandHours.eu" %></p>
48
+ <div class="row-fluid">
49
+ <footer class="span12">
50
+ <p><b><%= SETTINGS['web_shop_name'] || "Ten Thousand Hours" %></b><br />
51
+ <%= SETTINGS['web_shop_short_url'] ? link_to(SETTINGS['web_shop_short_url'], SETTINGS['web_shop_url']) : link_to("http://TenThousandHours.eu", 'http://TenThousandHours.eu') %><br />
52
+ <%= SETTINGS['web_shop_email'] ? link_to(SETTINGS['web_shop_email'], 'mailto:' + SETTINGS['web_shop_email']) : link_to("swami@TenThousandHours.eu", 'mailto:http://TenThousandHours.eu') %><br /></p>
53
+ </footer>
49
54
  </div>
50
55
 
51
56
  <!-- Le javascript
data/lib/tkh_admin_panel.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require "tkh_admin_panel/version"
2
2
  require 'bootstrap-sass'
3
+ require 'simple_form'
3
4
 
4
5
  module TkhAdminPanel
5
6
  class Engine < ::Rails::Engine
data/lib/tkh_admin_panel/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module TkhAdminPanel
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
data/tkh_admin_panel.gemspec CHANGED
@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
10
10
 
11
11
  gem.add_dependency "railties", "~> 3.2"
12
12
  gem.add_dependency "bootstrap-sass", '~> 2.0'
13
+ gem.add_dependency "simple_form", '~> 2.0'
13
14
 
14
15
  gem.files = `git ls-files`.split($\)
15
16
  gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tkh_admin_panel
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-25 00:00:00.000000000 Z
12
+ date: 2012-07-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
@@ -43,6 +43,22 @@ dependencies:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
45
  version: '2.0'
46
+ - !ruby/object:Gem::Dependency
47
+ name: simple_form
48
+ requirement: !ruby/object:Gem::Requirement
49
+ none: false
50
+ requirements:
51
+ - - ~>
52
+ - !ruby/object:Gem::Version
53
+ version: '2.0'
54
+ type: :runtime
55
+ prerelease: false
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: '2.0'
46
62
  description: Admin panel layout engine
47
63
  email:
48
64
  - swami@TenThousandHours.eu