Commit 4f830817 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Render appearance changes. Show appearance tab in admin area

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 40104eea
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
@import "sections/dashboard.scss"; @import "sections/dashboard.scss";
@import "sections/stat_graph.scss"; @import "sections/stat_graph.scss";
@import "sections/groups.scss"; @import "sections/groups.scss";
@import "sections/appearances.scss";
/** /**
* Code highlight * Code highlight
......
.appearance-logo-preview {
max-width: 400px;
margin-bottom: 20px;
}
module BrandHelper module AppearancesHelper
def brand_title def brand_title
'GitLab Enterprise Edition' if brand_item
brand_item.title
else
'GitLab Enterprise Edition'
end
end end
def brand_image def brand_image
image_tag 'brand_logo.png' logo = if brand_item
brand_item.logo
else
'brand_logo.png'
end
image_tag logo
end end
def brand_text def brand_text
...@@ -18,6 +28,18 @@ Each project can also have an issue tracker and a wiki. ...@@ -18,6 +28,18 @@ Each project can also have an issue tracker and a wiki.
Used by more than 50,000 organizations, GitLab is the most popular solution to manage git repositories on-premises. Used by more than 50,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.
Read more about GitLab at #{link_to "www.gitlab.com", "https://www.gitlab.com/", target: "_blank"}. Read more about GitLab at #{link_to "www.gitlab.com", "https://www.gitlab.com/", target: "_blank"}.
eos eos
markdown default_text
text = if brand_item
brand_item.description
else
default_text
end
markdown text
end
def brand_item
@appearance ||= Appearance.first
end end
end end
...@@ -16,4 +16,5 @@ ...@@ -16,4 +16,5 @@
= link_to "Hooks", admin_hooks_path = link_to "Hooks", admin_hooks_path
= nav_link(controller: :background_jobs) do = nav_link(controller: :background_jobs) do
= link_to "Background Jobs", admin_background_jobs_path = link_to "Background Jobs", admin_background_jobs_path
= nav_link(controller: :appearances) do
= link_to "Appearance", admin_appearances_path
...@@ -100,6 +100,8 @@ Gitlab::Application.routes.draw do ...@@ -100,6 +100,8 @@ Gitlab::Application.routes.draw do
end end
end end
resource :appearances
root to: "dashboard#index" root to: "dashboard#index"
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment