Skip to content

A
Asistencia
Commit 3eebd824 by Billy Larru
Options

[FIX detalleMontosAdministrativos, referencia a js y css ahora apuntan a la raiz del proyecto]

parent 01801e82
Showing with 161 additions and 141 deletions
src/main/java/asistencia/utilities/GeneralUtils.java
...@@ -5,22 +5,38 @@ ...@@ -5,22 +5,38 @@
*/ */
package asistencia.utilities; package asistencia.utilities;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* *
* @author sistem08user * @author sistem08user
*/ */
public class GeneralUtils { public class GeneralUtils {
public static int obtenerIndex(String ruta){
char[] c = ruta.toCharArray(); public static int obtenerIndex(String ruta) {
int salida = 0; char[] c = ruta.toCharArray();
for (int i = c.length-1; i >= 0; i--) { int salida = 0;
String help = c[i]+""; for (int i = c.length - 1; i >= 0; i--) {
if(!help.equals("/")){ String help = c[i] + "";
salida = i; if (!help.equals("/")) {
}else{ salida = i;
break; } else {
} break;
} }
return salida; }
} return salida;
}
public static String obtenerURIvista(String ruta) {
String rutaVista = "";
String patron = ".*/vistas/(.*)";
Pattern pattern = Pattern.compile(patron);
Matcher matcher = pattern.matcher(ruta);
if (matcher.find()) {
rutaVista = matcher.group(1);
}
return rutaVista;
}
} }
src/main/webapp/vistas/__template.jsp
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<!--<script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script>-->
<!--js-->
<!--js--> </body>
</body>
</html> </html>
\ No newline at end of file
src/main/webapp/vistas/main.jsp
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css--> <!--css-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp" %> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js--> <!--js-->
<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/selects/bootstrap_select.min.js"></script> <script type="text/javascript" src="../plantilla/assets/js/plugins/forms/selects/bootstrap_select.min.js"></script>
<script type="text/javascript" src="../plantilla/assets/js/pages/form_bootstrap_select.js"></script> <script type="text/javascript" src="../plantilla/assets/js/pages/form_bootstrap_select.js"></script>
<script> <script>
((window) => { ((window) => {
window.history.replaceState({}, '', 'main.jsp'); window.history.replaceState({}, '', 'main.jsp');
})(window); })(window);
</script> </script>
</body> </body>
</html> </html>
src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp
<%--<%@include file="templates/validar.jsp" %>--%> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<link href="../css/lib/sweetalert2.min.css" rel="stylesheet" type="text/css"/> <link href="../css/lib/sweetalert2.min.css" rel="stylesheet" type="text/css"/>
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="../../templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<div class="col-md-4 col-md-offset-4"> <div class="col-md-4 col-md-offset-4">
<div class="panel panel-primary"> <div class="panel panel-primary">
...@@ -55,15 +55,15 @@ ...@@ -55,15 +55,15 @@
</div> </div>
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<script src="../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript"></script>
<script src="../plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script>
<script src="../plantilla/assets/js/plugins/pickers/datepicker.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/pickers/datepicker.js" type="text/javascript"></script>
<script src="../js/lib/bootstrap-select.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/bootstrap-select.min.js" type="text/javascript"></script>
<script src="../plantilla/assets/js/plugins/forms/selects/select2.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/selects/select2.min.js"></script>
<script src="../js/lib/lodash.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/lodash.js" type="text/javascript"></script>
<script src="../js/pages/detalle_montos_administrativos.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/detalle_montos_administrativos.js" type="text/javascript"></script>
<!--js--> <!--js-->
</body> </body>
......
src/main/webapp/vistas/templates/footer-body.jsp
<!-- Footer --> <!-- Footer -->
<div class="footer text-muted"> <div class="footer text-muted">
&copy; 2018. <a href="#">Trismegisto Asistencia</a> <a href="#"></a> &copy; 2018. <a href="#">Trismegisto Asistencia</a> <a href="#"></a>
</div> </div>
<!-- /footer --> <!-- /footer -->
...@@ -17,25 +17,25 @@ ...@@ -17,25 +17,25 @@
</div> </div>
<!-- /page container --> <!-- /page container -->
<!-- Core JS files --> <!-- Core JS files -->
<script type="text/javascript" src="../plantilla/assets/js/plugins/loaders/pace.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/loaders/pace.min.js"></script>
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/jquery.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery.min.js"></script>
<script src="../js/lib/jquery.cookie.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/jquery.cookie.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/bootstrap.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/bootstrap.min.js"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/loaders/blockui.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/loaders/blockui.min.js"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/styling/switchery.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/styling/switchery.min.js"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/styling/uniform.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/styling/uniform.min.js"></script>
<!--<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/selects/bootstrap_multiselect.js"></script>--> <!--<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/selects/bootstrap_multiselect.js"></script>-->
<script type="text/javascript" src="../plantilla/assets/js/core/app.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/app.js"></script>
<!-- /core JS files --> <!-- /core JS files -->
<!--axios--> <!--axios-->
<script src="../plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script>
<script src="../js/lib/axios.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/axios.min.js" type="text/javascript"></script>
<script src="../js/lib/sweetalert2.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/sweetalert2.min.js" type="text/javascript"></script>
<!-- /Generales --> <!-- /Generales -->
<script src="../js/general.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/general.js" type="text/javascript"></script>
<script src="../js/pages/navbar.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/navbar.js" type="text/javascript"></script>
<script src="../js/pages/sidebar.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/sidebar.js" type="text/javascript"></script>
\ No newline at end of file \ No newline at end of file
src/main/webapp/vistas/templates/header-body.jsp
<%@include file="navbar.jsp" %> <jsp:include page="navbar.jsp" />
<!-- Page container --> <!-- Page container -->
<div class="page-container"> <div class="page-container">
<!-- Page content --> <!-- Page content -->
<div class="page-content"> <div class="page-content">
<%@include file="sidebar.jsp" %> <jsp:include page="sidebar.jsp" />
<!-- Main content --> <!-- Main content -->
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content area --> <!-- Content area -->
<div class="content"> <div class="content">
\ No newline at end of file \ No newline at end of file
src/main/webapp/vistas/templates/header.jsp
...@@ -4,22 +4,22 @@ ...@@ -4,22 +4,22 @@
<title>Trismegisto Asistencia</title> <title>Trismegisto Asistencia</title>
<!-- Global stylesheets --> <!-- Global stylesheets -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,300,100,500,700,900" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Roboto:400,300,100,500,700,900" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/icons/icomoon/styles.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/icons/icomoon/styles.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/icons/fontawesome/styles.min.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/icons/fontawesome/styles.min.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/bootstrap.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/bootstrap.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/core.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/core.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/components.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/components.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/colors.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/colors.css" rel="stylesheet" type="text/css">
<link href="../css/general.css" rel="stylesheet" type="text/css"/> <link href="${pageContext.request.contextPath}/css/general.css" rel="stylesheet" type="text/css"/>
<!-- /global stylesheets --> <!-- /global stylesheets -->
<script src="../js/lib/cookies.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/cookies.js" type="text/javascript"></script>
<!--<script src="../js/pages/validate.js" type="text/javascript"></script>--> <!--<script src="../js/pages/validate.js" type="text/javascript"></script>-->
<script> <script>
var sidebar = <%=(String) request.getSession().getAttribute("menu")%>; var sidebar = <%=(String) request.getSession().getAttribute("menu")%>;
var nombreUsuario = "<%=(String) request.getSession().getAttribute("nombre")%>"; var nombreUsuario = "<%=(String) request.getSession().getAttribute("nombre")%>";
var rolesUsuario = "<%=(String) request.getSession().getAttribute("roles")%>"; var rolesUsuario = "<%=(String) request.getSession().getAttribute("roles")%>";
var contextPath = "${pageContext.request.contextPath}/"; var contextPath = "${pageContext.request.contextPath}/";
</script> </script>
\ No newline at end of file
src/main/webapp/vistas/templates/navbar.jsp
<!-- Main navbar --> <!-- Main navbar -->
<div class="navbar navbar-default header-highlight"> <div class="navbar navbar-default header-highlight">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="../vistas/main.jsp"><img src="${pageContext.request.contextPath}/plantilla/assets/images/logo_light.png" alt=""></a> <a class="navbar-brand" href="${pageContext.request.contextPath}/vistas/main.jsp"><img src="${pageContext.request.contextPath}/plantilla/assets/images/logo_light.png" alt=""></a>
<ul class="nav navbar-nav visible-xs-block"> <ul class="nav navbar-nav visible-xs-block">
<li><a data-toggle="collapse" data-target="#navbar-mobile"><i class="icon-tree5"></i></a></li> <li><a data-toggle="collapse" data-target="#navbar-mobile"><i class="icon-tree5"></i></a></li>
<li><a class="sidebar-mobile-main-toggle"><i class="icon-paragraph-justify3"></i></a></li> <li><a class="sidebar-mobile-main-toggle"><i class="icon-paragraph-justify3"></i></a></li>
</ul> </ul>
</div> </div>
<div class="navbar-collapse collapse" id="navbar-mobile"> <div class="navbar-collapse collapse" id="navbar-mobile">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a class="sidebar-control sidebar-main-toggle hidden-xs"><i class="icon-paragraph-justify3"></i></a></li> <li><a class="sidebar-control sidebar-main-toggle hidden-xs"><i class="icon-paragraph-justify3"></i></a></li>
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="dropdown language-switch"> <li class="dropdown language-switch">
<a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<img src="${pageContext.request.contextPath}/plantilla/assets/images/flags/gb.png" class="position-left " alt=""> <img src="${pageContext.request.contextPath}/plantilla/assets/images/flags/gb.png" class="position-left " alt="">
Sistemas Sistemas
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu" id="proyectos"> <ul class="dropdown-menu" id="proyectos">
</ul> </ul>
</li> </li>
<li class="dropdown dropdown-user"> <li class="dropdown dropdown-user">
<a class="dropdown-toggle" data-toggle="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown">
<img src="" class="avatar" alt="" > <img src="" class="avatar" alt="" >
<span class="usuario-nombre"></span> <span class="usuario-nombre"></span>
<i class="caret"></i> <i class="caret"></i>
</a> </a>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li> <li>
<a id="logOut"> <a id="logOut">
<i class="fa fa-sign-out"></i> Salir <i class="fa fa-sign-out"></i> Salir
</a> </a>
</li> </li>
<!--<li><a href="#" id="logOut"><i class="icon-switch2"></i> Logout</a></li>--> <!--<li><a href="#" id="logOut"><i class="icon-switch2"></i> Logout</a></li>-->
</ul> </ul>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<!-- /main navbar --> <!-- /main navbar -->
\ No newline at end of file
src/main/webapp/vistas/templates/sidebar.jsp
<!-- Main sidebar --> <!-- Main sidebar -->
<div class="sidebar sidebar-main"> <div class="sidebar sidebar-main">
<div class="sidebar-content"> <div class="sidebar-content">
<!-- User menu --> <!-- User menu -->
<div class="sidebar-user"> <div class="sidebar-user">
<div class="category-content tp-sidebar-category-content"> <div class="category-content tp-sidebar-category-content">
<a href="main.jsp" class="media-left" style="padding-right: 0px;"> <a href="${pageContext.request.contextPath}/main.jsp" class="media-left" style="padding-right: 0px;">
<!--box-shadow: 0px 0px 13px 0px rgba(0,0,0,0.75);--> <!--box-shadow: 0px 0px 13px 0px rgba(0,0,0,0.75);-->
<img alt="Avatar usuario" class="avatar" style=" border-radius: 50%; border:2px solid white;"> <img alt="Avatar usuario" class="avatar" style=" border-radius: 50%; border:2px solid white;">
</a> </a>
......
src/main/webapp/vistas/templates/validar.jsp
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
System.out.println("Validando..."); System.out.println("Validando...");
if (session.getAttribute("usuario") == null) { if (session.getAttribute("usuario") == null) {
response.sendRedirect("main.jsp"); response.sendRedirect(request.getContextPath() + "/vistas/main.jsp");
} }
%> %>
\ No newline at end of file
Markdown is supported
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