ItEr37S16RFMaquetacionDesenhoAplicacionItEr36S18: Login page revamped
This commit is contained in:
Lorenzo Tilve
Javier Moran Rua
parent
d4ded81955
commit
2816caa523
7 changed files with 133 additions and 74 deletions
|
|
@ -17,14 +17,14 @@
|
|||
<intercept-url pattern="/common/img/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/common/css/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/zkau/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/common/layout/login_v01.zul" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/common/layout/login.zul" access="IS_AUTHENTICATED_ANONYMOUSLY" />
|
||||
<intercept-url pattern="/advance/**" access="ROLE_ADMINISTRATION" />
|
||||
<intercept-url pattern="/resources/criterions/**" access="ROLE_ADMINISTRATION" />
|
||||
<intercept-url pattern="/calendars/**" access="ROLE_ADMINISTRATION" />
|
||||
<intercept-url pattern="/labels/**" access="ROLE_ADMINISTRATION" />
|
||||
<intercept-url pattern="/common/configuration.zul" access="ROLE_ADMINISTRATION" />
|
||||
<intercept-url pattern="/**" access="IS_AUTHENTICATED_REMEMBERED" />
|
||||
<form-login login-page="/common/layout/login_v01.zul" authentication-failure-url="/common/layout/login_v01.zul?login_error=x"/>
|
||||
<form-login login-page="/common/layout/login.zul" authentication-failure-url="/common/layout/login.zul?login_error=x"/>
|
||||
|
||||
</http>
|
||||
|
||||
|
|
|
|||
92
navalplanner-webapp/src/main/webapp/common/css/login.css
Normal file
92
navalplanner-webapp/src/main/webapp/common/css/login.css
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
/* CSS Document */
|
||||
body {
|
||||
background-image: url(../img/fondo.gif);
|
||||
margin-top: 40px;
|
||||
font-family: Verdana, Arial, Helvetica, sans-serif;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.identificacion {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 18px;
|
||||
color: #0081C3;
|
||||
text-decoration: none;
|
||||
padding-top: 20px;
|
||||
text-align: left;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
.entrar {
|
||||
cursor: hand;
|
||||
background-color: #E4F3D9; /* green0 (normal background) */
|
||||
color: #58A758; /* green3 (text) */
|
||||
border: 1px solid #439e32; /* green4 (border) */
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
font-size:12px;
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
margin-top:15px;
|
||||
padding-top: 2px;
|
||||
padding-bottom: 2px;
|
||||
}
|
||||
|
||||
.entrar:hover {
|
||||
background-color: #C3EAAF; /* green1 (hover background) */
|
||||
}
|
||||
.entrar:active {
|
||||
background-color: #A1D586; /* green2 (active background)*/
|
||||
border-top: 2px solid #3f5917;
|
||||
border-left: 2px solid #3f5917;
|
||||
}
|
||||
|
||||
.usuario_clave {
|
||||
font-family: Verdana, Arial, Helvetica, sans-serif;
|
||||
font-size: 11px;
|
||||
color: #333333;
|
||||
text-decoration: none;
|
||||
padding-top: 5px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.campotexto {
|
||||
font-family: Verdana, Arial, Helvetica, sans-serif;
|
||||
font-size: 11px;
|
||||
color: #666666;
|
||||
text-decoration: none;
|
||||
border: 1px solid #CCCCCC;
|
||||
padding-left: 4px;
|
||||
}
|
||||
.fondo_identificacion {
|
||||
background-image: url(../img/degradado_azul.gif);
|
||||
background-repeat: repeat-x;
|
||||
}
|
||||
|
||||
.authentication {
|
||||
padding-top:10px;
|
||||
}
|
||||
|
||||
.ayuda {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
color: #009900;
|
||||
text-decoration: none;
|
||||
padding-bottom: 5px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
a.ayuda:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.login_ERROR {
|
||||
color: #ee0000;
|
||||
border: solid 1px #ee0000;
|
||||
background-color: #eecccc;
|
||||
-moz-border-radius: 10px;
|
||||
-webkit-border-radius: 10px;
|
||||
padding: 15px;
|
||||
margin: 10px;
|
||||
margin-top: 30px;
|
||||
width: 300px;
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
@charset "utf-8";
|
||||
body {
|
||||
|
||||
}
|
||||
|
||||
|
||||
.identificacion {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 18px;
|
||||
color: #0081C3;
|
||||
text-decoration: none;
|
||||
padding-top: 20px;
|
||||
text-align: center;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
.entrar {
|
||||
color:#333333;
|
||||
font-size:12px;
|
||||
font-family: Tahoma, Arial, Helvetica, sans-serif;
|
||||
border: 1px solid #0081C3;
|
||||
background-color: #C2E1F3;
|
||||
width: 150px;
|
||||
background-image: url(../img/flechitas.gif);
|
||||
height: 25px;
|
||||
}
|
||||
.usuario_clave {
|
||||
font-family: Verdana, Arial, Helvetica, sans-serif;
|
||||
font-size: 11px;
|
||||
color: #333333;
|
||||
text-decoration: none;
|
||||
padding-top: 5px;
|
||||
text-align: center;
|
||||
}
|
||||
.campotexto {
|
||||
font-family: Verdana, Arial, Helvetica, sans-serif;
|
||||
font-size: 11px;
|
||||
color: #666666;
|
||||
text-decoration: none;
|
||||
border: 1px solid #CCCCCC;
|
||||
padding-left: 4px;
|
||||
}
|
||||
.fondo_identificacion {
|
||||
background-image: url(../img/degradado_azul.gif);
|
||||
background-repeat: repeat-x;
|
||||
}
|
||||
BIN
navalplanner-webapp/src/main/webapp/common/img/fondo.gif
Normal file
BIN
navalplanner-webapp/src/main/webapp/common/img/fondo.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
BIN
navalplanner-webapp/src/main/webapp/common/img/logo_login.gif
Normal file
BIN
navalplanner-webapp/src/main/webapp/common/img/logo_login.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 6 KiB |
|
|
@ -17,40 +17,39 @@
|
|||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
|
||||
<?link rel="stylesheet" type="text/css" href="/common/css/login_v01.css"?>
|
||||
<?link rel="stylesheet" type="text/css" href="/common/css/login.css"?>
|
||||
|
||||
<div xmlns:n="http://www.zkoss.org/2005/zk/native">
|
||||
<n:table width="850" border="0" align="center" cellpadding="0" cellspacing="0">
|
||||
|
||||
<n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0">
|
||||
<n:tr>
|
||||
<n:td background="/navalplanner-webapp/common/img/flechitas.gif"></n:td>
|
||||
</n:tr>
|
||||
</n:table>
|
||||
<n:table width="850" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
|
||||
<n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
|
||||
<n:tr>
|
||||
<n:td height="100" valign="bottom"><n:img src="/navalplanner-webapp/common/img/logo.gif" alt="Naval Pro" width="238" height="85" /></n:td>
|
||||
<n:td height="100" align="left" valign="middle"><n:img src="/navalplanner-webapp/common/img/logo_login.gif" alt="Naval Pro" width="205" height="70" /></n:td>
|
||||
</n:tr>
|
||||
</n:table>
|
||||
<n:table width="850" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
|
||||
<n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
|
||||
<n:tr>
|
||||
<n:td class="identificacion">${i18n:_('AUTHENTICATE')}</n:td>
|
||||
<n:td width="20" class="identificacion"> </n:td>
|
||||
<n:td class="identificacion">${i18n:_('Access to the system')}</n:td>
|
||||
<n:td align="right" valign="bottom">
|
||||
<div tooltiptext="${i18n:_('Help on authentication (opens en new window')}">
|
||||
<n:a href="https://naval.igalia.com/fileadmin/templates/doc/index.html" target="_blank" class="ayuda">${i18n:_('Help')}</n:a>
|
||||
</div>
|
||||
</n:td>
|
||||
</n:tr>
|
||||
</n:table>
|
||||
|
||||
<html if="${not empty param.login_error}">
|
||||
<![CDATA[
|
||||
<div class="message_ERROR">
|
||||
${i18n:_('Incorrect authentication')}
|
||||
</div>
|
||||
]]>
|
||||
</html>
|
||||
|
||||
<n:form action="/navalplanner-webapp/j_spring_security_check" method="POST">
|
||||
|
||||
<n:table width="850" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" class="fondo_identificacion">
|
||||
<n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" class="fondo_identificacion">
|
||||
<n:tr>
|
||||
<n:td height="165" valign="top"><n:table width="450" border="0" align="center" cellpadding="0" cellspacing="0">
|
||||
<n:td width="20" height="165" valign="top"></n:td>
|
||||
<n:td valign="top" class="authentication"><n:table border="0" cellpadding="0" cellspacing="0">
|
||||
<n:tr>
|
||||
<n:td></n:td>
|
||||
</n:tr>
|
||||
|
|
@ -58,35 +57,44 @@
|
|||
<n:td class="usuario_clave">${i18n:_('User')}</n:td>
|
||||
</n:tr>
|
||||
<n:tr>
|
||||
<n:td><n:label> </n:label>
|
||||
<n:div align="center">
|
||||
<n:td><label> </label>
|
||||
<div align="center">
|
||||
<n:input name="j_username" type="text" class="campotexto" id="textfield" size="30" />
|
||||
</n:div></n:td>
|
||||
</div></n:td>
|
||||
</n:tr>
|
||||
<n:tr>
|
||||
<n:td class="usuario_clave">${i18n:_('Password')}</n:td>
|
||||
</n:tr>
|
||||
<n:tr>
|
||||
<n:td><n:div align="center">
|
||||
<n:td><div align="center">
|
||||
<n:input name="j_password" type="password" class="campotexto" id="textfield2" size="30" />
|
||||
</n:div></n:td>
|
||||
</div></n:td>
|
||||
</n:tr>
|
||||
<n:tr>
|
||||
<n:td></n:td>
|
||||
</n:tr>
|
||||
<n:tr>
|
||||
<n:td><n:label> </n:label>
|
||||
<n:div align="center">
|
||||
<n:td>
|
||||
<n:div align="left">
|
||||
<n:input name="button" type="submit" class="entrar" id="button" value="${i18n:_('Sign in')}" />
|
||||
</n:div></n:td>
|
||||
</n:tr>
|
||||
</n:table></n:td>
|
||||
<n:td width="450" height="165" valign="top">
|
||||
<html if="${not empty param.login_error}">
|
||||
<![CDATA[
|
||||
<div class="login_ERROR">
|
||||
${i18n:_('Incorrect authentication')}
|
||||
</div>
|
||||
]]>
|
||||
</html>
|
||||
</n:td>
|
||||
</n:tr>
|
||||
</n:table>
|
||||
|
||||
</n:form>
|
||||
|
||||
<n:table width="850" border="0" align="center" cellpadding="0" cellspacing="0" class="tabla_inferior">
|
||||
<n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" class="tabla_inferior">
|
||||
<n:tr>
|
||||
<n:td height="40" background="/navalplanner-webapp/common/img/linea_pie_login.gif"></n:td>
|
||||
</n:tr>
|
||||
|
|
@ -94,7 +102,12 @@
|
|||
<n:td></n:td>
|
||||
</n:tr>
|
||||
<n:tr>
|
||||
<n:td><n:div align="center"><n:img src="/navalplanner-webapp/common/img/logos_login.gif" width="500" height="91" /></n:div></n:td>
|
||||
<n:td height="100"><div align="right"><n:img src="/navalplanner-webapp/common/img/logos_login.gif" width="403" height="50" /></div></n:td>
|
||||
</n:tr>
|
||||
</n:table>
|
||||
<n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0">
|
||||
<n:tr>
|
||||
<n:td background="/navalplanner-webapp/common/img/flechitas.gif"></n:td>
|
||||
</n:tr>
|
||||
</n:table>
|
||||
</div>
|
||||
Loading…
Add table
Reference in a new issue