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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
eb784568
Commit
eb784568
authored
Jun 13, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve files/snippets action buttons
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
2af8ace1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
29 deletions
+29
-29
app/assets/stylesheets/generic/files.scss
app/assets/stylesheets/generic/files.scss
+1
-1
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+0
-9
app/models/ability.rb
app/models/ability.rb
+5
-1
app/views/projects/blob/_actions.html.haml
app/views/projects/blob/_actions.html.haml
+3
-3
app/views/projects/snippets/_blob.html.haml
app/views/projects/snippets/_blob.html.haml
+9
-6
app/views/snippets/_blob.html.haml
app/views/snippets/_blob.html.haml
+9
-7
app/views/snippets/show.html.haml
app/views/snippets/show.html.haml
+2
-2
No files found.
app/assets/stylesheets/generic/files.scss
View file @
eb784568
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
.options
{
.options
{
float
:
right
;
float
:
right
;
margin-top
:
-
5
px
;
margin-top
:
-
3
px
;
}
}
.left-options
{
.left-options
{
...
...
app/assets/stylesheets/sections/tree.scss
View file @
eb784568
...
@@ -117,15 +117,6 @@
...
@@ -117,15 +117,6 @@
}
}
}
}
.tree-btn-group
{
top
:
2px
;
.btn
{
margin-right
:
0px
;
padding
:
2px
10px
;
}
}
.tree-download-holder
.btn
{
.tree-download-holder
.btn
{
padding
:
4px
12px
;
padding
:
4px
12px
;
}
}
...
...
app/models/ability.rb
View file @
eb784568
...
@@ -236,7 +236,11 @@ class Ability
...
@@ -236,7 +236,11 @@ class Ability
:"modify_
#{
name
}
"
,
:"modify_
#{
name
}
"
,
]
]
else
else
subject
.
respond_to?
(
:project
)
?
project_abilities
(
user
,
subject
.
project
)
:
[]
if
subject
.
respond_to?
(
:project
)
project_abilities
(
user
,
subject
.
project
)
else
[]
end
end
end
end
end
end
end
...
...
app/views/projects/blob/_actions.html.haml
View file @
eb784568
...
@@ -14,6 +14,6 @@
...
@@ -14,6 +14,6 @@
=
link_to
"blame"
,
project_blame_path
(
@project
,
@id
),
class:
"btn btn-small"
unless
@blob
.
empty?
=
link_to
"blame"
,
project_blame_path
(
@project
,
@id
),
class:
"btn btn-small"
unless
@blob
.
empty?
=
link_to
"history"
,
project_commits_path
(
@project
,
@id
),
class:
"btn btn-small"
=
link_to
"history"
,
project_commits_path
(
@project
,
@id
),
class:
"btn btn-small"
-
if
allowed_tree_edit?
-
if
allowed_tree_edit?
=
link_to
'#modal-remove-blob'
,
class:
"remove-blob btn btn-small btn-remove"
,
"data-toggle"
=>
"modal"
do
=
link_to
'#modal-remove-blob'
,
class:
"remove-blob btn btn-small btn-remove"
,
"data-toggle"
=>
"modal"
do
remove
remove
app/views/projects/snippets/_blob.html.haml
View file @
eb784568
.file-holder
.file-holder
.file-title
.file-title
%i
.icon-file
%i
.icon-file
%strong
=
@snippet
.
file_name
%span
.file_name
%span
.options
=
@snippet
.
file_name
.btn-group.tree-btn-group.pull-right
.options
-
if
can?
(
current_user
,
:admin_project_snippet
,
@project
)
||
@snippet
.
author
==
current_user
.btn-group
=
link_to
"Edit"
,
edit_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-tiny"
,
title:
'Edit Snippet'
-
if
can?
(
current_user
,
:modify_project_snippet
,
@snippet
)
=
link_to
"Raw"
,
raw_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-tiny"
,
target:
"_blank"
=
link_to
"edit"
,
edit_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-small"
,
title:
'Edit Snippet'
=
link_to
"raw"
,
raw_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-small"
,
target:
"_blank"
-
if
can?
(
current_user
,
:admin_project_snippet
,
@snippet
)
=
link_to
"remove"
,
project_snippet_path
(
@project
,
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-small btn-remove"
,
title:
'Delete Snippet'
=
render
'snippets/blob_content'
=
render
'snippets/blob_content'
app/views/snippets/_blob.html.haml
View file @
eb784568
.file-holder
.file-holder
.file-title
.file-title
%i
.icon-file
%i
.icon-file
%strong
=
@snippet
.
file_name
%span
.file_name
%span
.options
=
@snippet
.
file_name
.btn-group.tree-btn-group.pull-right
.options
-
if
@snippet
.
author
==
current_user
.btn-group
=
link_to
"Edit"
,
edit_snippet_path
(
@snippet
),
class:
"btn btn-tiny"
,
title:
'Edit Snippet'
-
if
can?
(
current_user
,
:modify_personal_snippet
,
@snippet
)
=
link_to
"Delete"
,
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-tiny"
,
title:
'Delete Snippet'
=
link_to
"edit"
,
edit_snippet_path
(
@snippet
),
class:
"btn btn-small"
,
title:
'Edit Snippet'
=
link_to
"Raw"
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-tiny"
,
target:
"_blank"
=
link_to
"raw"
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-small"
,
target:
"_blank"
-
if
can?
(
current_user
,
:admin_personal_snippet
,
@snippet
)
=
link_to
"remove"
,
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-small btn-remove"
,
title:
'Delete Snippet'
=
render
'snippets/blob_content'
=
render
'snippets/blob_content'
app/views/snippets/show.html.haml
View file @
eb784568
...
@@ -7,9 +7,9 @@
...
@@ -7,9 +7,9 @@
private
private
.pull-right
.pull-right
=
link_to
new_snippet_path
,
class:
"btn btn-new
btn-small
"
,
title:
"New Snippet"
do
=
link_to
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New Snippet"
do
Add new snippet
Add new snippet
%hr
.append-bottom-20
.append-bottom-20
.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