nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4965 from marienfressinaud/develop

Browse source 
Remove duplicate checkbox in Settings
This commit is contained in:
Jonne Haß 2014-05-23 07:54:38 +02:00
commit a216f267a0
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/users/edit.html.haml
View file

@ -136,11 +136,6 @@
= type.check_box :started_sharing, {:checked => @email_prefs['started_sharing']}, false, true = type.check_box :started_sharing, {:checked => @email_prefs['started_sharing']}, false, true
%br %br
%p.checkbox_select
= type.label :also_commented, t('.also_commented')
= type.check_box :also_commented, {:checked => @email_prefs['also_commented']}, false, true
%br
%p.checkbox_select %p.checkbox_select
= type.label :mentioned, t('.mentioned') = type.label :mentioned, t('.mentioned')
= type.check_box :mentioned, {:checked => @email_prefs['mentioned']}, false, true = type.check_box :mentioned, {:checked => @email_prefs['mentioned']}, false, true

5
app/views/users/edit.mobile.haml
View file

@ -124,11 +124,6 @@
= type.check_box :started_sharing, {:checked => @email_prefs['started_sharing']}, false, true = type.check_box :started_sharing, {:checked => @email_prefs['started_sharing']}, false, true
%br %br
%p.checkbox_select
= type.label :also_commented, t('.also_commented')
= type.check_box :also_commented, {:checked => @email_prefs['also_commented']}, false, true
%br
%p.checkbox_select %p.checkbox_select
= type.label :mentioned, t('.mentioned') = type.label :mentioned, t('.mentioned')
= type.check_box :mentioned, {:checked => @email_prefs['mentioned']}, false, true = type.check_box :mentioned, {:checked => @email_prefs['mentioned']}, false, true