Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
35d0d774
Commit
35d0d774
authored
May 28, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prefer panels over fieldset when different forms
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
47989d60
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
92 additions
and
83 deletions
+92
-83
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+44
-40
app/views/profiles/applications.html.haml
app/views/profiles/applications.html.haml
+8
-5
app/views/profiles/design.html.haml
app/views/profiles/design.html.haml
+40
-38
No files found.
app/views/profiles/accounts/show.html.haml
View file @
35d0d774
...
...
@@ -9,10 +9,10 @@
Some options are unavailable for LDAP accounts
.account-page
%fieldse
t
.update-token
%legend
.panel.panel-defaul
t.update-token
.panel-heading
Reset Private token
%div
.panel-body
=
form_for
@user
,
url:
reset_private_token_profile_path
,
method: :put
do
|
f
|
.data
%p
...
...
@@ -32,12 +32,11 @@
=
f
.
submit
'Generate'
,
class:
"btn success btn-build-token"
-
unless
current_user
.
ldap_user?
%fieldset
-
if
current_user
.
otp_required_for_login
%legend
.text
-success
=
icon
(
'check'
)
.panel.panel
-success
.panel-heading
Two-factor Authentication enabled
%div
.panel-body
.pull-right
=
link_to
'Disable Two-factor Authentication'
,
profile_two_factor_auth_path
,
method: :delete
,
class:
'btn btn-close btn-sm'
,
data:
{
confirm:
'Are you sure?'
}
...
...
@@ -49,8 +48,10 @@
invalidating all previous codes.
-
else
%legend
Two-factor Authentication
%div
.panel.panel-default
.panel-heading
Two-factor Authentication
.panel-body
%p
Increase your account's security by enabling two-factor authentication (2FA).
%p
...
...
@@ -60,8 +61,10 @@
=
link_to
'Enable Two-factor Authentication'
,
new_profile_two_factor_auth_path
,
class:
'btn btn-success'
-
if
show_profile_social_tab?
%fieldset
%legend
Connected Accounts
.panel.panel-default
.panel-heading
Connected Accounts
.panel-body
.oauth-buttons.append-bottom-10
%p
Click on icon to activate signin with one of the following services
-
enabled_social_providers
.
each
do
|
provider
|
...
...
@@ -73,9 +76,10 @@
=
icon
(
'close'
)
-
if
show_profile_username_tab?
%fieldset
.update-username
%legend
.panel.panel-warning
.update-username
.panel-heading
Change Username
.panel-body
=
form_for
@user
,
url:
update_username_profile_path
,
method: :put
,
remote:
true
do
|
f
|
%p
Changing your username will change path to all personal projects!
...
...
@@ -92,10 +96,10 @@
=
f
.
submit
'Save username'
,
class:
"btn btn-warning"
-
if
show_profile_remove_tab?
%fieldset
.remove-account
%legend
.panel.panel-danger
.remove-account
.panel-heading
Remove account
%div
.panel-body
%p
Deleting an account has the following effects:
%ul
%li
All user content like authored issues, snippets, comments will be removed
...
...
app/views/profiles/applications.html.haml
View file @
35d0d774
...
...
@@ -5,9 +5,11 @@
OAuth2 protocol settings below.
%hr
%fieldset
.oauth-applications
%legend
Your applications
%p
=
link_to
'New Application'
,
new_oauth_application_path
,
class:
'btn btn-success'
.oauth-applications
%h3
Your applications
.pull-right
=
link_to
'New Application'
,
new_oauth_application_path
,
class:
'btn btn-success'
-
if
@applications
.
any?
%table
.table.table-striped
%thead
...
...
@@ -28,8 +30,9 @@
%td
=
link_to
'Edit'
,
edit_oauth_application_path
(
application
),
class:
'btn btn-link btn-sm'
%td
=
render
'doorkeeper/applications/delete_form'
,
application:
application
%fieldset
.oauth-authorized-applications.prepend-top-20
%legend
Authorized applications
.oauth-authorized-applications.prepend-top-20
%h3
Authorized applications
-
if
@authorized_tokens
.
any?
%table
.table.table-striped
...
...
app/views/profiles/design.html.haml
View file @
35d0d774
...
...
@@ -6,9 +6,10 @@
%hr
=
form_for
@user
,
url:
profile_path
,
remote:
true
,
method: :put
do
|
f
|
%fieldse
t
.application-theme
%legend
.panel.panel-defaul
t.application-theme
.panel-heading
Application theme
.panel-body
.themes_opts
=
label_tag
do
.prev.default
...
...
@@ -42,9 +43,10 @@
%br
.clearfix
%fieldse
t
.code-preview-theme
%legend
.panel.panel-defaul
t.code-preview-theme
.panel-heading
Code preview theme
.panel-body
.code_highlight_opts
-
color_schemes
.
each
do
|
color_scheme_id
,
color_scheme
|
=
label_tag
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment