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
fcd27b76
Commit
fcd27b76
authored
Jun 05, 2014
by
Marvin Frick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes display for empty brand_logo
parent
09ffd672
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
app/helpers/appearances_helper.rb
app/helpers/appearances_helper.rb
+9
-7
app/views/admin/appearances/_form.html.haml
app/views/admin/appearances/_form.html.haml
+1
-1
No files found.
app/helpers/appearances_helper.rb
View file @
fcd27b76
...
...
@@ -8,13 +8,15 @@ module AppearancesHelper
end
def
brand_image
logo
=
if
brand_item
brand_item
.
logo
else
'brand_logo.png'
end
image_tag
logo
if
brand_item
if
brand_item
.
logo?
image_tag
brand_item
.
logo
else
nil
end
else
image_tag
'brand_logo.png'
end
end
def
brand_text
...
...
app/views/admin/appearances/_form.html.haml
View file @
fcd27b76
...
...
@@ -17,7 +17,7 @@
.form-group
=
f
.
label
:logo
,
class:
'control-label'
.col-sm-10
-
if
@appearance
.
logo
-
if
@appearance
.
logo
?
=
image_tag
@appearance
.
logo
,
class:
'appearance-logo-preview'
=
f
.
file_field
:logo
,
class:
""
.hint
...
...
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