summaryrefslogtreecommitdiff
path: root/app/views/sessions
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-05-23 12:17:31 +0200
committerAzul <azul@riseup.net>2016-05-23 13:01:51 +0200
commitf47fc9d6522886cf81cfea26ec1f396219c539ba (patch)
treeb63490a1e515c211a15b9c3aa062a09927739c77 /app/views/sessions
parent7f0c42a5fa6d6c1952e53b9b73bad0202f746f3e (diff)
move signup from users to account_controller
There was a lot of special case handling going on in the users_controller for this. Lot simpler this way.
Diffstat (limited to 'app/views/sessions')
-rw-r--r--app/views/sessions/_warnings.html.haml12
-rw-r--r--app/views/sessions/new.html.haml2
2 files changed, 13 insertions, 1 deletions
diff --git a/app/views/sessions/_warnings.html.haml b/app/views/sessions/_warnings.html.haml
new file mode 100644
index 0000000..baf80a4
--- /dev/null
+++ b/app/views/sessions/_warnings.html.haml
@@ -0,0 +1,12 @@
+%noscript
+ %div.alert.alert-error=t :js_required_html
+#cookie_warning.alert.alert-error{:style => "display:none"}
+ =t :cookie_disabled_warning
+:javascript
+ document.cookie = "testing=cookies_enabled; path=/";
+ if(document.cookie.indexOf("testing=cookies_enabled") < 0)
+ {
+ document.getElementById('cookie_warning').style.display = 'block';
+ } else {
+ document.getElementById('cookie_warning').style.display = 'none';
+ }
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 942c485..6695123 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -2,7 +2,7 @@
.col-md-9
%h2=t :login
.lead=t :login_info
- = render :partial => 'users/warnings'
+ = render 'warnings'
= simple_form_for [:api, @session], validate: true, html: { id: :new_session, class: 'form-horizontal hidden js-show', style: "display:none;" } do |f|
= f.input :login, :required => false, :label => t(:username), :input_html => { :id => :srp_username }
= f.input :password, :required => false, :input_html => { :id => :srp_password }