diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2012-12-26 21:45:38 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2012-12-26 21:45:38 +0100 |
| commit | 422b1caeaa9f7d069a9208ecb0d0249485b1a05e (patch) | |
| tree | 90ef9e1d0b6f26178f1fae3e3df20226a1d91087 /src/main/webapp/WEB-INF | |
| parent | 348ec4e14aeaf4e98fcab96f0ae7242d178db69b (diff) | |
| download | esper-testing-422b1caeaa9f7d069a9208ecb0d0249485b1a05e.tar.gz esper-testing-422b1caeaa9f7d069a9208ecb0d0249485b1a05e.tar.bz2 esper-testing-422b1caeaa9f7d069a9208ecb0d0249485b1a05e.tar.xz esper-testing-422b1caeaa9f7d069a9208ecb0d0249485b1a05e.zip | |
o Adding details page for persons.
o Better front page.
Diffstat (limited to 'src/main/webapp/WEB-INF')
| -rw-r--r-- | src/main/webapp/WEB-INF/tags/common/head-element.tagx | 10 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/urlrewrite.xml | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/main/webapp/WEB-INF/tags/common/head-element.tagx b/src/main/webapp/WEB-INF/tags/common/head-element.tagx index e552b7b..bb8804c 100644 --- a/src/main/webapp/WEB-INF/tags/common/head-element.tagx +++ b/src/main/webapp/WEB-INF/tags/common/head-element.tagx @@ -1,7 +1,6 @@ <!--suppress JspAbsolutePathInspection --> -<jsp:root version="2.0" - xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:jsp="http://java.sun.com/JSP/Page"> +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:c="http://java.sun.com/jsp/jstl/core"> <jsp:output omit-xml-declaration="yes"/> <jsp:directive.attribute name="title" type="java.lang.String" required="false"/> <jsp:directive.attribute name="app" type="java.lang.String" required="false"/> @@ -11,13 +10,16 @@ <title><c:if test="${not empty title }">${title } - </c:if>Yeah</title> <link type="text/css" rel="stylesheet" href="/external/bootstrap-2.2.2/css/bootstrap.css"/> + <link type="text/css" rel="stylesheet" href="/external/angular-ui/ng-grid-1.5.0/ng-grid.css"/> + <link type="text/css" rel="stylesheet" href="/apps/app.css"/> <script type="text/javascript" src="/external/headjs-0.99/head.min.js"><!-- --></script> <script type="text/javascript"> head.js( {jquery: "/external/jquery-1.7.1.js"}, {angularjs: "/external/angular-1.0.3/angular.js"}, - {angularjsResource: "/external/angular-1.0.3/angular-resource.js"} + {angularjsResource: "/external/angular-1.0.3/angular-resource.js"}, + {angularUiNgGrid: "/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.js"} ); </script> <script>var noCache = new Date().getTime();</script> diff --git a/src/main/webapp/WEB-INF/urlrewrite.xml b/src/main/webapp/WEB-INF/urlrewrite.xml index ff4bf10..e5f3338 100644 --- a/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/src/main/webapp/WEB-INF/urlrewrite.xml @@ -15,4 +15,10 @@ <to type="forward">/index.jspx</to> </rule> + <rule match-type="regex"> + <from>^/person/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$</from> + <set type="parameter" name="uuid">$1</set> + <to type="forward">/person/person.jspx</to> + </rule> + </urlrewrite> |