RubyGems - masq2 - Versions diffs - 1.0.0 - Mend

masq2 1.0.0

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.

Files changed (92) hide show

checksums.yaml +7 -0
checksums.yaml.gz.sig +0 -0
data/CHANGELOG.md +83 -0
data/CODE_OF_CONDUCT.md +135 -0
data/CONTRIBUTING.md +151 -0
data/LICENSE.txt +22 -0
data/README.md +426 -0
data/SECURITY.md +23 -0
data/app/assets/images/masq/favicon.ico +0 -0
data/app/assets/images/masq/openid_symbol.png +0 -0
data/app/assets/images/masq/seatbelt_icon.png +0 -0
data/app/assets/images/masq/seatbelt_icon_gray.png +0 -0
data/app/assets/images/masq/seatbelt_icon_high.png +0 -0
data/app/assets/stylesheets/masq/application.css.erb +61 -0
data/app/controllers/masq/accounts_controller.rb +132 -0
data/app/controllers/masq/base_controller.rb +78 -0
data/app/controllers/masq/consumer_controller.rb +144 -0
data/app/controllers/masq/info_controller.rb +23 -0
data/app/controllers/masq/passwords_controller.rb +42 -0
data/app/controllers/masq/personas_controller.rb +75 -0
data/app/controllers/masq/server_controller.rb +247 -0
data/app/controllers/masq/sessions_controller.rb +58 -0
data/app/controllers/masq/sites_controller.rb +60 -0
data/app/controllers/masq/yubikey_associations_controller.rb +25 -0
data/app/helpers/masq/application_helper.rb +57 -0
data/app/helpers/masq/personas_helper.rb +15 -0
data/app/helpers/masq/server_helper.rb +15 -0
data/app/mailers/masq/account_mailer.rb +17 -0
data/app/models/masq/account.rb +245 -0
data/app/models/masq/open_id_request.rb +42 -0
data/app/models/masq/persona.rb +61 -0
data/app/models/masq/release_policy.rb +11 -0
data/app/models/masq/site.rb +68 -0
data/app/views/layouts/masq/base.html.erb +70 -0
data/app/views/layouts/masq/consumer.html.erb +30 -0
data/app/views/masq/account_mailer/forgot_password.html.erb +3 -0
data/app/views/masq/account_mailer/forgot_password.text.erb +3 -0
data/app/views/masq/account_mailer/signup_notification.html.erb +5 -0
data/app/views/masq/account_mailer/signup_notification.text.erb +5 -0
data/app/views/masq/accounts/_hcard.html.erb +29 -0
data/app/views/masq/accounts/edit.html.erb +100 -0
data/app/views/masq/accounts/new.html.erb +27 -0
data/app/views/masq/accounts/show.html.erb +4 -0
data/app/views/masq/accounts/show.xrds.builder +40 -0
data/app/views/masq/consumer/index.html.erb +31 -0
data/app/views/masq/consumer/start.html.erb +2 -0
data/app/views/masq/info/help.html.erb +8 -0
data/app/views/masq/info/index.html.erb +5 -0
data/app/views/masq/info/safe_login.html.erb +24 -0
data/app/views/masq/passwords/edit.html.erb +13 -0
data/app/views/masq/passwords/new.html.erb +11 -0
data/app/views/masq/personas/_form.html.erb +159 -0
data/app/views/masq/personas/edit.html.erb +9 -0
data/app/views/masq/personas/index.html.erb +17 -0
data/app/views/masq/personas/new.html.erb +9 -0
data/app/views/masq/server/decide.html.erb +146 -0
data/app/views/masq/server/index.xrds.builder +19 -0
data/app/views/masq/server/seatbelt_config.xml.builder +24 -0
data/app/views/masq/server/seatbelt_login_state.xml.builder +4 -0
data/app/views/masq/sessions/new.html.erb +27 -0
data/app/views/masq/shared/_error_messages.html.erb +12 -0
data/app/views/masq/sites/edit.html.erb +42 -0
data/app/views/masq/sites/index.html.erb +20 -0
data/config/initializers/configuration.rb +5 -0
data/config/initializers/mime_types.rb +1 -0
data/config/initializers/requires.rb +6 -0
data/config/locales/de.yml +281 -0
data/config/locales/en.yml +271 -0
data/config/locales/es.yml +254 -0
data/config/locales/nl.yml +258 -0
data/config/locales/rails.de.yml +225 -0
data/config/locales/ru.yml +272 -0
data/config/masq.example.yml +132 -0
data/config/routes.rb +41 -0
data/db/migrate/20120312120000_masq_schema.rb +152 -0
data/db/migrate/20130626220915_remame_last_authenticated_with_yubikey_on_masq_accounts.rb +11 -0
data/db/migrate/20130704205532_add_first_and_lastname_columns_to_personas.rb +11 -0
data/db/migrate/20130807060329_change_open_id_associations_server_url_column_type.rb +22 -0
data/lib/masq/active_record_openid_store/association.rb +16 -0
data/lib/masq/active_record_openid_store/nonce.rb +9 -0
data/lib/masq/active_record_openid_store/openid_ar_store.rb +58 -0
data/lib/masq/authenticated_system.rb +136 -0
data/lib/masq/engine.rb +12 -0
data/lib/masq/openid_server_system.rb +110 -0
data/lib/masq/signup.rb +53 -0
data/lib/masq/version.rb +5 -0
data/lib/masq.rb +50 -0
data/lib/masq2.rb +1 -0
data/lib/tasks/masq_tasks.rake +58 -0
data.tar.gz.sig +2 -0
metadata +377 -0
metadata.gz.sig +0 -0

