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
Léo-Paul Géneau
gitlab-ce
Commits
da5f0b91
Commit
da5f0b91
authored
May 18, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated snippets UI
Closes #14328
parent
da8ac163
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
118 additions
and
55 deletions
+118
-55
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+4
-0
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+14
-1
app/assets/stylesheets/pages/snippets.scss
app/assets/stylesheets/pages/snippets.scss
+31
-13
app/views/projects/snippets/_actions.html.haml
app/views/projects/snippets/_actions.html.haml
+27
-11
app/views/projects/snippets/show.html.haml
app/views/projects/snippets/show.html.haml
+3
-5
app/views/shared/snippets/_header.html.haml
app/views/shared/snippets/_header.html.haml
+9
-10
app/views/snippets/_actions.html.haml
app/views/snippets/_actions.html.haml
+27
-11
app/views/snippets/show.html.haml
app/views/snippets/show.html.haml
+3
-4
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
da5f0b91
...
@@ -162,6 +162,10 @@
...
@@ -162,6 +162,10 @@
}
}
}
}
.dropdown-menu-full-width
{
width
:
100%
;
}
.dropdown-menu-paging
{
.dropdown-menu-paging
{
.dropdown-page-two
,
.dropdown-page-two
,
.dropdown-menu-back
{
.dropdown-menu-back
{
...
...
app/assets/stylesheets/framework/files.scss
View file @
da5f0b91
...
@@ -5,6 +5,10 @@
...
@@ -5,6 +5,10 @@
.file-holder
{
.file-holder
{
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
&
.file-holder-no-border
{
border
:
0
;
}
&
.readme-holder
{
&
.readme-holder
{
margin
:
$gl-padding-top
0
;
margin
:
$gl-padding-top
0
;
}
}
...
@@ -23,8 +27,17 @@
...
@@ -23,8 +27,17 @@
word-wrap
:
break-word
;
word-wrap
:
break-word
;
border-radius
:
3px
3px
0
0
;
border-radius
:
3px
3px
0
0
;
&
.file-title-clear
{
padding-left
:
0
;
padding-right
:
0
;
background-color
:
transparent
;
.file-actions
{
right
:
0
;
}
}
.file-actions
{
.file-actions
{
float
:
right
;
position
:
absolute
;
position
:
absolute
;
top
:
5px
;
top
:
5px
;
right
:
15px
;
right
:
15px
;
...
...
app/assets/stylesheets/pages/snippets.scss
View file @
da5f0b91
...
@@ -16,19 +16,6 @@
...
@@ -16,19 +16,6 @@
}
}
}
}
.snippet-box
{
@include
border-radius
(
2px
);
display
:
block
;
float
:
left
;
padding
:
0
$gl-padding
;
font-weight
:
normal
;
margin-right
:
10px
;
font-size
:
$gl-font-size
;
border
:
1px
solid
;
line-height
:
32px
;
}
.markdown-snippet-copy
{
.markdown-snippet-copy
{
position
:
fixed
;
position
:
fixed
;
top
:
-10px
;
top
:
-10px
;
...
@@ -36,3 +23,34 @@
...
@@ -36,3 +23,34 @@
max-height
:
0
;
max-height
:
0
;
max-width
:
0
;
max-width
:
0
;
}
}
.file-holder.snippet-file-content
{
padding-bottom
:
$gl-padding
;
border-bottom
:
1px
solid
$border-color
;
.file-title
{
padding-top
:
$gl-padding
;
padding-bottom
:
$gl-padding
;
}
.file-actions
{
top
:
12px
;
}
.file-content
{
border-left
:
1px
solid
$border-color
;
border-right
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
}
}
.snippet-title
{
font-size
:
24px
;
font-weight
:
normal
;
}
.snippet-actions
{
@media
(
min-width
:
$screen-sm-min
)
{
float
:
right
;
}
}
app/views/projects/snippets/_actions.html.haml
View file @
da5f0b91
=
link_to
new_namespace_project_snippet_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-grouped new-snippet-link'
,
title:
"New Snippet"
do
.hidden-xs
=
icon
(
'plus'
)
=
link_to
new_namespace_project_snippet_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-grouped btn-create new-snippet-link'
,
title:
"New Snippet"
do
New Snippet
=
icon
(
'plus'
)
-
if
can?
(
current_user
,
:admin_project_snippet
,
@snippet
)
New Snippet
=
link_to
namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-grouped btn-remove"
,
title:
'Delete Snippet'
do
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
=
icon
(
'trash-o'
)
=
link_to
edit_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-grouped snippable-edit"
do
Delete
Edit
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
=
link_to
edit_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-grouped snippable-edit"
do
=
link_to
namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-grouped btn-warning"
,
title:
'Delete Snippet'
do
=
icon
(
'pencil-square-o'
)
Delete
Edit
.visible-xs-block.dropdown
%button
.btn.btn-default.btn-block.append-bottom-0.prepend-top-5
{
data:
{
toggle:
"dropdown"
}
}
Options
%span
.caret
.dropdown-menu.dropdown-menu-full-width
%ul
%li
=
link_to
new_namespace_project_snippet_path
(
@project
.
namespace
,
@project
),
title:
"New Snippet"
do
New Snippet
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
%li
=
link_to
edit_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
)
do
Edit
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
%li
=
link_to
namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
title:
'Delete Snippet'
do
Delete
app/views/projects/snippets/show.html.haml
View file @
da5f0b91
...
@@ -4,15 +4,13 @@
...
@@ -4,15 +4,13 @@
.snippet-holder
.snippet-holder
=
render
'shared/snippets/header'
=
render
'shared/snippets/header'
%article
.file-holder
%article
.file-holder
.file-holder-no-border.snippet-file-content
.file-title
.file-title
.file-title-clear
=
blob_icon
0
,
@snippet
.
file_name
=
blob_icon
0
,
@snippet
.
file_name
%strong
=
@snippet
.
file_name
=
@snippet
.
file_name
.file-actions.hidden-xs
.file-actions.hidden-xs
=
clipboard_button
(
clipboard_target:
".blob-content[data-blob-id='
#{
@snippet
.
id
}
']"
)
=
clipboard_button
(
clipboard_target:
".blob-content[data-blob-id='
#{
@snippet
.
id
}
']"
)
=
link_to
'Raw'
,
raw_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-sm"
,
target:
"_blank"
=
link_to
'Raw'
,
raw_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-sm"
,
target:
"_blank"
=
render
'shared/snippets/blob'
=
render
'shared/snippets/blob'
%div
#notes
=
render
"projects/notes/notes_with_form"
%div
#notes
=
render
"projects/notes/notes_with_form"
app/views/shared/snippets/_header.html.haml
View file @
da5f0b91
.detail-page-header
.detail-page-header.clearfix
.snippet-box.has-tooltip
{
class:
visibility_level_color
(
@snippet
.
visibility_level
),
title:
snippet_visibility_level_description
(
@snippet
.
visibility_level
,
@snippet
),
data:
{
container:
'body'
}}
.snippet-box.has-tooltip.inline.append-right-5
{
title:
snippet_visibility_level_description
(
@snippet
.
visibility_level
,
@snippet
),
data:
{
container:
"body"
}
}
%span
.sr-only
=
visibility_level_label
(
@snippet
.
visibility_level
)
=
visibility_level_icon
(
@snippet
.
visibility_level
,
fw:
false
)
=
visibility_level_icon
(
@snippet
.
visibility_level
,
fw:
false
)
=
visibility_level_label
(
@snippet
.
visibility_level
)
%strong
.item-title
%span
.identifier
Snippet ##{@snippet.id}
Snippet ##{@snippet.id}
%span
.creator
%span
.creator
·
created by
#{
link_to_member
(
@project
,
@snippet
.
author
,
size:
24
)
}
created by
#{
link_to_member
(
@project
,
@snippet
.
author
,
size:
24
,
author_class:
"author item-title"
)
}
·
=
time_ago_with_tooltip
(
@snippet
.
created_at
,
placement:
'bottom'
,
html_class:
'snippet_updated_ago'
)
=
time_ago_with_tooltip
(
@snippet
.
created_at
,
placement:
'bottom'
,
html_class:
'snippet_updated_ago'
)
-
if
@snippet
.
updated_at
!=
@snippet
.
created_at
-
if
@snippet
.
updated_at
!=
@snippet
.
created_at
%span
%span
·
=
icon
(
'edit'
,
title:
'edited'
)
=
icon
(
'edit'
,
title:
'edited'
)
=
time_ago_with_tooltip
(
@snippet
.
updated_at
,
placement:
'bottom'
,
html_class:
'snippet_edited_ago'
)
=
time_ago_with_tooltip
(
@snippet
.
updated_at
,
placement:
'bottom'
,
html_class:
'snippet_edited_ago'
)
.
pull-right
.
snippet-actions
-
if
@snippet
.
project_id?
-
if
@snippet
.
project_id?
=
render
"projects/snippets/actions"
=
render
"projects/snippets/actions"
-
else
-
else
=
render
"snippets/actions"
=
render
"snippets/actions"
.
detail-page-description.row-
content-block.second-block
.content-block.second-block
%h2
.
title
%h2
.
snippet-title.prepend-top-0.append-bottom-0
=
markdown
escape_once
(
@snippet
.
title
),
pipeline: :single_line
=
markdown
escape_once
(
@snippet
.
title
),
pipeline: :single_line
app/views/snippets/_actions.html.haml
View file @
da5f0b91
=
link_to
new_snippet_path
,
class:
'btn btn-grouped new-snippet-link'
,
title:
"New Snippet"
do
.hidden-xs
=
icon
(
'plus'
)
=
link_to
new_snippet_path
,
class:
"btn btn-grouped btn-create new-snippet-link"
,
title:
"New Snippet"
do
New Snippet
=
icon
(
'plus'
)
-
if
can?
(
current_user
,
:update_personal_snippet
,
@snippet
)
New Snippet
=
link_to
edit_snippet_path
(
@snippet
),
class:
"btn btn-grouped snippable-edit"
do
-
if
can?
(
current_user
,
:update_personal_snippet
,
@snippet
)
=
icon
(
'pencil-square-o'
)
=
link_to
edit_snippet_path
(
@snippet
),
class:
"btn btn-grouped snippable-edit"
do
Edit
Edit
-
if
can?
(
current_user
,
:admin_personal_snippet
,
@snippet
)
-
if
can?
(
current_user
,
:admin_personal_snippet
,
@snippet
)
=
link_to
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-grouped btn-remove"
,
title:
'Delete Snippet'
do
=
link_to
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-grouped btn-warning"
,
title:
'Delete Snippet'
do
=
icon
(
'trash-o'
)
Delete
Delete
.visible-xs-block.dropdown
%button
.btn.btn-default.btn-block.append-bottom-0.prepend-top-5
{
data:
{
toggle:
"dropdown"
}
}
Options
%span
.caret
.dropdown-menu.dropdown-menu-full-width
%ul
%li
=
link_to
new_snippet_path
,
title:
"New Snippet"
do
New Snippet
-
if
can?
(
current_user
,
:update_personal_snippet
,
@snippet
)
%li
=
link_to
edit_snippet_path
(
@snippet
)
do
Edit
-
if
can?
(
current_user
,
:admin_personal_snippet
,
@snippet
)
%li
=
link_to
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
title:
'Delete Snippet'
do
Delete
app/views/snippets/show.html.haml
View file @
da5f0b91
...
@@ -3,11 +3,10 @@
...
@@ -3,11 +3,10 @@
.snippet-holder
.snippet-holder
=
render
'shared/snippets/header'
=
render
'shared/snippets/header'
%article
.file-holder
%article
.file-holder
.file-holder-no-border.snippet-file-content
.file-title
.file-title
.file-title-clear
=
blob_icon
0
,
@snippet
.
file_name
=
blob_icon
0
,
@snippet
.
file_name
%strong
=
@snippet
.
file_name
=
@snippet
.
file_name
.file-actions.hidden-xs
.file-actions.hidden-xs
=
clipboard_button
(
clipboard_target:
".blob-content[data-blob-id='
#{
@snippet
.
id
}
']"
)
=
clipboard_button
(
clipboard_target:
".blob-content[data-blob-id='
#{
@snippet
.
id
}
']"
)
=
link_to
'Raw'
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-sm"
,
target:
"_blank"
=
link_to
'Raw'
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-sm"
,
target:
"_blank"
...
...
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