4 files changed, 15 insertions, 6 deletions
diff --git a/users/app/views/sessions/new.html.haml b/users/app/views/sessions/new.html.haml
index 81a55b8..c915968 100644
--- a/users/app/views/sessions/new.html.haml
+++ b/users/app/views/sessions/new.html.haml
@@ -1,5 +1,6 @@
 .span1
 .span9
+  = render :partial => 'users/warnings'
   %h2=t :login
   = simple_form_for @session, :validate => true, :html => { :id => :new_session, :class => 'form-horizontal' } do |f|
     = f.input :login, :required => false, :label => t(:username), :input_html => { :id => :srp_username }
diff --git a/users/app/views/users/_warnings.html.haml b/users/app/views/users/_warnings.html.haml
new file mode 100644
index 0000000..7e0b2ce
--- /dev/null
+++ b/users/app/views/users/_warnings.html.haml
@@ -0,0 +1,12 @@
+%noscript
+  %div.alert.alert-error=t :js_required
+#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';
+  }
+\ No newline at end of file
diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml
index f06df44..08e9dc3 100644
--- a/users/app/views/users/edit.html.haml
+++ b/users/app/views/users/edit.html.haml
@@ -1,6 +1 @@
-= render 'edit'
-
-
-=# user_form_with 'login_and_password_fields', :legend => :update_login_and_password if @user == current_user
-=# render 'cancel_account'
-
+= render 'edit'
+\ No newline at end of file
diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml
index b1953e1..f8d14b5 100644
--- a/users/app/views/users/new.html.haml
+++ b/users/app/views/users/new.html.haml
@@ -6,6 +6,7 @@
 
 .span1
 .span9
+  = render :partial => 'warnings'
   %h2=t :signup
   = simple_form_for(@user, form_options) do |f|
     %legend= t(:signup_message)