iugusdk 1.0.0.alpha.7 → 1.0.0.alpha.9

data/app/views/iugu/settings/profile.html.haml

@@ -1,19 +1,12 @@
 - content_for :title do I18n.t("iugu.profile_settings") end
-%div
-  %h3
-    = I18n.t "iugu.profile_settings"
-- if flash[:group] == :profile_update
-  = flash[:notice]
+
 
 - if current_user.guest
 
   = simple_form_for @user, :url => become_user_path, :method => :post do |f|
-    - if @user.errors.any?
-      #error_explanation{ :style => "margin-bottom: 15px" }
-        %ul
-          - @user.errors.full_messages.each do |msg|
-            %li
-              = msg
+
+    = render partial: "iugu/shared/notices", locals: { group: :profile_update, resource: @user }
+
     %div
       = f.label :email
       = f.email_field :email
@@ -31,79 +24,53 @@
 
 - else
 
-  = simple_form_for @user, :url => profile_update_path, :method => :post do |f|
-    - if @user.errors.any?
-      - unless @user.errors.include?(:password)
-        #error_explanation{ :style => "margin-bottom: 15px" }
-          %ul
-            - @user.errors.full_messages.each do |msg|
-              %li
-                = msg
+  = simple_form_for @user, :url => profile_update_path, :method => :post, :html => { :class => "no-bottom-margin" } do |f|
 
-    %div 
-      = f.label :name, I18n.t("activerecord.attributes.name")
-      = f.text_field :name
+    // I18n.locale
 
-    %div
-      = f.label :email
-      = f.email_field :email
+    - @input_success = ''
+    = render partial: "iugu/shared/notices", locals: { group: :profile_update, resource: @user }
+
+    = f.text_field :name, :placeholder => I18n.t("activerecord.attributes.name"), :class => "full-width string #{@user.errors.include?(:name) ? 'failure':@input_success }"
+
+    = f.email_field :email, :placeholder => "E-mail", :class => "full-width string #{@user.errors.include?(:email) ? 'failure':@input_success }"
 
     %div
-      = f.input :birthdate, :as => :date, :start_year => Date.today.year - 5, :end_year => Date.today.year - 100, :order => [:day, :month, :year], :label => I18n.t("activerecord.attributes.birthdate")
+
+      = @user.birthdate
+
+      = f.input :birthdate, :as => :hidden, :input_html => { :"data-selector" => "date", :"data-label" => I18n.t("activerecord.attributes.birthdate") }, :label => false
+
 
     - if AvailableLanguage.all.count > 1
       %div
-        = f.input :locale, :collection => AvailableLanguage.all, :label => I18n.t("activerecord.attributes.locale")
+        = f.input :locale, :collection => AvailableLanguage.all, :label => false, :input_html => { :"data-label" => I18n.t("activerecord.attributes.locale"), :"data-selector" => "select" }, :include_blank => false
 
     %div
-      = f.submit "OK"
-  %br
+      = f.submit I18n.t("iugu.save"), :class => "button default"
 
-  - if IuguSDK::enable_user_api
-    %h3
-      Api Token
-    = @user.token.token
-    %br
-    = link_to "Renew", renew_user_token_path
-    %br
-    %br
 
   - if IuguSDK::enable_signup_form
-    %div
-      %h3
-        = I18n.t "iugu.change_password"
 
-    - if flash[:group] == :password_update
-      = flash[:notice]
+    = simple_form_for @user, :url => profile_update_path + "#password", :method => :post do |f|
 
-    = simple_form_for @user, :url => profile_update_path, :method => :post do |f|
-      - if @user.errors.include?(:password)
-        #error_explanation{ :style => "margin-bottom: 15px" }
-          %ul
-            %li
-              = "Password " + @user.errors[:password].first
+      .element-spacing
+        %h3.no-bottom-margin
+          = I18n.t "activerecord.attributes.password"
 
-      %div
-        = f.label :password, I18n.t("activerecord.attributes.password")
-        = f.password_field :password
-  
-      %div
-        = f.label :password_confirmation, I18n.t("activerecord.attributes.password_confirmation")
-        = f.password_field :password_confirmation
 
-      %div
-        = f.submit "OK", :id => "new_password_submit"
 
-  %div
-    - if @user.destroying?
-      = I18n.t("iugu.user_destruction_in")
-      = @user.destruction_job.run_at
-      - unless @user.destruction_job.locked_at
-        = link_to I18n.t("iugu.undo"), profile_cancel_destruction_path, :confirm => I18n.t("iugu.are_you_sure?") 
-    - else
-      - if IuguSDK::enable_user_cancel
-        = link_to I18n.t("iugu.remove_user"), profile_destroy_path, :confirm => I18n.t("iugu.are_you_sure?") 
-  %br
+      - @input_success = ''
+      = render partial: "iugu/shared/notices", locals: { group: :password, resource: @user }
+
+      = f.password_field :password, :placeholder => I18n.t("activerecord.attributes.password"), :class => "full-width string #{@user.errors.include?(:password) ? 'failure':@input_success }"
+
+
+      = f.password_field :password_confirmation, :placeholder => I18n.t("activerecord.attributes.password_confirmation"), :class => "full-width string #{@user.errors.include?(:password) ? 'failure':@input_success }"
+
+      = hidden_field_tag "form_group", :password
+  
+      = f.submit I18n.t("iugu.save"), :id => "new_password_submit", :class => "button no-bottom-margin"
 
   - if IuguSDK::enable_social_linking
 
@@ -111,31 +78,51 @@
       %h3
         = I18n.t "iugu.social_account"
 
-      - if flash[:social]
-        #error_explanation{ :style => "margin-bottom: 15px" }
-          %ul
-            %li
-              = flash[:social]
+      = render partial: "iugu/shared/notices", locals: { group: :social }
+      .element-spacing
+        .social
+
+          %table
+            - SOCIAL_ACCOUNTS.keys.each do |provider|
+              %tr
+                %td
+                  %span
+                    = provider.capitalize
+                %td
+                  - social_account = @social_accounts.where(:provider => provider).first
+                  - unless social_account
+                    %a.button.default.no-bottom-margin{ :href => user_omniauth_authorize_path(provider) + "?origin=#{profile_settings_path}"}
+                      = I18n.t "iugu.link_social"
+                  - else
+                    = link_to I18n.t("iugu.unlink_social"), social_destroy_path(:id => social_account.id) + "#social", :class => "button warning no-bottom-margin"
 
-      - @social_accounts.each do |social_account|
 
+  - if IuguSDK::enable_user_api
+    %h3
+      = I18n.t("iugu.api_access")
+    = render partial: "iugu/shared/notices", locals: { group: :api }
+    .container
+      %div{ :style => 'text-align:center' }
+        = @user.token.token
+    = link_to I18n.t("iugu.api_renew"), renew_user_token_path + "#api", :class => "button no-bottom-margin"
+
+  %hr
+  .container.no-bottom-margin{ :style => "background-color:#FFF5F5" }
+    = render partial: "iugu/shared/notices", locals: { group: :remove_user }
+    - if @user.destroying?
+      .element-spacing
+        = I18n.t("iugu.user_destruction_in")
         %div
-          = social_account.provider.capitalize
-          UID:
-          = social_account.social_id
-          = link_to "Remove", social_destroy_path(:id => social_account.id)
-
-      - SOCIAL_ACCOUNTS.keys.each do |provider|
-    
-        - unless @social_accounts.where(:provider => provider).first 
-          %div
-            = link_to "#{I18n.t('iugu.sign_in_with')} #{provider.capitalize}", "/account/auth/#{provider}?origin=#{profile_settings_path}"
-
-
-
-
-
-
-
+          %strong
+            = I18n.l( @user.destruction_job.run_at, :format => :default )
 
+      - unless @user.destruction_job.locked_at
+        = link_to I18n.t("iugu.undo"), profile_cancel_destruction_path + "#remove_user", :confirm => I18n.t("iugu.are_you_sure?"), :class => "button warning no-bottom-margin"
 
+    - else
+      %h3
+        = I18n.t("iugu.remove_user")
+      %p
+        = I18n.t("iugu.remove_user_warning")
+      - if IuguSDK::enable_user_cancel
+        = link_to I18n.t("iugu.remove_user"), profile_destroy_path + "#remove_user", :confirm => I18n.t("iugu.are_you_sure?"), :class => "button warning no-bottom-margin"

data/app/views/iugu/shared/_notices.html.haml

@@ -0,0 +1,29 @@
+%div{ :style => "position:relative;height:1px;width:1px;display:inline"}
+  %a{ name: group, :style => "display: block; position: absolute; top: -80px; width: 2px; height: 2px" }
+- if flash[:group] == group
+
+  - [:notice, :warning, :error, :info].each do |flash_type|
+    - color = nil
+    - color = "green" if flash_type == :notice
+    - color = "red"   if flash_type == :error
+    - color = "blue"  if flash_type == :info
+
+    - if flash[flash_type]
+      %div{ class: (color ? "notice notice-#{color}" : "notice") }
+        %button.close{ :'data-dismiss' => "notice" }
+          ×
+        %h4.notice-heading
+          = flash[flash_type]
+
+  - resource = nil unless resource
+  - if resource && resource.errors.any?
+    .notice.notice-red
+      %h4.notice-heading
+        = I18n.t "simple_form.error_notification.default_message"
+
+      - if resource.errors.any?
+        %ul 
+          - resource.errors.full_messages.each do |msg|
+            %li 
+              = msg 
+

data/app/views/iugu/shared/_responsive-dialog.header.html.haml

@@ -1,3 +1,3 @@
 .header
   %h2 
-    = I18n.t("iugu.welcome")
+    = IuguSDK::application_title

data/app/views/layouts/iugu-sdk.html.haml

@@ -2,11 +2,11 @@
 %html{ :class => "no-js not-ready" }
   %head
     %title= content_for?(:title) ? yield(:title) : IuguSDK::application_title
+    = stylesheet_link_tag "iugu-ux"
+    = stylesheet_link_tag "iugu-sdk.css"
     = javascript_include_tag :vendor
     = javascript_include_tag 'jquery_ujs'
     = javascript_include_tag "iugu-ux"
-    = stylesheet_link_tag "iugu-ux"
-    = stylesheet_link_tag "iugu-sdk.css"
 
     %meta{ 'http-equiv' => "Content-Type", 'content' => "text/html; charset=UTF-8" }
     %meta{ 'http-equiv' => "cleartype", 'content' => "on" }

data/app/views/layouts/settings.html.haml

@@ -1,46 +1,60 @@
 !!! 5
-:plain
-  <!--[if IE 8 ]><html class="ie8 ie"> <![endif]-->
-  <!--[if (gte IE 9)]><html class="ie9 ie"> <![endif]-->
-  <!--[if !(IE)]><!--><html><!--<![endif]-->
-%html{:lang => "en"}
+%html{ :class => "no-js not-ready" }
   %head
-    %meta{:charset => "utf-8"}/
     %title= content_for?(:title) ? (yield(:title) + " - " + IuguSDK::application_title) : I18n.t("iugu.settings")
-    = csrf_meta_tags
-    
-    = stylesheet_link_tag    "settings"
-    = javascript_include_tag "settings"
-
-  %body{ :class => body_classes.join(' ') + ' settings iugu-ui' }
-
-
-    .header
-      = link_to image_tag('application_logo.png'), IuguSDK::app_main_url
-
-      = link_to I18n.t("iugu.back_to") + ' ' + IuguSDK::application_title, IuguSDK::app_main_url, :class => "button", :id => "btn-settings-back"
-
-
-    .container
-      .wrapper
-
-        %h1
-          = I18n.t("iugu.settings")
-        - unless flash[:social] || flash[:group]
-          - flash.each do |name, msg|
-            = content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String)
-
-
-        = link_to I18n.t("iugu.profile"), profile_settings_path
-        = ' | '
-        - if IuguSDK::enable_multiple_accounts == false && current_user.accounts.count <= 1
-          = link_to I18n.t("iugu.account"), account_view_path
-        - else
-          = link_to I18n.t("iugu.accounts"), account_settings_path
-
-        = yield()
+    = stylesheet_link_tag "iugu-ux"
+    = stylesheet_link_tag "iugu-sdk.css"
+    = javascript_include_tag :vendor
+    = javascript_include_tag 'jquery_ujs'
+    = javascript_include_tag "iugu-ux"
 
