tkh_admin_panel 0.9.27 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efab535573e7194cf52653e0a8d75dce40d53918
-  data.tar.gz: 83468897430cef117b8ebedec210ffc87f03864a
+  metadata.gz: d62fcd07cf95c3da9ebe04afd00718368890dec2
+  data.tar.gz: 1759c12830643a05cd36321ad960b45cc93222b5
 SHA512:
-  metadata.gz: f41a18617100e91168bbd9190b4db6c230fa1a86f7b92ce636036001b3329cf377df4ba7018be1cffaaffe7ce9af03b04eb5b0bb50a3f8fd0dc1d7a302903df7
-  data.tar.gz: c8b17b8438cba3f6014aa46303ec35723df3193853d71496e95b21bba97bf1eb3a876ad4dba0c58698ab22ecfb1bcd26d1262276fd9cfae7bfa296cc2a50e4bc
+  metadata.gz: 8e80da4bbd9be5177312ce723089e5628a801d3619c098a53a1176a4584a9261c03770e0a90aa5e65166e369f3b0a99fbee11ecb5840fcb06d7545ddfea86690
+  data.tar.gz: 19dd235d0315f7b40bbf0dbab7dde9340f86d37c2d0780dd5eec8b5516b879990ecac5f8d4b7ced06e6a505cf7131735d7f3205c70acd5629ded7256b36ccd17

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 
 
+## 0.10
+
+* Routes work with normal Rails apps as well as those with the route_translator gem
+* Removed the tkh_authentication dependency
+* Improved styling of admin panel
+* The ckeditor gem for inline HTML editing has been moved from the tkh_content gem to this one.
+
+
 ## 0.9.27
 
 * Fixed deprecation warnings by changing extensions of stylesheets.

data/app/assets/javascripts/ckeditor/config.js.coffee

@@ -0,0 +1,24 @@
+CKEDITOR.editorConfig = (config) ->
+  config.language = 'en'
+  config.uiColor = "#AADC6E"
+  config.width = '750'
+  config.height = '800'
+  config.forcePasteAsPlainText = true
+  config.allowedContent = true
+  # config.extraAllowedContent = true
+  config.htmlEncodeOutput = false;
+  config.entities = false;
+
+  config.toolbar_Pure = [
+    { name: 'styles',      items: [ 'Format' ] },
+    { name: 'basicstyles', items: [ 'Bold','Italic','Strike','-','RemoveFormat' ] },
+    { name: 'paragraph',   items: [ 'BulletedList','NumberedList','-','Outdent','Indent','-','Blockquote','-','JustifyLeft','JustifyCenter','JustifyRight' ] },
+    # { name: 'quoteauthor', items: [ element: 'p', attributes : { 'class' : 'author'} ] }, # tried but it did not work
+    '/',
+    { name: 'clipboard',   items: [ 'Undo','Redo' ] },
+    { name: 'links',       items: [ 'Link','Unlink' ] },
+    { name: 'insert',      items: [ 'Image','Table','HorizontalRule','SpecialChar' ] },
+    { name: 'document',    items: [ 'Source','-','Save' ] },
+    ]
+  config.toolbar = 'Pure'
+  true

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

