iugusdk 1.0.5 → 1.0.6

data/app/views/iugu/sessions/new.html.haml

@@ -17,28 +17,27 @@
                 %h4.notice-heading
                   = msg
 
-        - if IuguSDK::enable_signup_form
-          = simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "no-bottom-margin" }) do |f|
-            .inputs
-              = f.input :email, :required => false, :autofocus => true, :placeholder => "E-Mail", :label => false
-
-              = f.input :password, :required => false, :placeholder => I18n.t("activerecord.attributes.password"), :label => false
-              // = f.input :remember_me, :as => :boolean, :label => I18n.t("activerecord.attributes.remember_me") if devise_mapping.rememberable?
-              - if !params[:invitation_token].blank?
-                = f.input :user_invitation, as: :hidden, input_html: { value: params[:invitation_token] }
-            .actions
-              = f.button :submit, I18n.t("iugu.sign_in"), :class => "full-width default"
-
-            - if devise_mapping.recoverable? && controller_name != 'passwords'
-              = link_to I18n.t("iugu.forgot_your_password?"), new_password_path(resource_name), :class => "button full-width no-bottom-margin"
-
-            - if IuguSDK::enable_social_login
-              .social
-                .text
-                  = I18n.t("iugu.or_sign_up_with")
-                - if devise_mapping.omniauthable?
-                  - resource_class.omniauth_providers.each do |provider|
-                    = link_to "#{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "full-width button no-bottom-margin default #{provider.to_s}"
+        = simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "no-bottom-margin" }) do |f|
+          .inputs
+            = f.input :email, :required => false, :autofocus => true, :placeholder => "E-Mail", :label => false
+
+            = f.input :password, :required => false, :placeholder => I18n.t("activerecord.attributes.password"), :label => false
+            // = f.input :remember_me, :as => :boolean, :label => I18n.t("activerecord.attributes.remember_me") if devise_mapping.rememberable?
+            - if !params[:invitation_token].blank?
+              = f.input :user_invitation, as: :hidden, input_html: { value: params[:invitation_token] }
+          .actions
+            = f.button :submit, I18n.t("iugu.sign_in"), :class => "full-width default"
+
+          - if devise_mapping.recoverable? && controller_name != 'passwords'
+            = link_to I18n.t("iugu.forgot_your_password?"), new_password_path(resource_name), :class => "button full-width no-bottom-margin"
+
+          - if IuguSDK::enable_social_login
+            .social
+              .text
+                = I18n.t("iugu.or_sign_up_with")
+              - if devise_mapping.omniauthable?
+                - resource_class.omniauth_providers.each do |provider|
+                  = link_to "#{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "full-width button no-bottom-margin default #{provider.to_s}"
 
 
         - if IuguSDK::enable_user_confirmation

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

@@ -51,29 +51,27 @@
     = f.submit I18n.t("iugu.save"), :class => "btn-block btn btn-lg btn-primary"
 
 
-  - if IuguSDK::enable_signup_form
+  = simple_form_for @user, :url => profile_update_path + "#password", role: "form", :method => :post do |f|
 
-    = simple_form_for @user, :url => profile_update_path + "#password", role: "form", :method => :post do |f|
+    .element-spacing
+      %h3.no-bottom-margin
+        = I18n.t "activerecord.attributes.password"
 
-      .element-spacing
-        %h3.no-bottom-margin
-          = I18n.t "activerecord.attributes.password"
+    - @input_success = ''
+    = render partial: "iugu/shared/notices", locals: { group: :password, resource: @user }
 
-      - @input_success = ''
-      = render partial: "iugu/shared/notices", locals: { group: :password, resource: @user }
+    .row
+      .col-md-6
+        .form-group{ class: "form-group #{@user.errors.include?(:password) ? 'has-error':@input_success}" }
+          = f.password_field :password, :placeholder => I18n.t("activerecord.attributes.password"), class: "form-control"
 