+    %meta{ 'http-equiv' => "Content-Type", 'content' => "text/html; charset=UTF-8" }
+    %meta{ 'http-equiv' => "cleartype", 'content' => "on" }
+    %meta{ 'http-equiv' => "X-UA-Compatible", 'content' => "IE=edge,chrome=1" }
 
+    = csrf_meta_tags
+    %link{:href => "/favicon.ico", :rel => "shortcut icon"}/
+
+    -# HTML 5 support for Internet Explorer
+    :plain
+      <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+    -# Mobile capabilities
+    %meta{ name:"HandheldFriendly", content:"True" }
+    %meta{ name:"MobileOptimized", content:320 }
+    %meta{ name:"format-detection", content:"telephone=no" }
+    %meta{ name:"viewport", content:"width=device-width, initial-scale=1, maximum-scale=1" }
+    %meta{ name:"apple-mobile-web-app-capable", :content => "yes" }
+
+
+  %body.iugu-ui.application-background.settings
+
+    .wrapper
+      .header
+        = link_to image_tag('application_logo.png'), IuguSDK::app_main_url
+
+        = link_to I18n.t("iugu.back_to") + ' ' + IuguSDK::application_title, IuguSDK::app_main_url, :class => "button", :id => "btn-settings-back"
+
+      .tabbed
+        %ul.nav
+          %li{ :class => "#{controller_name=='profile'?'active':''}" }
+            %a{ :href => profile_settings_path }
+              = I18n.t "iugu.profile"
+          %li{ :class => "#{controller_name=='profile'?'':'active'}" }
+            - if IuguSDK::enable_multiple_accounts == false && current_user.accounts.count <= 1
+              = link_to I18n.t("iugu.account"), account_view_path
+            - else
+              = link_to I18n.t("iugu.accounts"), account_settings_path
+        .container.no-bottom-margin
+
+          - unless flash[:social] || flash[:group]
+            - flash.each do |name, msg|
+              - if msg.is_a? String
+                .notice.notice-red{ :class => name }
+                  %button.close{ :'data-dismiss' => "notice" }
+                    &times;
+                  %h4.notice-heading
+                    = msg
+
+          = yield
 
-:plain
-  </html>

data/config/locales/iugu.en.yml

@@ -12,8 +12,15 @@ en:
     update: "Update"
     unhappy?: "Unhappy?"
     try_first: "Try first"
+    skip_and_save_later: "... or save your account later, and"
+    skip_and_save_later_action: " skip this step ▸"
+    or_sign_up_with: "or sign in using"
+    already_have_account: "Already have an account?"
+    already_have_account_action: "Sign in"
     generate_new_token: "Generate new token"
     create_account: "Create Account"
+    no_account: "No account?"
+    no_account_action: "Sign up"
     add: "Add"
     active: "Active"
     unnamed: "Unnamed"
@@ -33,6 +40,7 @@ en:
     accounts: "Accounts"
     account_domains: "Account Domains"
     social_unlinked: "Social Account successfully unlink"
+    social_linked: "Social Account successfully linked"
     account_destruction_in: "Account will be remove at "
     account_destruction_undone: "Account destruction canceled"
     account_user_destruction_undone: "Account user destruction canceled"
@@ -78,8 +86,9 @@ en:
     verify_later: "Verify later"
     instructions: "Instructions"
     resend_confirmation_instructions: "Resend confirmation instructions"
+    resend_confirmation_instructions_action: "Resend confirmation mail"
     confirm_email_through_link_below: "You can confirm your account email through the link below"
-    send_me_reset_password_instructions: "Send me reset password instructions"
+    send_me_reset_password_instructions: "Recover my password"
     leave_it_blank_if_dont_wanna_change_it: "leave it blank if you don't want to change it"
     we_need_your_current_password_to_confirm_changes: "we need your current password to confirm your changes"
     did_not_receive_confirmation_instructions?: "Didn't receive confirmation instructions?"
@@ -121,6 +130,6 @@ en:
       password_confirmation: "Password confirmation"
       name: "Name"
       birthdate: "Birthdate"
-      locale: "Locale"
+      locale: "Language"
       remember_me: "Remember me"
       

data/config/locales/iugu.pt-BR.yml

@@ -12,7 +12,11 @@ pt-BR:
     update: "Atualizar"
     unhappy?: "Infeliz?"
     try_first: "Testar Primeiro"
+    skip_and_save_later: "... ou faça seu cadastro depois e"
+    skip_and_save_later_action: " pule este passo ▸"
     or_sign_up_with: "ou entre com"
+    already_have_account: "Já tem uma conta?"
+    already_have_account_action: "Entrar"
     generate_new_token: "Gerar novo token"
     create_account: "Criar Conta"
     no_account: "Não possue conta?"
@@ -36,6 +40,7 @@ pt-BR:
     accounts: "Contas"
     account_domains: "Domínios"
     social_unlinked: "Rede social desvinculada com sucesso"
+    social_linked: "Rede social vinculada com sucesso"
     account_destruction_in: "A conta será removida em "
     account_destruction_undone: "Remoção da conta cancelada"
     account_user_destruction_undone: "Remoção do usuário da conta cancelada"
@@ -47,6 +52,7 @@ pt-BR:
     are_you_sure?: "Tem certeza disso?"
     remove: "Excluir"
     remove_user: "Remover Usuário"
+    remove_user_warning: "Tenha cuidado ao remover seu usuário. Esta operação pode ser irreversível."
     cancel_account: "Cancelar conta"
     cancel_my_account: "Cancelar minha conta"
     removing: "Excluindo..."
@@ -57,7 +63,9 @@ pt-BR:
     sign_out: "Deslogar"
     sign_in: "Entrar"
     sign_in_with: "Entrar com"
-    sign_up: "Cadastro"
+    link_social: "Ativar"
+    unlink_social: "Desconectar"
+    sign_up: "Criar uma conta"
     profile: "Perfil"
     profile_settings: "Configurações de Perfil"
     account_settings: "Configurações de conta"
@@ -80,9 +88,10 @@ pt-BR:
     verify_domain: "Verificar Dominio"
     verify_later: "Verificar depois"
     instructions: "Instruções"
-    resend_confirmation_instructions: "Instruções para re-envio de confirmação"
+    resend_confirmation_instructions: "Instruções para confirmação"
+    resend_confirmation_instructions_action: "Re-enviar email de confirmação"
     confirm_email_through_link_below: "Você pode confirmar o email da sua conta no link abaixo"
-    send_me_reset_password_instructions: "Me envie instruções para reset de senha"
+    send_me_reset_password_instructions: "Recuperar minha senha"
     leave_it_blank_if_dont_wanna_change_it: "Deixa em branco se não quiser alterar"
     we_need_your_current_password_to_confirm_changes: "Nos precisamos da sua senha atual para confirmar as mudanças"
     did_not_receive_confirmation_instructions?: "Não recebeu as instruções para confirmação?"
@@ -90,6 +99,8 @@ pt-BR:
     custom_domains: "Dominios customizados"
     api_tokens: "Tokens da api"
     api_type: "Tipo de api"
+    api_access: "Acesso via API"
+    api_renew: "Renovar Token de Acesso"
     description: "Descrição"
     i_dont_have_any_accounts: "Eu não tenho nenhuma conta"
     owner: "dono"
@@ -124,6 +135,14 @@ pt-BR:
       password_confirmation: "Confirmação de senha"
       name: "Nome"
       birthdate: "Data de nascimento"
-      locale: "Localidade"
+      locale: "Idioma"
       remember_me: "Lembre-me"
-              
+
+  simple_form:
+    "yes": "Sim"
+    "no": "Não"
+    required:
+      text: "obrigatório"
+      mark: "*"
+    error_notification:
+      default_message: "Alguns erros foram encontrados:"