beef-admin_area 0.1.4 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.6

data/admin_area.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{admin_area}
-  s.version = "0.1.4"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-08-26}
+  s.date = %q{2009-09-07}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

data/app/controllers/admin/settings_controller.rb

@@ -1,33 +1,18 @@
 class Admin::SettingsController < Admin::BaseController
 
-  # rescue_from Flickr::APIError, :with => :flickr_error
-  
   def show
     unless current_user.admin?
       flash.now[:notice] = 'You may view settings but editing is only available to Adminstrators.'
     end
-    
     @settings = Settings
-
-    # unless Settings.flickr_api_key.blank? or Settings.flickr_api_secret.blank?
-    #   Flickr::API.connect Settings.flickr_api_key, Settings.flickr_api_secret, Settings.flickr_auth_token
-    #   if @unauthorised = Flickr::API.unauthorised?
-    #     @login_url = Flickr::API.login_url
-    #   end
-    # end
   end
 
   def update
     unless current_user.admin?
       flash[:notice] = 'You may view settings but editing is only available to Adminstrators.'
     else
-  
       params[:settings].each_pair do |key,value|
-        if(key =~ /(_api_key|_api_secret)/i)
-          value.strip!
-        end
-        
-        Settings[key] = value.gsub(/^http\:\/\//i,'')
+        Settings[key] = value.strip
       end
   
       flash.now[:notice] = "Setting#{params[:settings].length>1?'s':''} #{params[:settings].collect{|s,v| s.humanize}.join(', ')} was successfully updated."
@@ -37,7 +22,6 @@ class Admin::SettingsController < Admin::BaseController
       format.html { redirect_to admin_setting_path}
       format.js
     end
-
   end
 
 end

data/app/helpers/admin/base_helper.rb

@@ -33,24 +33,6 @@ module Admin::BaseHelper
     page << 'init_flash_messages();'
   end
   
-  def lastest_flickr
-    return if Settings.flickr_api_key.blank? or Settings.flickr_user_id.blank?
-    Flickr::API.connect Settings.flickr_api_key, Settings.flickr_api_secret, Settings.flickr_auth_token
-    flickr_params = { :per_page => '5', :page => params[:page], :user_id => Settings.flickr_user_id, :sort => 'date-taken-desc', :tag_mode => 'all' }
-    flickr_params[:tags] = params[:tags] unless params[:tags].blank?
-    flickr_result = Flickr::Photo.find(:all, flickr_params)
-    render :partial => 'admin/shared/flickr_latest.html.erb', :locals => { :flickr_images => flickr_result }
-  end
-  
-  def flickr_select
-    return if Settings.flickr_api_key.blank? or Settings.flickr_user_id.blank?
-    Flickr::API.connect Settings.flickr_api_key, Settings.flickr_api_secret, Settings.flickr_auth_token
-    flickr_params = { :per_page => '12', :page => params[:page], :user_id => Settings.flickr_user_id, :sort => 'date-taken-desc', :tag_mode => 'all' }
-    flickr_params[:tags] = params[:tags] unless params[:tags].blank?
-    flickr_result = Flickr::Photo.find(:all, flickr_params)
-    render :partial => 'admin/shared/flickr.html.erb', :locals => { :flickr_images => flickr_result }
-  end
-  
   def preview_link(object)
     url = url_for([:preview, :admin, object ])
     link_to_function 'Preview', "new Ajax.Updater('page_preview', '#{url}', {asynchronous:true, evalScripts:true, parameters: this.up('form').serialize() + '&assets=' + getAssetIDs('asset-list')})", :class => 'button' 

data/config/routes.rb

@@ -1,7 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
   map.admin 'admin', :controller => 'admin/base'
   map.namespace(:admin) do |admin|
-    admin.flickr 'flickr', :controller => 'base', :action => 'flickr'
     admin.resource :settings
     admin.resources :users
   end

data/generators/admin_area_files/admin_area_files_generator.rb

@@ -12,6 +12,13 @@ class AdminAreaFilesGenerator < Rails::Generator::Base
   
   attr_accessible :name
   validates_presence_of :name
+  
+private
+  before_save :set_permalink
+
+  def set_permalink
+    self.permalink = name.parameterize
+  end
 RUBY
       
       

data/generators/admin_area_files/templates/app/views/admin/settings/show.html.erb

@@ -23,12 +23,7 @@
   </fieldset>
 
   <fieldset id="flickrsettings"><legend>Flickr Settings</legend>
-  <% if @unauthorised %>
-    <p>You are currently unauthorised because <%= @unauthorised %>, please <%= link_to 'login to flickr', @login_url %>
-  <% end -%>
-    <%= setting_form [['flickr_user_id','text'],
-                ['flickr_api_key','text'],
-                ['flickr_api_secret','text']] %>
+  <%= setting_form :flickr_user_id %>
   </fieldset>
   
   

data/generators/admin_area_files/templates/migration.rb

@@ -8,6 +8,7 @@ class CreateSettingsAndUsers < ActiveRecord::Migration
     
     change_table(:users) do |t|
       t.string :name, :limit => 128
+      t.string :permalink, :limit => 128
       t.string :role, :limit => 10
     end
   end

data/generators/admin_area_files/templates/public/stylesheets/admin/screen.css

@@ -721,11 +721,6 @@ a.right {
   color: #ddd;
 }
 
-#flickr-select img {
-  margin: 2px;
-  border: 1px solid #666;
-}
-
 /* so:preview-text */
 
 .preview-area p {

data/generators/admin_scaffold/templates/admin_index.html.erb

@@ -1,7 +1,7 @@
-<h1>Listing <%= plural_name %></h1>
+<h1>Listing <%= plural_name.titleize %></h1>
 
 <ul class="choices">
-  <li><%%= link_to 'New <%= singular_name %>', new_admin_<%= singular_name %>_path %></li>
+  <li><%%= link_to 'New <%= singular_name.titleize %>', new_admin_<%= singular_name %>_path %></li>
 </ul>
 
 <table>
@@ -10,8 +10,8 @@
 <% for attribute in attributes -%>
       <%%= sortable_table_header :name => "<%= attribute.column.human_name %>",  :sort => "<%= attribute.name %>" %>
 <% end -%>
+      <th colspan="2">Actions</th>
     </tr>
-    <th colspan="2">Actions</th>
   </thead>
   <tbody>
 <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
@@ -33,6 +33,7 @@
 <% for attribute in attributes -%>
       <%%= sortable_table_header :name => "<%= attribute.column.human_name %>",  :sort => "<%= attribute.name %>" %>
 <% end -%>
+      <th colspan="2">Actions</th>
     </tr>
   </tfoot>
 </table>

data/generators/admin_scaffold/templates/admin_show.html.erb

@@ -1,4 +1,4 @@
-<h1><%%= @<%= singular_name %>.new_record? ? 'New' : 'Editing' %> <%= singular_name %></h1>
+<h1><%%= @<%= singular_name %>.new_record? ? 'New' : 'Editing' %> <%= singular_name.titleize %></h1>
 
 <%% form_for([:admin, @<%= singular_name %>]) do |f| %>
   <%%= f.error_messages %>

data/generators/admin_scaffold/templates/view_index.html.erb

@@ -1,4 +1,4 @@
-<h1>Listing <%= plural_name %></h1>
+<h1>Listing <%= plural_name.titleize %></h1>
 
 <table>
   <tr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-admin_area
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -07:00
+date: 2009-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -182,6 +182,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/beef/admin
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -202,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Rails engine that provides a standard admin area with user managament