kete_browserid 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/app/views/account/_login_button.html.erb

@@ -1,3 +1,3 @@
-<% if !::KeteBrowserid::REPLACE_EXISTING_LOGIN || (Kete.is_configured? && anonymous_ok_for?(session[:return_to])) -%>
+<% if !::KeteBrowserid.supported?(request.user_agent) || !::KeteBrowserid::REPLACE_EXISTING_LOGIN || (Kete.is_configured? && anonymous_ok_for?(session[:return_to])) -%>
   <div class="wrap"><%= submit_tag @button_text, { :class => @button_classes.join(' '), :tabindex => '1'} %></div>
 <% end -%>

data/app/views/account/_login_form.html.erb

@@ -1,17 +1,27 @@
-<fieldset>
-  <% unless ::KeteBrowserid::REPLACE_EXISTING_LOGIN -%>
-  <h3><%= t '.use_browserid' -%></h3>
-  <% end -%>
+<% if ::KeteBrowserid.supported?(request.user_agent) -%>
+  <fieldset>
+    <% unless ::KeteBrowserid::REPLACE_EXISTING_LOGIN -%>
+      <h3><%= t '.use_browserid' -%></h3>
+    <% end -%>
 
-  <p><%= t '.register_via_browserid',
-	 :register_link => link_for_register_via_browserid -%></p>
-  <h4><%= link_for_login_with_browserid -%></h4>
-</fieldset>
+    <p><%= t '.register_via_browserid',
+	   :register_link => link_for_register_via_browserid -%></p>
+    <h4><%= link_for_login_with_browserid -%></h4>
 
-<% unless ::KeteBrowserid::REPLACE_EXISTING_LOGIN -%>
+    <% if ::KeteBrowserid::REPLACE_EXISTING_LOGIN -%>
+      <p><%= t '.usually_use_normal_login_1' -%></p>
+      <p><%= t '.usually_use_normal_login_2', :site_name => Kete.pretty_site_name -%></p>
+      <p><%= t '.usually_use_normal_login_3' -%></p>
+    <% end -%>
+  </fieldset>
+<% end -%>
+
+<% if !::KeteBrowserid.supported?(request.user_agent) || !::KeteBrowserid::REPLACE_EXISTING_LOGIN -%>
 <p>&nbsp;</p>
 <fieldset>
-  <h3><%= t '.or_standard_login' -%></h3>
+  <% if ::KeteBrowserid.supported?(request.user_agent) -%>
+    <h3><%= t '.or_standard_login' -%></h3>
+  <% end -%>
 
   <!--[form:login]-->
   <% if Kete.is_configured? -%>
@@ -47,6 +57,15 @@
                                                :action => 'forgot_password',
                                                :urlified_name => @site_basket.urlified_name},
                                              :tabindex => '1') -%></p>
+
+  <% unless ::KeteBrowserid.supported?(request.user_agent) -%>  
+    <p><%=t '.usually_use_browserid',
+            :generate_password_link => link_to(t('.generate_password'),
+                                             { :controller => 'account',
+                                               :action => 'forgot_password',
+                                               :urlified_name => @site_basket.urlified_name},
+                                             :tabindex => '1') -%></p>
+    <% end -%>
   <% end -%>
 </fieldset>
 <% end -%>

data/config/locales/en.yml

@@ -2,9 +2,14 @@
 en:
   account:
     login_form:
+      generate_password: "Click Here"
       or_standard_login: "Or use standard {{t.base.login}} {{t.base.form}}"
       register_via_browserid: "Are {{t.base.you}} {{t.base.registered}}? {{t.base.you.capitalize}} will need to {{register_link}} first before {{t.base.you}} can {{t.base.login}}."
       use_browserid: "Use {{t.base.browserid}}"
+      usually_use_browserid: "Do you usually use {{t.base.browserid}} to {{t.base.login}}? If so, you'll need to request a {{t.base.password}} (if you haven't already): {{generate_password_link}}."
+      usually_use_normal_login_1: "Do you usually NOT use {{t.base.browserid}} to {{t.base.login}}?"
+      usually_use_normal_login_2: "{{t.base.browserid}} is this site's preferred way to login (because it works with a lot of other sites!), please set up your {{t.base.browserid}} account and we'll match it to your existing {{site_name}} account."
+      usually_use_normal_login_3: "Just click \"{{t.base.login.capitalize}} with {{t.base.browserid}}\" to get started signing up with {{t.base.browserid}}."
     signup_as_browserid:
       second_step: "Now that you have created your {{t.base.browserid}}, we need to ask you a few more questions before completing your sign up on the site."
       short_name: "{{t.base.short_name.capitalize}}"

data/kete_browserid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kete_browserid}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Walter McGinnis"]
-  s.date = %q{2012-06-20}
+  s.date = %q{2012-07-12}
   s.description = %q{An add-on for Kete (http://kete.net.nz) that replaces normal login with a browserid based login.}
   s.email = %q{walter@katipo.co.nz}
   s.extra_rdoc_files = [

data/lib/kete_browserid.rb

@@ -1,4 +1,8 @@
 module KeteBrowserid
   REPLACE_EXISTING_LOGIN = true
   REPLACE_EXISTING_REGISTER = true
+
+  def self.supported?(user_agent)
+    !user_agent.include?('MSIE 7.') && !user_agent.include?('MSIE 6.')
+  end
 end

data/lib/kete_browserid/extensions/helpers/application_helper.rb

@@ -7,8 +7,11 @@ ApplicationHelper.module_eval do
   end
   
   def link_to_login(phrase, url_for_options, html_options)
+    standard_html = link_to_unless_current phrase, url_for_options, html_options
+    return standard_html unless ::KeteBrowserid.supported?(request.user_agent)
+
     html = String.new
-    
+
     # don't make link active for login page
     browserid_login_html = if params[:controller] == 'account' && params[:action] == 'login'
                              t('application_helper.link_to_login.login_with_browserid')
@@ -16,8 +19,9 @@ ApplicationHelper.module_eval do
                              link_for_login_with_browserid
                            end
 
+    
     unless ::KeteBrowserid::REPLACE_EXISTING_LOGIN
-      html = link_to_unless_current phrase, url_for_options, html_options
+      html = standard_html
       html += '</li><li>'
     end
 
@@ -33,6 +37,9 @@ ApplicationHelper.module_eval do
   end
 
   def link_to_register(phrase, url_for_options, html_options)
+    standard_html = link_to_unless_current phrase, url_for_options, html_options
+    return standard_html unless ::KeteBrowserid.supported?(request.user_agent)
+
     html = String.new
     
     # don't make link active for signup page
@@ -43,7 +50,7 @@ ApplicationHelper.module_eval do
                               end
 
     unless ::KeteBrowserid::REPLACE_EXISTING_REGISTER
-      html = link_to_unless_current phrase, url_for_options, html_options
+      html = 
       html += '</li><li>'
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kete_browserid
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Walter McGinnis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-20 00:00:00 +12:00
+date: 2012-07-12 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency