-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
119 additions
and
100 deletions.
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
mvc-base/src/main/webapp/WEB-INF/decorators/boostrapMenu.jsp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
|
|
||
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> | ||
| <html> | ||
| <body> | ||
|
|
||
| <div class="well sidebar-nav"> | ||
| <ul class="nav nav-list"> | ||
| <li class="nav-header"><spring:message code="layout.lang" /> </li> | ||
| <li><a href="?lang=fr"><spring:message code="layout.lang.french" /></a></li> | ||
| <li><a href="?lang=en"><spring:message code="layout.lang.english" /></a></li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| </body> | ||
| </html> |
30 changes: 30 additions & 0 deletions
30
mvc-base/src/main/webapp/WEB-INF/decorators/boostrapNavbar.jsp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
|
|
||
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> | ||
| <html> | ||
| <body> | ||
|
|
||
| <div class="navbar navbar-inverse navbar-fixed-top"> | ||
| <div class="navbar-inner"> | ||
| <div class="container-fluid"> | ||
| <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </a> | ||
| <a class="brand" href="#">Mvc base</a> | ||
| <div class="nav-collapse collapse"> | ||
| <p class="navbar-text pull-right"> | ||
| Logged in as <a href="#" class="navbar-link">Username</a> | ||
| </p> | ||
| <ul class="nav"> | ||
| <li class="active"><a href="#">Home</a></li> | ||
| <li><a href="#about">About</a></li> | ||
| <li><a href="#contact">Contact</a></li> | ||
| </ul> | ||
| </div> <!--/.nav-collapse --> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </body> | ||
| </html> |
174 changes: 74 additions & 100 deletions
174
mvc-base/src/main/webapp/WEB-INF/decorators/twitterBoostrapLayout.jsp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,75 @@ | ||
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> | ||
| <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="dec" %> | ||
| <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> | ||
| <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <meta name="description" content=""> | ||
| <meta name="author" content="Geoffroy Warin"> | ||
|
|
||
| <title><dec:title default="mvc-java-init" /></title> | ||
|
|
||
| <link href="resources/css/bootstrap.min.css" rel="stylesheet"> | ||
| <style type="text/css"> | ||
| body { | ||
| padding-top: 60px; | ||
| padding-bottom: 40px; | ||
| } | ||
| .sidebar-nav { | ||
| padding: 9px 0; | ||
| } | ||
| </style> | ||
| <!-- See http://twitter.github.com/bootstrap/scaffolding.html#responsive --> | ||
| <link href="resources/css/bootstrap-responsive.min.css" rel="stylesheet" /> | ||
|
|
||
| <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> | ||
| <!--[if lt IE 9]> | ||
| <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> | ||
| <![endif]--> | ||
|
|
||
| <!-- Fav and touch icons | ||
| <link rel="apple-touch-icon-precomposed" sizes="144x144" href="resources/ico/apple-touch-icon-144-precomposed.png"> | ||
| <link rel="apple-touch-icon-precomposed" sizes="114x114" href="resources/ico/apple-touch-icon-114-precomposed.png"> | ||
| <link rel="apple-touch-icon-precomposed" sizes="72x72" href="resources/ico/apple-touch-icon-72-precomposed.png"> | ||
| <link rel="apple-touch-icon-precomposed" href="resources/ico/apple-touch-icon-57-precomposed.png"> | ||
| <link rel="shortcut icon" href="resources/ico/favicon.png"> | ||
| --> | ||
|
|
||
| <dec:head /> | ||
| </head> | ||
| <body> | ||
| <div class="navbar navbar-inverse navbar-fixed-top"> | ||
| <div class="navbar-inner"> | ||
| <div class="container-fluid"> | ||
| <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </a> | ||
| <a class="brand" href="#">Project name</a> | ||
| <div class="nav-collapse collapse"> | ||
| <p class="navbar-text pull-right"> | ||
| Logged in as <a href="#" class="navbar-link">Username</a> | ||
| </p> | ||
| <ul class="nav"> | ||
| <li class="active"><a href="#">Home</a></li> | ||
| <li><a href="#about">About</a></li> | ||
| <li><a href="#contact">Contact</a></li> | ||
| </ul> | ||
| </div> <!--/.nav-collapse --> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div id="message" class="alert alert-info"> | ||
| <spring:message code="message.lang.instructions"/> | ||
| </div> | ||
|
|
||
| <div class="container-fluid"> | ||
| <div class="row-fluid"> | ||
|
|
||
| <div class="span3"> | ||
| <div class="well sidebar-nav"> | ||
| <ul class="nav nav-list"> | ||
| <li class="nav-header"><spring:message code="layout.lang" /> </li> | ||
| <li><a href="?lang=fr"><spring:message code="layout.lang.french" /></a></li> | ||
| <li><a href="?lang=en"><spring:message code="layout.lang.english" /></a></li> | ||
| </ul> | ||
| </div> <!--/.well --> | ||
| </div> <!--/span--> | ||
|
|
||
| <div class="span9"> | ||
| <!--Body content--> | ||
| <dec:body /> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| <hr> | ||
| <footer> | ||
| <p>© Company 2012</p> | ||
| </footer> | ||
|
|
||
| </div><!--/.container-fluid--> | ||
|
|
||
| <script src="http://code.jquery.com/jquery-latest.min.js" type="text/javascript"></script> | ||
| <script src="resources/js/bootstrap.min.js" type="text/javascript"></script> | ||
| </body> | ||
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> | ||
| <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="dec" %> | ||
| <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> | ||
| <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <meta name="description" content=""> | ||
| <meta name="author" content="Geoffroy Warin"> | ||
|
|
||
| <title><dec:title default="mvc-java-init" /></title> | ||
|
|
||
| <link href="resources/css/bootstrap.min.css" rel="stylesheet"> | ||
| <style type="text/css"> | ||
| body { | ||
| padding-top: 60px; | ||
| padding-bottom: 40px; | ||
| } | ||
| .sidebar-nav { | ||
| padding: 9px 0; | ||
| } | ||
| </style> | ||
| <!-- See http://twitter.github.com/bootstrap/scaffolding.html#responsive --> | ||
| <link href="resources/css/bootstrap-responsive.min.css" rel="stylesheet" /> | ||
|
|
||
| <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> | ||
| <!--[if lt IE 9]> | ||
| <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> | ||
| <![endif]--> | ||
|
|
||
| <!-- Fav and touch icons | ||
| <link rel="apple-touch-icon-precomposed" sizes="144x144" href="resources/ico/apple-touch-icon-144-precomposed.png"> | ||
| <link rel="apple-touch-icon-precomposed" sizes="114x114" href="resources/ico/apple-touch-icon-114-precomposed.png"> | ||
| <link rel="apple-touch-icon-precomposed" sizes="72x72" href="resources/ico/apple-touch-icon-72-precomposed.png"> | ||
| <link rel="apple-touch-icon-precomposed" href="resources/ico/apple-touch-icon-57-precomposed.png"> | ||
| <link rel="shortcut icon" href="resources/ico/favicon.png"> | ||
| --> | ||
|
|
||
| <dec:head /> | ||
| </head> | ||
| <body> | ||
|
|
||
| <%@include file="boostrapNavbar.jsp"%> | ||
|
|
||
| <div id="message" class="alert alert-info"> | ||
| <spring:message code="message.lang.instructions"/> | ||
| </div> | ||
|
|
||
| <div class="container-fluid"> | ||
| <div class="row-fluid"> | ||
|
|
||
| <div class="span3"> | ||
| <%@include file="boostrapMenu.jsp"%> | ||
| </div> <!--/span--> | ||
|
|
||
| <div class="span9"> | ||
| <!--Body content--> | ||
| <dec:body /> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| <hr> | ||
| <footer> | ||
| <p>© geowarin 2013</p> | ||
| </footer> | ||
|
|
||
| </div><!--/.container-fluid--> | ||
|
|
||
| <script src="http://code.jquery.com/jquery-latest.min.js" type="text/javascript"></script> | ||
| <script src="resources/js/bootstrap.min.js" type="text/javascript"></script> | ||
| </body> | ||
| </html> |