@@ -56,7 +56,14 @@ input[type="button"], input[type="submit"] {
 
 .navbar-login-info { padding-right: 1.5em; }
 
-#admin-menu-tab { margin-bottom: 3em; }
+.nav li.active a {
+  background-color: $purple;
+  color: #fff;
+  a {
+    color: #fff;
+    font-family: opensanssemibold, $font-family-sans-serif;
+  }
+}
 
 .list-group {
   h3 {
@@ -129,12 +136,10 @@ margin: 0;
 }
 
 .pagination {
-  border-bottom: 1px solid $gray-lighter;
-  border-top: 1px solid $gray-lighter;
   display: block;
   padding: 0.2em;
   text-align: center;
-  margin: 0 0 2.5em;
+  margin: 1.5rem 0;
   a { padding: 0 0.15em; }
   .current { font-style: normal; }
   .previous_page {
@@ -156,10 +161,10 @@ margin: 0;
 
 .draggable {
   list-style-type: none;
-  margin: 2em 0 2em 4em;
+  margin: 2rem 0 2rem 1rem;
   li {
     cursor: move;
-    margin: 0.5em 0;
+    margin: 0.5rem 0;
   }
 }
 
@@ -189,3 +194,17 @@ margin: 0;
 .admin-comment-body {
   font-size: 2.5rem;
 }
+
+.badge {
+  font-family: opensanslight, "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: normal;
+}
+
+
+#admin-menu-tab {
+  margin-bottom: 3em;
+}
+
+.nav-tabs > li > a {
+    border-radius: 12px 12px 0 0;
+  }

data/app/views/layouts/admin.html.erb

@@ -21,8 +21,10 @@
 
     <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container">
+        <div class="navbar-header">
+          <%= link_to Setting.first.try(:site_name), root_path, class: "navbar-brand" %>
+        </div>
         <ul class="nav navbar-nav">
-          <%= content_tag :li, link_to(Setting.first.try(:site_name), root_path) %>
           <%= content_tag :li, link_to( 'blog', blog_path) unless Setting.first.disable_blog? %>
         </ul>
         <%= render 'shared/login_info_for_navbar' %>

data/config/initializers/ckeditor_rails.rb

@@ -0,0 +1,39 @@
+Ckeditor::Rails.configure do |config|
+  # default is nil for all languages, or set as %w[en zh]
+  config.assets_languages = nil
+
+  # default is nil for all plugins,
+  # or set as white list: %w[image link liststyle table tabletools]
+  # or set as black list: config.default_plugins - %w[about a11yhelp]
+  config.assets_plugins = nil
+  # config.assets_plugins = %w[image link liststyle table tabletools]
+
+  # default is nil for all skins, or set as %w[moon]
+  config.assets_skins = nil
+end
+
+###################### from old JS config which was working great
+# CKEDITOR.editorConfig = (config) ->
+#   config.language = tkh_locale
+#   config.uiColor = "#AADC6E"
+#   config.width = '650'
+#   config.height = '450'
+#   config.forcePasteAsPlainText = true
+#   config.allowedContent = true
+#   # config.extraAllowedContent = true
+#   config.htmlEncodeOutput = false;
+#   config.entities = false;
+
+#   config.toolbar_Pure = [
+#     { name: 'styles',      items: [ 'Format' ] },
+#     { name: 'basicstyles', items: [ 'Bold','Italic','Strike','-','RemoveFormat' ] },
+#     { name: 'paragraph',   items: [ 'BulletedList','NumberedList','-','Outdent','Indent','-','Blockquote','-','JustifyLeft','JustifyCenter','JustifyRight' ] },
+#     # { name: 'quoteauthor', items: [ element: 'p', attributes : { 'class' : 'author'} ] }, # tried but it did not work
+#     '/',
+#     { name: 'clipboard',   items: [ 'Undo','Redo' ] },
+#     { name: 'links',       items: [ 'Link','Unlink' ] },
+#     { name: 'insert',      items: [ 'Image','Table','HorizontalRule','SpecialChar' ] },
+#     { name: 'document',    items: [ 'Source','-','Save' ] },
+#     ]
+#   config.toolbar = 'Pure'
+#   true

data/config/routes.rb

@@ -1,5 +1,17 @@
 Rails.application.routes.draw do
-  scope "(:locale)" do
-    resources :settings
+
+  if Gem::Specification::find_all_by_name('route_translator').any?
+
+    localized do
+      resources :settings
+    end
+
+  else # using normal Rails i18n routes
+
+    scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
+      resources :settings
+    end
+
   end
+
 end

data/lib/generators/tkh_admin_panel/create_or_update_migrations/create_or_update_migrations_generator.rb

@@ -1,5 +1,5 @@
 require 'rails/generators/migration'
- 
+
 module TkhAdminPanel
   module Generators
     class CreateOrUpdateMigrationsGenerator < ::Rails::Generators::Base
@@ -14,13 +14,13 @@ module TkhAdminPanel
         end
         @prev_migration_nr.to_s
       end
- 
+
       def copy_migrations
         puts 'creating or updating setting migrations'
         migration_template "create_settings.rb", "db/migrate/create_settings.rb"
         migration_template "add_contact_email_to_settings.rb", "db/migrate/add_contact_email_to_settings.rb"
       end
- 
+
     end
   end
-end
+end

data/lib/tkh_admin_panel.rb

@@ -8,14 +8,15 @@ require 'will_paginate'
 require 'twitter-typeahead-rails'
 require 'simple_form'
 require 'tkh_admin_panel/tkh_admin_panel_action_controller_extension'
-require 'tkh_authentication'
+# require 'tkh_authentication'
 require 'jquery-ui-rails'
+require 'ckeditor_rails'
 
 module TkhAdminPanel
   class Engine < ::Rails::Engine
     # debugging. this is not working. moving directive to host app
     initializer "TkhAdminPanel precompile hook", :group => :all do |app|
-      app.config.assets.precompile += ['admin.js', 'admin.css', 'admin/pages.js', 'admin/illustrations.js', 'admin/menus.js']
+      app.config.assets.precompile += ['admin.js', 'admin.css', 'admin/pages.js', 'admin/illustrations.js', 'admin/menus.js', 'admin/ckeditor/config.js']
     end
 
     # to extend the application_controller in the host app

data/lib/tkh_admin_panel/version.rb

@@ -1,3 +1,3 @@
 module TkhAdminPanel
-  VERSION = "0.9.27"
+  VERSION = "0.10"
 end

data/tkh_admin_panel.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "bootstrap-sass"
   # following these instructions: https://github.com/twbs/bootstrap-sass
   gem.add_dependency 'sass-rails'
-  gem.add_dependency 'autoprefixer-rails' # It is also recommended to use Autoprefixer with Bootstrap to add browser vendor prefixes automatically.
+  gem.add_dependency 'ckeditor_rails'
+  # gem.add_dependency 'autoprefixer-rails' # It is also recommended to use Autoprefixer with Bootstrap to add browser vendor prefixes automatically.
   gem.add_dependency "bootstrap-will_paginate"
   gem.add_dependency "will_paginate"
   # twitter-typeahead-rails is for autocomplete fields in forms
@@ -28,6 +29,6 @@ Gem::Specification.new do |gem|
   # I'll upgrade when I figure out the new API
   gem.add_dependency 'twitter-typeahead-rails', '~> 0.9.3'
   gem.add_dependency "simple_form"
-  gem.add_dependency "tkh_authentication", '~> 0.9'
+  # gem.add_dependency "tkh_authentication", '~> 0.9'
   gem.add_dependency "jquery-ui-rails"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_admin_panel
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: '0.10'
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
+  name: ckeditor_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: tkh_authentication
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +193,7 @@ files:
 - app/assets/javascripts/admin/illustrations.js.coffee
 - app/assets/javascripts/admin/menus.js.coffee
 - app/assets/javascripts/admin/pages.js.coffee
+- app/assets/javascripts/ckeditor/config.js.coffee
 - app/assets/stylesheets/admin.css.scss
 - app/assets/stylesheets/admin/bootstrap_and_overrides.scss
 - app/assets/stylesheets/admin/custom.scss
@@ -220,6 +207,7 @@ files:
 - app/views/settings/edit.html.erb
 - app/views/settings/show.html.erb
 - app/views/shared/_admin_sidebar.html.erb
+- config/initializers/ckeditor_rails.rb
 - config/routes.rb
 - lib/generators/tkh_admin_panel/copy_files/copy_files_generator.rb
 - lib/generators/tkh_admin_panel/copy_files/templates/_admin_sidebar.html.erb