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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
a4c9b4fb
Commit
a4c9b4fb
authored
Jun 15, 2016
by
Annabel Dunstone
Committed by
Jacob Schatz
Jun 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style wiki sub nav links
parent
8e841530
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
95 additions
and
84 deletions
+95
-84
app/views/projects/graphs/_head.html.haml
app/views/projects/graphs/_head.html.haml
+2
-2
app/views/projects/wikis/_nav.html.haml
app/views/projects/wikis/_nav.html.haml
+6
-6
app/views/projects/wikis/_new.html.haml
app/views/projects/wikis/_new.html.haml
+17
-14
app/views/projects/wikis/edit.html.haml
app/views/projects/wikis/edit.html.haml
+15
-13
app/views/projects/wikis/git_access.html.haml
app/views/projects/wikis/git_access.html.haml
+27
-25
app/views/projects/wikis/pages.html.haml
app/views/projects/wikis/pages.html.haml
+10
-8
app/views/projects/wikis/show.html.haml
app/views/projects/wikis/show.html.haml
+18
-16
No files found.
app/views/projects/graphs/_head.html.haml
View file @
a4c9b4fb
%ul
.nav-links.sub-nav
%
div
{
class:
(
container_class
)
}
.nav-links.sub-nav
%
ul
{
class:
(
container_class
)
}
-
page_specific_javascripts
asset_path
(
"graphs/application.js"
)
=
nav_link
(
action: :show
)
do
...
...
app/views/projects/wikis/_nav.html.haml
View file @
a4c9b4fb
.
top-area
%ul
.nav-links
.
nav-links.sub-nav
%ul
{
class:
(
container_class
)
}
=
nav_link
(
html_options:
{
class:
params
[
:id
]
==
'home'
?
'active'
:
''
})
do
=
link_to
'Home'
,
namespace_project_wiki_path
(
@project
.
namespace
,
@project
,
:home
)
...
...
@@ -10,9 +10,9 @@
=
link_to
namespace_project_wikis_git_access_path
(
@project
.
namespace
,
@project
)
do
Git Access
.nav-controls
-
if
can?
(
current_user
,
:create_wiki
,
@project
)
=
link_to
'#modal-new-wiki'
,
class:
"add-new-wiki btn btn-new"
,
"data-toggle"
=>
"modal"
do
=
nav_link
do
=
link_to
'#modal-new-wiki'
,
"data-toggle"
=>
"modal"
do
New Page
=
render
'projects/wikis/new'
=
render
'projects/wikis/new'
app/views/projects/wikis/_new.html.haml
View file @
a4c9b4fb
%div
#modal-new-wiki
.modal
-
@no_container
=
true
%div
{
class:
(
container_class
)
}
%div
#modal-new-wiki
.modal
.modal-dialog
.modal-content
.modal-header
...
...
app/views/projects/wikis/edit.html.haml
View file @
a4c9b4fb
-
@no_container
=
true
-
page_title
"Edit"
,
@page
.
title
.
capitalize
,
"Wiki"
=
render
'nav'
.top-area
%div
{
class:
(
container_class
)
}
.top-area
.nav-text.wiki-page
%strong
-
if
@page
.
persisted?
...
...
@@ -16,4 +18,4 @@
=
render
'main_links'
=
render
'form'
=
render
'form'
app/views/projects/wikis/git_access.html.haml
View file @
a4c9b4fb
-
@no_container
=
true
-
page_title
"Git Access"
,
"Wiki"
=
render
'nav'
.row-content-block
%div
{
class:
(
container_class
)
}
.row-content-block
%span
.oneline
Git access for
%strong
=
@project_wiki
.
path_with_namespace
...
...
@@ -9,7 +11,7 @@
.pull-right
=
render
"shared/clone_panel"
,
project:
@project_wiki
.git-empty.prepend-top-default
.git-empty.prepend-top-default
%fieldset
%legend
Install Gollum:
%pre
.dark
...
...
app/views/projects/wikis/pages.html.haml
View file @
a4c9b4fb
-
@no_container
=
true
-
page_title
"Pages"
,
"Wiki"
=
render
'nav'
%ul
.content-list
%div
{
class:
(
container_class
)
}
%ul
.content-list
-
@wiki_pages
.
each
do
|
wiki_page
|
%li
=
link_to
wiki_page
.
title
,
namespace_project_wiki_path
(
@project
.
namespace
,
@project
,
wiki_page
)
%small
(
#{
wiki_page
.
format
}
)
.pull-right
%small
Last edited
#{
time_ago_with_tooltip
(
wiki_page
.
commit
.
authored_date
)
}
=
paginate
@wiki_pages
,
theme:
'gitlab'
=
paginate
@wiki_pages
,
theme:
'gitlab'
app/views/projects/wikis/show.html.haml
View file @
a4c9b4fb
-
@no_container
=
true
-
page_title
@page
.
title
.
capitalize
,
"Wiki"
=
render
'nav'
.top-area
%div
{
class:
(
container_class
)
}
.top-area
.nav-text
%strong
=
@page
.
title
.
capitalize
...
...
@@ -12,13 +14,13 @@
.nav-controls
=
render
'main_links'
-
if
@page
.
historical?
-
if
@page
.
historical?
.warning_message
This is an old version of this page.
You can view the
#{
link_to
"most recent version"
,
namespace_project_wiki_path
(
@project
.
namespace
,
@project
,
@page
)
}
or browse the
#{
link_to
"history"
,
namespace_project_wiki_history_path
(
@project
.
namespace
,
@project
,
@page
)
}
.
.wiki-holder.prepend-top-default.append-bottom-default
.wiki-holder.prepend-top-default.append-bottom-default
.wiki
=
preserve
do
=
render_wiki_content
(
@page
)
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