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
bddf04ac
Commit
bddf04ac
authored
Oct 05, 2020
by
Lakshit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply gl-button class to shared/wikis directory
parent
e2520352
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
10 deletions
+15
-10
app/views/shared/wikis/_form.html.haml
app/views/shared/wikis/_form.html.haml
+2
-2
app/views/shared/wikis/_main_links.html.haml
app/views/shared/wikis/_main_links.html.haml
+3
-3
app/views/shared/wikis/_sidebar.html.haml
app/views/shared/wikis/_sidebar.html.haml
+1
-1
app/views/shared/wikis/diff.html.haml
app/views/shared/wikis/diff.html.haml
+1
-1
app/views/shared/wikis/edit.html.haml
app/views/shared/wikis/edit.html.haml
+1
-1
app/views/shared/wikis/pages.html.haml
app/views/shared/wikis/pages.html.haml
+2
-2
changelogs/unreleased/-231217-shared-wikis.yml
changelogs/unreleased/-231217-shared-wikis.yml
+5
-0
No files found.
app/views/shared/wikis/_form.html.haml
View file @
bddf04ac
...
@@ -72,8 +72,8 @@
...
@@ -72,8 +72,8 @@
-
if
@page
&&
@page
.
persisted?
-
if
@page
&&
@page
.
persisted?
=
f
.
submit
_
(
"Save changes"
),
class:
'btn-success btn qa-save-changes-button'
=
f
.
submit
_
(
"Save changes"
),
class:
'btn-success btn qa-save-changes-button'
.float-right
.float-right
=
link_to
_
(
"Cancel"
),
wiki_page_path
(
@wiki
,
@page
),
class:
'btn btn-cancel btn-grouped'
=
link_to
_
(
"Cancel"
),
wiki_page_path
(
@wiki
,
@page
),
class:
'btn
gl-button
btn-cancel btn-grouped'
-
else
-
else
=
f
.
submit
s_
(
"Wiki|Create page"
),
class:
'btn-success btn qa-create-page-button rspec-create-page-button'
=
f
.
submit
s_
(
"Wiki|Create page"
),
class:
'btn-success btn qa-create-page-button rspec-create-page-button'
.float-right
.float-right
=
link_to
_
(
"Cancel"
),
wiki_path
(
@wiki
),
class:
'btn btn-cancel'
=
link_to
_
(
"Cancel"
),
wiki_path
(
@wiki
),
class:
'btn
gl-button
btn-cancel'
app/views/shared/wikis/_main_links.html.haml
View file @
bddf04ac
-
if
@page
&
.
persisted?
-
if
@page
&
.
persisted?
-
if
can?
(
current_user
,
:create_wiki
,
@wiki
.
container
)
-
if
can?
(
current_user
,
:create_wiki
,
@wiki
.
container
)
=
link_to
wiki_path
(
@wiki
,
action: :new
),
class:
"btn btn-success"
,
role:
"button"
,
data:
{
qa_selector:
'new_page_button'
}
do
=
link_to
wiki_path
(
@wiki
,
action: :new
),
class:
"btn
gl-button
btn-success"
,
role:
"button"
,
data:
{
qa_selector:
'new_page_button'
}
do
=
s_
(
"Wiki|New page"
)
=
s_
(
"Wiki|New page"
)
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :history
),
class:
"btn"
,
role:
"button"
,
data:
{
qa_selector:
'page_history_button'
}
do
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :history
),
class:
"btn
gl-button
"
,
role:
"button"
,
data:
{
qa_selector:
'page_history_button'
}
do
=
s_
(
"Wiki|Page history"
)
=
s_
(
"Wiki|Page history"
)
-
if
can?
(
current_user
,
:create_wiki
,
@wiki
.
container
)
&&
@page
.
latest?
&&
@valid_encoding
-
if
can?
(
current_user
,
:create_wiki
,
@wiki
.
container
)
&&
@page
.
latest?
&&
@valid_encoding
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :edit
),
class:
"btn js-wiki-edit"
,
role:
"button"
,
data:
{
qa_selector:
'edit_page_button'
}
do
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :edit
),
class:
"btn
gl-button
js-wiki-edit"
,
role:
"button"
,
data:
{
qa_selector:
'edit_page_button'
}
do
=
_
(
"Edit"
)
=
_
(
"Edit"
)
app/views/shared/wikis/_sidebar.html.haml
View file @
bddf04ac
...
@@ -18,5 +18,5 @@
...
@@ -18,5 +18,5 @@
=
render
@sidebar_wiki_entries
,
context:
'sidebar'
=
render
@sidebar_wiki_entries
,
context:
'sidebar'
.block.w-100
.block.w-100
-
if
@sidebar_limited
-
if
@sidebar_limited
=
link_to
wiki_path
(
@wiki
,
action: :pages
),
class:
'btn btn-block'
,
data:
{
qa_selector:
'view_all_pages_button'
}
do
=
link_to
wiki_path
(
@wiki
,
action: :pages
),
class:
'btn
gl-button
btn-block'
,
data:
{
qa_selector:
'view_all_pages_button'
}
do
=
s_
(
"Wiki|View All Pages"
)
=
s_
(
"Wiki|View All Pages"
)
app/views/shared/wikis/diff.html.haml
View file @
bddf04ac
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
=
_
(
'Changes'
)
=
_
(
'Changes'
)
.nav-controls.pb-md-3.pb-lg-0
.nav-controls.pb-md-3.pb-lg-0
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :history
),
class:
'btn'
,
role:
'button'
,
data:
{
qa_selector:
'page_history_button'
}
do
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :history
),
class:
'btn
gl-button
'
,
role:
'button'
,
data:
{
qa_selector:
'page_history_button'
}
do
=
s_
(
'Wiki|Page history'
)
=
s_
(
'Wiki|Page history'
)
.page-content-header
.page-content-header
...
...
app/views/shared/wikis/edit.html.haml
View file @
bddf04ac
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
.nav-controls.pb-md-3.pb-lg-0
.nav-controls.pb-md-3.pb-lg-0
-
if
@page
.
persisted?
-
if
@page
.
persisted?
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :history
),
class:
"btn"
do
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :history
),
class:
"btn
gl-button
"
do
=
s_
(
"Wiki|Page history"
)
=
s_
(
"Wiki|Page history"
)
-
if
can?
(
current_user
,
:admin_wiki
,
@wiki
.
container
)
-
if
can?
(
current_user
,
:admin_wiki
,
@wiki
.
container
)
#delete-wiki-modal-wrapper
{
data:
{
delete_wiki_url:
wiki_page_path
(
@wiki
,
@page
),
page_title:
@page
.
human_title
}
}
#delete-wiki-modal-wrapper
{
data:
{
delete_wiki_url:
wiki_page_path
(
@wiki
,
@page
),
page_title:
@page
.
human_title
}
}
...
...
app/views/shared/wikis/pages.html.haml
View file @
bddf04ac
...
@@ -10,14 +10,14 @@
...
@@ -10,14 +10,14 @@
=
s_
(
"Wiki|Wiki Pages"
)
=
s_
(
"Wiki|Wiki Pages"
)
.nav-controls.pb-md-3.pb-lg-0
.nav-controls.pb-md-3.pb-lg-0
=
link_to
wiki_path
(
@wiki
,
action: :git_access
),
class:
'btn'
do
=
link_to
wiki_path
(
@wiki
,
action: :git_access
),
class:
'btn
gl-button
'
do
=
sprite_icon
(
'download'
)
=
sprite_icon
(
'download'
)
=
_
(
"Clone repository"
)
=
_
(
"Clone repository"
)
.dropdown.inline.wiki-sort-dropdown
.dropdown.inline.wiki-sort-dropdown
.btn-group
{
role:
'group'
}
.btn-group
{
role:
'group'
}
.btn-group
{
role:
'group'
}
.btn-group
{
role:
'group'
}
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
display:
'static'
},
class:
'btn btn-default'
}
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
display:
'static'
},
class:
'btn
gl-button
btn-default'
}
=
sort_title
=
sort_title
=
sprite_icon
(
'chevron-down'
)
=
sprite_icon
(
'chevron-down'
)
%ul
.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
%ul
.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
...
...
changelogs/unreleased/-231217-shared-wikis.yml
0 → 100644
View file @
bddf04ac
---
title
:
Apply GitLab UI button styles to buttons in app/views/shared/wikis directory
merge_request
:
44338
author
:
Lakshit
type
:
other
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