From 6c32fa7845d1b80437a7e8b9bc2a26ebd271cb6d Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Sun, 7 Jun 2015 22:28:47 +0200
Subject: [PATCH] Fix Bootstrap 3 regression: add email visibility icon to
 settings page

---
 app/assets/javascripts/app/pages/settings.js     | 2 +-
 app/assets/stylesheets/new_styles/_settings.scss | 2 +-
 app/views/users/_edit.haml                       | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/pages/settings.js b/app/assets/javascripts/app/pages/settings.js
index c111d5681..eab65b738 100644
--- a/app/assets/javascripts/app/pages/settings.js
+++ b/app/assets/javascripts/app/pages/settings.js
@@ -1,7 +1,7 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 app.pages.Settings = Backbone.View.extend({
   initialize: function() {
-    $(".settings_visibilty").tooltip({placement: "top"});
+    $(".settings_visibility").tooltip({placement: "top"});
   }
 });
 // @license-end
diff --git a/app/assets/stylesheets/new_styles/_settings.scss b/app/assets/stylesheets/new_styles/_settings.scss
index 2220ba114..8eac7f8a3 100644
--- a/app/assets/stylesheets/new_styles/_settings.scss
+++ b/app/assets/stylesheets/new_styles/_settings.scss
@@ -22,7 +22,7 @@
   }
 }
 
-.settings_visibilty { margin-left: 10px; }
+.settings_visibility { margin-left: 10px; }
 
 #profile_bio {
   width: 100%;
diff --git a/app/views/users/_edit.haml b/app/views/users/_edit.haml
index 20d64468a..941a68b07 100644
--- a/app/views/users/_edit.haml
+++ b/app/views/users/_edit.haml
@@ -17,7 +17,10 @@
           %p
             %b= current_user.diaspora_handle
         .col-md-6
-          %h3= t('.your_email')
+          %h3
+            = t(".your_email")
+            %i.entypo.lock.gray.settings_visibility{title: t("users.edit.your_email_private")}
+
 
           = form_for 'user', url: user_path, html: { method: :put, class: "form-horizontal col-md-12" , id: "email-form"} do |f|
             = f.error_messages