data/app/views/layouts/masq/consumer.html.erb ADDED Viewed

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%=t :openid_consumer_testsuite_title %></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <%= stylesheet_link_tag 'masq/application' %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <div id="head">
+      <h1><%=t :relying_party_title %></h1>
+    </div>
+    <div id="main">
+      <div class="wrap">
+        <h2><%=t :openid_consumer_testsuite_title %></h2>
+        <% if flash[:notice] %><div class="notice"><%=simple_format h flash[:notice] %></div><% end %>
+        <% if flash[:alert] %><div class="error"><%=simple_format h flash[:alert] %></div><% end %>
+        <%= yield %>
+      </div>
+    </div>
+    <div id="foot">
+      <div class="wrap">
+        <span class="note">
+          powered by <%= link_to "masq2", 'https://github.com/oauth-xx/masq2' %>
+          and <%= link_to image_tag('masq/openid_symbol.png') + " OpenID", 'https://openid.net/' %>
+        </span>
+      </div>
+    </div>
+  </body>
+</html>

data/app/views/masq/account_mailer/forgot_password.html.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<p><%=t :forgot_password_create_new_one %>:</p>
+<p><%= reset_password_url(:id => @account.password_reset_code) %></p>

data/app/views/masq/account_mailer/forgot_password.text.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<%=t :forgot_password_create_new_one %>:
+<%= reset_password_url(:id => @account.password_reset_code) %>

data/app/views/masq/account_mailer/signup_notification.html.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<p><%=t :account_created_but_not_activated_yet %></p>
+<p><%=t :please_activate_it_by_clicking_the_following_link %>:</p>
+<p><%= link_to t(:activation_link), activate_account_url(:activation_code => @account.activation_code) %></p>

data/app/views/masq/account_mailer/signup_notification.text.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<%=t :account_created_but_not_activated_yet %>
+<%=t :please_activate_it_by_clicking_the_following_link %>:
+<%= activate_account_url(:activation_code => @account.activation_code) %>

data/app/views/masq/accounts/_hcard.html.erb ADDED Viewed

@@ -0,0 +1,29 @@
+<div id="hcard-<%= persona.fullname.gsub(/\s/, '-') if persona.fullname %>" class="vcard">
+  <% if persona.web_blog and !persona.web_blog.empty? %>
+ <a class="url fn" href='<%= persona.web_blog %>' ><%= persona.fullname %></a>
+    <% else %>
+ <span class="fn"><%= persona.fullname %></span>
+    <% end %>
+ <% if persona.company_name%>
+ <div class="org"><%= persona.company_name %></div>
+ <% end %>
+ <% if persona.email %>
+ <a class="email" href="mailto:<%= persona.email %>"><%= persona.email %></a>
+ <% end %>
+ <% if persona.address %>
+ <div class="adr">
+  <div class="street-address"><%= persona.address %></div>
+  <span class="locality"><%= persona.city %></span>
+,
+  <span class="region"><%= persona.state %></span>
+,
+  <span class="postal-code"><%= persona.postcode %></span>
+  <span class="country-name"><%= persona.country %></span>
+ </div>
+ <% end %>
+ <% if persona.phone_mobile%>
+ <div class="tel"><%= persona.phone_mobile%></div>
+ <% end %>
+</div>

data/app/views/masq/accounts/edit.html.erb ADDED Viewed

@@ -0,0 +1,100 @@
+<h2><%=t :my_profile %></h2>
+<%= error_messages_for current_account %>
+<%= form_for current_account, :url => account_path, :html => { :method => :put } do |f| %>
+  <% unless email_as_login? -%>
+  <div class="row">
+    <%= f.label :email, t(:email) %>
+    <%= f.text_field :email %>
+  </div>
+  <% end -%>
+  <div class="row">
+    <%= f.label :public_persona_id, t(:public_persona) %>
+    <%= f.select :public_persona_id, current_account.personas.map{ |p| [ p.title, p.id ]}, :include_blank => !Masq::Engine.config.masq['force_default_persona'] %>
+  </div>
+  <div>
+    <%= f.submit t(:submit_update) %>
+  </div>
+<% end %>
+<% if Masq::Engine.config.masq['can_change_password'] %>
+  <h2><%=t :my_password %></h2>
+  <%= form_tag change_password_account_path, :method => :put do %>
+    <div class="row">
+      <%= label_tag :old_password, t(:old_password) %>
+      <%= password_field_tag :old_password %>
+    </div>
+    <div class="row">
+      <%= label_tag :password, t(:new_password_minimum_6_characters).html_safe %>
+      <%= password_field_tag :password %>
+    </div>
+    <div class="row">
+      <%= label_tag :password_confirmation, t(:password_confirmation) %>
+      <%= password_field_tag :password_confirmation %>
+    </div>
+    <div>
+      <%= submit_tag t(:submit_update) %>
+    </div>
+  <% end %>
+<% end %>
+<% if Masq::Engine.config.masq['can_use_yubikey'] %>
+  <h2><%=t :my_yubikey %></h2>
+  <% if current_account.yubico_identity? %>
+  <%= form_tag account_yubikey_association_path, :method => :delete do %>
+    <div class="row">
+      <p><%=t :your_account_is_associated_with_the_yubico_identity %> <strong><%= current_account.yubico_identity %></strong></p>
+      <p class="note"><%=t :yubikey_how_to_use %></p>
+    </div>
+    <div>
+      <%= submit_tag t(:remove_association) %>
+    </div>
+  <% end %>
+  <%= form_for :account, :url => account_path, :html => { :method => :put } do |f| %>
+    <div>
+      <p>
+        <% if current_account.yubikey_mandatory? %>
+         <%=t :your_yubikey_is_mandatory_for_login %>
+        <% else %>
+         <%=t :your_yubikey_is_optional_for_login %>
+        <% end %>
+      </p>
+      <div>
+        <%= f.hidden_field :yubikey_mandatory, :value => (current_account.yubikey_mandatory ? 0 : 1)  %>
+        <%= submit_tag( current_account.yubikey_mandatory ? t(:make_my_yubikey_optional) : t(:make_my_yubikey_mandatory) ) %>
+      </div>
+    </div>
+  <% end %>
+  <% else %>
+  <%= form_tag account_yubikey_association_path do %>
+    <div class="row">
+      <%= label_tag :yubico_otp, t(:your_yubikey_a_one_time_password).html_safe %>
+      <%= password_field_tag :yubico_otp %>
+    </div>
+    <div>
+      <%= submit_tag t(:associate_account_with_yubikey) %>
+    </div>
+  <% end %>
+  <% end %>
+<% end %>
+<% if Masq::Engine.config.masq['can_disable_account'] %>
+  <h2><%=t :disable_my_account %></h2>
+  <%= form_tag account_path, :method => :delete do %>
+    <p><%=t :wont_be_possible_to_reclaim_identifier %> <%= identifier(current_account) %></p>
+    <div class="row">
+      <%= label_tag :confirmation_password, t(:confirm_by_entering_password) %>
+        <%= password_field_tag :confirmation_password, '' %>
+    </div>
+    <div>
+      <%= submit_tag t(:delete_my_account_and_data) %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/masq/accounts/new.html.erb ADDED Viewed

@@ -0,0 +1,27 @@
+<h2><%=t :signup_title %></h2>
+<%= error_messages_for @account %>
+<%= form_for @account, :url => account_path do |f| -%>
+  <% unless email_as_login? -%>
+  <div class="row">
+    <%= f.label :login, t(:login) %>
+    <%= f.text_field :login %>
+  </div>
+  <% end -%>
+  <div class="row">
+    <%= f.label :email, t(:email) %>
+    <%= f.text_field :email %>
+  </div>
+  <div class="row">
+    <%= f.label :password, t(:password) %>
+    <%= f.password_field :password %>
+  </div>
+  <div class="row">
+    <%= f.label :password_confirmation, t(:password_confirmation) %>
+    <%= f.password_field :password_confirmation %>
+  </div>
+  <div>
+    <%= f.submit t(:signup) %>
+  </div>
+<% end -%>

data/app/views/masq/accounts/show.html.erb ADDED Viewed

@@ -0,0 +1,4 @@
+<h2><%=h @account.login %></h2>
+<p>OpenID: <%= identifier(@account) %></p>
+<%= render :partial => 'hcard', :locals => {:persona => @account.public_persona } if @account.public_persona   %>

data/app/views/masq/accounts/show.xrds.builder ADDED Viewed

@@ -0,0 +1,40 @@
+xml.instruct!
+xml.xrds(
+  :XRDS,
+  "xmlns:openid" => OpenID::OPENID_1_0_NS,
+  "xmlns:xrds" => "xri://$xrds",
+  "xmlns" => "xri://$xrd*($v*2.0)",
+) do
+  xml.XRD do
+    xml.Service(priority: 1) do
+      xml.Type(OpenID::OPENID_2_0_TYPE)
+      xml.Type(OpenID::SReg::NS_URI_1_1)
+      xml.Type(OpenID::SReg::NS_URI_1_0)
+      xml.Type(OpenID::AX::AXMessage::NS_URI)
+      xml.Type(OpenID::PAPE::AUTH_MULTI_FACTOR) if Masq::Engine.config.masq["use_ssl"] && @account.has_otp_device?
+      xml.Type(OpenID::PAPE::AUTH_PHISHING_RESISTANT) if Masq::Engine.config.masq["use_ssl"] && @account.has_otp_device?
+      xml.URI(endpoint_url)
+      xml.LocalID(identity_url(account: @account, protocol: scheme))
+    end
+    xml.Service(priority: 2) do
+      xml.Type(OpenID::OPENID_1_1_TYPE)
+      xml.Type(OpenID::SReg::NS_URI_1_1)
+      xml.Type(OpenID::SReg::NS_URI_1_0)
+      xml.Type(OpenID::AX::AXMessage::NS_URI)
+      xml.Type(OpenID::PAPE::AUTH_MULTI_FACTOR) if Masq::Engine.config.masq["use_ssl"] && @account.has_otp_device?
+      xml.Type(OpenID::PAPE::AUTH_PHISHING_RESISTANT) if Masq::Engine.config.masq["use_ssl"] && @account.has_otp_device?
+      xml.URI(endpoint_url)
+      xml.tag!("openid:Delegate", identity_url(account: @account, protocol: scheme))
+    end
+    xml.Service(priority: 3) do
+      xml.Type(OpenID::OPENID_1_0_TYPE)
+      xml.Type(OpenID::SReg::NS_URI_1_1)
+      xml.Type(OpenID::SReg::NS_URI_1_0)
+      xml.Type(OpenID::AX::AXMessage::NS_URI)
+      xml.Type(OpenID::PAPE::AUTH_MULTI_FACTOR) if Masq::Engine.config.masq["use_ssl"] && @account.has_otp_device?
+      xml.Type(OpenID::PAPE::AUTH_PHISHING_RESISTANT) if Masq::Engine.config.masq["use_ssl"] && @account.has_otp_device?
+      xml.URI(endpoint_url)
+      xml.tag!("openid:Delegate", identity_url(account: @account, protocol: scheme))
+    end
+  end
+end

