Skip to content
GitLab
Commit ffe71b10 authored by Jenkins's avatar Jenkins
Browse files

Merge commit 'f545a6a6' into rc

parents 5b226172 f545a6a6
Hide whitespace changes
Inline Side-by-side
src/main/webapp/WEB-INF/classes/log4j.xml
View file @ ffe71b10
......@@ -7,20 +7,20 @@
<appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
<param name="Threshold" value="ALL"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m%n"/>
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m{nolookups}%n"/>
</layout>
</appender>
<appender name="allConsoleAppender" class="org.apache.log4j.ConsoleAppender">
<param name="Threshold" value="ALL"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m%n"/>
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m{nolookups}%n"/>
</layout>
</appender>
<appender name="fileAppender" class="org.apache.log4j.RollingFileAppender">
<param name="Threshold" value="ALL"/>
<param name="File" value="logs/geonetwork.log"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m%n"/>
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m{nolookups}%n"/>
</layout>
</appender>
......
src/main/webapp/catalog/templates/top-toolbar.html
View file @ ffe71b10
<div class="container-fluid">
<div data-ng-class="fluidHeaderLayout ? 'container-fluid' : 'container'">
<div class="navbar-header">
<a class="hidden-sm hidden-md hidden-lg pull-left gn-logo-link" data-gn-active-tb-item="{{gnCfg.mods.home.appUrl}}" data-ng-hide="{{gnCfg.mods.header.isLogoInHeader}}">
<img class="gn-logo"
alt="{{'siteLogo' | translate}}"
data-ng-src="{{gnUrl}}../images/logos/{{info['node/id'] || info['system/site/siteId']}}.png?random{{info['system/site/lastUpdate']}}"/>
</a>
<a class="hidden-sm hidden-md hidden-lg btn btn-link pull-left"
data-gn-active-tb-item="{{gnCfg.mods.home.appUrl}}">
<span class="gn-name"
data-ng-class="authenticated && user.isEditorOrMore() ? 'gn-truncate' : ''"
title="{{info['system/site/name']}}">{{info['node/name'] || info['system/site/name']}}</span>
</a>
<button type="button"
class="navbar-toggle collapsed"
data-toggle="collapse"
......@@ -14,59 +25,77 @@
</button>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li data-ng-if="gnCfg.mods.home.enabled">
<a data-gn-active-tb-item="{{gnCfg.mods.home.appUrl}}">
<img class="gn-logo"
data-ng-src="{{gnUrl}}../images/logos/{{info['system/site/siteId']}}.png?random{{info['system/site/lastUpdate']}}"/>
<span class="hidden-sm hidden-md">{{info['system/site/name']}}</span>
<ul class="nav navbar-nav gn-menu-xs" role="menu">
<li class="clearfix hidden-xs" data-ng-if="gnCfg.mods.home.enabled">
<a class="pull-left gn-logo-link"
data-gn-active-tb-item="{{gnCfg.mods.home.appUrl}}">
<img class="gn-logo gn-margin-right"
data-ng-hide="{{gnCfg.mods.header.isLogoInHeader}}"
alt="{{'siteLogo' | translate}}"
data-ng-src="{{gnUrl}}../images/logos/{{info['node/id'] || info['system/site/siteId']}}.png?random{{info['system/site/lastUpdate']}}"/>
<span class="gn-name"
data-ng-if="gnCfg.mods.header.showGNName"
data-ng-class="authenticated && user.isEditorOrMore() ? 'gn-truncate' : ''"
title="{{info['node/name'] || info['system/site/name']}}">
{{info['node/name'].split('|')[0] || info['system/site/name']}}
</span>
</a>
</li>
<li data-ng-if="gnCfg.mods.search.enabled">
<li class="gn-menuitem-xs" data-ng-if="gnCfg.mods.search.enabled">
<a data-gn-active-tb-item="{{gnCfg.mods.search.appUrl}}"
title="{{'search' | translate}}">
<i class="fa fa-search"></i>
<span class="hidden-sm" data-translate="">search</span>
title="{{'search' | translate}}">
<i class="fa fa-fw fa-search hidden-sm"></i>
<span translate>search</span>
</a>
</li>
<li data-ng-if="gnCfg.mods.map.enabled">
<a data-gn-active-tb-item="{{gnCfg.mods.map.appUrl}}"
title="{{'map' | translate}}">
<i class="fa fa-globe"></i>
<span class="hidden-sm" data-translate="">makeYourMap</span>
<li class="gn-menuitem-xs" data-ng-if="gnCfg.mods.map.enabled">
<a data-gn-active-tb-item="{{isExternalViewerEnabled ? externalViewerUrl : gnCfg.mods.map.appUrl}}"
title="{{'map' | translate}}">
<i class="fa fa-fw fa-globe hidden-sm"></i>
<span translate>makeYourMap</span>
<span data-gnv-layer-indicator=""/>
</a>
</li>
<li class="dropdown dropdown-hover open" data-ng-if="gnCfg.mods.editor.enabled"
<li class="dropdown dropdown-hover open gn-clear-xs" data-ng-if="gnCfg.mods.editor.enabled"
data-ng-show="authenticated && user.isEditorOrMore()"
id="gn-login-dropdown">
<a data-gn-active-tb-item="{{gnCfg.mods.editor.appUrl}}"
title="{{'editorBoard' | translate}}"
class="dropdown-toggle"
class="dropdown-toggle gn-menuheader-xs"
role="button" aria-expanded="false">
<i class="fa fa-pencil"></i>
<span class="hidden-sm" data-translate="">contribute</span>
<i class="fa fa-fw fa-pencil hidden-sm"></i>
<span translate>contribute</span>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<ul class="dropdown-menu gn-menu-xs clearfix" role="list">
<li class="gn-menuitem-xs" role="menuitem">
<a data-gn-active-tb-item="{{gnCfg.mods.editor.appUrl}}#/board">
<i class="fa fa-fw fa-bars"></i>&nbsp;<span translate>editorHome</span>
</a>
</li>
<li role="separator" class="divider gn-separator-xs"></li>
<li class="gn-menuitem-xs" role="menuitem">
<a data-gn-active-tb-item="{{gnCfg.mods.editor.appUrl}}#/create">
<i class="fa fa-fw fa-plus"/>&nbsp;<span data-translate="">addRecord</span>
<i class="fa fa-fw fa-plus"></i>&nbsp;<span translate>addRecord</span>
</a>
</li>
<li>
<li class="gn-menuitem-xs" role="menuitem">
<a data-gn-active-tb-item="{{gnCfg.mods.editor.appUrl}}#/import">
<i class="fa fa-fw fa-upload"/>&nbsp;<span data-translate="">ImportRecord</span>
<i class="fa fa-fw fa-upload"></i>&nbsp;<span translate>ImportRecord</span>
</a>
</li>
<li>
<li class="gn-menuitem-xs" role="menuitem">
<a data-gn-active-tb-item="{{gnCfg.mods.editor.appUrl}}#/directory">
<i class="fa fa-fw fa-list-ul"/>&nbsp;<span data-translate="">directoryManager</span>
<i class="fa fa-fw fa-bookmark"></i>&nbsp;<span translate>directoryManager</span>
</a>
</li>
<li>
<li class="gn-menuitem-xs" role="menuitem">
<a data-gn-active-tb-item="{{gnCfg.mods.editor.appUrl}}#/batchedit">
<i class="fa fa-fw fa-pencil"/>&nbsp;<span data-translate="">batchEditing</span>
<i class="fa fa-fw fa-pencil"></i>&nbsp;<span translate>batchEditing</span>
</a>
</li>
<li class="gn-menuitem-xs" role="menuitem" ng-if="user.isAdministratorOrMore() && healthCheck.IndexHealthCheck === true">
<a data-gn-active-tb-item="{{gnCfg.mods.editor.appUrl}}#/accessManager">
<i class="fa fa-fw fa-lock"/>&nbsp;<span data-translate="">accessManager</span>
</a>
</li>
</ul>
......@@ -74,45 +103,53 @@
<li class="dropdown dropdown-hover open" data-ng-show="user.isUserAdminOrMore()">
<a data-gn-active-tb-item="admin.console"
title="{{'adminConsole' | translate}}"
class="dropdown-toggle"
class="dropdown-toggle gn-menuheader-xs"
role="button" aria-expanded="false">
<i class="fa fa-wrench"></i>
<span class="hidden-sm" data-translate="">adminConsole</span>
<i class="fa fa-fw fa-wrench hidden-sm"></i>
<span translate>adminConsole</span>
</a>
<ul data-ng-if="user.isUserAdmin() && viewMenuAdmin" class="dropdown-menu" role="menu">
<li data-ng-repeat="t in userAdminMenu" data-ng-if="t.name!=usersAndGroups">
<ul data-ng-if="user.isUserAdmin()" class="dropdown-menu gn-menu-xs" role="list">
<li class="gn-menuitem-xs" role="menuitem">
<a data-gn-active-tb-item="admin.console#/home">
<i class="fa fa-fw fa-th"></i>&nbsp;<span translate>adminHome</span>
</a>
</li>
<li role="separator" class="divider gn-separator-xs"></li>
<li class="gn-menuitem-xs" role="menuitem" data-ng-repeat="t in userAdminMenu">
<a data-gn-active-tb-item="admin.console{{t.route}}">
<i class="fa fa-fw {{t.icon}}"/>&nbsp;<span data-translate="">{{t.name | translate}}</span>
<i class="fa fa-fw {{t.icon}}"></i>&nbsp;<span translate>{{t.name | translate}}</span>
</a>
</li>
</ul>
<ul data-ng-if="user.isAdministrator()" class="dropdown-menu" role="menu">
<li data-ng-repeat="t in adminMenu" data-ng-if="t.name!=usersAndGroups">
<ul data-ng-if="user.isAdministrator()" class="dropdown-menu gn-menu-xs" role="list">
<li class="gn-menuitem-xs" role="menuitem">
<a data-gn-active-tb-item="admin.console#/home">
<i class="fa fa-fw fa-th"></i>&nbsp;<span translate>adminHome</span>
</a>
</li>
<li role="separator" class="divider gn-separator-xs"></li>
<li class="gn-menuitem-xs" role="menuitem" data-ng-repeat="t in adminMenu">
<a data-gn-active-tb-item="{{gnCfg.mods.admin.appUrl}}{{t.route}}">
<i class="fa fa-fw {{t.icon}}"/>&nbsp;<span data-translate="">{{t.name | translate}}</span>
<i class="fa fa-fw {{t.icon}}"></i>&nbsp;<span translate>{{t.name | translate}}</span>
</a>
</li>
</ul>
</li>
<li><a>
<span class="alert alert-danger ng-hide"
data-ng-show="session.remainingTime > 0 &&
session.remainingTime < session.alertInTitleWhen"
data-translate=""
data-translate-values="{remainingTime: '{{session.remainingTime}}'}">
sessionWillExpireIn
</span>
</a></li>
<li gn-static-pages-list-viewer data-section="top" data-language="{{lang}}" />
</ul>
<form class="navbar-form navbar-right" role="language">
<form class="navbar-form navbar-right language-switcher">
<span class="gn-menuheader-xs visible-xs"
data-ng-if="!authenticated && service !== 'catalog.signin' && service !== 'new.account' && (!shibbolethEnabled || (shibbolethEnabled && !shibbolethHideLogin))"
data-translate="">language</span>
<div class="form-group"
data-gn-language-switcher="lang"
data-langs="langs"
data-lang-labels="langLabels"/>
data-lang-labels="langLabels">
</div>
</form>
<!-- PRODIGE SPECIFIC-->
<ul data-ng-if="gnCfg.mods.signin.enabled"
class="nav navbar-nav navbar-right">
<li data-ng-show="authenticated">
......@@ -152,5 +189,6 @@
</a>
</li>
</ul>
<!-- PRODIGE SPECIFIC-->
</div>
</div>
src/main/webapp/xslt/base-layout.xsl
View file @ ffe71b10
......@@ -37,8 +37,7 @@
<xsl:include href="common/base-variables.xsl"/>
<xsl:include href="base-layout-cssjs-loader.xsl"/>
<xsl:include href="skin/default/skin.xsl"/>
<!-- Enable extension of application -->
<!-- Enable extension of application -->
<!-- @PRODIGE -->
<xsl:include href="extend/base-layout-cssjs-loader.xsl"/>
......@@ -46,7 +45,7 @@
<html ng-app="{$angularModule}" lang="{$lang2chars}" id="ng-app">
<head>
<title>
<xsl:value-of select="util:getNodeName('', $lang, true())"/>
<xsl:value-of select="util:getNodeName('', $lang, true())"/>
</title>
<meta charset="utf-8"/>
<meta name="viewport" content="initial-scale=1.0"/>
......@@ -64,7 +63,7 @@
title="{concat($env/system/site/name, ' - ', $env/system/site/organization)}"/>
<xsl:call-template name="css-load"/>
<!-- @PRODIGE -->
<!-- @PRODIGE -->
<xsl:call-template name="ux-css-load"/>
</head>
......@@ -79,9 +78,8 @@
<xsl:if test="not($isLoggedIn)">
<iframe src="/geonetwork/srv/fre/catalog.signin?redirect=noroute" style="display:none" onload="$(this).remove()"></iframe>
</xsl:if>
<!-- @PRODIGE -->
<div data-gn-alert-manager=""></div>
<!-- @PRODIGE -->
<div data-gn-alert-manager=""></div>
<xsl:choose>
<xsl:when test="ends-with($service, 'nojs')">
......@@ -92,13 +90,15 @@
</div>
</xsl:when>
<xsl:otherwise>
<xsl:if test="$isJsEnabled">
<xsl:call-template name="no-js-alert"/>
</xsl:if>
<!-- AngularJS application -->
<xsl:if test="$angularApp != 'gn_search' and $angularApp != 'gn_viewer' and $angularApp != 'gn_formatter_viewer'">
<div class="navbar navbar-default gn-top-bar"
role="navigation"
data-ng-hide="layout.hideTopToolBar"
data-ng-include="'{$uiResourcesPath}views/apps_extend/templates/top-toolbar.html'"></div>
data-ng-include="'{$uiResourcesPath}templates/top-toolbar.html'"></div>
</xsl:if>
<xsl:apply-templates mode="content" select="."/>
......
Supports Markdown
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