Check-in [5512724c86]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:maquetacion admin
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:5512724c86cc2154e431d5c6653c7365f5e66187
User & Date: malcon 2015-01-08 20:52:13
Context
2015-01-08
23:03
interceptor para session check-in: c0852beff1 user: malcon tags: trunk
20:52
maquetacion admin check-in: 5512724c86 user: malcon tags: trunk
06:33
plantilla admin check-in: 65b9d7e1fb user: malcon tags: trunk
Changes

Changes to WebContent/META-INF/context.xml.

1
2
3
4
5
6
7
8
9
10
11
12
13
<?xml version="1.0" encoding="UTF-8"?>
<context>
	<Resource auth="Container"
	    driverClassName="com.mysql.jdbc.Driver"
	    maxActive="10"
	    name="jdbc/daw1"
	    username="root"
	    password="123"
	    type="javax.sql.DataSource"
	    url="jdbc:mysql://localhost:3306/agenciadb">
	</Resource>
</context>








|





1
2
3
4
5
6
7
8
9
10
11
12
13
<?xml version="1.0" encoding="UTF-8"?>
<context>
	<Resource auth="Container"
	    driverClassName="com.mysql.jdbc.Driver"
	    maxActive="10"
	    name="jdbc/daw1"
	    username="root"
	    password="mysql"
	    type="javax.sql.DataSource"
	    url="jdbc:mysql://localhost:3306/agenciadb">
	</Resource>
</context>

Changes to WebContent/WEB-INF/admin/plantilla/cabecera.jsp.

2
3
4
5
6
7
8
9
10

<p id="cmp_logo">

<p>
<h1><s:text name="EyM Administrador"/></h1>
<div id="corner">
<p class="logout">
<a href="<s:url action="logoutUsuario" namespace="/admin"/>">Logout</a>
</div>







|

2
3
4
5
6
7
8
9
10

<p id="cmp_logo">

<p>
<h1><s:text name="EyM Administrador"/></h1>
<div id="corner">
<p class="logout">
<a href="<s:url action="logoutUsuario" namespace="/admin"/>">Cerrar Sesi&oacute;n</a>
</div>

Changes to WebContent/WEB-INF/admin/plantilla/menu__cliente.jsp.

1
2
3
4

5
6
7

8


9
10
11

12
13
14
<%@ taglib prefix="s" uri="/struts-tags"%>
<div id = wrap>
	<ul>
		<li>

			<a	href="<s:url action="inicializarCliente" namespace="/cliente"/>">
					Clientes
		</li>

		<li>


			<a	href="<s:url action="inicializarLibroReclamaciones" namespace="/cliente"/>">
					Libro reclamaciones
			</a>

		</li>
	</ul>
</div>


|
|
>


|
>
|
>
>



>



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
<%@ taglib prefix="s" uri="/struts-tags"%>
<div id = wrap>
	<ul id="sidenav-a" class="accordion">
		<li class="accordion-content">
		<div class="row">
			<a	href="<s:url action="inicializarCliente" namespace="/cliente"/>">
					Clientes
			</a>
			</div>
		</li>
		<li class="accordion-content row">
			<div class="row">
			<a	href="<s:url action="inicializarLibroReclamaciones" namespace="/cliente"/>">
					Libro reclamaciones
			</a>
			</div>
		</li>
	</ul>
</div>

Changes to WebContent/WEB-INF/admin/plantilla/menu__reserva.jsp.

1
2
3
4

5
6
7

8
9
<%@ taglib prefix="s" uri="/struts-tags"%>

<ul>
	<li>

		<a	href="<s:url action="inicializarReserva" namespace="/reserva"/>">
		Resevas
		</a>

	</li>
</ul>


|
|
>
|
|
|
>


1
2
3
4
5
6
7
8
9
10
11
<%@ taglib prefix="s" uri="/struts-tags"%>

<ul id="sidenav-a" class="accordion">
	<li class="accordion-content">
		<div class="row">
			<a	href="<s:url action="inicializarReserva" namespace="/reserva"/>">
			Resevas
			</a>
		</div>
	</li>
</ul>

Changes to WebContent/WEB-INF/admin/plantilla/menu_principal.jsp.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
<%@ taglib prefix="s" uri="/struts-tags"%>

<div id='applications_menu'>
	<ul>
		<li><a href="<s:url action="inicializarReserva" namespace="/reserva"/>">
			Reservas
			</a>
		</li>
		<li><a href="<s:url action="inicializarCliente" namespace="/cliente"/>">
			Clientes
			</a>
		</li>
		<li><a>Paquetes</a></li>
		<li><a>Pagos</a></li>
		<li><a>Configuracion</a></li>
	</ul>
</div>





|



|


|
|
|

|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
<%@ taglib prefix="s" uri="/struts-tags"%>

<div id='applications_menu'>
	<ul>
		<li><a href="<s:url action="inicializarReserva" namespace="/reserva"/>">
			<span>Reservas</span>
			</a>
		</li>
		<li><a href="<s:url action="inicializarCliente" namespace="/cliente"/>">
			<span>Clientes</span>
			</a>
		</li>
		<li><a><span>Paquetes</span></a></li>
		<li><a><span>Pagos</span></a></li>
		<li><a><span>Configuracion</span></a></li>
	</ul>
</div>

Changes to WebContent/css/estilos.css.

490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
....
1296
1297
1298
1299
1300
1301
1302

1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
....
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335





