radiant-reader-extension 0.9.2 → 1.0.0

data/app/views/admin/messages/preview.html.haml

@@ -0,0 +1 @@
+= @message.preview.body

data/app/views/admin/messages/show.html.haml

@@ -0,0 +1,72 @@
+- include_stylesheet('admin/reader')
+- body_classes << "reversed"
+
+= render_region :top 
+
+- render_region :header do |header|
+  - header.title do
+    %h1
+      = t('preview_and_send_message')
+
+#preview
+  - render_region :preview do |preview|
+    - preview.headers do
+      .message_header
+        %ul
+          - @message.preview.each_header do |name, value|
+            %li{:class => name}
+              = "#{name}:"
+              %strong
+                = value
+
+    - preview.body do
+      .message_body
+        %iframe.message_body{:src => preview_admin_message_url(@message)}
+
+    - preview.buttons do
+      .preview_controls
+        %p
+          = link_to t('edit_message'), edit_admin_message_url(@message)
+
+#deliver
+  - render_region :delivery do |delivery|
+    - delivery.function do
+      - if @message.administrative?
+        %p
+          = t("#{@message.function}_sent_automatically")
+        %ul
+          %li
+            = link_to t('edit_message').titlecase, edit_admin_message_url(@message)
+          %li
+            - if @message.group
+              = link_to @message.group.name + ' ' + t('group_page'), admin_group_url(@message.group)
+            - else
+              = link_to t('reader_configuration_page').titlecase, admin_reader_configuration_url
+ 
+    - delivery.options do
+      - unless @message.administrative?
+        - form_for :message, @message, :url => deliver_admin_message_url(@message), :html => {"data-onsubmit_status"=>"Sending email messages&#8230;"} do |f|
+          %h3
+            = t("send_to").titlecase + ":"
+          %p
+            = radio_button_tag 'delivery', 'all', true, :id => 'delivery_to_all', :disabled => @message.possible_readers.empty?
+            %label.checkbox{:for => 'delivery_to_all', :class => @message.possible_readers.empty? ? 'disabled' : ''} 
+              = t('everyone')
+              = t('count_people', :count => @message.possible_readers.count)
+          %p
+            = radio_button_tag 'delivery', 'inactive', false, :id => 'delivery_to_inactive', :disabled => @message.inactive_readers.empty?
+            %label.checkbox{:for => 'delivery_to_inactive', :class => @message.inactive_readers.empty? ? 'disabled' : ''} 
+              = t('everyone_inactive')
+              = t('count_people', :count => @message.inactive_readers.count)
+          %p
+            = radio_button_tag 'delivery', 'unsent', false, :id => 'delivery_to_unsent', :disabled => @message.undelivered_readers.empty?
+            %label.checkbox{:for => 'delivery_to_unsent', :class => @message.undelivered_readers.empty? ? 'disabled' : ''} 
+              = t('everyone_unsent')
+              = t('count_people', :count => @message.undelivered_readers.count)
+
+          %p.buttons
+            = submit_tag t('send_message')
+            = t('or')
+            = link_to t('cancel'), @message.group ? admin_group_url(@message.group) : admin_messages_url
+            
+    

data/app/views/admin/reader_configuration/edit.html.haml

@@ -0,0 +1,41 @@
+- body_classes << "reversed"
+
+- render_region :main do |main|
+  - main.edit_header do
+    %h1 Reader configuration
+
+  - main.edit_form do
+    - form_for :config, :url => admin_reader_configuration_url, :html => {"data-onsubmit_status"=>"Saving changes&#8230;", :method => :put} do |f|
+      = render_region :form_top
+      - render_region :form do |form|
+        - form.edit_registration do
+          %fieldset
+            %h3 
+              = t('registration').titlecase
+            %p
+              = edit_config('reader.allow_registration?')
+            %p
+              = edit_config('reader.require_confirmation?')
+            %p
+              = edit_config('reader.use_honorifics?')
+            %p
+              = edit_config('reader.layout')
+  
+        - form.edit_sender do
+          %fieldset
+            %h3 Administrative email
+            %p
+              = edit_config('email.name')
+            %p
+              = edit_config('email.address')
+            %p
+              = edit_config('email.prefix')
+            %p
+              = edit_config('email.layout')
+      
+      - render_region :form_bottom do |form_bottom|
+        - form_bottom.edit_buttons do
+          %p.buttons
+            %input.button{:type=>"submit", :value=>"Save Changes"}/
+            or
+            = link_to "Cancel", admin_reader_configuration_url

