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
Jérome Perrin
gitlab-ce
Commits
11656fd4
Commit
11656fd4
authored
Oct 21, 2014
by
Robert Schilling
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8111 from cirosantilli/dry-group-avatar-button
Factor choose group avatar button
parents
5b3bf155
01db264f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
21 deletions
+10
-21
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+1
-7
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-7
app/views/groups/new.html.haml
app/views/groups/new.html.haml
+1
-7
app/views/shared/_choose_group_avatar_button.html.haml
app/views/shared/_choose_group_avatar_button.html.haml
+7
-0
No files found.
app/views/admin/groups/_form.html.haml
View file @
11656fd4
...
...
@@ -16,13 +16,7 @@
.form-group.group-description-holder
=
f
.
label
:avatar
,
"Group avatar"
,
class:
'control-label'
.col-sm-10
%a
.choose-btn.btn.btn-small.js-choose-group-avatar-button
%i
.fa.fa-paperclip
%span
Choose File ...
%span
.file_name.js-avatar-filename
File name...
=
f
.
file_field
:avatar
,
class:
"js-group-avatar-input hidden"
.light
The maximum file size allowed is 100KB.
=
render
'shared/choose_group_avatar_button'
,
f:
f
-
if
@group
.
new_record?
.form-group
...
...
app/views/groups/edit.html.haml
View file @
11656fd4
...
...
@@ -31,13 +31,7 @@
You can change your group avatar here
-
else
You can upload a group avatar here
%a
.choose-btn.btn.btn-small.js-choose-group-avatar-button
%i
.fa.fa-paperclip
%span
Choose File ...
%span
.file_name.js-avatar-filename
File name...
=
f
.
file_field
:avatar
,
class:
"js-group-avatar-input hidden"
.light
The maximum file size allowed is 100KB.
=
render
'shared/choose_group_avatar_button'
,
f:
f
-
if
@group
.
avatar?
%hr
=
link_to
'Remove avatar'
,
group_avatar_path
(
@group
.
to_param
),
data:
{
confirm:
"Group avatar will be removed. Are you sure?"
},
method: :delete
,
class:
"btn btn-remove btn-small remove-avatar"
...
...
app/views/groups/new.html.haml
View file @
11656fd4
...
...
@@ -16,13 +16,7 @@
.form-group.group-description-holder
=
f
.
label
:avatar
,
"Group avatar"
,
class:
'control-label'
.col-sm-10
%a
.choose-btn.btn.btn-small.js-choose-group-avatar-button
%i
.fa.fa-paperclip
%span
Choose File ...
%span
.file_name.js-avatar-filename
File name...
=
f
.
file_field
:avatar
,
class:
"js-group-avatar-input hidden"
.light
The maximum file size allowed is 100KB.
=
render
'shared/choose_group_avatar_button'
,
f:
f
.form-group
.col-sm-2
...
...
app/views/shared/_choose_group_avatar_button.html.haml
0 → 100644
View file @
11656fd4
%a
.choose-btn.btn.btn-small.js-choose-group-avatar-button
%i
.fa.fa-paperclip
%span
Choose File ...
%span
.file_name.js-avatar-filename
File name...
=
f
.
file_field
:avatar
,
class:
'js-group-avatar-input hidden'
.light
The maximum file size allowed is 100KB.
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