radiant-reader-extension 1.3.4 → 1.3.6

data/README.md

@@ -17,6 +17,7 @@ Right now we are **not compatible with multi_site or the sites extension**: that
 * public interface internationalized;
 * Uses the new configuration interface;
 * Messaging much simplified and now intended to be purely administrative.
+* ajaxable status panel returned by `reader_session_url`
 
 ## Status
 

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.6

data/app/controllers/reader_sessions_controller.rb

@@ -4,6 +4,24 @@ class ReaderSessionsController < ReaderActionController
   before_filter :require_reader, :only => :destroy
   radiant_layout { |controller| Radiant::Config['reader.layout'] }
   
+  def show
+    @reader = current_reader
+    respond_to do |format|
+      format.html { 
+        if !@reader
+          redirect_to reader_login_url
+        elsif @reader.inactive?
+          redirect_to reader_activation_url
+        else
+          redirect_to reader_profile_url
+        end
+      }
+      format.js {
+        render :partial => 'readers/controls', :layout => false
+      }
+    end
+  end
+  
   def new
     if current_reader
       if current_reader.activated?
@@ -32,7 +50,7 @@ class ReaderSessionsController < ReaderActionController
           redirect_back_or_to default_loggedin_url
         }
         format.js { 
-          redirect_back_with_format(:js) 
+          redirect_back_with_format(:js)
         }
       end
       
@@ -42,7 +60,9 @@ class ReaderSessionsController < ReaderActionController
           flash[:error] = t('login_unknown')
           render :action => :new 
         }
-        format.js { render :action => :new, :layout => false }
+        format.js { 
+          render :action => :new, :layout => false 
+        }
       end
     end
   end

data/app/controllers/readers_controller.rb

@@ -6,7 +6,7 @@ class ReadersController < ReaderActionController
   before_filter :check_registration_allowed, :only => [:new, :create]
   before_filter :initialize_partials
   before_filter :i_am_me, :only => [:show, :edit]
-  before_filter :require_reader, :except => [:index, :new, :create, :activate]
+  before_filter :require_reader, :except => [:new, :create, :activate]
   before_filter :restrict_to_self, :only => [:edit, :update, :resend_activation]
   before_filter :no_removing, :only => [:remove, :destroy]
   before_filter :require_password, :only => [:update]
@@ -17,19 +17,6 @@ class ReadersController < ReaderActionController
 
   def show
     @reader = Reader.find(params[:id])
-    respond_to do |format|
-      format.html { 
-        if @reader.inactive? && @reader == current_reader
-          redirect_to reader_activation_url
-        else
-          render
-        end
-      }
-      format.js { 
-        @inline = true
-        render :partial => 'readers/controls'
-      }
-    end
   end
 
   def new

data/app/views/reader_sessions/_login_form.html.haml

@@ -13,7 +13,7 @@
           = purpose + ','
           = t('please')
         - else
-          = t('please')
+          = t('please').titlecase
         = t('log_in')
         - if Radiant::Config['reader.allow_registration?']
           = t('or')

data/app/views/readers/_controls.html.haml

@@ -1,25 +1,13 @@
-%div#reader_links
-  - if current_reader
-    - if current_reader.activated?
-      %p
-        %strong
-          Hello 
-          = current_reader.name
-        %br
-        = link_to 'your page', reader_url(current_reader)
-        |
-        = link_to 'preferences', edit_reader_url(current_reader)
-        |
-        - if current_reader.is_user?
-          = link_to 'admin', admin_pages_url
-          |
-        = link_to 'log out', reader_logout_url
-    -else
-      %p 
-        please check your email for an activation message
-  - else
-    %p
-      To take part, please 
-      = link_to 'log in', reader_login_url
-      or
-      = link_to 'register', new_reader_url
+- if !current_reader
+  = link_to t('navigation.log_in'), reader_login_url
+  = link_to t('navigation.register'), new_reader_url
+- elsif !current_reader.activated?
+  = link_to t('navigation.activate'), reader_activation_url
+- else
+  = link_to t('navigation.profile'), reader_profile_url
+  = link_to t('navigation.account'), reader_account_url
+  - if current_reader.is_user?
+    = link_to t('navigation.admin'), admin_pages_url
+  = link_to t('navigation.log_out'), reader_logout_url
+
+

data/app/views/readers/_standard_parts.html.haml

@@ -1,11 +1,8 @@
-- add_reader_js '/javascripts/reader.js'
-- add_reader_css '/stylesheets/reader.css'
+- content_for :reader_css do
+  %link{:rel => 'stylesheet', :type => 'text/css', :href => '/stylesheets/reader.css', :media => 'all'}
 
-- content_for :section_navigation do
-  = link_to t('navigation.readers'), readers_url, :class => 'section'
-  = link_to t('navigation.your_account'), reader_account_url
-  - if Radiant::Config['reader.help_url']
-    = link_to t('navigation.reader_help'), Radiant::Config['reader.help_url']
+- content_for :reader_js do
+  %script{:src => '/javascripts/reader.js', :type => 'text/javascript'}
 
 - content_for :reader_css do
   - reader_css_paths.each do |path|
@@ -18,3 +15,9 @@
 - content_for :person do
   - if @reader && !@reader.new_record?
     = standard_gravatar_for(@reader)
+  
+- content_for :section_navigation do
+  = link_to t('navigation.readers'), readers_url, :class => 'section'
+  = link_to t('navigation.loading'), reader_session_url, :class => "remotecontent"
+  - if Radiant::Config['reader.help_url']
+    = link_to t('navigation.reader_help'), Radiant::Config['reader.help_url']

data/config/locales/en.yml

@@ -5,6 +5,7 @@ en:
   activate_account: "Activate your account"
   activation_complete: "Thank you very much for persevering with the registration process. Your account is now active."
   activation_message_sent: "Account activation instructions have been emailed to you."
+  activation_required: "Please check your email for an activation message"
   activation_required_header: "Please check your email"
   activation_required_explanation: "You should have received a confirmation message containing a link that will activate your account."
   activation_sent: "Activation message sent"
@@ -20,6 +21,7 @@ en:
   cannot_edit_others: "You are not allowed to edit other people's accounts."
   change_gravatar: "change gravatar image"
   change_password: "Change your password"
+  check_email: "Please check your email for an activation message"
   config:
     reader:
       allow_registration?: "Allow registration"
@@ -80,12 +82,16 @@ en:
   logout_message: "You are logged out. Bye!"
   must_be_empty: "must be empty"
   navigation:
+    account: "Your account"
     activate: "Activate account"
+    admin: "Admin"
     readers: "People"
     preferences: "Preferences"
-    profile: "Your profile"
+    profile: "Profile"
     log_in: "Log in"
     log_out: "Log out"
+    loading: "Loading..."
+    register: "Register"
     your_account: "Your account"
   new_account: "Create an account"
   new_password: "New password"
@@ -136,6 +142,7 @@ en:
   sorry: "sorry"
   sorry_access_denied: "Sorry: access denied"
   spam_trap: "it's a spam trap and shouldn't be visible"
+  status_check: "Please wait: loading controls"
   terms_and_conditions: "terms and conditions"
   thanks_activated: "Thank you! Your account has been activated."
   thanks_and_activation_instructions: "Thank you for registering. Now please check your email. We have sent a message containing a link that will automatically activate your account and log you in."

data/lib/controller_extensions.rb

@@ -53,8 +53,10 @@ module ControllerExtensions    # for inclusion into ApplicationController
     end
 
     def redirect_back_with_format(format = 'html')
+      Rails.logger.warn "<<< redirect_back_with_format. session[:return_to] is #{session[:return_to].inspect}"
       address = session[:return_to]
-      raise StandardError, "Can't add format to an already formatted url: #{address}" unless File.extname(address).blank?
+      previous_format = File.extname(address)
+      raise StandardError, "Can't add format to an already formatted url: #{address}" unless previous_format.blank? || previous_format == format
       redirect_to address + ".#{format}"    # nasty! but necessary for inline login.
     end
 

data/public/javascripts/reader.js

@@ -1,9 +1,21 @@
 (function($) { 
 
+	$.fn.rails_flash = function() { 
+		this.each(function() { 
+		  var self = $(this);
+      var closer = $('<a href="#" class="closer">x</a>').appendTo(self);
+      closer.click( function (event) {
+        event.preventDefault();
+        self.fadeOut('fast');
+      });
+		});
+		return this;
+  };
+
 	$.fn.toggler = function() { 
 		this.each(function() { 
 		  var self = $(this);
-		  var toggling = $(self.attr.rel);
+		  var toggling = $(self.attr('rel'));
       self.click( function (event) {
         event.preventDefault();
         toggling.toggle();
@@ -12,8 +24,172 @@
 		return this;
 	};
 
+  $.ajaxSetup({
+    'beforeSend': function(xhr) {
+      xhr.setRequestHeader("Accept", "text/javascript");
+    }
+  });
+  
+  // general-purpose event blocker
+  function squash(e) {
+    if(e) {
+      e.preventDefault();
+      e.stopPropagation();
+      if (e.target) e.target.blur();
+    } 
+  }
+	
+	$.fn.fetch_remote_content = function() {
+		this.each(function() {
+		  var self = $(this);
+		  var url = self.attr('href');
+		  if (url) {
+  		  self.addClass('waiting');
+        $.get(url, function (result) { self.replaceWith($(result)); });
+		  }
+		});
+		return this;
+	};
+
+  /*
+   * jQuery Color Animations
+   * Copyright 2007 John Resig
+   * Released under the MIT and GPL licenses.
+   * syntax corrected but otherwise untouched.
+   */
+  
+  // We override the animation for all of these color styles
+  $.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i, attr) {
+    $.fx.step[attr] = function(fx) {
+      if (!fx.colorInit) {
+        fx.start = getColor(fx.elem, attr);
+        fx.end = getRGB(fx.end);
+        fx.colorInit = true;
+      }
+
+      fx.elem.style[attr] = "rgb(" + [
+      Math.max(Math.min(parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10), 255), 0),
+      Math.max(Math.min(parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10), 255), 0),
+      Math.max(Math.min(parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10), 255), 0)
+      ].join(",") + ")";
+    }
+  });
+
+  // Color Conversion functions from highlightFade
+  // By Blair Mitchelmore
+  // http://jquery.offput.ca/highlightFade/
+
+  // Parse strings looking for color tuples [255,255,255]
+  function getRGB(color) {
+      var result;
+
+      // Check if we're already dealing with an array of colors
+      if ( color && color.constructor == Array && color.length == 3 )
+          return color;
+
+      // Look for rgb(num,num,num)
+      if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
+          return [parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10)];
+
+      // Look for rgb(num%,num%,num%)
+      if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
+          return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
+
+      // Look for #a0b1c2
+      if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
+          return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
+
+      // Look for #fff
+      if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
+          return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
+
+      // Look for rgba(0, 0, 0, 0) == transparent in Safari 3
+      if (result = /rgba\(0, 0, 0, 0\)/.exec(color))
+          return colors['transparent'];
+
+      // Otherwise, we're most likely dealing with a named color
+      return colors[jQuery.trim(color).toLowerCase()];
+  }
+
+  function getColor(elem, attr) {
+    var color;
+
+    do {
+      color = $.curCSS(elem, attr);
+
+      // Keep going until we find an element that has color, or we hit the body
+      if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") )
+        break;
+
+      attr = "backgroundColor";
+    } while ( elem = elem.parentNode );
+
+    return getRGB(color);
+  };
+
+  // Some named colors to work with
+  // From Interface by Stefan Petre
+  // http://interface.eyecon.ro/
+
+  var colors = {
+      aqua:[0,255,255],
+      azure:[240,255,255],
+      beige:[245,245,220],
+      black:[0,0,0],
+      blue:[0,0,255],
+      brown:[165,42,42],
+      cyan:[0,255,255],
+      darkblue:[0,0,139],
+      darkcyan:[0,139,139],
+      darkgrey:[169,169,169],
+      darkgreen:[0,100,0],
+      darkkhaki:[189,183,107],
+      darkmagenta:[139,0,139],
+      darkolivegreen:[85,107,47],
+      darkorange:[255,140,0],
+      darkorchid:[153,50,204],
+      darkred:[139,0,0],
+      darksalmon:[233,150,122],
+      darkviolet:[148,0,211],
+      fuchsia:[255,0,255],
+      gold:[255,215,0],
+      green:[0,128,0],
+      indigo:[75,0,130],
+      khaki:[240,230,140],
+      lightblue:[173,216,230],
+      lightcyan:[224,255,255],
+      lightgreen:[144,238,144],
+      lightgrey:[211,211,211],
+      lightpink:[255,182,193],
+      lightyellow:[255,255,224],
+      lime:[0,255,0],
+      magenta:[255,0,255],
+      maroon:[128,0,0],
+      navy:[0,0,128],
+      olive:[128,128,0],
+      orange:[255,165,0],
+      pink:[255,192,203],
+      purple:[128,0,128],
+      violet:[128,0,128],
+      red:[255,0,0],
+      silver:[192,192,192],
+      white:[255,255,255],
+      yellow:[255,255,0],
+      transparent: [255,255,255]
+  };
+
+  $.fn.blush = function(color, duration) {
+    color = color || "#FFFF9C";
+    duration = duration || 1500;
+    var backto = this.css("background-color");
+    if (backto == "" || backto == 'transparent') backto = '#ffffff';
+    this.css("background-color", color).animate({"background-color": backto}, duration);
+  };
+
 })(jQuery);
 
 $(function() {
   $("a.toggle").toggler();
+  $("a.remotecontent").fetch_remote_content();
+  $("div.notice, div.error").rails_flash();
 });

