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
1c22d4f5
Commit
1c22d4f5
authored
Feb 21, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Help message for wiki, styled projects page
parent
ce8eba89
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
71 additions
and
32 deletions
+71
-32
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+4
-2
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+9
-8
app/assets/stylesheets/login.scss
app/assets/stylesheets/login.scss
+1
-1
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+29
-2
app/views/deploy_keys/_show.html.haml
app/views/deploy_keys/_show.html.haml
+2
-2
app/views/layouts/_projects_side.html.haml
app/views/layouts/_projects_side.html.haml
+1
-1
app/views/projects/_tile.html.haml
app/views/projects/_tile.html.haml
+10
-8
app/views/wikis/_form.html.haml
app/views/wikis/_form.html.haml
+6
-0
app/views/wikis/edit.html.haml
app/views/wikis/edit.html.haml
+2
-2
app/views/wikis/history.html.haml
app/views/wikis/history.html.haml
+1
-1
app/views/wikis/show.html.haml
app/views/wikis/show.html.haml
+6
-5
No files found.
app/assets/javascripts/merge_requests.js
View file @
1c22d4f5
...
@@ -9,17 +9,19 @@ var MergeRequest = {
...
@@ -9,17 +9,19 @@ var MergeRequest = {
$
(
this
).
parent
().
addClass
(
"
active
"
);
$
(
this
).
parent
().
addClass
(
"
active
"
);
});
});
$
(
"
.tabs a.merge-notes-tab
"
).
live
(
"
click
"
,
function
()
{
$
(
"
.tabs a.merge-notes-tab
"
).
live
(
"
click
"
,
function
(
e
)
{
$
(
"
.merge-request-diffs
"
).
hide
();
$
(
"
.merge-request-diffs
"
).
hide
();
$
(
"
.merge-request-notes
"
).
show
();
$
(
"
.merge-request-notes
"
).
show
();
e
.
preventDefault
();
});
});
$
(
"
.tabs a.merge-diffs-tab
"
).
live
(
"
click
"
,
function
()
{
$
(
"
.tabs a.merge-diffs-tab
"
).
live
(
"
click
"
,
function
(
e
)
{
if
(
!
MergeRequest
.
diffs_loaded
)
{
if
(
!
MergeRequest
.
diffs_loaded
)
{
MergeRequest
.
loadDiff
();
MergeRequest
.
loadDiff
();
}
}
$
(
"
.merge-request-notes
"
).
hide
();
$
(
"
.merge-request-notes
"
).
hide
();
$
(
"
.merge-request-diffs
"
).
show
();
$
(
"
.merge-request-diffs
"
).
show
();
e
.
preventDefault
();
});
});
},
},
...
...
app/assets/stylesheets/common.scss
View file @
1c22d4f5
...
@@ -253,14 +253,12 @@ img.lil_av {
...
@@ -253,14 +253,12 @@ img.lil_av {
}
}
.widget
{
.widget
{
@include
shade
;
padding
:
20px
;
padding
:
20px
;
margin-bottom
:
20px
;
margin-bottom
:
20px
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#fff
)
,
to
(
#f1f1f1
));
background-image
:
-webkit-linear-gradient
(
#fff
6
.6%
,
#f1f1f1
);
background-image
:
-moz-linear-gradient
(
#fff
6
.6%
,
#f1f1f1
);
background-image
:
-o-linear-gradient
(
#fff
6
.6%
,
#f1f1f1
);
border
:
1px
solid
#DDD
;
border
:
1px
solid
#DDD
;
border-radius
:
5px
;
border-radius
:
5px
;
background
:
#fafafa
;
.link_holder
{
.link_holder
{
background
:
#eee
;
background
:
#eee
;
...
@@ -304,6 +302,9 @@ img.lil_av {
...
@@ -304,6 +302,9 @@ img.lil_av {
.row_title
{
.row_title
{
font-weight
:bold
;
font-weight
:bold
;
color
:
#444
;
color
:
#444
;
&
:hover
{
text-decoration
:underline
;
}
}
}
li
,
.wll
{
li
,
.wll
{
...
@@ -345,10 +346,6 @@ img.lil_av {
...
@@ -345,10 +346,6 @@ img.lil_av {
@include
shade
;
@include
shade
;
}
}
.well.padded
{
padding
:
29px
;
}
.download_repo_link
{
.download_repo_link
{
background
:
url("images.png")
no-repeat
0
-48px
;
background
:
url("images.png")
no-repeat
0
-48px
;
padding-left
:
20px
;
padding-left
:
20px
;
...
@@ -369,3 +366,7 @@ table a code {
...
@@ -369,3 +366,7 @@ table a code {
top
:
-2px
;
top
:
-2px
;
margin-right
:
3px
;
margin-right
:
3px
;
}
}
.span12
hr
{
margin-top
:
5px
;
}
app/assets/stylesheets/login.scss
View file @
1c22d4f5
/* Login Page */
/* Login Page */
body
.login-page
{
body
.login-page
{
padding-top
:
10%
;
padding-top
:
10%
;
background
:
$style_color
;
background
:
#f1f1f1
;
}
}
.login-box
{
.login-box
{
...
...
app/assets/stylesheets/projects.css.scss
View file @
1c22d4f5
...
@@ -222,6 +222,33 @@ input.git_clone_url {
...
@@ -222,6 +222,33 @@ input.git_clone_url {
background
:
#fff
!
important
;
background
:
#fff
!
important
;
}
}
.span12
hr
{
.project_tile
{
margin-top
:
2px
;
@include
shade
;
@include
round-borders-all
(
4px
);
margin-bottom
:
20px
;
width
:
338px
;
float
:left
;
margin-left
:
20px
;
border
:
1px
solid
#DDD
;
padding-bottom
:
20px
;
.title
{
background
:
#f5f5f5
;
padding
:
5px
10px
2px
20px
;
border-bottom
:
1px
solid
#DDD
;
margin-bottom
:
15px
;
h3
{
&
:hover
{
text-decoration
:
underline
;
}
}
}
.data
{
margin
:
0
20px
;
}
.buttons
{
margin
:
0
20px
;
}
}
}
app/views/deploy_keys/_show.html.haml
View file @
1c22d4f5
%tr
%tr
%td
%td
%a
{
:href
=>
project_deploy_key_path
(
key
.
project
,
key
)}
%a
{
:href
=>
project_deploy_key_path
(
key
.
project
,
key
)}
=
key
.
title
%strong
=
key
.
title
%td
%td
%span
.update-author
%span
.update-author
Added
Added
=
time_ago_in_words
(
key
.
created_at
)
=
time_ago_in_words
(
key
.
created_at
)
ago
ago
%td
%td
=
link_to
'Remove'
,
project_deploy_key_path
(
key
.
project
,
key
),
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"danger btn delete-key small"
=
link_to
'Remove'
,
project_deploy_key_path
(
key
.
project
,
key
),
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:class
=>
"danger btn delete-key small
right
"
app/views/layouts/_projects_side.html.haml
View file @
1c22d4f5
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.widget
.widget
You can create at least
You can create at least
=
current_user
.
projects_limit
=
current_user
.
projects_limit
projects. Click on
button
to add a new one
projects. Click on
link below
to add a new one
.link_holder
.link_holder
=
link_to
new_project_path
,
:class
=>
""
do
=
link_to
new_project_path
,
:class
=>
""
do
New Project »
New Project »
...
...
app/views/projects/_tile.html.haml
View file @
1c22d4f5
-
@projects
.
in_groups_of
(
2
,
false
)
do
|
projects
|
-
@projects
.
in_groups_of
(
2
,
false
)
do
|
projects
|
.row
.row
-
projects
.
each_with_index
do
|
project
,
i
|
-
projects
.
each_with_index
do
|
project
,
i
|
%div
.span5.well.padded
%div
.project_tile
=
link_to
project_path
(
project
)
do
.title
%h3
=
truncate
(
project
.
name
,
:length
=>
28
)
=
link_to
project_path
(
project
)
do
%p
%h3
=
truncate
(
project
.
name
,
:length
=>
28
)
%input
{
:value
=>
project
.
url_to_repo
,
:class
=>
[
'git-url'
,
'one_click_select'
,
'text'
,
'project_list_url'
],
:readonly
=>
'readonly'
}
.data
%p
%a
.btn.info
{
:href
=>
tree_project_ref_path
(
project
,
project
.
root_ref
)}
Browse code
%input
{
:value
=>
project
.
url_to_repo
,
:class
=>
[
'git-url'
,
'one_click_select'
,
'text'
,
'project_list_url'
],
:readonly
=>
'readonly'
}
%a
.btn
{
:href
=>
project_commits_path
(
project
)}
Commits
.buttons
%a
.btn.info
{
:href
=>
tree_project_ref_path
(
project
,
project
.
root_ref
)}
Browse code
%a
.btn
{
:href
=>
project_commits_path
(
project
)}
Commits
app/views/wikis/_form.html.haml
View file @
1c22d4f5
...
@@ -6,6 +6,12 @@
...
@@ -6,6 +6,12 @@
-
@wiki
.
errors
.
full_messages
.
each
do
|
msg
|
-
@wiki
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.alert-message.block-message.warning
%p
Wiki content is parsed with
#{
link_to
"Markdown"
,
"http://en.wikipedia.org/wiki/Markdown"
}
.
%br
To add link to new page you can just type
%code
[Link Title](page-slug)
.clearfix
.clearfix
=
f
.
label
:title
=
f
.
label
:title
.input
=
f
.
text_field
:title
,
:class
=>
:xxlarge
.input
=
f
.
text_field
:title
,
:class
=>
:xxlarge
...
...
app/views/wikis/edit.html.haml
View file @
1c22d4f5
%h
1
Editing page
%h
3
Editing page
%hr
=
render
'form'
=
render
'form'
app/views/wikis/history.html.haml
View file @
1c22d4f5
%h
2
Versions
%h
3
Versions
%table
%table
%thead
%thead
%tr
%tr
...
...
app/views/wikis/show.html.haml
View file @
1c22d4f5
%h3
%h3
=
@wiki
.
title
=
@wiki
.
title
=
link_to
edit_project_wiki_path
(
@project
,
@wiki
),
:class
=>
"right btn small"
do
%span
.right
Edit
-
if
can?
current_user
,
:write_wiki
,
@project
-
if
can?
current_user
,
:write_wiki
,
@project
=
link_to
history_project_wiki_path
(
@project
,
@wiki
),
:class
=>
"btn small"
do
=
link_to
history_project_wiki_path
(
@project
,
@wiki
),
:class
=>
"right btn small"
do
History
History
=
link_to
edit_project_wiki_path
(
@project
,
@wiki
),
:class
=>
"btn small"
do
Edit
%hr
%hr
=
markdown_to_html
@wiki
.
content
=
markdown_to_html
@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