admin_interface 1.3.1 → 1.4.1

data/admin_interface.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name = "admin_interface"
-  spec.version = '1.3.1'
+  spec.version = '1.4.1'
   spec.platform = Gem::Platform::RUBY
   spec.summary = "A Rails admin interface generator. Theme stolen from Redmine."
   spec.email = "joost@joopp.com"

data/{lib/generators/admin_interface/templates → app}/helpers/admin/base_helper.rb

@@ -56,7 +56,7 @@ module Admin::BaseHelper
     first = collection.offset_value + 1
     last = [collection.offset_value + collection.limit_value, collection.total_count].min
     total = collection.total_count
-    html = I18n.t('views.pagination_info', :default => "(%{first}-%{last}/%{total})", :first => first, :last => last, :total => total)
+    html = I18n.t('views.pagination_info', :default => "(%{first}-%{last}/%{total})", :first => number_with_delimiter(first), :last => number_with_delimiter(last), :total => number_with_delimiter(total))
     content_tag(:nav, html.html_safe, :class => 'pagination info').html_safe
   end
 

data/lib/admin_interface.rb

@@ -2,6 +2,12 @@
 module AdminInterface
 
   class Engine < ::Rails::Engine
+    # Load translations
+    I18n.load_path += Dir.glob( File.expand_path("locales/*.{rb,yml}", File.dirname(__FILE__)) )
+
+    # Load helpers
+    # FIXME: Does this work correctly with __FILE__ instead of File.dirname(__FILE__)
+    config.autoload_paths << File.expand_path("../../../app/helpers", __FILE__)
   end
 
 end

data/lib/generators/admin_interface/admin_interface_generator.rb

@@ -27,9 +27,10 @@ class AdminInterfaceGenerator < Rails::Generators::Base
   #   copy_file("views/admin.css", "public/stylesheets/admin.css")
   # end
 
-  def copy_helper_files
-    copy_file("helpers/admin/base_helper.rb", "app/helpers/admin/base_helper.rb")
-  end
+  # Helper files are kept in the Engine Gem.
+  # def copy_helper_files
+  #   copy_file("helpers/admin/base_helper.rb", "app/helpers/admin/base_helper.rb")
+  # end
 
   def add_admin_route
     route <<ROUTE

data/vendor/assets/stylesheets/admin_interface.css.scss

@@ -14,6 +14,7 @@ div.input {
   height: 1%;
   margin: 0;
   padding: 5px 0 8px 180px;
+  border: 1px solid #D7D7D7;
 }
 
 /***** Custom additions to Redmine *****/
@@ -893,6 +894,7 @@ padding-bottom: 3px;
 .icon-package { background-image: asset_url('admin/package.png', image); }
 .icon-home { background-image: asset_url('admin/home.png', image); }
 .icon-user { background-image: asset_url('admin/user.png', image); }
+.icon-user-go { background-image: asset_url('admin/user_go.png', image); }
 .icon-projects { background-image: asset_url('admin/projects.png', image); }
 .icon-help { background-image: asset_url('admin/help.png', image); }
 .icon-attachment  { background-image: asset_url('admin/attachment.png', image); }
@@ -916,6 +918,9 @@ padding-bottom: 3px;
 .icon-zoom-in { background-image: asset_url('admin/zoom_in.png', image); }
 .icon-zoom-out { background-image: asset_url('admin/zoom_out.png', image); }
 .icon-changeset { background-image: asset_url('admin/changeset.png', image); }
+.icon-call { background-image: asset_url('admin/call.gif', image); }
+.icon-call-in { background-image: asset_url('admin/call_in.png', image); }
+.icon-call-out { background-image: asset_url('admin/call_out.png', image); }
 
 .icon-file { background-image: asset_url('admin/files/default.png', image); }
 .icon-file.text-plain { background-image: asset_url('admin/files/text.png', image); }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admin_interface
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70292071245660 !ruby/object:Gem::Requirement
+  requirement: &70111143901980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70292071245660
+  version_requirements: *70111143901980
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70292071245000 !ruby/object:Gem::Requirement
+  requirement: &70111143901580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292071245000
+  version_requirements: *70111143901580
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70292071244340 !ruby/object:Gem::Requirement
+  requirement: &70111143901040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70292071244340
+  version_requirements: *70111143901040
 description: A Rails admin interface generator. Theme stolen from Redmine. Similar
   to web-app-theme but better ;).
 email: joost@joopp.com
@@ -54,6 +54,7 @@ files:
 - .gitignore
 - README.rdoc
 - admin_interface.gemspec
+- app/helpers/admin/base_helper.rb
 - doc/screenshot.png
 - lib/admin_interface.rb
 - lib/generators/admin_interface/USAGE
@@ -61,7 +62,6 @@ files:
 - lib/generators/admin_interface/templates/INSTALL
 - lib/generators/admin_interface/templates/controllers/base_controller.rb
 - lib/generators/admin_interface/templates/controllers/resource_controller.rb
-- lib/generators/admin_interface/templates/helpers/admin/base_helper.rb
 - lib/generators/admin_interface/templates/views/index.html.erb
 - lib/generators/admin_interface/templates/views/layout.html.erb
 - lib/generators/admin_scaffold/USAGE
@@ -147,6 +147,9 @@ files:
 - vendor/assets/images/admin/bullet_toggle_minus.png
 - vendor/assets/images/admin/bullet_toggle_plus.png
 - vendor/assets/images/admin/calendar.png
+- vendor/assets/images/admin/call.gif
+- vendor/assets/images/admin/call_in.png
+- vendor/assets/images/admin/call_out.png
 - vendor/assets/images/admin/cancel.png
 - vendor/assets/images/admin/changeset.png
 - vendor/assets/images/admin/close.png
@@ -271,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Rails admin interface generator. Theme stolen from Redmine.