1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
    height: 100%;
    width: 100%;
}
#main_form_body {
    height: 100%;
}
#secondary {
    /*background: none repeat scroll 0 0 #5a5858;*/
    border-bottom: 1px solid #5a5858;
    border-right: 1px solid #3c3c3c;
    padding: 0;
    vertical-align: top;
    width: 1px;
}
div.customize {
................................................................................
    color: #ffffff;
    list-style: outside none none;
    margin: 0 0 15px;
    padding: 0;
    text-shadow: 0 1px 0 #333333;
}
#sidenav-a li.accordion-content {

    background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
    border-bottom: 1px solid #333333;
    display: block;
    font-size: 1em;
    min-width: 180px;
    padding: 0;
}
#sidenav-a li.accordion-content:last-child {
    border-bottom: medium none;
}
#sidenav-a li {
    background: url("../images/sidenav-bg-a.gif") repeat-x scroll 0 100% rgba(0, 0, 0, 0);
    font-size: 1em;
    padding: 0 0 2px;
}
#sidenav-a li > span {
    background: url("../images/sidenav-link-a.png") repeat-x scroll 0 100% rgba(0, 0, 0, 0);
    cursor: pointer;
    display: block;
................................................................................
    text-decoration: none !important;
    white-space: nowrap;
}
#sidenav-a .tree-grid, #sidenav-a .tree-grid tr.row, #sidenav-a .tree-grid td {
    background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
    border: medium none;
}
#sidenav-a li .tree-grid a {
    color: #ffffff;
}





#sidenav-a li .tree-grid .row {
    color: #fff;
    font-size: 1.1em;
    font-weight: normal;
    height: 21px;
    line-height: 20px;
    text-transform: none;
}
#sidenav-a li .tree-grid .row:hover, #sidenav-a li .tree-grid .row:focus, #sidenav-a li .tree-grid .row:active, #sidenav-a li .tree-grid .row.active, #sidenav-a li .tree-grid .row.selected {
    background: url("../images/sidenav-bg-c.gif") repeat-x scroll 0 0 rgba(0, 0, 0, 0);
}
#sidenav-a li .tree-grid .row:hover a, #sidenav-a li .tree-grid .row:focus a, #sidenav-a li .tree-grid .row:active a, #sidenav-a li .tree-grid .row.active a, #sidenav-a li .tree-grid .row.selected a {
    color: #3f3d3d;
    text-shadow: 0 1px 0 #fff;
}
ul.split-a {
    list-style: outside none none;
    overflow: hidden;
    padding: 0;







|







 







>

|









|







 







|


>
>
>
>
>
|










|







490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
....
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
....
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
    height: 100%;
    width: 100%;
}
#main_form_body {
    height: 100%;
}
#secondary {
    background: none repeat scroll 0 0 #5a5858;
    border-bottom: 1px solid #5a5858;
    border-right: 1px solid #3c3c3c;
    padding: 0;
    vertical-align: top;
    width: 1px;
}
div.customize {
................................................................................
    color: #ffffff;
    list-style: outside none none;
    margin: 0 0 15px;
    padding: 0;
    text-shadow: 0 1px 0 #333333;
}
#sidenav-a li.accordion-content {
	color: #ffffff;
    background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
    /*border-bottom: 1px solid #333333;*/
    display: block;
    font-size: 1em;
    min-width: 180px;
    padding: 0;
}
#sidenav-a li.accordion-content:last-child {
    border-bottom: medium none;
}
#sidenav-a li {
   /* background: url("../images/sidenav-bg-a.gif") repeat-x scroll 0 100% rgba(0, 0, 0, 0);*/
    font-size: 1em;
    padding: 0 0 2px;
}
#sidenav-a li > span {
    background: url("../images/sidenav-link-a.png") repeat-x scroll 0 100% rgba(0, 0, 0, 0);
    cursor: pointer;
    display: block;
................................................................................
    text-decoration: none !important;
    white-space: nowrap;
}
#sidenav-a .tree-grid, #sidenav-a .tree-grid tr.row, #sidenav-a .tree-grid td {
    background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
    border: medium none;
}
#sidenav-a li a {
    color: #ffffff;
}

#sidenav-a li .row:hover, #sidenav-a li .row:focus, #sidenav-a li .row:active, #sidenav-a li .row.active, #sidenav-a li .row.selected {
    background: url("../images/sidenav-bg-c.gif") repeat-x scroll 0 0 rgba(0, 0, 0, 0);
}

#sidenav-a li .row {
    color: #fff;
    font-size: 1.1em;
    font-weight: normal;
    height: 21px;
    line-height: 20px;
    text-transform: none;
}
#sidenav-a li .tree-grid .row:hover, #sidenav-a li .tree-grid .row:focus, #sidenav-a li .tree-grid .row:active, #sidenav-a li .tree-grid .row.active, #sidenav-a li .tree-grid .row.selected {
    background: url("../images/sidenav-bg-c.gif") repeat-x scroll 0 0 rgba(0, 0, 0, 0);
}
#sidenav-a li .row:hover a, #sidenav-a li .row:focus a, #sidenav-a li .tree-grid .row:active a, #sidenav-a li .row.active a, #sidenav-a li .row.selected a {
    color: #3f3d3d;
    text-shadow: 0 1px 0 #fff;
}
ul.split-a {
    list-style: outside none none;
    overflow: hidden;
    padding: 0;

Added WebContent/images/sidenav-bg-c.gif.

cannot compute difference between binary files