radiant-reader-extension 1.3.0 → 1.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.3.0
1
+ 1.3.1
@@ -10,7 +10,7 @@
10
10
  - unless no_title
11
11
  %h2
12
12
  - if purpose
13
- = t(purpose) + ','
13
+ = purpose + ','
14
14
  = t('please')
15
15
  - else
16
16
  = t('please')
@@ -13,21 +13,21 @@
13
13
 
14
14
  %p
15
15
  = f.label :name, t('your_name'), :class => 'required'
16
- %span.formnote= t('name_notes')
17
16
  %br
18
17
  = f.text_field :name, :class => 'standard'
18
+ %span.formnote= t('form_notes.name')
19
19
 
20
20
  - if Radiant::Config['reader.use_honorifics?']
21
21
  %p
22
22
  = f.label :honorific, t(:honorific), :class => 'optional'
23
- %span.formnote= t('honorific_notes')
23
+ %span.formnote= t('form_notes.honorific')
24
24
  %br
25
25
  = f.text_field :honorific, :class => 'standard'
26
26
 
27
27
  - if reader.new_record? && reader.email_field
28
28
  %p
29
29
  = f.label reader.email_field, t('label.reader.email'), :class => 'required'
30
- %span.formnote= t('email_notes')
30
+ %span.formnote= t('form_notes.email')
31
31
  %br
32
32
  = text_field_tag reader.email_field, params[reader.email_field] || reader.email, :id => "reader_#{reader.email_field}", :class => 'standard'
33
33
  .innocuous
@@ -42,20 +42,20 @@
42
42
  = f.label :email, t('your_email'), :class => 'required'
43
43
  %br
44
44
  = f.text_field :email, :class => 'standard'
45
- %span.formnote= t('email_notes')
45
+ %span.formnote= t('form_notes.email')
46
46
 
47
47
  %p
48
48
  = f.label :login, t('login_name'), :class => 'optional'
49
49
  %br
50
50
  = f.text_field :login, :class => 'standard'
51
- %span.formnote= t('login_notes')
51
+ %span.formnote= t('form_notes.login')
52
52
 
53
53
  - if reader.new_record?
54
54
  %p
55
55
  = f.label :password, t('password'), :class => 'required'
56
56
  %br
57
57
  = f.password_field :password, :class => 'standard', :autocomplete => 'off'
58
- %span.formnote= t('password_notes')
58
+ %span.formnote= t('form_notes.new_password')
59
59
 
60
60
  %p
61
61
  = f.label :password_confirmation, t('confirm_password'), :class => 'required'
@@ -68,13 +68,14 @@
68
68
  = f.label :password, t('password').titlecase, :class => 'optional'
69
69
  %span.password
70
70
  •••••
71
- = link_to t('change_password'), '#', :class => 'toggle', :rel => ".display_password, .new_password"
71
+ %span.formnote= link_to t('change_password'), '#', :class => 'toggle', :rel => ".display_password, .new_password"
72
+
72
73
  .new_password.hidden
73
74
  %p
74
75
  = f.label :password, t('new_password'), :class => 'required'
75
76
  %br
76
77
  = f.password_field :password, :class => 'standard', :autocomplete => 'off'
77
- %span.formnote= t('new_password_notes')
78
+ %span.formnote= t('form_notes.new_password')
78
79
  %p
79
80
  = f.label :password_confirmation, t('confirm_new_password'), :class => 'required'
80
81
  %br
@@ -85,7 +86,7 @@
85
86
  = f.label :description, t('your_description'), :class => 'optional'
86
87
  %br
87
88
  = f.text_area :description, :class => 'standard', :rows => 8
88
- %span.formnote= t('description_notes')
89
+ %span.formnote= t('form_notes.description')
89
90
 
90
91
  - @edit_partials.each do |partial|
91
92
  = render :partial => partial, :locals => {:reader => @reader}
@@ -36,21 +36,25 @@ en:
36
36
  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."
37
37
  continue: "Continue"
38
38
  create_message: "create message"
39
- description_notes: "you can fill this in later. Textile formatting is allowed."
40
39
  dont_fill: "Don't fill this in!"
41
40
  edit_profile: "edit your profile"
42
- email_notes: "we will send an activation message to this address"
43
41
  email_unknown: "Sorry. That email address is not known here."
44
42
  enter_code: "Please enter confirmation code"
45
43
  enter_email_for_reminder: "enter your email address and we will send the message again"
46
44
  enter_own_password: "First, just to make sure you're you, please enter your current password:"
47
- existing_password_notes: "leave blank to keep present password. If changing, at least four characters."
48
45
  forgotten_password: "forgotten password?"
46
+ form_notes:
47
+ description: "you can fill this in later. Textile formatting is allowed."
48
+ email: "we will send activation instructions to this address"
49
+ existing_password: "leave blank to keep present password. If changing, at least four characters."
50
+ login: "leave blank to use your email address"
51
+ name: "this is how you will be credited on the site"
52
+ new_password: "at least four characters, please"
53
+ honorific: "this is prepended to your name when you are credited"
49
54
  form_problem: "there was a problem with the form"
50
55
  getting_gravatar: "If you would like a picture to appear next to your messages, give yourself a gravatar at"
51
56
  hello: "hello"
52
57
  honorific: "Title or rank"
53
- honorific_notes: ""
54
58
  invitation_message: "Invitation message"
55
59
  invite_description: '<a href="%{url}">Edit your preferences to put some text about yourself here.'
56
60
  if_cant_find: "If you can't find the message, we can"
@@ -69,11 +73,9 @@ en:
69
73
  log_in: 'log in'
70
74
  log_out: "log out"
71
75
  login_name: "Login name"
72
- login_notes: "leave blank to use your email address"
73
76
  login_unknown: "Sorry: we don't recognise that combination of username and password."
74
77
  logout_message: "You are logged out. Bye!"
75
78
  must_be_empty: "must be empty"
76
- name_notes: "as you would like it to appear on the site"
77
79
  navigation:
78
80
  activate: "Activate account"
79
81
  readers: "People"
@@ -92,7 +94,6 @@ en:
92
94
  password_incorrect: "Sorry. Wrong password."
93
95
  password_mismatch: "Passwords don't match! Please try again."
94
96
  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>."
95
- password_notes: "at least four characters, please"
96
97
  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)."
97
98
  password_reset_reassurance: "Your password will not change until you fill in that form, so only you can complete this process."
98
99
  password_updated_notice: "Thank you. Your password has been updated and you are now logged in."
@@ -1,136 +1,91 @@
1
- @import reader_constants.sass
1
+ @import compass/css3
2
2
 
