radiant-reader-extension 1.0.1 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/app/controllers/reader_action_controller.rb

@@ -49,7 +49,11 @@ protected
     unless set_reader     # set_reader is in ControllerExtension and sets Reader.current while checking for current_reader
       store_location
       respond_to do |format|
-        format.html { redirect_to reader_login_url }
+        format.html {
+          flash[:explanation] = t('reader_required')
+          flash[:notice] = t('please_log_in')
+          redirect_to reader_login_url 
+        }
         format.js { 
           @inline = true
           render :partial => 'reader_sessions/login_form' 
@@ -58,11 +62,14 @@ protected
       false
     end
   end
-
+  
   def require_activated_reader
     unless current_reader && current_reader.activated?
       respond_to do |format|
-        format.html { redirect_to reader_activation_url }
+        format.html { 
+          flash[:explanation] = t('activation_required')
+          redirect_to reader_activation_url 
+        }
         format.js { 
           @inline = true
           render :partial => 'reader_activations/activation_required' 
@@ -75,10 +82,10 @@ protected
   def require_no_reader
     if set_reader
       store_location
-      flash[:notice] = 'please_log_out'
+      flash[:notice] = t('please_log_out')
       redirect_back_or_to url_for(current_reader)
       return false
     end
   end
-
+  
 end

data/app/controllers/reader_sessions_controller.rb

@@ -27,7 +27,7 @@ class ReaderSessionsController < ReaderActionController
     else
       respond_to do |format|
         format.html { 
-          flash[:error] = 'login_unknown'
+          flash[:error] = t('login_unknown')
           render :action => :new 
         }
         format.js { render :action => :new, :layout => false }
@@ -43,7 +43,7 @@ class ReaderSessionsController < ReaderActionController
       session['user_id'] = nil
       current_user = nil
     end
-    flash[:notice] = 'logout_message'
+    flash[:notice] = t('logout_message')
     redirect_back_or_to reader_login_url
   end
   

data/app/controllers/readers_controller.rb

@@ -33,7 +33,7 @@ class ReadersController < ReaderActionController
 
   def new
     if current_reader
-      flash[:error] = "You're already logged in!"
+      flash[:error] = t('already_logged_in')
       redirect_to url_for(current_reader) and return
     end
     @reader = Reader.new
@@ -49,7 +49,7 @@ class ReadersController < ReaderActionController
     @reader.clear_password = params[:reader][:password]
 
     unless @reader.email.blank?
-      flash[:error] = 'please_avoid_spam_trap'
+      flash[:error] = t('please_avoid_spam_trap')
       @reader.email = ''
       @reader.errors.add(:trap, "must_be_empty")
       render :action => 'new' and return

data/app/views/admin/readers/index.html.haml

@@ -20,7 +20,7 @@
           - render_region :tbody do |tbody|
             - tbody.title_cell do
               %td{:class => reader.activated? ? 'name activated' : 'name inactive'}
-                = link_to image_tag(gravatar_url(reader.email, :size=>"32px"), :class=>"avatar avatar_32x32", :width=>32, :height=>32, :alt=>""), edit_admin_reader_url(reader)
+                = link_to gravatar_for(reader, {:size => 32}, {:class => 'avatar avatar_32x32'}), edit_admin_reader_url(reader)
                 = link_to reader.name, edit_admin_reader_url(reader), :class => reader.trusted? ? '' : 'untrusted'
                 %span.info
                   = "(#{reader.login})"

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

@@ -1,4 +1,5 @@
-= render :partial => 'readers/flasher'
+- content_for :signals do
+  = render :partial => 'readers/flasher'
 
 - if current_reader
   %p
@@ -27,7 +28,7 @@
 - else
   - if flash[:explanation]
     %p
-      = t(flash[:explanation])
+      = flash[:explanation]
       
   = render :partial => 'login_form', :locals => {:no_title => true}
 
@@ -37,4 +38,4 @@
   = t('log_in').titlecase
 
 - content_for :title do
-  = t('log_in')
+  = t('please_log_in').titlecase

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

@@ -1,6 +1,6 @@
 - if flash[:notice]
   .notice
-    %p= t(flash[:notice])
+    %p= flash[:notice]
 - if flash[:error]
   .error
-    %p= t(flash[:error])
+    %p= flash[:error]

data/config/locales/en.yml

@@ -7,6 +7,7 @@ en:
   activation_message_sent: "Account activation instructions have been emailed to you."
   activation_sent: "Activation message sent"
   already_active: "Your account is already active."
+  already_logged_in: "You're already logged in!"
   already_registered: "If you've already registered, you should only need to"
   and_try_again: "and try again."
   bold_required: "Fields with bold headings are required and will cause grumbling if left blank:"
@@ -26,7 +27,7 @@ en:
       name: "Message sender"
       address: "Message reply-to"
       prefix: "Subject prefix"
-      layout: "Layout for messages"
+      layout: "Email layout"
   confirm_new_password: "Confirm new password"
   confirm_password: "Confirm password"
   confirmation_code: "Confirmation code"
@@ -51,11 +52,9 @@ en:
   invitation_message: "Invitation message"
   if_cant_find: "If you can't find the message, we can"
   if_mistake_see_admin: "If this is a mistake, please talk to the site administrator about your account."
-  if_not_you: "If that's not you, or you want to log in with another account"
   is_free_and_quick: " is free and only takes a moment"
   log_in: 'log in'
   log_out: "log out"
-  logged_in_as: 'You are currently logged in as'
   login_name: "Login name"
   login_notes: "leave blank to use your email address"
   login_unknown: "Sorry: we don't recognise that combination of username and password."
@@ -144,4 +143,5 @@ en:
   really_delete_reader: "Are you sure you want to remove the reader %{name}? This cannot be undone."
   never_sent: 'never sent'
   for: 'for'
-  home: 'home'
+  home: 'home'
+  reader_required: "Sorry: this part of the site requires an account."

data/lib/reader_helper.rb

@@ -3,6 +3,12 @@ module ReaderHelper
   def self.included(base)
 
     base.module_eval do
+      def gravatar_for(reader, gravatar_options={}, img_options ={})
+        size = gravatar_options[:size]
+        img_options[:size] = "#{size}x#{size}" if size
+        image_tag reader.gravatar_url(gravatar_options), img_options
+      end
+
       def clean_textilize(text)
         Sanitize.clean(textilize(text), Sanitize::Config::RELAXED)
       end

data/public/stylesheets/sass/_reader_constants.sass

@@ -0,0 +1,41 @@
+@import compass/css3
+
+$red: #b20315
+$darkred: #a80016
+$palered: #db4d5c
+$yellow: #e09a0c
+$darkyellow: #bc7815
+$blue: #004250
+
+$coolgrey0: #f1f0ee
+$coolgrey1: #e2e1dd
+$coolgrey2: #d6d6d4
+$coolgrey3: #cacac8
+$coolgrey4: #bdbdbd
+$coolgrey5: #b3b3b3
+$coolgrey6: #afafaf
+$coolgrey7: #9a9b9d
+$coolgrey8: #8c8d8e
+$coolgrey9: #747679
+$coolgrey10: #616265
+$coolgrey11: #4d4e53
+
+$dark: $coolgrey11
+$mid: $coolgrey8
+$pale: $coolgrey6
+$paler: $coolgrey4
+$verypale: $coolgrey2
+
+$page: white
+$text: $coolgrey11
+$hover: $red
+$tag: $coolgrey8
+$input: $coolgrey11
+
+=inputfonts
+  font-family: Georgia, serif
+  font-size: 1.2em
+  line-height: 1.4
+
+=functionalfonts
+  font-family: helvetica, arial, sans-serif

data/public/stylesheets/sass/reader.sass

@@ -0,0 +1,136 @@
+@import reader_constants.sass
+
+/*** friendly forms *******
+
+form.friendly
+  margin: 0 0 60px 0
+  p
+    margin: 1em 0 0 0
+  input.titular
+    clear: both
+    width: 95%
+    font-family: Georgia,Palatino,Sylfaen,"Times New Roman", Times, serif
+    font-size: 1.2em
+    line-height: 1
+    color: #4d4e53
+    border-width: 1px
+    border-style: solid
+    border-color: #cacac8
+    padding: 5px
+    font-size: 200%
+  textarea, select
+    width: 95%
+    font-family: Georgia,Palatino,Sylfaen,"Times New Roman", Times, serif
+    font-size: 1.2em
+    line-height: 1
+    color: #4d4e53
+    border-width: 1px
+    border-style: solid
+    border-color: #cacac8
+    padding: 5px
+  input
+    &.standard
+      width: 95%
+      font-family: Georgia,Palatino,Sylfaen,"Times New Roman", Times, serif
+      font-size: 1.2em
+      line-height: 1
+      color: #4d4e53
+      border-width: 1px
+      border-style: solid
+      border-color: #cacac8
+      padding: 5px
+    &.login
+      width: 50%
+      font-family: Georgia,Palatino,Sylfaen,"Times New Roman", Times, serif
+      font-size: 1.2em
+      line-height: 1
+      color: #4d4e53
+      border-width: 1px
+      border-style: solid
+      border-color: #cacac8
+      padding: 5px
+  textarea
+    color: #559dc4
+    line-height: 1.4
+  span.formnote
+    font-family: helvetica, arial, sans-serif
+    font-size: 0.8em
+    line-height: 1.4
+    color: #cacac8
+  div.error-with-field
+    display: inline
+  small.error
+    display: none
+  p.context
+    margin: 0
+  div.innocuous
+    display: none
+  label.required
+    font-weight: bold
+
+/***** input validation and error reporting *******
+
+p
+  &.errornote
+    color: #d1005d
+  &.haserror
+    border-left-width: 4px
+    border-left-style: solid
+    border-left-color: #d1005d
+    padding-left: 12px
+    color: #d1005d
+    input, textarea
+      border-width: 1px
+      border-style: solid
+      border-color: #d1005d
+    label
+      color: #d1005d
+
+ul.friendly
+  list-style: square
+  font-family: helvetica, arial, sans-serif
+  font-size: 0.8em
+  line-height: 1.4
+  color: #4d4e53
+  padding-left: 0
+  margin-top: 0
+
+h2.inviting, a.inviting
+  display: block
+  font-family: 'HelveticaNeue-Light', helvetica, arial, sans-serif
+  font-weight: bold
+  font-size: 1.6em
+  margin-bottom: 0
+  margin-top: 50px
+
+/***** gravatars and other useful things *******
+
+img.gravatar
+  float: left
+  margin: 0 10px 3px 0
+  +box-shadow
+  border: 3px solid white
+  &.thumbnail
+    margin: 2px 10px 10px 0
+  &.big
+    margin: 8px 10px 4px 0
+
+/*** system messages and controls *******
+
+.notice, .error
+  position: absolute
+  width: 250px
+  right: 10px
+  +border-radius
+  +box-shadow
+  color: white
+  margin: 0
+  padding: 0.75em
+
+.notice
+  background-color: #00cc33
+  border: 3px solid #7fe699
+
+.error
+  background-color: #cc0000
+  border: 3px solid #ff0071

data/radiant-reader-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-10-20}
+  s.date = %q{2010-11-01}
   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 = [
@@ -108,7 +108,9 @@ Gem::Specification.new do |s|
      "public/images/admin/chk_off.png",
      "public/images/admin/chk_on.png",
      "public/images/admin/delta.png",
+     "public/stylesheets/sass/_reader_constants.sass",
      "public/stylesheets/sass/admin/reader.sass",
+     "public/stylesheets/sass/reader.sass",
      "radiant-reader-extension.gemspec",
      "reader_extension.rb",
      "spec/controllers/admin/messages_controller_spec.rb",

data/reader_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "1.0.1"
+  version "1.1.0"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   
@@ -28,7 +28,7 @@ class ReaderExtension < Radiant::Extension
         admin.sites.edit.add :form, "admin/sites/choose_reader_layout", :after => "edit_homepage"
       end
     end
-    
+        
     if respond_to?(:tab)
       tab("Readers") do
         add_item("Readers", "/admin/readers")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +01:00
+date: 2010-11-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -191,7 +191,9 @@ files:
 - public/images/admin/chk_off.png
 - public/images/admin/chk_on.png
 - public/images/admin/delta.png
+- public/stylesheets/sass/_reader_constants.sass
 - public/stylesheets/sass/admin/reader.sass
+- public/stylesheets/sass/reader.sass
 - radiant-reader-extension.gemspec
 - reader_extension.rb
 - spec/controllers/admin/messages_controller_spec.rb