diff options
Diffstat (limited to 'app/views/profiles/show.html.haml')
| -rw-r--r-- | app/views/profiles/show.html.haml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index f5fab727a57..bf9f1336a4f 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -2,6 +2,8 @@ - page_title s_("Profiles|Edit Profile") - @content_class = "limit-container-width" unless fluid_layout - gravatar_link = link_to Gitlab.config.gravatar.host, 'https://' + Gitlab.config.gravatar.host +- availability = availability_values +- custom_emoji = show_status_emoji?(@user.status) = bootstrap_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user gl-mt-3 js-quick-submit gl-show-field-errors' }, authenticity_token: true do |f| = form_errors(@user) @@ -48,9 +50,9 @@ - emoji_button = button_tag type: :button, class: 'js-toggle-emoji-menu emoji-menu-toggle-button gl-button btn has-tooltip', title: s_("Profiles|Add status emoji") do - - if @user.status + - if custom_emoji = emoji_icon @user.status.emoji - %span#js-no-emoji-placeholder.no-emoji-placeholder{ class: ('hidden' if @user.status) } + %span#js-no-emoji-placeholder.no-emoji-placeholder{ class: ('hidden' if custom_emoji) } = sprite_icon('slight-smile', css_class: 'award-control-icon-neutral') = sprite_icon('smiley', css_class: 'award-control-icon-positive') = sprite_icon('smile', css_class: 'award-control-icon-super-positive') @@ -68,6 +70,10 @@ prepend: emoji_button, append: reset_message_button, placeholder: s_("Profiles|What's your status?") + - if Feature.enabled?(:set_user_availability_status, @user) + .checkbox-icon-inline-wrapper + = status_form.check_box :availability, { data: { testid: "user-availability-checkbox" }, label: s_("Profiles|Busy"), wrapper_class: 'gl-mr-0 gl-font-weight-bold' }, availability["busy"], availability["not_set"] + .gl-text-gray-600.gl-ml-5= s_('Profiles|"Busy" will be shown next to your name') - if Feature.enabled?(:user_time_settings) %hr .row.user-time-preferences |