tkh_admin_panel 0.2 → 0.2.1

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 
 
+## 0.2.1
+
+* Added inline HTML editor
+
+
 ## 0.2
 
 * Added german locale and translations. Upgrader need to run the update task and run migrations

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tkh_admin_panel.gemspec
 gemspec
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+# gem 'tkh_inline_editor', :path => '/Users/swamiatma/Documents/Dropbox/coding/ruby/gems/tkh_inline_editor'

data/app/assets/javascripts/admin.js

@@ -7,4 +7,5 @@
 //= require jquery
 //= require jquery_ujs
 //= require bootstrap
+//= require bootstrap-wysihtml5-all
 //= require custom

data/app/assets/javascripts/custom.js.coffee

@@ -2,3 +2,4 @@ jQuery ->
   $("a[rel=popover]").popover()
   $(".tooltip").tooltip()
   $("a[rel=tooltip]").tooltip()
+	$('#editable').wysihtml5()

data/app/assets/stylesheets/admin.css.scss

@@ -1,4 +1,5 @@
 @import 'bootstrap_and_overrides.css.scss';
+@import 'bootstrap-wysihtml5';
 
 footer {
 	margin: 2em 1em .5em;

data/lib/generators/tkh_admin_panel/create_or_update_locales/templates/de.yml

@@ -1,3 +1,3 @@
 de:
-  admin_panel: 'Administrator-Schaltfläche'
-  admin_panel_for: "Administrator-Schaltfläche für"
+  admin_panel: 'Administratorschaltfläche'
+  admin_panel_for: "Administratorschaltfläche für"

data/lib/tkh_admin_panel.rb

@@ -2,6 +2,8 @@ require "tkh_admin_panel/version"
 require 'bootstrap-sass'
 require 'simple_form'
 require 'tkh_admin_panel/tkh_admin_panel_action_controller_extension'
+# require 'bootstrap-wysihtml5-rails'
+require 'tkh_inline_editor'
 
 module TkhAdminPanel
   class Engine < ::Rails::Engine

data/lib/tkh_admin_panel/version.rb

@@ -1,3 +1,3 @@
 module TkhAdminPanel
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

data/tkh_admin_panel.gemspec

@@ -11,6 +11,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency "railties", "~> 3.2"
   gem.add_dependency "bootstrap-sass", '~> 2.0'
   gem.add_dependency "simple_form", '~> 2.0'
+  # This gem does not support p tags until wysihtml5 0.4 is released and linked to gem below
+  # gem.add_dependency 'bootstrap-wysihtml5-rails'
+  # try using my own tkh_inline_editor instead
+  gem.add_dependency 'tkh_inline_editor'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_admin_panel
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: tkh_inline_editor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Admin panel layout engine
 email:
 - swami@TenThousandHours.eu