tkh_admin_panel 0.2.7 → 0.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.md CHANGED
@@ -2,6 +2,13 @@
2
2
 
3
3
 
4
4
 
5
+ ## 0.2.8
6
+
7
+ * Removed tkh_inline_editor dependency
8
+ * Added pages.js to the admin js manifest.
9
+ * Added ckeditor js file to the admin js manifest. CKEditor is now the official html inline editor of the tkh_cms suite. Until next change.
10
+
11
+
5
12
  ## 0.2.7
6
13
 
7
14
  * Removed language switcher partial. It's been moved to the tkh_menus gem
@@ -8,5 +8,6 @@
8
8
  //= require jquery-ui
9
9
  //= require jquery_ujs
10
10
  //= require bootstrap
11
- //= require bootstrap-wysihtml5-all
11
+ //= require ckeditor-jquery
12
12
  //= require custom
13
+ //= require pages
@@ -2,6 +2,4 @@ jQuery ->
2
2
  $("a[rel=popover]").popover()
3
3
  $(".tooltip").tooltip()
4
4
  $("a[rel=tooltip]").tooltip()
5
- # $('#editable').wysihtml5()
6
5
  $('.typeahead').typeahead()
7
- $('.whatever-man').tooltip()
@@ -1,5 +1,4 @@
1
1
  @import 'bootstrap_and_overrides.css.scss';
2
- @import 'bootstrap-wysihtml5';
3
2
 
4
3
  footer {
5
4
  margin: 2em 1em .5em;
@@ -16,6 +16,7 @@
16
16
  <link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
17
17
  <link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
18
18
  <%= csrf_meta_tag %>
19
+ <script type="text/javascript">var tkh_locale = '<%= I18n.locale.to_s %>';</script>
19
20
  </head>
20
21
 
21
22
  <body>
@@ -1,3 +1,3 @@
1
1
  module TkhAdminPanel
2
- VERSION = "0.2.7"
2
+ VERSION = "0.2.8"
3
3
  end
@@ -3,7 +3,7 @@ require 'bootstrap-sass'
3
3
  require 'simple_form'
4
4
  require 'tkh_admin_panel/tkh_admin_panel_action_controller_extension'
5
5
  # require 'bootstrap-wysihtml5-rails'
6
- require 'tkh_inline_editor'
6
+ # require 'tkh_inline_editor'
7
7
 
8
8
  module TkhAdminPanel
9
9
  class Engine < ::Rails::Engine
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
16
16
  # This gem does not support p tags until wysihtml5 0.4 is released and linked to gem below
17
17
  # gem.add_dependency 'bootstrap-wysihtml5-rails'
18
18
  # try using my own tkh_inline_editor instead
19
- gem.add_dependency 'tkh_inline_editor'
19
+ # gem.add_dependency 'tkh_inline_editor'
20
20
 
21
21
  gem.files = `git ls-files`.split($\)
22
22
  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.2.7
4
+ version: 0.2.8
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: 2013-01-17 00:00:00.000000000 Z
12
+ date: 2013-01-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
@@ -75,22 +75,6 @@ dependencies:
75
75
  - - ! '>='
76
76
  - !ruby/object:Gem::Version
77
77
  version: '0'
78
- - !ruby/object:Gem::Dependency
79
- name: tkh_inline_editor
80
- requirement: !ruby/object:Gem::Requirement
81
- none: false
82
- requirements:
83
- - - ! '>='
84
- - !ruby/object:Gem::Version
85
- version: '0'
86
- type: :runtime
87
- prerelease: false
88
- version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
- requirements:
91
- - - ! '>='
92
- - !ruby/object:Gem::Version
93
- version: '0'
94
78
  description: Admin panel layout engine
95
79
  email:
96
80
  - swami@TenThousandHours.eu