tkh_admin_panel 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53b21176ea3320a0a7b2448832a6e690053aa9e1
-  data.tar.gz: 157fbe38328114223bcc5dc6bfa25a2b60ad799f
+  metadata.gz: 166b9ae19084886b2c4bca3d5cf2087e447377b1
+  data.tar.gz: 61201597871efe82551b074e1cfa33a1e4c57743
 SHA512:
-  metadata.gz: 2c8cd716439dc82f17545be201f385454bef206c1cd1d3944ffc67f2366903b5e043df67bda3a2b9cacc7ba01e828f8657d7a53f76b06e22fd5cdd3978d37551
-  data.tar.gz: a1bbe374bdd0ff04f9ee6f81a107db995aff0502f3ca664a6616344ac6c8629bf6ccf595dbcc232cee56f3d98bfcdb4ec404a2a2a2f5a9667bcb403e398c2b04
+  metadata.gz: aae6a49650212f63759d0d1c1f594da5a776f8bc83d97393ce3e86f7826b7bd3e99dd6984741945f12c4fe58d0083d544901b323b816bfa249cd0699d49dfa80
+  data.tar.gz: 4724eed1e6f2a8f6a56dd996e77909ce5356892885e3b372a1193ecdbd820d3210772a3925e547d6a6066e43ff550d02577b229c527424cc249ef5a84f4ee161

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 
 
+## 0.9.10
+
+* Fixed up and styled paginators
+* Added pagination locales for English and French
+* Fixed up CSS for form errors
+
+
 ## 0.9.9
 
 * Added js files and functionality for menus associations autocomplete

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

@@ -107,6 +107,8 @@ margin: 0;
 }
 
 .pagination {
+  border-bottom: 1px solid $gray-lighter;
+  border-top: 1px solid $gray-lighter;
   display: block;
   padding: 0.2em;
   text-align: center;
@@ -149,3 +151,13 @@ margin: 0;
   margin-bottom: 5em;
   text-align: center;
 }
+
+// boostrap 3 and simple_form don't play too well together yet
+.alert-error {
+  @extend .alert-danger;
+}
+.help-inline {
+  @extend .label;
+  @extend .label-danger;
+  margin: 1em;
+}

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

@@ -1,11 +1,11 @@
 en:
   admin_panel: 'Admin Panel'
   admin_panel_for: "Admin Panel for "
-  
+
   activerecord:
     models:
       settings: 'site settings'
-    
+
     attributes:
       setting:
         site_name: 'site name'
@@ -17,7 +17,7 @@ en:
         enable_comments_in_blog: 'enable comments in blog'
         contact_email: 'contact email'
         company_name: 'company name'
-        
+
   settings:
     blog_enabled: 'blog enabled?'
     hint:
@@ -26,7 +26,40 @@ en:
       site_tagline: 'a small descriptive sentence'
       disable_blog: 'should be checked if you do NOT want a blog'
       blog_tagline:  'a small descriptive sentence'
-    
+
     update:
       notice: 'Site Settings were successfully updated.'
       warning: 'There was a problem saving your changes.'
+
+  will_paginate:
+    previous_label: "← Previous"
+    next_label: "Next →"
+    page_gap: "…"
+
+    page_entries_info:
+      single_page:
+        zero: "No %{model} found"
+        one: "Displaying 1 %{model}"
+        other: "Displaying all %{count} %{model}"
+      single_page_html:
+        zero: "No %{model} found"
+        one: "Displaying <b>1</b> %{model}"
+        other: "Displaying <b>all&nbsp;%{count}</b> %{model}"
+
+      multi_page: "Displaying %{model} %{from} - %{to} of %{count} in total"
+      multi_page_html: "Displaying %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b> in total"
+
+    # models:
+    # entry:
+    # zero: entries
+    # one: entry
+    # few: entries
+    # other: entries
+
+    # line_item:
+    # page_entries_info:
+    # single_page:
+    # zero: "Your shopping cart is empty"
+    # one: "Displaying one item in your cart"
+    # other: "Displaying all %{count} items"
+    # multi_page: "Displaying items %{from} - %{to} of %{count} in total"

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

@@ -1,11 +1,11 @@
 fr:
   admin_panel: "Panneau d'administration"
   admin_panel_for: "Panneau d'administration pour "
-  
+
   activerecord:
     models:
       settings: 'options du site'
-      
+
     attributes:
       setting:
         site_name: 'nom du site'
@@ -30,3 +30,36 @@ fr:
     update:
       notice: 'Succes: les options du site ont été mises à jour.'
       warning: "Il y'a eu un problem et vos modifications n'ont pas été sauvegardées."
+
+  will_paginate:
+    previous_label: "← avant"
+    next_label: "prochain →"
+    page_gap: "…"
+
+    page_entries_info:
+      single_page:
+        zero: "pas de %{model}"
+        one: "montrer 1 %{model}"
+        other: "montrer les %{count} %{model}"
+      single_page_html:
+        zero: "pas de %{model}"
+        one: "montrer <b>1</b> %{model}"
+        other: "montrer <b>les&nbsp;%{count}</b> %{model}"
+
+      multi_page: "montrer %{model} %{from} - %{to} of %{count} au total"
+      multi_page_html: "montrer %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b> au total"
+
+    # models:
+    # entry:
+    # zero: entries
+    # one: entry
+    # few: entries
+    # other: entries
+
+    # line_item:
+    # page_entries_info:
+    # single_page:
+    # zero: "Your shopping cart is empty"
+    # one: "Displaying one item in your cart"
+    # other: "Displaying all %{count} items"
+    # multi_page: "Displaying items %{from} - %{to} of %{count} in total"

data/lib/tkh_admin_panel.rb

@@ -2,7 +2,7 @@ require 'tkh_admin_panel/version'
 require 'globalize'
 require 'bootstrap-sass'
 require 'twitter-typeahead-rails'
-require 'bootstrap-will_paginate'
+require 'will_paginate'
 require 'simple_form'
 require 'tkh_admin_panel/tkh_admin_panel_action_controller_extension'
 require 'tkh_authentication'

data/lib/tkh_admin_panel/version.rb

@@ -1,3 +1,3 @@
 module TkhAdminPanel
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

data/tkh_admin_panel.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "railties", "> 4.0"
   gem.add_dependency "globalize"
   gem.add_dependency "bootstrap-sass"
-  gem.add_dependency "bootstrap-will_paginate"
+  gem.add_dependency "will_paginate"
   # twitter-typeahead-rails is for autocomplete fields in forms
   # versions > 0.10 must have fewer bugs but is not backward compatible
   # I'll upgrade when I figure out the new API

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_admin_panel
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-will_paginate
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='