Fixed logo in different languages.
* Fixed help link in login page. FEA: ItEr66S03CommunityMaterialItEr65S04
|
Before Width: | Height: | Size: 7.2 KiB |
|
|
@ -25,6 +25,7 @@
|
|||
<intercept-url pattern="/planner/css/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/callback/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/zkau/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/help/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/common/layout/login.zul" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/common/layout/timeout.zul" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/advance/**" access="ROLE_ADMINISTRATION" />
|
||||
|
|
|
|||
BIN
navalplanner-webapp/src/main/webapp/common/img/en/logo.png
Normal file
|
After Width: | Height: | Size: 9 KiB |
BIN
navalplanner-webapp/src/main/webapp/common/img/en/logo_login.png
Normal file
|
After Width: | Height: | Size: 6.8 KiB |
BIN
navalplanner-webapp/src/main/webapp/common/img/es/logo.png
Normal file
|
After Width: | Height: | Size: 8.9 KiB |
BIN
navalplanner-webapp/src/main/webapp/common/img/es/logo_login.png
Normal file
|
After Width: | Height: | Size: 6.7 KiB |
BIN
navalplanner-webapp/src/main/webapp/common/img/gl/logo.png
Normal file
|
After Width: | Height: | Size: 7.6 KiB |
BIN
navalplanner-webapp/src/main/webapp/common/img/gl/logo_login.png
Normal file
|
After Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 7.1 KiB |
|
|
@ -29,6 +29,8 @@
|
|||
<zscript>
|
||||
<![CDATA[
|
||||
contextPath = Executions.getCurrent().getContextPath();
|
||||
logoLoginLink = contextPath + "/common/img/" +
|
||||
org.navalplanner.web.I18nHelper._("en") + "/logo_login.png";
|
||||
]]>
|
||||
</zscript>
|
||||
|
||||
|
|
@ -39,7 +41,7 @@
|
|||
</n:table>
|
||||
<n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
|
||||
<n:tr>
|
||||
<n:td height="100" align="left" valign="middle"><n:img src="${contextPath}/common/img/logo_login.png" alt="NavalPlan" /></n:td>
|
||||
<n:td height="100" align="left" valign="middle"><n:img src="${contextPath}/common/img/${i18n:_('en')}/logo_login.png" alt="NavalPlan" /></n:td>
|
||||
</n:tr>
|
||||
</n:table>
|
||||
<n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
|
||||
|
|
@ -48,7 +50,7 @@
|
|||
<n:td class="identificacion">${i18n:_('Access to the system')}</n:td>
|
||||
<n:td align="right" valign="bottom">
|
||||
<div tooltiptext="${i18n:_('Help on authentication (opens a new window)')}">
|
||||
<n:a href="http://www.navalplan.org/fileadmin/templates/doc/index.html" target="_blank" class="ayuda">${i18n:_('Help')}</n:a>
|
||||
<n:a href="${contextPath}/help/${i18n:_('en')}/index.html" target="_blank" class="ayuda">${i18n:_('Help')}</n:a>
|
||||
</div>
|
||||
</n:td>
|
||||
</n:tr>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
<n:tr>
|
||||
<n:td width="180" valign="center">
|
||||
<n:a href="${contextPath}/">
|
||||
<n:img src="${contextPath}/common/img/logo.png" /></n:a></n:td>
|
||||
<n:img src="${contextPath}/common/img/${i18n:_('en')}/logo.png" /></n:a></n:td>
|
||||
<n:td valign="top">
|
||||
<n:table width="100%" border="0" cellspacing="0" cellpadding="0">
|
||||
<n:tr>
|
||||
|
|
|
|||