data/app/views/masq/consumer/index.html.erb ADDED Viewed

@@ -0,0 +1,31 @@
+<%= form_tag consumer_start_path do %>
+  <div class="row">
+    <%= label_tag :openid_identifier, t(:identifier) + ':', :class => 'check' %>
+    <%= text_field_tag :openid_identifier, Masq::Engine.config.masq['host'] %>
+    <%= submit_tag t(:verify) %>
+  </div>
+  <div class="row">
+    <%= check_box_tag :immediate %>
+    <%= label_tag :immediate, t(:use_immediate_mode), :class => 'check' %>
+  </div>
+  <div class="row">
+    <%= check_box_tag :use_sreg, params[:did_sreg] %>
+    <%= label_tag :use_sreg, t(:request_registration_data), :class => 'check' %>
+  </div>
+  <div class="row">
+    <%= check_box_tag :use_ax_fetch, params[:did_ax_fetch] %>
+    <%= label_tag :use_ax_fetch, t(:request_attribute_exchange_data), :class => 'check' %>
+  </div>
+  <div class="row">
+    <%= check_box_tag :use_ax_store, params[:did_ax_store] %>
+    <%= label_tag :use_ax_store, t(:store_attribute_exchange_data), :class => 'check' %>
+  </div>
+  <div class="row">
+    <%= check_box_tag :use_pape, params[:did_pape] %>
+    <%= label_tag :use_pape, t(:request_pape), :class => 'check' %>
+  </div>
+  <div class="row">
+    <%= check_box_tag :force_post, params[:force_post] %>
+    <%= label_tag :force_post, t(:force_post), :class => 'check' %>
+  </div>
+<% end %>

data/app/views/masq/consumer/start.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ <%= @form_text.html_safe %>
2	+ <%= javascript_tag("document.getElementById('checkid_form').submit();") %>

data/app/views/masq/info/help.html.erb ADDED Viewed

@@ -0,0 +1,8 @@
+<h2><%= t(:questions_answers) %></h2>
+<p><%=t :here_we_cover_openid_topics %></p>
+<h3><%=t :openid_delegation %></h3>
+<%=simple_format t(:delegation_explanation) %>
+<pre>
+&lt;link rel="openid2.provider openid.server" href="<%= endpoint_url %>" /&gt;
+&lt;link rel="openid2.local_id openid.delegate" href="<%= identifier(logged_in? ? current_account : 'YOUR_LOGIN') %>" /&gt;
+</pre>

data/app/views/masq/info/index.html.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<h2><%=t :get_your_openid %></h2>
+<%= simple_format t(:openid_intro) %>
+<% unless Masq::Engine.config.masq['disable_registration'] %>
+  <%= simple_format t(:openid_intro_link, :signup_link => link_to(t(:signup_for_an_openid), new_account_path)) %>
+<% end %>

data/app/views/masq/info/safe_login.html.erb ADDED Viewed

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%=h page_title %></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="/favicon.ico" type="image/ico" />
+    <%= stylesheet_link_tag 'masq/application' %>
+  </head>
+  <body>
+    <div id="head">
+      <h1><%= Masq::Engine.config.masq['name'] %></h1>
+    </div>
+    <div id="main">
+      <div class="wrap">
+        <h2><%=t :login_to_proceed %></h2>
+        <% if checkid_request %>
+        <p><%=t :host_requests_identification_you_need_to_login, :host => extract_host(checkid_request.trust_root) %></p>
+        <% end %>
+        <%=simple_format t(:login_intro, :login_url => login_url(:protocol => scheme)) %>
+      </div>
+    </div>
+  </body>
+</html>

data/app/views/masq/passwords/edit.html.erb ADDED Viewed

@@ -0,0 +1,13 @@
+<%= form_tag password_path(:id => @reset_code), :method => 'put' do %>
+  <div class="row">
+    <%= label_tag :password, t(:password) %>
+    <%= password_field_tag :password %>
+  </div>
+  <div class="row">
+    <%= label_tag :password_confirmation, t(:password_confirmation) %>
+    <%= password_field_tag :password_confirmation %>
+  </div>
+  <div>
+    <%= submit_tag t(:reset_password) %>
+  </div>
+<% end %>

data/app/views/masq/passwords/new.html.erb ADDED Viewed

@@ -0,0 +1,11 @@
+<h2><%=t :forgot_password_title %></h2>
+<%= form_tag password_path do %>
+  <div class="row">
+    <%= content_tag :label, t(:please_enter_email), :for => 'email' %>
+    <%= text_field_tag :email, params[:email] %>
+  </div>
+  <div>
+    <%= submit_tag t(:submit_send) %>
+  </div>
+<% end %>

data/app/views/masq/personas/_form.html.erb ADDED Viewed

@@ -0,0 +1,159 @@
+  <%- attributes = Masq::Engine.config.masq['attribute_mappings'].symbolize_keys.keys %>
+  <%- phone             = [:phone_home, :phone_mobile, :phone_fax, :phone_work] %>
+  <%- instant_messaging = [:im_aim, :im_icq, :im_msn, :im_yahoo, :im_jabber, :im_skype] %>
+  <%- other_information = [:biography, :image_default, :web_default, :web_blog] %>
+  <div class="row inline space">
+    <%= form.label :title, t(:title) %>
+    <%= form.text_field :title %>
+  </div>
+  <%- if attributes.include? :nickname %>
+  <h3><%=t :personal_information %></h3>
+  <div class="row inline">
+    <%= form.label :nickname, property_label_text(:nickname) %>
+    <%= form.text_field :nickname %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :fullname %>
+  <div class="row inline">
+    <%= form.label :fullname, property_label_text(:fullname) %>
+    <%= form.text_field :fullname %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :email %>
+  <div class="row inline">
+    <%= form.label :email, property_label_text(:email) %>
+    <%= form.text_field :email %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :address %>
+  <div class="row inline">
+    <%= form.label :address, property_label_text(:address) %>
+    <%= form.text_field :address %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :address_additional %>
+  <div class="row inline">
+    <%= form.label :address_additional, property_label_text(:address_additional) %>
+    <%= form.text_field :address_additional %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :postcode %>
+  <div class="row inline">
+    <%= form.label :postcode, property_label_text(:postcode) %>
+    <%= form.text_field :postcode %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :city %>
+  <div class="row inline">
+    <%= form.label :city, property_label_text(:city) %>
+    <%= form.text_field :city %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :state %>
+  <div class="row inline">
+    <%= form.label :state, property_label_text(:state) %>
+    <%= form.text_field :state %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :country %>
+  <div class="row inline">
+    <%= form.label :country, property_label_text(:country) %>
+    <%= form.select :country, countries_for_select, { :include_blank => true } %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :language %>
+  <div class="row inline">
+    <%= form.label :language, property_label_text(:language) %>
+    <%= form.select :language, languages_for_select, { :include_blank => true } %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :timezone %>
+  <div class="row inline">
+    <%= form.label :timezone, property_label_text(:timezone) %>
+    <%= form.select :timezone, ActiveSupport::TimeZone::MAPPING.values.sort, { :include_blank => true } %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :gender %>
+  <div class="row inline">
+    <%= form.label :gender, property_label_text(:gender) %>
+    <%= form.select :gender, [['Male', 'M'], ['Female', 'F']], { :include_blank => true } %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :date_of_birth %>
+  <div class="row inline space">
+    <%= form.label :dob_day, property_label_text(:dob) %>
+    <%= select_day persona.dob_day, :prefix => 'persona', :field_name => 'dob_day', :include_blank => true %>
+    <%= select_month persona.dob_month, :prefix => 'persona', :field_name => 'dob_month', :include_blank => true %>
+    <%= select_year persona.dob_year, :prefix => 'persona', :field_name => 'dob_year', :include_blank => true, :start_year => (Date.today.year - 100), :end_year => Date.today.year %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :company_name %>
+  <h3><%=t :professional_information %></h3>
+  <div class="row inline">
+    <%= form.label :company_name, property_label_text(:company_name) %>
+    <%= form.text_field :company_name %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :job_title %>
+  <div class="row inline">
+    <%= form.label :job_title, property_label_text(:job_title) %>
+    <%= form.text_field :job_title %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :address_business %>
+  <div class="row inline">
+    <%= form.label :address_business, property_label_text(:address_business) %>
+    <%= form.text_field :address_business %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :address_additional_business %>
+  <div class="row inline">
+    <%= form.label :address_additional_business, property_label_text(:address_additional_business) %>
+    <%= form.text_field :address_additional_business %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :postcode_business %>
+  <div class="row inline">
+    <%= form.label :postcode_business, property_label_text(:postcode_business) %>
+    <%= form.text_field :postcode_business %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :city_business %>
+  <div class="row inline">
+    <%= form.label :city_business, property_label_text(:city_business) %>
+    <%= form.text_field :city_business %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :state_business %>
+  <div class="row inline">
+    <%= form.label :state_business, property_label_text(:state_business) %>
+    <%= form.text_field :state_business %>
+  </div>
+  <% end %>
+  <%- if attributes.include? :country_business %>
+  <div class="row inline space">
+    <%= form.label :country_business, property_label_text(:country_business) %>
+    <%= form.select :country_business, countries_for_select, { :include_blank => true } %>
+  </div>
+  <% end %>
+  <%- {:phone => phone,
+       :instant_messaging => instant_messaging,
+       :other_information => other_information}.each do |title,attrs| %>
+    <%- if (attributes - attrs).size != attributes.size %>
+      <h3><%=t title %></h3>
+      <%- attrs.each do |attr| %>
+        <%- if attributes.include? attr %>
+          <div class="row inline">
+            <%= form.label attr, property_label_text(attr) %>
+            <%= form.text_field attr %>
+          </div>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>

data/app/views/masq/personas/edit.html.erb ADDED Viewed

@@ -0,0 +1,9 @@
+<h2><%=t :edit_your_persona, :title => h(persona.title) %></h2>
+<%= error_messages_for persona %>
+<%= form_for [:account, persona] do |f| %>
+  <%= render :partial => 'form', :object => f %>
+  <div>
+    <%= f.submit t(:submit_update), :class => 'labelspace' %>
+  </div>
+<% end %>

data/app/views/masq/personas/index.html.erb ADDED Viewed

@@ -0,0 +1,17 @@
+<h2><%=t :my_personas_title %></h2>
+<p><%=t :personas_intro %></p>
+<ul>
+  <% @personas.each do |persona| %>
+  <li>
+    <h3><%=h persona.title%></h3>
+    <div class="options">
+      <%= link_to t(:edit), edit_account_persona_path(persona) %>
+      <%= link_to t(:delete), account_persona_path(persona), :data => { :confirm => t(:really_want_to_delete_persona, :title => h(persona.title))}, :method => :delete %>
+    </div>
+  </li>
+  <% end %>
+</ul>
+<%= link_to t(:create_a_new_persona), new_account_persona_path %>

data/app/views/masq/personas/new.html.erb ADDED Viewed

@@ -0,0 +1,9 @@
+<h2><%=t :create_a_new_persona_title %></h2>
+<%= error_messages_for persona %>
+<%= form_for [:account, persona] do |f| %>
+  <%= render :partial => 'form', :object => f %>
+  <div>
+    <%= f.submit 'create', :class => 'labelspace' %>
+  </div>
+<% end %>