aboutsummaryrefslogtreecommitdiff
path: root/src/main/webapp/WEB-INF
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-01-04 22:59:40 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2013-01-04 22:59:40 +0100
commit1902b2c1dfff62c0225a170db38a4882df9143e6 (patch)
tree435aa293f83dd8af266ef8d2946817e7c03bbdeb /src/main/webapp/WEB-INF
parente7addeeb21ab8293855554f361619e4c57c3c1b4 (diff)
downloadesper-testing-1902b2c1dfff62c0225a170db38a4882df9143e6.tar.gz
esper-testing-1902b2c1dfff62c0225a170db38a4882df9143e6.tar.bz2
esper-testing-1902b2c1dfff62c0225a170db38a4882df9143e6.tar.xz
esper-testing-1902b2c1dfff62c0225a170db38a4882df9143e6.zip
o Adding a basic navbar for ease of use.
o Bootstrap-responsive.
Diffstat (limited to 'src/main/webapp/WEB-INF')
-rwxr-xr-xsrc/main/webapp/WEB-INF/tags/common/head.tagx2
-rwxr-xr-xsrc/main/webapp/WEB-INF/urlrewrite.xml4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/webapp/WEB-INF/tags/common/head.tagx b/src/main/webapp/WEB-INF/tags/common/head.tagx
index 0ad2ba2..0f288fb 100755
--- a/src/main/webapp/WEB-INF/tags/common/head.tagx
+++ b/src/main/webapp/WEB-INF/tags/common/head.tagx
@@ -9,7 +9,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title><c:if test="${not empty title }">${title } - </c:if>Yeah</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link type="text/css" rel="stylesheet" href="/external/bootstrap-2.2.2/css/bootstrap.css"/>
+ <link type="text/css" rel="stylesheet" href="/external/bootstrap-2.2.2/css/bootstrap-responsive.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"/>
diff --git a/src/main/webapp/WEB-INF/urlrewrite.xml b/src/main/webapp/WEB-INF/urlrewrite.xml
index a649f8b..a4834c9 100755
--- a/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -16,13 +16,13 @@
</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>
+ <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>
<rule match-type="regex">
- <from>^/person/([-_0-9A-Za-z]{22})$</from>
+ <from>^/person/([-_0-9A-Za-z]{22})/?$</from>
<set type="parameter" name="uuid">$1</set>
<to type="forward">/person/person.jspx</to>
</rule>