diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-12 20:47:22 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-12 20:47:22 +0100 |
| commit | 34413615683677e26213263fb98f63b5aab64872 (patch) | |
| tree | 7e682e8709ecfd5347316ea39240789548795606 /app/views | |
| parent | 1aa477ac2f0e9195497899691bb5cc16a7034c01 (diff) | |
Adding simple_form, adding profile settings, header image
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/dashboard.html.haml | 4 | ||||
| -rw-r--r-- | app/views/settings/show.html.haml | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 9f665e8c3..452a0bfba 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -2,7 +2,7 @@ %link{ rel: 'salmon', href: api_salmon_url(@account.id) }/ %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/ -.card +.card{ style: "background-image: url(#{@account.header.url(:medium)})" } .avatar= image_tag @account.avatar.url(:large) %h1.name = @account.display_name.blank? ? @account.username : @account.display_name diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml index ea8390bae..8592144d8 100644 --- a/app/views/layouts/dashboard.html.haml +++ b/app/views/layouts/dashboard.html.haml @@ -17,6 +17,10 @@ = link_to oauth_authorized_applications_path do = fa_icon 'shield' Authorized apps + %li{ class: active_nav_class(settings_path) } + = link_to settings_path do + = fa_icon 'user' + Edit profile .dashboard__content .dashboard__top-bar = content_for?(:page_title) ? yield(:page_title) : 'Mastodon' diff --git a/app/views/settings/show.html.haml b/app/views/settings/show.html.haml new file mode 100644 index 000000000..ac5a1c36f --- /dev/null +++ b/app/views/settings/show.html.haml @@ -0,0 +1,6 @@ += simple_form_for @account, url: settings_path, method: :put do |f| + = f.input :display_name + = f.input :note + = f.input :avatar + = f.input :header + = f.button :submit |