From 044a5b1f747469ad5042362087e7dc9f59748cf8 Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Sat, 13 Jul 2013 22:26:02 -0400 Subject: [PATCH] update settings page to not be so tweety --- views/settings.slim | 93 ++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/views/settings.slim b/views/settings.slim index 2e3f04db..f59f31c7 100644 --- a/views/settings.slim +++ b/views/settings.slim @@ -1,59 +1,58 @@ .page - .row.content + .content .span12.text-center - h1 Site Settings + h1 Account Settings - .row - .span12.text-center + .txt-Center - if !current_site.errors.empty? .row .span8.offset2 .alert.alert-block.alert-error - current_site.errors.each do |error| p = error.last.first - - .row - .span4 - h2 Change Password - form method="POST" action="/change_password" - input name="csrf_token" type="hidden" value="#{csrf_token}" - - div - p Current Password: - input name="current_password" type="password" - - div - p New Password: - input name="new_password" type="password" - - div - p Confirm New Password: - input name="new_password_confirm" type="password" - - input.btn-Action type="submit" value="Change Password" - .span4 - h2 Change Site (User) Name + + .row + .col.col-33 + h2.delta Change Password + form method="POST" action="/change_password" + input name="csrf_token" type="hidden" value="#{csrf_token}" + + div + p Current Password: + input name="current_password" type="password" + + div + p New Password: + input name="new_password" type="password" + + div + p Confirm New Password: + input name="new_password_confirm" type="password" + + input.btn-Action type="submit" value="Change Password" - form method="POST" action="/change_name" - input name="csrf_token" type="hidden" value="#{csrf_token}" - - p It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ - - - div + .col.col-33 + h2.delta Change Site (User) Name + + form method="POST" action="/change_name" + input name="csrf_token" type="hidden" value="#{csrf_token}" + + p It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ - + p Current name: #{current_site.username} - div + p New name: - input name="name" type="text" placeholder="newname" - div - input.btn-Action type="submit" value="Change Name" - - .span4 - h2 Mark Adult Content - p If your site contains objectionable (adult) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines "adult" content yet, we are still working on this. In the interim, best guesses. Thanks for your patience as we try to find a way to balance out the needs of everyone. - - form method="POST" action="/change_nsfw" - input name="csrf_token" type="hidden" value="#{csrf_token}" - input name="is_nsfw" type="hidden" value="false" - p: strong My page contains objectionable (adult) content:    - - input.btn-Action type="submit" value="Update" \ No newline at end of file + input name="name" type="text" placeholder="newname" + + input.btn-Action type="submit" value="Change Name" + + .col.col-33 + h2.delta Mark Adult Content + p If your site contains objectionable (adult) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines "adult" content yet, we are still working on this. In the interim, best guesses. Thanks for your patience as we try to find a way to balance out the needs of everyone. + + form method="POST" action="/change_nsfw" + input name="csrf_token" type="hidden" value="#{csrf_token}" + input name="is_nsfw" type="hidden" value="false" + p: strong My page contains objectionable (adult) content:    + + input.btn-Action type="submit" value="Update" \ No newline at end of file