From 20ffa57583bdc55b8e5d91e531d9f151bf13b3da Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Fri, 1 Jun 2018 09:11:48 +0200 Subject: [PATCH] Move sign-in flow layout to core Closes SCI-2477. --- app/assets/stylesheets/themes/scinote.scss | 16 +++++++++++ app/views/layouts/sign_in_halt.html.erb | 31 ++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 app/views/layouts/sign_in_halt.html.erb diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 365d93fff..805e9820f 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -334,6 +334,22 @@ a[data-toggle="tooltip"] { } } +.navbar-sign-in-halt { + .navbar-header { + float: left !important; + } + + .sign-in-halt-logout-button { + padding-top: 7px; + } +} + +.sign-in-halt-container { + margin: 0; + padding: 70px 10px 50px 10px; + width: 100%; +} + .navbar-secondary { -webkit-transition: all 0.5s ease; -moz-transition: all 0.5s ease; diff --git a/app/views/layouts/sign_in_halt.html.erb b/app/views/layouts/sign_in_halt.html.erb new file mode 100644 index 000000000..9358ade32 --- /dev/null +++ b/app/views/layouts/sign_in_halt.html.erb @@ -0,0 +1,31 @@ +<% # This layout should be used when sign in flow is halted (due to e.g. password expiry, %> +<% # or some similar halt in sign-in chain) %> +<% content_for :content do %> + + <% if flash[:error]%> +
+
+ + + <%= sanitize_input(flash[:error]) %> +
+
+ <% end %> +
+ <%= yield %> +
+<% end %> +<%= render template: 'scinote/common/layouts/application' %>