Skip to content
Snippets Groups Projects
Verified Commit 35d0d774 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Prefer panels over fieldset when different forms

parent 47989d60
No related branches found
No related tags found
No related merge requests found
Loading
@@ -9,10 +9,10 @@
Loading
@@ -9,10 +9,10 @@
Some options are unavailable for LDAP accounts Some options are unavailable for LDAP accounts
   
.account-page .account-page
%fieldset.update-token .panel.panel-default.update-token
%legend .panel-heading
Reset Private token Reset Private token
%div .panel-body
= form_for @user, url: reset_private_token_profile_path, method: :put do |f| = form_for @user, url: reset_private_token_profile_path, method: :put do |f|
.data .data
%p %p
Loading
@@ -32,12 +32,11 @@
Loading
@@ -32,12 +32,11 @@
= f.submit 'Generate', class: "btn success btn-build-token" = f.submit 'Generate', class: "btn success btn-build-token"
   
- unless current_user.ldap_user? - unless current_user.ldap_user?
%fieldset - if current_user.otp_required_for_login
- if current_user.otp_required_for_login .panel.panel-success
%legend.text-success .panel-heading
= icon('check')
Two-factor Authentication enabled Two-factor Authentication enabled
%div .panel-body
.pull-right .pull-right
= link_to 'Disable Two-factor Authentication', profile_two_factor_auth_path, method: :delete, class: 'btn btn-close btn-sm', = link_to 'Disable Two-factor Authentication', profile_two_factor_auth_path, method: :delete, class: 'btn btn-close btn-sm',
data: { confirm: 'Are you sure?' } data: { confirm: 'Are you sure?' }
Loading
@@ -48,9 +47,11 @@
Loading
@@ -48,9 +47,11 @@
= link_to 'generate new ones', codes_profile_two_factor_auth_path, method: :post, data: { confirm: 'Are you sure?' } = link_to 'generate new ones', codes_profile_two_factor_auth_path, method: :post, data: { confirm: 'Are you sure?' }
invalidating all previous codes. invalidating all previous codes.
   
- else - else
%legend Two-factor Authentication .panel.panel-default
%div .panel-heading
Two-factor Authentication
.panel-body
%p %p
Increase your account's security by enabling two-factor authentication (2FA). Increase your account's security by enabling two-factor authentication (2FA).
%p %p
Loading
@@ -60,42 +61,45 @@
Loading
@@ -60,42 +61,45 @@
= link_to 'Enable Two-factor Authentication', new_profile_two_factor_auth_path, class: 'btn btn-success' = link_to 'Enable Two-factor Authentication', new_profile_two_factor_auth_path, class: 'btn btn-success'
   
- if show_profile_social_tab? - if show_profile_social_tab?
%fieldset .panel.panel-default
%legend Connected Accounts .panel-heading
.oauth-buttons.append-bottom-10 Connected Accounts
%p Click on icon to activate signin with one of the following services .panel-body
- enabled_social_providers.each do |provider| .oauth-buttons.append-bottom-10
.btn-group %p Click on icon to activate signin with one of the following services
= link_to oauth_image_tag(provider), omniauth_authorize_path(User, provider), - enabled_social_providers.each do |provider|
method: :post, class: "btn btn-lg #{'active' if oauth_active?(provider)}" .btn-group
- if oauth_active?(provider) = link_to oauth_image_tag(provider), omniauth_authorize_path(User, provider),
= link_to unlink_profile_account_path(provider: provider), method: :delete, class: 'btn btn-lg' do method: :post, class: "btn btn-lg #{'active' if oauth_active?(provider)}"
= icon('close') - if oauth_active?(provider)
= link_to unlink_profile_account_path(provider: provider), method: :delete, class: 'btn btn-lg' do
= icon('close')
   
- if show_profile_username_tab? - if show_profile_username_tab?
%fieldset.update-username .panel.panel-warning.update-username
%legend .panel-heading
Change Username Change Username
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f| .panel-body
%p = form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
Changing your username will change path to all personal projects!
%div
= f.text_field :username, required: true, class: 'form-control'
 
.loading-gif.hide
%p %p
= icon('spinner spin') Changing your username will change path to all personal projects!
Saving new username %div
%p.light = f.text_field :username, required: true, class: 'form-control'
= user_url(@user)  
%div .loading-gif.hide
= f.submit 'Save username', class: "btn btn-warning" %p
= icon('spinner spin')
Saving new username
%p.light
= user_url(@user)
%div
= f.submit 'Save username', class: "btn btn-warning"
   
- if show_profile_remove_tab? - if show_profile_remove_tab?
%fieldset.remove-account .panel.panel-danger.remove-account
%legend .panel-heading
Remove account Remove account
%div .panel-body
%p Deleting an account has the following effects: %p Deleting an account has the following effects:
%ul %ul
%li All user content like authored issues, snippets, comments will be removed %li All user content like authored issues, snippets, comments will be removed
Loading
Loading
Loading
@@ -5,9 +5,11 @@
Loading
@@ -5,9 +5,11 @@
OAuth2 protocol settings below. OAuth2 protocol settings below.
%hr %hr
   
%fieldset.oauth-applications .oauth-applications
%legend Your applications %h3
%p= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success' Your applications
.pull-right
= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success'
- if @applications.any? - if @applications.any?
%table.table.table-striped %table.table.table-striped
%thead %thead
Loading
@@ -28,8 +30,9 @@
Loading
@@ -28,8 +30,9 @@
%td= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link btn-sm' %td= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link btn-sm'
%td= render 'doorkeeper/applications/delete_form', application: application %td= render 'doorkeeper/applications/delete_form', application: application
   
%fieldset.oauth-authorized-applications.prepend-top-20 .oauth-authorized-applications.prepend-top-20
%legend Authorized applications %h3
Authorized applications
   
- if @authorized_tokens.any? - if @authorized_tokens.any?
%table.table.table-striped %table.table.table-striped
Loading
Loading
Loading
@@ -6,49 +6,51 @@
Loading
@@ -6,49 +6,51 @@
%hr %hr
   
= form_for @user, url: profile_path, remote: true, method: :put do |f| = form_for @user, url: profile_path, remote: true, method: :put do |f|
%fieldset.application-theme .panel.panel-default.application-theme
%legend .panel-heading
Application theme Application theme
.themes_opts .panel-body
= label_tag do .themes_opts
.prev.default = label_tag do
= f.radio_button :theme_id, 1 .prev.default
Graphite = f.radio_button :theme_id, 1
Graphite
   
= label_tag do = label_tag do
.prev.classic .prev.classic
= f.radio_button :theme_id, 2 = f.radio_button :theme_id, 2
Charcoal Charcoal
   
= label_tag do = label_tag do
.prev.modern .prev.modern
= f.radio_button :theme_id, 3 = f.radio_button :theme_id, 3
Green Green
   
= label_tag do = label_tag do
.prev.gray .prev.gray
= f.radio_button :theme_id, 4 = f.radio_button :theme_id, 4
Gray Gray
   
= label_tag do = label_tag do
.prev.violet .prev.violet
= f.radio_button :theme_id, 5 = f.radio_button :theme_id, 5
Violet Violet
   
= label_tag do = label_tag do
.prev.blue .prev.blue
= f.radio_button :theme_id, 6 = f.radio_button :theme_id, 6
Blue Blue
%br %br
.clearfix .clearfix
   
%fieldset.code-preview-theme .panel.panel-default.code-preview-theme
%legend .panel-heading
Code preview theme Code preview theme
.code_highlight_opts .panel-body
- color_schemes.each do |color_scheme_id, color_scheme| .code_highlight_opts
= label_tag do - color_schemes.each do |color_scheme_id, color_scheme|
.prev = label_tag do
= image_tag "#{color_scheme}-scheme-preview.png" .prev
= f.radio_button :color_scheme_id, color_scheme_id = image_tag "#{color_scheme}-scheme-preview.png"
= color_scheme.gsub(/[-_]+/, ' ').humanize = f.radio_button :color_scheme_id, color_scheme_id
= color_scheme.gsub(/[-_]+/, ' ').humanize
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment