radiant-reader-extension 1.3.13 → 2.0.0.rc4

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

@@ -1,30 +1,33 @@
-- include_stylesheet 'reader'
+- content_for :breadcrumbs do
+  = link_to t('reader_extension.home').titlecase, '/'
+  > 
+  = t('reader_extension.reset_password').titlecase
 
-%p
-  =t('password_reset_instructions')
-  %strong
-    =t('password_reset_reassurance')
-  
-- if @error
-  %p.haserror
-    = t(@error)
+- content_for :title do
+  = t('reader_extension.reset_password').titlecase
 
-.password_form
-  - email = current_reader.email if current_reader
-  - form_tag password_reset_path, :class => 'friendly' do
-    %p
-      %label{:for => "email"}
-        = t('your_email')
-      %br
-      = text_field_tag 'email', email, :class => 'titular'
+- content_for :form do
+  %p
+    =t('reader_extension.password_reset_instructions')
+    %strong
+      =t('reader_extension.password_reset_reassurance')
 
-    %p
-      = submit_tag t('send_reset_button')
+  - if @error
+    %p.haserror
+      = t(@error)
 
-- content_for :breadcrumbs do
-  = link_to t('home').titlecase, '/'
-  > 
-  = t('reset_password').titlecase
+  .password_form
+    - email = current_reader.email if current_reader
+    - form_tag password_reset_path, :class => 'friendly' do
+      %p
+        %label{:for => "email"}
+          = t('reader_extension.your_email')
+        %br
+        = text_field_tag 'email', email, :class => 'titular'
 
-- content_for :title do
-  = t('reset_password').titlecase
+      %p
+        = submit_tag t('reader_extension.send_reset_button')
+  
+= render :partial => 'shared/standard_reader_parts'
+
+= yield :form

data/app/views/reader_activations/_activation_required.haml

@@ -1,4 +1,4 @@
 %h2
-  = t('activation_required_header')
+  = t('reader_extension.activation_required_header')
 %p
-  = t('activation_required_explanation')
+  = t('reader_extension.activation_required_explanation')

data/app/views/reader_activations/show.html.haml

@@ -1,13 +1,11 @@
-= render :partial => 'readers/standard_parts'
-
 -content_for :instructions do
   - if current_reader && current_reader.activated?
     %p
-      = t("activation_complete")
+      = t("reader_extension.activation_complete")
 
     - if session[:return_to]
       %p 
-        = link_to t("return_to_page"), session[:return_to]
+        = link_to t("reader_extension.return_to_page"), session[:return_to]
 
   - else
     %div.activation
@@ -15,23 +13,23 @@
         %p.errornotice
           = @error
       %p
-        = t('thanks_and_activation_instructions')
+        = t('reader_extension.thanks_and_activation_instructions')
 
       %p
-        = link_to(t("resend_activation"), new_reader_activation_url) + '.'
+        = link_to(t("reader_extension.resend_activation"), new_reader_activation_url) + '.'
 
 - content_for :breadcrumbs do
-  = link_to t('Home'), '/'
+  = link_to t('reader_extension.Home'), '/'
   >
-  = t('activate_account')
+  = t('reader_extension.activate_account')
 
 - content_for :title do
   - if current_reader && current_reader.activated?
-    = t('hello').titlecase
+    = t('reader_extension.hello').titlecase
     = current_reader.name
   - else
-    = t('activation_sent')
-
-
+    = t('reader_extension.activation_sent')
+  
+= render :partial => 'shared/standard_reader_parts'
 
-= yield :instructions
+= yield :instructions

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

@@ -6,34 +6,35 @@
   - cssclass = "compact friendly"
   - cssclass << " inline" if @inline
   - form_for @reader_session, :url => reader_session_path, :html => {:class => cssclass} do |f|
+    %input{:type => :hidden, :name => :authentication_type, :value => :session}
     
     - unless no_title
       %h2
         - if purpose
           = purpose + ','
-          = t('please')
+          = t('reader_extension.please')
         - else
-          = t('please').titlecase
-        = t('log_in')
+          = t('reader_extension.please').titlecase
+        = t('reader_extension.log_in')
         - if Radiant::Config['reader.allow_registration?']
-          = t('or')
-          = link_to t('register'), new_reader_url
+          = t('reader_extension.or')
+          = link_to t('reader_extension.register'), new_reader_url
 
     - if @error
       %p.haserror
-        = t('login_unknown')
+        = t('reader_extension.login_unknown')
         %br
-        = link_to t('forgotten_password'), new_password_reset_url
+        = link_to t('reader_extension.forgotten_password'), new_password_reset_url
 
     %p{ :class => @reader_session.errors.on(:login) ? 'haserror' : '' }
       %label{:for => "reader_session_login"}
-        = t('login_or_email')
+        = t('reader_extension.login_or_email')
       %br
       = f.text_field :login, :class => 'login' 
         
     %p{ :class => @reader_session.errors.on(:password) ? 'haserror' : '' }
       %label{:for => "reader_session_password"}
-        = t('password').titlecase
+        = t('reader_extension.password').titlecase
       %br
       = f.password_field :password, :class => 'login'
 
@@ -41,13 +42,13 @@
       = f.submit ' Log in '
       = f.check_box :remember_me
       %label.paranthetical{:for => "reader_session_remember_me"}
-        = t('remember_me')
+        = t('reader_extension.remember_me')
 
   %ul
     - if Radiant::Config['reader.allow_registration?']
       %li
         = link_to "registration".titlecase, new_reader_url
-        = t('is_free_and_quick')
+        = t('reader_extension.is_free_and_quick')
     %li
-      = link_to t("forgotten_password"), new_password_reset_url
+      = link_to t("reader_extension.forgotten_password"), new_password_reset_url
       

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

@@ -1,23 +1,21 @@
-= render :partial => 'readers/standard_parts'
-
 - content_for :login do
   - if @message
     %p
       = @message
   - else
     %p
-      = t('log_in_or_register')
+      = t('reader_extension.log_in_or_register')
   
   = render :partial => 'login_form', :locals => {:no_title => true}
 
 - content_for :breadcrumbs do
-  = link_to t('home').titlecase, '/' 
+  = link_to t('reader_extension.home').titlecase, '/' 
   > 
-  = t('log_in').titlecase
+  = t('reader_extension.log_in').titlecase
 
 - content_for :title do
-  = t('please_log_in').titlecase
-
+  = t('reader_extension.please_log_in').titlecase
 
+= render :partial => 'shared/standard_reader_parts'
 
-= yield :login
+= yield :login

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

@@ -1,13 +1,15 @@
 - 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
+  = link_to t('reader_extension.navigation.log_in'), reader_login_url
+  = link_to t('reader_extension.navigation.register'), new_reader_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
+  %strong
+    = link_to t('reader_extension.navigation.greeting', :name => current_reader.name), reader_profile_url
+  - if !current_reader.activated?
+    = link_to t('reader_extension.navigation.activate'), reader_activation_url
+  - else
+    = link_to t('reader_extension.navigation.account'), reader_account_url
+    - if current_reader.is_user?
+      = link_to t('reader_extension.navigation.admin'), admin_pages_url
+    = link_to t('reader_extension.navigation.log_out'), reader_logout_url
 
 

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

@@ -2,96 +2,95 @@
 - check_password ||= false
 
 - form_for reader, :html => {:class => 'friendly'} do |f| 
+  %input{:type => :hidden, :name => :authentication_type, :value => :user}
+
   - unless @reader.errors.empty?
     %p.has_error
-      = t('sorry').titlecase
-      = t('form_problem') + '.'
-      = t('affected_fields_highlighted')
+      = t('reader_extension.sorry').titlecase
+      = t('reader_extension.form_problem') + '.'
+      = t('reader_extension.affected_fields_highlighted')
   - else
     %p
-      = t('bold_required')
+      = t('reader_extension.bold_required')
 
   %p
-    = f.label :name, t('your_name'), :class => 'required'
+    = f.label :name, nil, :class => 'required'
     %br
     = f.text_field :name, :class => 'standard'
-    %span.formnote= t('form_notes.name')
+    %span.formnote= t('reader_extension.form_notes.name')
 
   - if Radiant::Config['reader.use_honorifics?']
     %p
-      = f.label :honorific, t(:honorific), :class => 'optional'
+      = f.label :honorific, nil, :class => 'optional'
       %br
       = f.text_field :honorific, :class => 'standard'
-      %span.formnote= t('form_notes.honorific')
+      %span.formnote= t('reader_extension.form_notes.honorific')
 
-  - if reader.new_record? && reader.email_field
+  - if reader.new_record?
     %p
-      = f.label reader.email_field, t('label.reader.email'), :class => 'required'
+      = f.label reader.email_field, t('reader_extension.label.reader.email'), :class => 'required'
       %br
       = text_field_tag reader.email_field, params[reader.email_field] || reader.email, :id => "reader_#{reader.email_field}", :class => 'standard'
-      %span.formnote= t('form_notes.email')
+      %span.formnote= t('reader_extension.form_notes.email')
     .innocuous
       %p
-        =f.label :email, t("dont_fill"), :class => 'required'
+        =f.label :email, nil, :class => 'required'
         %br
-        = f.text_field :email, :class => 'standard'
-        %span.formnote= t('spam_trap')
+        = f.text_field :email, :class => 'standard', :value => ""
+        %span.formnote= t('reader_extension.spam_trap')
 
   - else
     %p
-      = f.label :email, t('your_email'), :class => 'required'
+      = f.label :email, nil, :class => 'required'
       %br
       = f.text_field :email, :class => 'standard'
-      %span.formnote= t('form_notes.email')
+      %span.formnote= t('reader_extension.form_notes.email')
 
   %p
-    = f.label :login, t('login_name'), :class => 'optional'
+    = f.label :login, nil, :class => 'optional'
     %br
     = f.text_field :login, :class => 'standard'
-    %span.formnote= t('form_notes.login')
+    %span.formnote= t('reader_extension.form_notes.login')
 
   - if reader.new_record?
     %p
-      = f.label :password, t('password'), :class => 'required'
+      = f.label :password, nil, :class => 'required'
       %br
       = f.password_field :password, :class => 'standard', :autocomplete => 'off'
-      %span.formnote= t('form_notes.new_password')
+      %span.formnote= t('reader_extension.form_notes.new_password')
 
     %p
-      = f.label :password_confirmation, t('confirm_password'), :class => 'required'
+      = f.label :password_confirmation, nil, :class => 'required'
       %br
       = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
 
   - else 
     .display_password
       %p
-        = f.label :password, t('password').titlecase, :class => 'optional'
+        = f.label :password, nil, :class => 'optional'
         %span.password
           •••••
-        %span.formnote= link_to t('change_password'), '#', :class => 'toggle', :rel => ".display_password, .new_password"
+        %span.formnote= link_to t('reader_extension.change_password'), '#', :class => 'toggle', :rel => ".display_password, .new_password"
           
     .new_password.hidden
       %p
-        = f.label :password, t('new_password'), :class => 'required'
+        = f.label :password, t('reader_extension.new_password'), :class => 'required'
         %br
         = f.password_field :password, :class => 'standard', :autocomplete => 'off'
-        %span.formnote= t('form_notes.new_password')
+        %span.formnote= t('reader_extension.form_notes.new_password')
       %p
-        = f.label :password_confirmation, t('confirm_new_password'), :class => 'required'
+        = f.label :password_confirmation, t('reader_extension.confirm_new_password'), :class => 'required'
         %br
         = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
     
-  - if Radiant::Config['reader.use_description?']
+  - if Radiant::Config['reader.get_profile?']
     %p
-      = f.label :description, t('your_description'), :class => 'optional'
+      = f.label :description, nil, :class => 'optional'
       %br
       = f.text_area :description, :class => 'standard', :rows => 8
-      %span.formnote= t('form_notes.description')
-
-  - @edit_partials.each do |partial|
-    = render :partial => partial, :locals => {:reader => @reader}
+      %span.formnote= t('reader_extension.form_notes.description')
 
   %p
-    = submit_tag reader.new_record? ? t('create_account') : t("update_account")
+    = submit_tag reader.new_record? ? t('reader_extension.create_account') : t("reader_extension.update_account")
     or 
     = link_to 'cancel', request.referer

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

@@ -0,0 +1,11 @@
+- if Group.subscribable.any?
+  %h3
+    = t('reader_extension.subscriptions').titlecase
+  %p
+    - Group.subscribable.each do |group|
+      = check_box_tag "reader[group_ids][]", group.id, @reader.is_in?(group), :id => "reader_group_#{group.id}"
+      %label{:for => "reader_group_#{group.id}"}
+        = group.name
+      %span.formnote
+        = group.invitation
+      %br

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

@@ -1,27 +1,27 @@
-= render :partial => 'readers/standard_parts'
-
 - content_for :introduction do
   %p
-    = t("hello").titlecase
+    = t("reader_extension.hello").titlecase
     = link_to(@reader.name, reader_url(@reader)) + '.'
-    = t('preferences_intro')
+    = t('reader_extension.preferences_intro')
 
 - content_for :form do
+  %pre
+    = @reader.errors.full_messages
   = render :partial => 'form', :locals => {:reader => @reader}
   %p
     = standard_gravatar_for(@reader, 'http://gravatar.com/site/login')
-    = link_to t('change_gravatar'), "http://gravatar.com/site/login/"
+    = link_to t('reader_extension.change_gravatar'), "http://gravatar.com/site/login/"
     
 - content_for :breadcrumbs do 
-  = link_to t('home').titlecase, '/'
+  = link_to t('reader_extension.home').titlecase, '/'
   >
-  = link_to t('you').titlecase, '/readers/me'
+  = link_to t('reader_extension.you').titlecase, '/readers/me'
   >
-  = t('account_settings')
+  = t('reader_extension.account_settings')
 
 - content_for :title do 
-  = t('account_settings')
-    
+  = t('reader_extension.account_settings')
 
+= render :partial => 'shared/standard_reader_parts'
 
-= yield :form
+= yield :form

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

@@ -1,7 +1,6 @@
-= render :partial => 'readers/standard_parts'
-
 - content_for :introduction do
-  =t('readers_introduction')
+  %p
+    =t('reader_extension.readers_introduction')
   
 - content_for :list do
   #readers
@@ -17,23 +16,23 @@
               = link_to standard_gravatar_for(reader), reader_url(reader), {:title => reader.name}
               = link_to reader.name, reader_url(reader)
             %p.context
-              = t("joined_on")
+              = t("reader_extension.joined_on")
               = l(reader.created_at, :format => :date) + '.'
-              - @index_partials.each do |partial|
-                = render :partial => partial, :locals => {:reader => reader}
 
 - content_for :pagination do
-  = pagination_and_summary_for(@readers, t('person'))
+  = pagination_and_summary_for(@readers, t('reader_extension.person'))
 
 - content_for :breadcrumbs do
-  = link_to t('home').titlecase, '/'
+  = link_to t('reader_extension.home').titlecase, '/'
   >
-  = t('people').titlecase
+  = t('reader_extension.people').titlecase
 
 - content_for :title do
-  = t('people').titlecase
+  = t('reader_extension.people').titlecase
 
+= render :partial => 'shared/standard_reader_parts'
 
 = yield :pagination if @readers.previous_page
 = yield :list
 = yield :pagination if @readers.next_page
+

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

@@ -1,16 +1,14 @@
-= render :partial => 'readers/standard_parts'
-
-%div.login_form
-  %h1 
-    = t('log_in').titlecase
-
-  = render :partial => 'reader_sessions/login_form', :locals => {:backto => @backto}
-
 - content_for :breadcrumbs do
-  = link_to t('home').titlecase, '/' 
+  = link_to t('reader_extension.home').titlecase, '/' 
   > 
-  t('log_in').titlecase
+  t('reader_extension.log_in').titlecase
 
 - content_for :title do
-  = t('log_in').titlecase
-  
+  = t('reader_extension.log_in').titlecase
+
+= render :partial => 'shared/standard_reader_parts'
+
+%div.login_form
+  %h1 
+    = t('reader_extension.log_in').titlecase
+  = render :partial => 'reader_sessions/login_form', :locals => {:backto => @backto}

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

@@ -1,35 +1,33 @@
-= render :partial => 'readers/standard_parts'
-
 - content_for :introduction do
   %p
-    = t('please_register')
+    = t('reader_extension.please_register')
 
 - content_for :form do
   = render :partial => 'form'
 
 - content_for :notes do
   %h3
-    = t('notes').titlecase
+    = t('reader_extension.notes').titlecase
   %ul.friendly
     %li
-      = t('confirming_email')
+      = t('reader_extension.confirming_email')
     %li
-      = t('getting_gravatar')
+      = t('reader_extension.getting_gravatar')
       = link_to "gravatar.com" + '.', "http://www.gravatar.com"
     - if Radiant::Config['reader.terms_url']
       %li
-        = t('please_read_our')
-        = link_to t("terms_and_conditions"), Radiant::Config['reader.terms_url']
+        = t('reader_extension.please_read_our')
+        = link_to t("reader_extension.terms_and_conditions"), Radiant::Config['reader.terms_url']
 
 - content_for :breadcrumbs do
-  = link_to t('home').titlecase, '/'
+  = link_to t('reader_extension.home').titlecase, '/'
   > 
-  = t('register').titlecase
+  = t('reader_extension.register').titlecase
 
 - content_for :title do
-  = t('new_account').titlecase
-
+  = t('reader_extension.new_account')
 
+= render :partial => 'shared/standard_reader_parts'
 
 = yield :form
-= yield :notes
+= yield :notes

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

@@ -2,26 +2,26 @@
 
 %div.apologetic
   %p.haserror
-    = t('page_permission_denied')
+    = t('reader_extension.page_permission_denied')
 
     - if current_reader
-      = t('if_mistake_see_admin')
+      = t('reader_extension.if_mistake_see_admin')
 
       - content_for :title do
-        = t('sorry_access_denied')
+        = t('reader_extension.sorry_access_denied')
       
     - else
-      = t('please_log_in') + '.'
+      = t('reader_extension.please_log_in') + '.'
 
       - content_for :title do
-        = t('please_log_in')
+        = t('reader_extension.please_log_in')
 
   - unless current_reader
     = render :partial => 'reader_sessions/login_form'
 
 - content_for :breadcrumbs do
-  = link_to t('home').titlecase, '/'
+  = link_to t('reader_extension.home').titlecase, '/'
   >
-  = t('access_denied')
+  = t('reader_extension.access_denied')
 
 

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

@@ -1,27 +1,26 @@
-= render :partial => 'readers/standard_parts'
 
 - content_for :description do
   - if @reader.description.blank?
     %p 
-      = t('no_description')
+      = t('reader_extension.no_description')
   - else
-    = clean_textilize @reader.description
+    = clean_html @reader.description
 
   - @show_partials.each do |partial|
     = render :partial => partial, :locals => {:reader => @reader}
 
 - content_for :breadhead do
-  = link_to t('readers').titlecase + t('separator'), readers_url
-  = yield :parent
+  = link_to t('reader_extension.readers').titlecase, readers_url
+  = t('reader_extension.separator')
 
 - content_for :title do
   = @reader.name
 
 - content_for :breadcrumbs do
   = yield :breadhead
-  = t('separator')
+  = t('reader_extension.separator')
   = yield :title
 
+= render :partial => 'shared/standard_reader_parts'
 
-
-= yield :description
+= yield :description

data/app/views/shared/_standard_reader_parts.html.haml

@@ -0,0 +1,14 @@
+- content_for :person do
+  - if @reader && !@reader.new_record?
+    = standard_gravatar_for(@reader)
+  
+- content_for :section_navigation do
+  = link_to t('reader_extension.navigation.readers'), readers_url, :class => 'section'
+  - if Radiant::Config['reader.help_url']
+    = link_to t('reader_extension.navigation.reader_help'), Radiant::Config['reader.help_url']
+
+- content_for :controls do
+  = render :partial => 'readers/controls'
+
+- content_for :signals do
+  = render :partial => 'readers/flasher'

data/app/views/site/not_allowed.html.haml

@@ -0,0 +1,4 @@
+%h1
+  = t('reader_extension.access_denied')
+%p
+  = t('reader_extension.page_private')

data/config/initializers/authlogic_connect_config.rb

@@ -0,0 +1,12 @@
+# connections = {}
+# %w{twitter facebook google yahoo myspace vimeo linked_in}.each do |provider|
+#   if Radiant.config["reader.#{provider}.key"]
+#     connect[provider] = {
+#       :key => Radiant.config["reader.#{provider}.key"],
+#       :secret => Radiant.config["reader.#{provider}.secret"],
+#       :label => provider.titlecase
+#     }
+#   end
+# end
+# 
+# AuthlogicConnect.config = connections

data/config/initializers/radiant_config.rb

@@ -3,6 +3,7 @@ Radiant.config do |config|
     reader.define 'allow_registration?', :default => true
     reader.define 'require_confirmation?', :default => true
     reader.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => false
+    reader.define 'get_profile?', :default => true
   end
   config.namespace('email') do |email|
     email.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => true