radiant-reader-extension 1.3.0 → 1.3.1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

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

@@ -10,7 +10,7 @@
     - unless no_title
       %h2
         - if purpose
-          = t(purpose) + ','
+          = purpose + ','
           = t('please')
         - else
           = t('please')

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

@@ -13,21 +13,21 @@
 
   %p
     = f.label :name, t('your_name'), :class => 'required'
-    %span.formnote= t('name_notes')
     %br
     = f.text_field :name, :class => 'standard'
+    %span.formnote= t('form_notes.name')
 
   - if Radiant::Config['reader.use_honorifics?']
     %p
       = f.label :honorific, t(:honorific), :class => 'optional'
-      %span.formnote= t('honorific_notes')
+      %span.formnote= t('form_notes.honorific')
       %br
       = f.text_field :honorific, :class => 'standard'
 
   - if reader.new_record? && reader.email_field
     %p
       = f.label reader.email_field, t('label.reader.email'), :class => 'required'
-      %span.formnote= t('email_notes')
+      %span.formnote= t('form_notes.email')
       %br
       = text_field_tag reader.email_field, params[reader.email_field] || reader.email, :id => "reader_#{reader.email_field}", :class => 'standard'
     .innocuous
@@ -42,20 +42,20 @@
       = f.label :email, t('your_email'), :class => 'required'
       %br
       = f.text_field :email, :class => 'standard'
-      %span.formnote= t('email_notes')
+      %span.formnote= t('form_notes.email')
 
   %p
     = f.label :login, t('login_name'), :class => 'optional'
     %br
     = f.text_field :login, :class => 'standard'
-    %span.formnote= t('login_notes')
+    %span.formnote= t('form_notes.login')
 
   - if reader.new_record?
     %p
       = f.label :password, t('password'), :class => 'required'
       %br
       = f.password_field :password, :class => 'standard', :autocomplete => 'off'
-      %span.formnote= t('password_notes')
+      %span.formnote= t('form_notes.new_password')
 
     %p
       = f.label :password_confirmation, t('confirm_password'), :class => 'required'
@@ -68,13 +68,14 @@
         = f.label :password, t('password').titlecase, :class => 'optional'
         %span.password
           •••••
-          = link_to t('change_password'), '#', :class => 'toggle', :rel => ".display_password, .new_password"
+        %span.formnote= link_to t('change_password'), '#', :class => 'toggle', :rel => ".display_password, .new_password"
+          
     .new_password.hidden
       %p
         = f.label :password, t('new_password'), :class => 'required'
         %br
         = f.password_field :password, :class => 'standard', :autocomplete => 'off'
-        %span.formnote= t('new_password_notes')
+        %span.formnote= t('form_notes.new_password')
       %p
         = f.label :password_confirmation, t('confirm_new_password'), :class => 'required'
         %br
@@ -85,7 +86,7 @@
       = f.label :description, t('your_description'), :class => 'optional'
       %br
       = f.text_area :description, :class => 'standard', :rows => 8
-      %span.formnote= t('description_notes')
+      %span.formnote= t('form_notes.description')
 
   - @edit_partials.each do |partial|
     = render :partial => partial, :locals => {:reader => @reader}

data/config/locales/en.yml

@@ -36,21 +36,25 @@ en:
   confirming_email: "When you press the 'register' button we will send a confirmation email to the address you enter above. Click on a link in that message, and you're in."
   continue: "Continue"
   create_message: "create message"
-  description_notes: "you can fill this in later. Textile formatting is allowed."
   dont_fill: "Don't fill this in!"
   edit_profile: "edit your profile"
-  email_notes: "we will send an activation message to this address"
   email_unknown: "Sorry. That email address is not known here."
   enter_code: "Please enter confirmation code"
   enter_email_for_reminder: "enter your email address and we will send the message again"
   enter_own_password: "First, just to make sure you're you, please enter your current password:"
-  existing_password_notes: "leave blank to keep present password. If changing, at least four characters."
   forgotten_password: "forgotten password?"
+  form_notes:
+    description: "you can fill this in later. Textile formatting is allowed."
+    email: "we will send activation instructions to this address"
+    existing_password: "leave blank to keep present password. If changing, at least four characters."
+    login: "leave blank to use your email address"
+    name: "this is how you will be credited on the site"
+    new_password: "at least four characters, please"
+    honorific: "this is prepended to your name when you are credited"
   form_problem: "there was a problem with the form"
   getting_gravatar: "If you would like a picture to appear next to your messages, give yourself a gravatar at"
   hello: "hello"
   honorific: "Title or rank"
-  honorific_notes: ""
   invitation_message: "Invitation message"
   invite_description: '<a href="%{url}">Edit your preferences to put some text about yourself here.'
   if_cant_find: "If you can't find the message, we can"
@@ -69,11 +73,9 @@ en:
   log_in: 'log in'
   log_out: "log out"
   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."
   logout_message: "You are logged out. Bye!"
   must_be_empty: "must be empty"
-  name_notes: "as you would like it to appear on the site"
   navigation:
     activate: "Activate account"
     readers: "People"
@@ -92,7 +94,6 @@ en:
   password_incorrect: "Sorry. Wrong password."
   password_mismatch: "Passwords don't match! Please try again."
   password_not_yet_changed: "Your password hasn't changed yet, so if you've just remembered it please <a href='%{url}'>log in as usual</a>."
-  password_notes: "at least four characters, please"
   password_reset_instructions: "Please enter your email address below. If we recognise it, we'll send you a message with a confirmation link (or if your account is not yet active, we'll send the activation message again)."
   password_reset_reassurance: "Your password will not change until you fill in that form, so only you can complete this process."
   password_updated_notice: "Thank you. Your password has been updated and you are now logged in."

data/public/stylesheets/sass/reader.sass

@@ -1,136 +1,91 @@
-@import reader_constants.sass
+@import compass/css3
 
-/*** friendly forms *******
+$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
 
-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
+=functional
   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: normal
+=strong
+  +functional
   font-weight: bold
-  font-size: 1.6em
-  margin-bottom: 0
-  margin-top: 50px
+=small
+  +functional
+  font-size: 80%
 
-/***** gravatars and other useful things *******
+
+div#readers
+  .reader
+    margin-bottom: 1em
+  h2
+    line-height: 1
+    margin: 0
+  
+div.activation_required
+  color: $accent
+
+p.administrative
+  font-family: helvetica,arial,sans-serif
+  color: $pale
 
 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
+  &.tiny
+    margin: 0 6px 4px 0
+    border: 1px solid white
 
-/*** 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
+form.friendly
+  margin: 0 0 60px 0
+  p
+    margin: 1em 0 0 0
+  input.titular
+    width: 95%
+    font-size: 200%
+  textarea, select
+    width: 95%
+  textarea
+    height: 400px
+  input.standard
+    width: 95%
+  input.login
+    width: 50%
+  span.formnote
+    color: $mid
+  label
+    &.required
+      font-weight: bold
+  span.password
+    display: block
+    width: 95%
+    padding: 5px 
+    font-size: 1.2
+    line-height: 1.2
+    color: $pale
+    border: 1px solid $pale
+  span.error-with-field
+    input, select
+      border: 1px solid red
+      color: red
+    span.error
+      line-height: 1.4
+      background-color: $accent
+      color: white
+      padding: 3px 6px
+      margin: -5px 0 0 6px
+      cursor: pointer
+      +border-radius
+      +box-shadow
+      a.closer
+        margin-left: 10px
+        color: white
+        text-decoration: none
+    

data/radiant-reader-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-01-31}
   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 = [
@@ -109,7 +109,6 @@ Gem::Specification.new do |s|
      "public/images/admin/chk_on.png",
      "public/images/admin/delta.png",
      "public/javascripts/reader.js",
-     "public/stylesheets/sass/_reader_constants.sass",
      "public/stylesheets/sass/admin/reader.sass",
      "public/stylesheets/sass/reader.sass",
      "radiant-reader-extension.gemspec",

data/reader_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "1.3.0"
+  version "1.3.1"
   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: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +00:00
+date: 2011-01-31 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,7 +192,6 @@ files:
 - public/images/admin/chk_on.png
 - public/images/admin/delta.png
 - public/javascripts/reader.js
-- public/stylesheets/sass/_reader_constants.sass
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/reader.sass
 - radiant-reader-extension.gemspec

data/public/stylesheets/sass/_reader_constants.sass

@@ -1,41 +0,0 @@
-@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