-      .row
-        .col-md-6
-          .form-group{ class: "form-group #{@user.errors.include?(:password) ? 'has-error':@input_success}" }
-            = f.password_field :password, :placeholder => I18n.t("activerecord.attributes.password"), class: "form-control"
+      .col-md-6
+        .form-group{ class: "form-group #{@user.errors.include?(:password) ? 'has-error':@input_success}" }
+          = f.password_field :password_confirmation, :placeholder => I18n.t("activerecord.attributes.password_confirmation"), class: "form-control"
 
-        .col-md-6
-          .form-group{ class: "form-group #{@user.errors.include?(:password) ? 'has-error':@input_success}" }
-            = f.password_field :password_confirmation, :placeholder => I18n.t("activerecord.attributes.password_confirmation"), class: "form-control"
+    = hidden_field_tag "form_group", :password
 
-      = hidden_field_tag "form_group", :password
-  
-      = f.submit I18n.t("iugu.save"), :id => "new_password_submit", :class => "btn btn-lg btn-primary btn-block"
+    = f.submit I18n.t("iugu.save"), :id => "new_password_submit", :class => "btn btn-lg btn-primary btn-block"
 
   - if IuguSDK::enable_social_linking
 

data/app/views/iugu/shared/_settings.header.html.haml

@@ -0,0 +1,20 @@
+%nav{ class: "navbar navbar-default navbar-fixed-top", role: "navigation" }
+  .navbar-header
+    %button{ class: "navbar-toggle", type: "button", data: { toggle: "collapse", target: ".navbar-ex1-collapse" } }
+      %span.sr-only
+        Toggle Navigation
+      %span.icon-bar
+      %span.icon-bar
+      %span.icon-bar
+    .navbar-brand
+      = link_to image_tag('application_logo.png'), IuguSDK::app_main_url
+  %div.collapse.navbar-collapse.navbar-ex1-collapse
+    %ul.nav.navbar-nav
+      %li{ :class => "#{controller_name=='profile'?'active':''}" }
+        %a{ :href => profile_settings_path }
+          = I18n.t "iugu.profile"
+      %li{ class: "#{controller_name=='account'?'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

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

@@ -30,26 +30,7 @@
 
   %body
 
-    %nav{ class: "navbar navbar-default navbar-fixed-top", role: "navigation" }
-      .navbar-header
-        %button{ class: "navbar-toggle", type: "button", data: { toggle: "collapse", target: ".navbar-ex1-collapse" } }
-          %span.sr-only
-            Toggle Navigation
-          %span.icon-bar
-          %span.icon-bar
-          %span.icon-bar
-        .navbar-brand
-          = link_to image_tag('application_logo.png'), IuguSDK::app_main_url
-      %div.collapse.navbar-collapse.navbar-ex1-collapse
-        %ul.nav.navbar-nav
-          %li{ :class => "#{controller_name=='profile'?'active':''}" }
-            %a{ :href => profile_settings_path }
-              = I18n.t "iugu.profile"
-          %li{ class: "#{controller_name=='account'?'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
+    = render :partial => "iugu/shared/settings.header"
 
     - unless flash[:social] || flash[:group]
       - flash.each do |name, msg|

data/lib/iugusdk/version.rb

@@ -1,3 +1,3 @@
 module IuguSDK
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/iugusdk.rb

@@ -84,7 +84,7 @@ module IuguSDK
   self.enable_social_login = false
 
   mattr_accessor :enable_social_linking
-  self.enable_social_linking = true
+  self.enable_social_linking = false
 
   mattr_accessor :enable_user_confirmation
   self.enable_user_confirmation = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iugusdk
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -768,6 +768,7 @@ files:
 - app/views/iugu/shared/_links.html.haml
 - app/views/iugu/shared/_notices.html.haml
 - app/views/iugu/shared/_responsive-dialog.header.html.haml
+- app/views/iugu/shared/_settings.header.html.haml
 - app/views/iugu/shared/_signup_fields.html.haml
 - app/views/iugu/unlocks/new.html.haml
 - app/views/layouts/iugu-sdk.html.haml
@@ -940,7 +941,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -856814466176584110
+      hash: 1359425245067352116
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -949,7 +950,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -856814466176584110
+      hash: 1359425245067352116
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24