Define content_for page_header_title in Devise views. Refs #5309

4 files changed, 39 insertions, 28 deletions

diff --git a/app/views/devise/invitations/edit.html.slim b/app/views/devise/invitations/edit.html.slim
index 6c9a6f436..7a22146c0 100644
--- a/app/views/devise/invitations/edit.html.slim
+++ b/app/views/devise/invitations/edit.html.slim
@@ -1,14 +1,19 @@
-.col-md-offset-2.col-md-8
-  .panel.panel-default
-    .panel-heading = t('devise.invitations.edit.header')
-    
-    .panel-body
-      = simple_form_for resource, as: resource_name, :url => invitation_path(resource_name), :html => { :method => :put, class: "form-horizontal" } do |form|
-        = form.hidden_field :invitation_token
-
-        = form.input :name
-        = form.input :password, as: :password
-        = form.input :password_confirmation, as: :password
-
-        .submit
-          = form.button :submit, value: t('devise.invitations.edit.submit_button'), class: 'btn-info'
\ No newline at end of file
+/ PageHeader
+
+- content_for :page_header_title, t('.title')
+
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = simple_form_for resource, as: resource_name, :url => invitation_path(resource_name), :html => { :method => :put, class: "form-horizontal", id: 'invitation_form' } do |form|
+            .row
+              .col-lg-12
+                = form.hidden_field :invitation_token
+
+                = form.input :name
+                = form.input :password, as: :password
+                = form.input :password_confirmation, as: :password
+
+            = form.button :submit, value: t('devise.invitations.edit.submit_button'), class: 'btn-info btn-default formSubmitr', form: 'invitation_form'
diff --git a/app/views/devise/passwords/edit.html.slim b/app/views/devise/passwords/edit.html.slim
index 864a44499..0d18f657c 100644
--- a/app/views/devise/passwords/edit.html.slim
+++ b/app/views/devise/passwords/edit.html.slim
@@ -1,13 +1,17 @@
-.col-md-offset-2.col-md-8
-  .panel.panel-default
-    .panel-heading = t('.title')
-    .panel-body
-      = simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, class: "form-horizontal" }) do |f|
+/ PageHeader
 
-        = f.input :reset_password_token, as: :hidden
-        = f.input :password, as: :password
-        = f.input :password_confirmation, as: :password
-        
-        .form-actions
-          = link_to t("cancel"), unauthenticated_root_path, class: 'btn btn-default'
-          = f.button :submit, :value => t("devise.passwords.edit.commit"), class: 'btn-info'
\ No newline at end of file
+- content_for :page_header_title, t('.title')
+
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, class: "form-horizontal", id: 'password_form' }) do |f|
+          .row
+            .col-lg-12
+              = f.input :reset_password_token, as: :hidden
+              = f.input :password, as: :password
+              = f.input :password_confirmation, as: :password
+
+          = f.button :submit, :value => t("devise.passwords.edit.commit"), class: 'btn btn-default formSubmitr', form: 'password_form'
diff --git a/app/views/devise/passwords/new.html.slim b/app/views/devise/passwords/new.html.slim
index 6e03595fc..303f78f0e 100644
--- a/app/views/devise/passwords/new.html.slim
+++ b/app/views/devise/passwords/new.html.slim
@@ -1,6 +1,6 @@
 / PageHeader
 
-= pageheader '', t('.title')
+- content_for :page_header_title, t('.title')
 
 / PageContent
 .page_content
@@ -12,4 +12,4 @@
             .col-lg-12
               = form.input :email, :as => :email, placeholder: 'user@domain.com'
 
-          = form.button :submit, :value => t("devise.passwords.new.commit"), class: 'btn btn-default formSubmitr', form: 'invitation_form'
+          = form.button :submit, :value => t("devise.passwords.new.commit"), class: 'btn btn-default formSubmitr', form: 'password_form'
diff --git a/app/views/devise/sessions/new.html.slim b/app/views/devise/sessions/new.html.slim
index 0ed17e24a..a812726e5 100644
--- a/app/views/devise/sessions/new.html.slim
+++ b/app/views/devise/sessions/new.html.slim
@@ -1,3 +1,5 @@
+- content_for :page_header_title, t('.title')
+
 .page_content#devise
   .container-fluid
     #sessions_new.row