Commit 1e11409c authored by Kirill Smelkov's avatar Kirill Smelkov

NXD Show ICP on front page & on footer of every other pages

TODO detect whether request comes from China and only then show ICP.
parent dd93cd3d
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
} }
} }
// TODO adjust .page-with-sidebar .icp-footer
@media (max-width: $screen-sm-max) { @media (max-width: $screen-sm-max) {
.page-with-sidebar .content-wrapper { .page-with-sidebar .content-wrapper {
padding: 0; padding: 0;
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
min-height: 100vh; min-height: 100vh;
width: 100%; width: 100%;
padding: 20px; padding: 20px;
padding-bottom: 0px; // bottom is for .icp-footer
background: #EAEBEC; background: #EAEBEC;
.container-fluid { .container-fluid {
...@@ -36,6 +37,11 @@ ...@@ -36,6 +37,11 @@
} }
} }
.icp-footer {
text-align: center;
padding: 10px; // = content-wrapper.padding / 2
}
.nav-sidebar { .nav-sidebar {
margin-top: 14 + $header-height; margin-top: 14 + $header-height;
margin-bottom: 100px; margin-bottom: 100px;
......
...@@ -53,4 +53,13 @@ module PageLayoutHelper ...@@ -53,4 +53,13 @@ module PageLayoutHelper
css_class css_class
end end
def should_render_icp?
extra_config.has_key?('ICP')
# TODO render ICP only for requests from China
end
def render_icp
link_to extra_config.ICP, "http://www.miibeian.gov.cn/"
end
end end
...@@ -28,3 +28,6 @@ ...@@ -28,3 +28,6 @@
.content .content
.clearfix .clearfix
= yield = yield
.icp-footer
- if should_render_icp?
= render_icp
...@@ -34,3 +34,5 @@ ...@@ -34,3 +34,5 @@
= link_to "Help", help_path = link_to "Help", help_path
= link_to "About GitLab", "https://about.gitlab.com/" = link_to "About GitLab", "https://about.gitlab.com/"
= link_to "About Nexedi", "http://nexedi.com/" = link_to "About Nexedi", "http://nexedi.com/"
- if should_render_icp?
= render_icp
...@@ -395,6 +395,9 @@ production: &base ...@@ -395,6 +395,9 @@ production: &base
# piwik_url: '_your_piwik_url' # piwik_url: '_your_piwik_url'
# piwik_site_id: '_your_piwik_site_id' # piwik_site_id: '_your_piwik_site_id'
## Site ICP number
# ICP: '_your_site_icp_'
rack_attack: rack_attack:
git_basic_auth: git_basic_auth:
# Rack Attack IP banning enabled # Rack Attack IP banning enabled
......
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