data/public/stylesheets/sass/admin/reader.sass

@@ -13,8 +13,6 @@
       font-weight: normal
       a
         color: #06c
-        font-size: 80%
-        font-weight: normal
         
 /* show and send page
 
@@ -83,4 +81,3 @@ ul.help
   code
     color: #c00
     font-size: 115%
-

data/public/stylesheets/sass/reader.sass

@@ -1,11 +1,11 @@
 @import compass/css3
 
-$dark: #4d4e53        / cool grey 11
-$mid: #8c8d8e         / cool grey 8
-$pale: #afafaf        / cool grey 6
-$paler: #bdbdbd       / cool grey 4
-$verypale: #d6d6d4    / cool grey 2
-$accent = #d1005d     / rubine red
+$dark: #4d4e53
+$mid: #8c8d8e        
+$pale: #afafaf
+$paler: #bdbdbd
+$verypale: #d6d6d4
+$accent = #d1005d
 
 =functional
   font-family: helvetica, arial, sans-serif
@@ -17,7 +17,7 @@ $accent = #d1005d     / rubine red
   +functional
   font-size: 80%
 
-.error, .notice
+div.error, div.notice
   position: absolute
   width: 300px
   top: 50px
@@ -33,10 +33,10 @@ $accent = #d1005d     / rubine red
     right: 5px
     color: white
     font-weight: bold
-.notice
+div.notice
   background-color: #b2e5b2
   color: #060
-.error
+div.error
   background-color: #f3c2c2
   color: #770000
 
@@ -66,7 +66,7 @@ img.gravatar
     border: 1px solid white
 
 form.friendly
-  margin: 0 0 60px 0
+  margin: 0 0 2em 0
   p
     margin: 1em 0 0 0
   input.login

data/radiant-reader-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.3.4"
+  s.version = "1.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-02-09}
   s.description = %q{Centralises reader/member/user registration and management tasks for the benefit of other extensions}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [

data/reader_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "1.3.4"
+  version "1.3.6"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 3
-  - 4
-  version: 1.3.4
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +00:00
+date: 2011-02-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency