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
8e900113
Commit
8e900113
authored
Jan 01, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restyle wiki for for twbs3
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
eaec2350
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
27 deletions
+30
-27
app/views/projects/edit_tree/show.html.haml
app/views/projects/edit_tree/show.html.haml
+1
-1
app/views/projects/wikis/_form.html.haml
app/views/projects/wikis/_form.html.haml
+24
-23
app/views/projects/wikis/_nav.html.haml
app/views/projects/wikis/_nav.html.haml
+1
-1
app/views/projects/wikis/edit.html.haml
app/views/projects/wikis/edit.html.haml
+4
-2
No files found.
app/views/projects/edit_tree/show.html.haml
View file @
8e900113
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
=
label_tag
'commit_message'
,
class:
"control-label"
do
=
label_tag
'commit_message'
,
class:
"control-label"
do
Commit message
Commit message
.col-sm-10
.col-sm-10
=
text_area_tag
'commit_message'
,
''
,
placeholder:
"Update
#{
@blob
.
name
}
"
,
required:
true
,
rows:
3
=
text_area_tag
'commit_message'
,
''
,
placeholder:
"Update
#{
@blob
.
name
}
"
,
required:
true
,
rows:
3
,
class:
'form-control'
.form-actions
.form-actions
=
hidden_field_tag
'last_commit'
,
@last_commit
=
hidden_field_tag
'last_commit'
,
@last_commit
=
hidden_field_tag
'content'
,
''
,
id:
"file-content"
=
hidden_field_tag
'content'
,
''
,
id:
"file-content"
...
...
app/views/projects/wikis/_form.html.haml
View file @
8e900113
=
form_for
[
@project
,
@wiki
],
method:
@wiki
.
persisted?
?
:put
:
:post
do
|
f
|
=
form_for
[
@project
,
@wiki
],
method:
@wiki
.
persisted?
?
:put
:
:post
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
-
if
@wiki
.
errors
.
any?
-
if
@wiki
.
errors
.
any?
#error_explanation
#error_explanation
%h2
=
"
#{
pluralize
(
@wiki
.
errors
.
count
,
"error"
)
}
prohibited this wiki from being saved:"
%h2
=
"
#{
pluralize
(
@wiki
.
errors
.
count
,
"error"
)
}
prohibited this wiki from being saved:"
...
@@ -6,29 +6,30 @@
...
@@ -6,29 +6,30 @@
-
@wiki
.
errors
.
full_messages
.
each
do
|
msg
|
-
@wiki
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.issue-box
=
f
.
hidden_field
:title
,
value:
@wiki
.
title
%h3
.title
.form-group
.edit-wiki-header
=
f
.
label
:format
,
class:
'control-label'
=
@wiki
.
title
.
titleize
.col-sm-10
=
f
.
hidden_field
:title
,
value:
@wiki
.
title
=
f
.
select
:format
,
options_for_select
(
GollumWiki
::
MARKUPS
,
{
selected:
@wiki
.
format
}),
{},
class:
"form-control"
=
f
.
select
:format
,
options_for_select
(
GollumWiki
::
MARKUPS
,
{
selected:
@wiki
.
format
}),
{},
class:
"pull-right input-medium"
=
f
.
label
:format
,
class:
"pull-right"
,
style:
"padding-right: 20px;"
.row
.context
.col-sm-2
.col-sm-10
.col-sm-10
%span
.cgray
%p
.cgray
Wiki content is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
Wiki content is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
To link to a (new) page you can just type
To link to a (new) page you can just type
%code
[Link Title](page-slug)
%code
[Link Title](page-slug)
\.
\.
.form-group
=
f
.
label
:content
,
class:
'control-label'
.col-sm-10
=
f
.
text_area
:content
,
class:
'form-control js-gfm-input'
,
rows:
18
.form-group
=
f
.
label
:commit_message
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:message
,
class:
'form-control'
,
rows:
18
.description
.form-group
=
f
.
label
:content
.col-sm-10
=
f
.
text_area
:content
,
class:
'span8 js-gfm-input'
,
rows:
18
.description
.form-group
=
f
.
label
:commit_message
.col-sm-10
=
f
.
text_field
:message
,
class:
'span8'
,
rows:
18
.form-actions
.form-actions
-
if
@wiki
&&
@wiki
.
persisted?
-
if
@wiki
&&
@wiki
.
persisted?
=
f
.
submit
'Save changes'
,
class:
"btn-save btn"
=
f
.
submit
'Save changes'
,
class:
"btn-save btn"
...
...
app/views/projects/wikis/_nav.html.haml
View file @
8e900113
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
.append-bottom-20
=
nav_link
(
html_options:
{
class:
params
[
:id
]
==
'home'
?
'active'
:
''
})
do
=
nav_link
(
html_options:
{
class:
params
[
:id
]
==
'home'
?
'active'
:
''
})
do
=
link_to
'Home'
,
project_wiki_path
(
@project
,
:home
)
=
link_to
'Home'
,
project_wiki_path
(
@project
,
:home
)
...
...
app/views/projects/wikis/edit.html.haml
View file @
8e900113
=
render
'nav'
=
render
'nav'
%h3
.page-title
%h3
.page-title
Editing page
Editing -
=
render
'main_links'
%span
.light
#{
@wiki
.
title
.
titleize
}
=
render
'main_links'
%hr
=
render
'form'
=
render
'form'
.pull-right
.pull-right
...
...
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