3
- /*** friendly forms *******
3
+ $dark: #4d4e53 / cool grey 11
4
+ $mid: #8c8d8e / cool grey 8
5
+ $pale: #afafaf / cool grey 6
6
+ $paler: #bdbdbd / cool grey 4
7
+ $verypale: #d6d6d4 / cool grey 2
8
+ $accent = #d1005d / rubine red
4
9
 
5
- form.friendly
6
- margin: 0 0 60px 0
7
- p
8
- margin: 1em 0 0 0
9
- input.titular
10
- clear: both
11
- width: 95%
12
- font-family: Georgia,Palatino,Sylfaen,"Times New Roman", Times, serif
13
- font-size: 1.2em
14
- line-height: 1
15
- color: #4d4e53
16
- border-width: 1px
17
- border-style: solid
18
- border-color: #cacac8
19
- padding: 5px
20
- font-size: 200%
21
- textarea, select
22
- width: 95%
23
- font-family: Georgia,Palatino,Sylfaen,"Times New Roman", Times, serif
24
- font-size: 1.2em
25
- line-height: 1
26
- color: #4d4e53
27
- border-width: 1px
28
- border-style: solid
29
- border-color: #cacac8
30
- padding: 5px
31
- input
32
- &.standard
33
- width: 95%
34
- font-family: Georgia,Palatino,Sylfaen,"Times New Roman", Times, serif
35
- font-size: 1.2em
36
- line-height: 1
37
- color: #4d4e53
38
- border-width: 1px
39
- border-style: solid
40
- border-color: #cacac8
41
- padding: 5px
42
- &.login
43
- width: 50%
44
- font-family: Georgia,Palatino,Sylfaen,"Times New Roman", Times, serif
45
- font-size: 1.2em
46
- line-height: 1
47
- color: #4d4e53
48
- border-width: 1px
49
- border-style: solid
50
- border-color: #cacac8
51
- padding: 5px
52
- textarea
53
- color: #559dc4
54
- line-height: 1.4
55
- span.formnote
56
- font-family: helvetica, arial, sans-serif
57
- font-size: 0.8em
58
- line-height: 1.4
59
- color: #cacac8
60
- div.error-with-field
61
- display: inline
62
- small.error
63
- display: none
64
- p.context
65
- margin: 0
66
- div.innocuous
67
- display: none
68
- label.required
69
- font-weight: bold
70
-
71
- /***** input validation and error reporting *******
72
-
73
- p
74
- &.errornote
75
- color: #d1005d
76
- &.haserror
77
- border-left-width: 4px
78
- border-left-style: solid
79
- border-left-color: #d1005d
80
- padding-left: 12px
81
- color: #d1005d
82
- input, textarea
83
- border-width: 1px
84
- border-style: solid
85
- border-color: #d1005d
86
- label
87
- color: #d1005d
88
-
89
- ul.friendly
90
- list-style: square
10
+ =functional
91
11
  font-family: helvetica, arial, sans-serif
92
- font-size: 0.8em
93
- line-height: 1.4
94
- color: #4d4e53
95
- padding-left: 0
96
- margin-top: 0
97
-
98
- h2.inviting, a.inviting
99
- display: block
100
- font-family: 'HelveticaNeue-Light', helvetica, arial, sans-serif
12
+ font-weight: normal
13
+ =strong
14
+ +functional
101
15
  font-weight: bold
102
- font-size: 1.6em
103
- margin-bottom: 0
104
- margin-top: 50px
16
+ =small
17
+ +functional
18
+ font-size: 80%
105
19
 
106
- /***** gravatars and other useful things *******
20
+
21
+ div#readers
22
+ .reader
23
+ margin-bottom: 1em
24
+ h2
25
+ line-height: 1
26
+ margin: 0
27
+
28
+ div.activation_required
29
+ color: $accent
30
+
31
+ p.administrative
32
+ font-family: helvetica,arial,sans-serif
33
+ color: $pale
107
34
 
108
35
  img.gravatar
109
- float: left
110
- margin: 0 10px 3px 0
111
36
  +box-shadow
112
37
  border: 3px solid white
113
38
  &.thumbnail
114
39
  margin: 2px 10px 10px 0
115
40
  &.big
116
41
  margin: 8px 10px 4px 0
42
+ &.tiny
43
+ margin: 0 6px 4px 0
44
+ border: 1px solid white
117
45
 
118
- /*** system messages and controls *******
119
-
120
- .notice, .error
121
- position: absolute
122
- width: 250px
123
- right: 10px
124
- +border-radius
125
- +box-shadow
126
- color: white
127
- margin: 0
128
- padding: 0.75em
129
-
130
- .notice
131
- background-color: #00cc33
132
- border: 3px solid #7fe699
133
-
134
- .error
135
- background-color: #cc0000
136
- border: 3px solid #ff0071
46
+ form.friendly
47
+ margin: 0 0 60px 0
48
+ p
49
+ margin: 1em 0 0 0
50
+ input.titular
51
+ width: 95%
52
+ font-size: 200%
53
+ textarea, select
54
+ width: 95%
55
+ textarea
56
+ height: 400px
57
+ input.standard
58
+ width: 95%
59
+ input.login
60
+ width: 50%
61
+ span.formnote
62
+ color: $mid
63
+ label
64
+ &.required
65
+ font-weight: bold
66
+ span.password
67
+ display: block
68
+ width: 95%
69
+ padding: 5px
70
+ font-size: 1.2
71
+ line-height: 1.2
72
+ color: $pale
73
+ border: 1px solid $pale
74
+ span.error-with-field
75
+ input, select
76
+ border: 1px solid red
77
+ color: red
78
+ span.error
79
+ line-height: 1.4
80
+ background-color: $accent
81
+ color: white
82
+ padding: 3px 6px
83
+ margin: -5px 0 0 6px
84
+ cursor: pointer
85
+ +border-radius
86
+ +box-shadow
87
+ a.closer
88
+ margin-left: 10px
89
+ color: white
90
+ text-decoration: none
91
+
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{radiant-reader-extension}
8
- s.version = "1.3.0"
8
+ s.version = "1.3.1"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["spanner"]
12
- s.date = %q{2011-01-27}
12
+ s.date = %q{2011-01-31}
13
13
  s.description = %q{Centralises reader/member/user registration and management tasks for the benefit of other extensions}
14
14
  s.email = %q{will@spanner.org}
15
15
  s.extra_rdoc_files = [
@@ -109,7 +109,6 @@ Gem::Specification.new do |s|
109
109
  "public/images/admin/chk_on.png",
110
110
  "public/images/admin/delta.png",
111
111
  "public/javascripts/reader.js",
112
- "public/stylesheets/sass/_reader_constants.sass",
113
112
  "public/stylesheets/sass/admin/reader.sass",
114
113
  "public/stylesheets/sass/reader.sass",
115
114
  "radiant-reader-extension.gemspec",
data/reader_extension.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require_dependency 'application_controller'
2
2
 
3
3
  class ReaderExtension < Radiant::Extension
4
- version "1.3.0"
4
+ version "1.3.1"
5
5
  description "Provides reader/member/user registration and management functions"
6
6
  url "http://spanner.org/radiant/reader"
7
7
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: radiant-reader-extension
3
3
  version: !ruby/object:Gem::Version
4
- hash: 27
4
+ hash: 25
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 3
9
- - 0
10
- version: 1.3.0
9
+ - 1
10
+ version: 1.3.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - spanner
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-01-27 00:00:00 +00:00
18
+ date: 2011-01-31 00:00:00 +00:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -192,7 +192,6 @@ files:
192
192
  - public/images/admin/chk_on.png
193
193
  - public/images/admin/delta.png
194
194
  - public/javascripts/reader.js
195
- - public/stylesheets/sass/_reader_constants.sass
196
195
  - public/stylesheets/sass/admin/reader.sass
197
196
  - public/stylesheets/sass/reader.sass
198
197
  - radiant-reader-extension.gemspec
@@ -1,41 +0,0 @@
1
- @import compass/css3
2
-
3
- $red: #b20315
4
- $darkred: #a80016
5
- $palered: #db4d5c
6
- $yellow: #e09a0c
7
- $darkyellow: #bc7815
8
- $blue: #004250
9
-
10
- $coolgrey0: #f1f0ee
11
- $coolgrey1: #e2e1dd
12
- $coolgrey2: #d6d6d4
13
- $coolgrey3: #cacac8
14
- $coolgrey4: #bdbdbd
15
- $coolgrey5: #b3b3b3
16
- $coolgrey6: #afafaf
17
- $coolgrey7: #9a9b9d
18
- $coolgrey8: #8c8d8e
19
- $coolgrey9: #747679
20
- $coolgrey10: #616265
21
- $coolgrey11: #4d4e53
22
-
23
- $dark: $coolgrey11
24
- $mid: $coolgrey8
25
- $pale: $coolgrey6
26
- $paler: $coolgrey4
27
- $verypale: $coolgrey2
28
-
29
- $page: white
30
- $text: $coolgrey11
31
- $hover: $red
32
- $tag: $coolgrey8
33
- $input: $coolgrey11
34
-
35
- =inputfonts
36
- font-family: Georgia, serif
37
- font-size: 1.2em
38
- line-height: 1.4
39
-
40
- =functionalfonts
41
- font-family: helvetica, arial, sans-serif