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
2681a01b
Commit
2681a01b
authored
Mar 14, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add resize button for better wiki reading
parent
a685624d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
17 deletions
+24
-17
app/assets/javascripts/main.js.coffee
app/assets/javascripts/main.js.coffee
+6
-0
app/views/commits/_diffs.html.haml
app/views/commits/_diffs.html.haml
+1
-1
app/views/wikis/edit.html.haml
app/views/wikis/edit.html.haml
+0
-1
app/views/wikis/show.html.haml
app/views/wikis/show.html.haml
+17
-15
No files found.
app/assets/javascripts/main.js.coffee
View file @
2681a01b
...
...
@@ -53,6 +53,12 @@ $ ->
$
(
'.trigger-submit'
).
on
'change'
,
->
$
(
@
).
parents
(
'form'
).
submit
()
# Wiki resizer
$
(
'.wiki-fullscreen'
).
on
'click'
,
->
$
(
'.writeboards-menu'
).
toggleClass
(
'hide'
)
$
(
'.writeboards-content'
).
toggleClass
(
'span9'
).
toggleClass
(
'span12'
)
# Flash
if
(
flash
=
$
(
".flash-container"
)).
length
>
0
flash
.
click
->
$
(
@
).
fadeOut
()
...
...
app/views/commits/_diffs.html.haml
View file @
2681a01b
...
...
@@ -25,7 +25,7 @@
%span
=
diff
.
old_path
-
if
@commit
.
prev_commit
=
link_to
project_tree_path
(
@project
,
tree_join
(
@commit
.
prev_commit_id
,
diff
.
new_path
)),
{
:class
=>
'btn pull-right view-file'
}
do
=
link_to
project_tree_path
(
@project
,
tree_join
(
@commit
.
prev_commit_id
,
diff
.
new_path
)),
{
:class
=>
'btn
btn-tiny
pull-right view-file'
}
do
View file @
%span
.commit-short-id
=
@commit
.
short_id
(
6
)
-
else
...
...
app/views/wikis/edit.html.haml
View file @
2681a01b
%h3
.page_title
Editing page
%hr
=
render
'form'
.pull-right
...
...
app/views/wikis/show.html.haml
View file @
2681a01b
.row
.span3
.span3
.writeboards-menu
=
render
'writeboards/nav'
.span9
%h3
.page_title
=
@wiki
.
title
%span
.pull-right
=
link_to
pages_project_wikis_path
(
@project
),
class:
"btn btn-small grouped"
do
Pages
-
if
can?
current_user
,
:write_wiki
,
@project
=
link_to
history_project_wiki_path
(
@project
,
@wiki
),
class:
"btn btn-small grouped"
do
History
=
link_to
edit_project_wiki_path
(
@project
,
@wiki
),
class:
"btn btn-small grouped"
do
%i
.icon-edit
Edit
%br
.span9.writeboards-content
-
if
@wiki
!=
@most_recent_wiki
.
warning_message
.
alert
This is an old version of this page.
You can view the
#{
link_to
"most recent version"
,
project_wiki_path
(
@project
,
@wiki
)
}
or browse the
#{
link_to
"history"
,
history_project_wiki_path
(
@project
,
@wiki
)
}
.
.file_holder
.file_title
=
link_to
'#'
,
class:
'wiki-fullscreen'
do
%i
.icon-resize-horizontal
=
@wiki
.
title
%span
.options
=
link_to
pages_project_wikis_path
(
@project
),
class:
"btn btn-tiny grouped"
do
Pages
-
if
can?
current_user
,
:write_wiki
,
@project
=
link_to
history_project_wiki_path
(
@project
,
@wiki
),
class:
"btn btn-tiny grouped"
do
History
=
link_to
edit_project_wiki_path
(
@project
,
@wiki
),
class:
"btn btn-tiny grouped"
do
%i
.icon-edit
Edit
.file_content.wiki
=
preserve
do
=
markdown
@wiki
.
content
...
...
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