Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds a footer to admin pages #5532

Open
wants to merge 2 commits into
base: 3.12.x
Choose a base branch
from
+29 −4
Open

adds a footer to admin pages #5532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7df6470
replaces #3529, adds a footer to admin pages (can be deactivated in s…
Mar 23, 2021
7190f4a
fix suggested by michel
May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web-ui/src/main/resources/catalog/style/gn.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ div[gn-transfer-ownership] * .list-group {
.gn-editor-container, .gn-batch-editor, #gn-directory-container,
#gn-new-metadata-container, #gn-import-container {
padding-top: 70px;
padding-bottom: 50px;
}
}

Expand Down
21 changes: 18 additions & 3 deletions web-ui/src/main/resources/catalog/templates/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
<div class="footer">
<p data-translate>poweredBy</p>
</div>
<ul class="nav navbar-nav">
<li class="navbar-text">
<span data-translate=""
data-translate-values="{platform: '{{info['system/platform/name']}}', version: '{{info['system/platform/version']}}', subversion: '{{info['system/platform/subVersion']}}'}">
versionDetails</span>
</li>
<li><a href="http://geonetwork-opensource.org/">
<span data-translate="">about</span></a>
</li>
<li class="hidden-sm"><a href="https://github.com/geonetwork/core-geonetwork">
<i class="fa fa-fw fa-github"></i>
<span data-translate="">github</span></a></li>
<li>
<a href="../../doc/api" title="{{'learnTheApi' | translate}}">API</a>
</li>
<li gn-static-pages-list-viewer data-section="footer" data-language="{{lang}}" />
</ul>

3 changes: 2 additions & 1 deletion web-ui/src/main/resources/catalog/views/default/less/gn_admin_default.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ ul.gn-resultview li.list-group-item {
}
.main {
margin-left: @gn-sidebar-width;
padding: 25px 10px 50px 10px;
padding: 25px 10px 10px 10px;
margin-bottom: @gn-bottombar-height;
@media (max-width: @screen-xs-max) {
margin-left: 0;
}
Expand Down
1 change: 1 addition & 0 deletions web-ui/src/main/resources/catalog/views/default/less/gn_login_default.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import "../../../style/gn_login";
@import "gn_view.less";
@import "gn_footer_default.less";
// alert messages
@import "gn_alerts_default.less";
// variables for manipulating the theme
Expand Down
7 changes: 7 additions & 0 deletions web/src/main/webapp/xslt/base-layout.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@

<xsl:apply-templates mode="content" select="."/>

<xsl:if test="$angularApp != 'gn_search' and $angularApp != 'gn_viewer' and $angularApp != 'gn_formatter_viewer'">
<div class="navbar gn-bottom-bar"
role="navigation"
data-ng-hide="layout.hideTopToolBar"
data-ng-include="'{$uiResourcesPath}templates/footer.html'"></div>
</xsl:if>

<xsl:if test="$isJsEnabled">
<xsl:call-template name="javascript-load"/>
</xsl:if>
Expand Down