data/app/views/admin/reader_configuration/show.html.haml

@@ -0,0 +1,46 @@
+- body_classes << "reversed"
+- include_stylesheet('admin/reader')
+
+#reader_settings.box
+  %h3
+    .actions
+      = button_to t("edit"), edit_admin_reader_configuration_url, :method => :get
+    =t("reader_admin")
+  
+  - render_region :settings do |settings|
+    - settings.registration do
+      %p.ruled
+        = show_config 'reader.allow_registration?'
+      %p.ruled
+        = show_config 'reader.require_confirmation?'
+      %p.ruled
+        = show_config 'reader.use_honorifics?'
+      %p.ruled
+        = show_config 'reader.layout'
+
+    - settings.sender do
+      %p.ruled
+        = show_config 'email.name'
+      %p.ruled
+        = show_config 'email.address', :class => 'uri'
+      %p.ruled
+        = show_config 'email.prefix'
+      %p.ruled
+        = show_config 'email.layout'
+
+#message_settings.box
+  %h4
+    =t("reader_emails")
+  
+  - render_region :messages do |messages|
+    - messages.administration do
+      - MessageFunction.find_all.each do |func|
+        - message = Message.functional(func)
+        %p.ruled
+          %label= func.description
+          - if message
+            = link_to message.subject, admin_message_url(message)
+          - else
+            = link_to image('plus') + " create message", new_admin_message_url(:function => func), :class => 'create'
+
+

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

@@ -1,5 +1,4 @@
 - form_for [:admin, @reader] do |f|
-  = hidden_field "reader", "lock_version"
   
   = render :partial => 'avatar' unless @reader.new_record?
   
@@ -39,6 +38,8 @@
         = f.label :notes, t('notes'), :class => "optional"
         ~ f.text_area "notes", :size => "53x4", :class => "textarea"
   
+  = render_region :form_additions, :locals => {:f => f}
+
   - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
     - form_bottom.edit_buttons do
       %p.buttons

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

@@ -4,10 +4,41 @@
 #readers_table.outset      
   %table#readers.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"}
     %thead
-      = render :partial => 'list_head'
+      %thead
+        %tr
+          - render_region :thead do |thead|
+            - thead.title_header do
+              %th.reader Name / Login
+            - thead.description_header do
+              %th.reader_description Self-description
+            - thead.modify_header do
+              %th.modify Modify
+              
     %tbody
       - @readers.each do |reader|
-        = render :partial => 'listed', :locals => {:reader => reader}
+        %tr
+          - 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 reader.name, edit_admin_reader_url(reader), :class => reader.trusted? ? '' : 'untrusted'
+                %span.info
+                  = "(#{reader.login})"
+                - unless reader.notes.blank?
+                  %p.admin_notes
+                    %strong
+                      note:
+                    = reader.notes
+
+            - tbody.description_cell do
+              %td.reader_description
+                = truncate_and_textilize(reader.description, 24)
+
+            - tbody.modify_cell do
+              %td.actions
+                - if admin?
+                  = link_to(image('minus') + ' ' + t('delete_reader'), admin_reader_url(reader), :method => :delete, :class => 'action', :confirm => t('really_delete_reader', :name => reader.name))
+        
       
   - render_region :bottom do |bottom|
     - bottom.buttons do

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

@@ -1,13 +1,10 @@
 %p
-  Thank you. A message has been sent to 
-  %strong
-    = params[:email]
-  containing the instructions for setting a new password. 
-  Remember, it hasn't changed yet and won't until you follow the instructions in the message.
+  = t('reset_message_instructions')
 
 - content_for :breadcrumbs do
-  = link_to 'Home', '/'
-  > Reset password
+  = link_to t('home').titlecase, '/'
+  > 
+  = t('reset_password')
 
-- content_for :pagetitle do
-  Reset message sent
+- content_for :title do
+  = t('reset_message_sent')

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

@@ -3,69 +3,65 @@
 
     %p
       %strong
-        Hello
+        = t('hello')
         = @reader.name + '.'
-      Thank you for persevering with the authorization process. 
-      %br
-      Please enter and confirm the new password you would like to use. It must be at least four characters long, nothing obvious or typical and ideally a mixture of numbers and letters.
-
+      = t('new_password_instructions')
 
     - form_for @reader, :url => password_reset_path, :method => :put, :html => {:class => 'friendly', :autocomplete => "off"} do |f|
 
       - if @reader.errors.any?
-        %p.haserror
-          %strong
-            Sorry: there was a problem.
-          = @reader.errors.full_messages.to_sentence
+        %p.errornote
+          %strong 
+            = t('sorry').titlecase
+            = t('form_problem') + '.'
 
       = hidden_field_tag :id, params[:id]
       = hidden_field_tag :confirmation_code, @reader.perishable_token
 
-      %p{:class => @reader.errors.any? ? 'haserror' : ''}
-        = f.label :password, "New password", :class => 'required'
+      %p
+        = f.label :password, t('new_password'), :class => 'required'
+        %span.formnote= t('password_notes')
         %br
         = f.password_field :password, :class => 'titular'
 
-      %p{:class => @reader.errors.any? ? 'haserror' : ''}
-        = f.label :password_confirmation, "Repeat for confirmation", :class => 'required'
+      %p
+        = f.label :password_confirmation, t('repeat_password'), :class => 'required'
         %br
         = f.password_field :password_confirmation, :class => 'titular'
       %p
         = f.submit "Update my password and log me in"
         
       %p
-        Your password hasn't changed yet, so if you've just remembered it you can still
-        = link_to "log in.", reader_login_url
+        = t('password_not_yet_changed')
 
-      - content_for :pagetitle do
-        Change my password
+      - content_for :title do
+        = t('change_password')
 
   - else 
 
-    %p.haserror
-      Sorry: the system can't find you. That link must have been garbled somewhere along the line. 
-      Please paste the 20-character confirmation code into the box below and we'll try again.
+    %p.errornote
+      = t('sorry_reset_not_found')
       
     - form_tag edit_password_reset_path, :method => 'GET', :class => 'friendly', :autocomplete => "off" do
       = hidden_field_tag :id, params[:id]
       %p
         %label{:for => "confirmation_code"}
-          confirmation code
+          = t('confirmation_code')
         %br
         = text_field_tag 'confirmation_code', '', :class => 'titular'
 
       %p
-        = submit_tag 'try again'
+        = submit_tag t('continue')
     
-    %p
-      The confirmation code only works for ten minutes, but you can always 
-      = link_to "enter your email address again", new_password_reset_url
-      and we'll send a new one.
+    %ul.actions
+      %li
+        = link_to t("restart_password_change"), new_password_reset_url
       
-    - content_for :pagetitle do
-      Please enter confirmation code
+    - content_for :title do
+      = t('enter_code')
       
 - content_for :breadcrumbs do
-  = link_to 'Home', '/'
-  > Reset password
+  = link_to t('home').titlecase, '/'
+  > 
+  = t('reset_password')
 

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

@@ -1,31 +1,30 @@
 - include_stylesheet 'reader'
 
 %p
-  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).
+  =t('password_reset_instructions')
   %strong
-    Your password will not change until you fill in that form,
-  so only you can complete this process.
+    =t('password_reset_reassurance')
   
 - if @error
   %p.haserror
-    = @error
+    = t(@error)
 
 .password_form
-
   - email = current_reader.email if current_reader
   - form_tag password_reset_path, :class => 'friendly' do
     %p
       %label{:for => "email"}
-        Email address
+        = t('your_email')
       %br
       = text_field_tag 'email', email, :class => 'titular'
 
     %p
-      = submit_tag 'send me instructions'
+      = submit_tag t('send_reset_button')
 
 - content_for :breadcrumbs do
-  = link_to 'Home', '/'
-  > Reset password
+  = link_to t('home').titlecase, '/'
+  > 
+  = t('reset_password').titlecase
 
-- content_for :pagetitle do
-  Reset your password
+- content_for :title do
+  = t('reset_password').titlecase

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

@@ -1,41 +1,32 @@
 = render :partial => 'readers/flasher'
 
 - if current_reader && current_reader.activated?
-
   %p
-    Thank you very much for persevering with the registration process. Your account is now active.
+    = t("activation_complete")
 
-  = render :partial => 'on_activation'
+  - if session[:return_to]
+    %p 
+      = link_to (t("return_to_page"), session[:return_to]) + '?'
     
-  - content_for :pagetitle do
-    Hello 
+  - content_for :title do
+    = t('hello').titlecase
     = current_reader.name
 
 - else
   %div.activation
+    - if @error
+      %p.errornotice
+        = t(@error)
     %p
-      - if current_reader
-        Thank you for registering. Now please check your email. We have sent a message to 
-        %strong
-          = current_reader.email
-        containing a link that will automatically activate your account and log you in. If you can't find the message, we can 
-        = link_to("send it again", new_reader_activation_url) + '.'
-      - else
-        Please check your email. You should have received a message containing a link that will automatically activate your account and log you in. If you can't find the message, we can 
-        = link_to("send it again", new_password_reset_url) + ':'
-        just put your email address in the password reminder form, and if your account has not been activated you'll receive another activation message.
-
-    - if Radiant::Config['reader.allow_registration?']
-      %p
-        If you think you might have put the wrong email address in, the easiest thing to do is 
-        = link_to 'register again', new_reader_url
-        with the right one. The failed registration attempt will be purged after a week or so.
+      = t('thanks_and_activation_instructions')
+      = link_to("resend_activation", new_reader_activation_url) + '.'
+      - unless current_reader
+        = t('enter_email_for_reminder')
 
-  - content_for :pagetitle do
-    Activation message sent
+  - content_for :title do
+    = t('activation_sent')
 
 - content_for :breadcrumbs do
-  = link_to 'Home', '/'
+  = link_to t('Home'), '/'
   >
-  Activate your account
-
+  = t('activate_account')

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

@@ -10,50 +10,44 @@
     - unless no_title
       %h2
         - if purpose
-          = purpose + ','
-          please
+          = t(purpose) + ','
+          = t('please')
         - else
-          Please
-        log in or
-        = link_to "register", new_reader_url
+          = t('please')
+        = t('log_in')
+        - if Radiant::Config['reader.allow_registration?']
+          = t('or')
+          = link_to t('register'), new_reader_url
 
     - if @error
       %p.haserror
-        Sorry: we don't recognise that combination of username and password.
+        = t('login_unknown')
         %br
-        If you've forgotten your password we can always 
-        = link_to 'make you a new one', repassword_url
+        = link_to t('forgotten_password'), new_password_reset_url
 
     %p{ :class => @reader_session.errors.on(:login) ? 'haserror' : '' }
       %label{:for => "reader_session_login"}
-        Username
+        = t('username').titlecase
       %br
       = f.text_field :login, :class => 'login' 
-      - if @reader_session.errors.on(:login)
-        %br
-        This
-        = @reader_session.errors.on(:login).to_a.to_sentence
         
     %p{ :class => @reader_session.errors.on(:password) ? 'haserror' : '' }
       %label{:for => "reader_session_password"}
-        Password
+        = t('password').titlecase
       %br
       = f.password_field :password, :class => 'login'
-      - if @reader_session.errors.on(:password)
-        %br
-        This
-        = @reader_session.errors.on(:password).to_a.to_sentence
 
     %p.buttons
       = f.submit ' Log in '
       = f.check_box :remember_me
       %label.paranthetical{:for => "reader_session_remember_me"}
-        Remember me
+        = t('remember_me')
 
-  %p.quiet
+  %ul.quiet
     - if Radiant::Config['reader.allow_registration?']
-      If you haven't already, you will need to 
-      = link_to "register", new_reader_url
-      before you can log in. It only takes a moment.
-    If you've forgotten your password, you can enter your email address to
-    = link_to("set a new one", new_password_reset_url) + '.'
+      %li
+        = link_to "registration".titlecase, new_reader_url
+        = t('is_free_and_quick')
+    %li
+      = link_to t("forgotten_password").titlecase, new_password_reset_url
+