Skip to content

Commit 3826c30

Browse files
jogepjogep
committed
Switch to latest bootstrap version 3.2.0 in REST Showcase
1 parent fbf4113 commit 3826c30

19 files changed

+5942
-5867
lines changed

‎apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@
44
<html lang="en">
55
<head>
66
<meta charset="utf-8">
7-
<title>Order ${id}</title>
8-
<link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
9-
<link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
<title>Orders</title>
10+
<link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
11+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
12+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
13+
<!--[if lt IE 9]>
14+
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
15+
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
16+
<![endif]-->
1017
</head>
1118
<body>
1219
<div class="container-fluid">
13-
<div class="row-fluid">
14-
<div class="span12">
20+
<div class="row">
21+
<div class="col-md-12">
1522

1623
<div class="page-header">
1724
<h1>Delete Order ${id}</h1>
@@ -28,11 +35,11 @@
2835
</form>
2936
<br />
3037
<a href="${pageContext.request.contextPath}/orders" class="btn btn-info">
31-
<i class="icon icon-arrow-left"></i> Back to Orders
38+
<span class="glyphicon glyphicon-arrow-left"></span> Back to Orders
3239
</a>
33-
</div><!--/row-->
34-
</div><!--/span-->
35-
</div><!--/row-->
40+
</div><!--/col-md-12--->
41+
</div><!--/row-->
42+
</div><!--/container-->
3643
</body>
3744
</html>
3845

‎apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,61 @@
44
<html lang="en">
55
<head>
66
<meta charset="utf-8">
7-
<title>Order <s:property value="id" /></title>
8-
<link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
9-
<link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
<title>Orders</title>
10+
<link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
11+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
12+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
13+
<!--[if lt IE 9]>
14+
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
15+
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
16+
<![endif]-->
1017
</head>
1118
<body>
1219
<div class="container-fluid">
13-
<div class="row-fluid">
14-
<div class="span12">
20+
<div class="row">
21+
<div class="col-md-12">
1522

1623
<div class="page-header">
1724
<h1>Order <s:property value="id" /></h1>
1825
</div>
1926

20-
<s:fielderror cssClass="alert alert-error"/>
27+
<s:actionmessage cssClass="alert alert-danger"/>
2128

2229
<s:form method="post" action="%{#request.contextPath}/orders/%{id}" cssClass="form-horizontal" theme="simple">
2330
<s:hidden name="_method" value="put" />
24-
<div class="control-group">
25-
<label class="control-label" for="id">ID</label>
26-
<div class="controls">
27-
<s:textfield id="id" name="id" disabled="true"/>
31+
<div class="form-group">
32+
<label class="col-sm-2 control-label" for="id">ID</label>
33+
<div class="col-sm-4">
34+
<s:textfield id="id" name="id" disabled="true" cssClass="form-control"/>
2835
</div>
2936
</div>
30-
<div class="control-group">
31-
<label class="control-label" for="clientName">Client</label>
32-
<div class="controls">
33-
<s:textfield id="clientName" name="clientName"/>
37+
<div class="form-group">
38+
<label class="col-sm-2 control-label" for="clientName">Client</label>
39+
<div class="col-sm-4">
40+
<s:textfield id="clientName" name="clientName" cssClass="form-control"/>
3441
</div>
3542
</div>
36-
<div class="control-group">
37-
<label class="control-label" for="amount">Amount</label>
38-
<div class="controls">
39-
<s:textfield id="amount" name="amount" />
43+
<div class="form-group">
44+
<label class="col-sm-2 control-label" for="amount">Amount</label>
45+
<div class="col-sm-4">
46+
<s:textfield id="amount" name="amount" cssClass="form-control" />
4047
</div>
4148
</div>
42-
<div class="form-actions">
43-
<s:submit cssClass="btn btn-primary"/>
49+
<div class="form-group">
50+
<div class="col-sm-offset-2 col-sm-4">
51+
<s:submit cssClass="btn btn-primary"/>
52+
</div>
4453
</div>
4554
<table>
4655
</s:form>
4756
<a href="${pageContext.request.contextPath}/orders" class="btn btn-info">
48-
<i class="icon icon-arrow-left"></i> Back to Orders
57+
<span class="glyphicon glyphicon-arrow-left"></span> Back to Orders
4958
</a>
50-
</div><!--/row-->
51-
</div><!--/span-->
52-
</div><!--/row-->
59+
</div><!--/col-md-12--->
60+
</div><!--/row-->
61+
</div><!--/container-->
5362
</body>
5463
</html>
5564

‎apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,53 @@
44
<html lang="en">
55
<head>
66
<meta charset="utf-8">
7-
<title>New Order</title>
8-
<link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
9-
<link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
<title>Orders</title>
10+
<link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
11+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
12+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
13+
<!--[if lt IE 9]>
14+
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
15+
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
16+
<![endif]-->
1017
</head>
1118
<body>
1219
<div class="container-fluid">
13-
<div class="row-fluid">
14-
<div class="span12">
20+
<div class="row">
21+
<div class="col-md-12">
1522

1623
<div class="page-header">
1724
<h1>New Order</h1>
1825
</div>
1926

20-
<s:fielderror cssClass="alert alert-error"/>
27+
<s:actionmessage cssClass="alert alert-danger"/>
2128

2229
<s:form method="post" action="%{#request.contextPath}/orders" cssClass="form-horizontal" theme="simple">
23-
<div class="control-group">
24-
<label class="control-label" for="clientName">Client</label>
25-
<div class="controls">
26-
<s:textfield id="clientName" name="clientName"/>
30+
<div class="form-group">
31+
<label class="col-sm-2 control-label" for="clientName">Client</label>
32+
<div class="col-sm-4">
33+
<s:textfield id="clientName" name="clientName" cssClass="form-control"/>
2734
</div>
2835
</div>
29-
<div class="control-group">
30-
<label class="control-label" for="amount">Amount</label>
31-
<div class="controls">
32-
<s:textfield id="amount" name="amount" />
36+
<div class="form-group">
37+
<label class="col-sm-2 control-label" for="amount">Amount</label>
38+
<div class="col-sm-4">
39+
<s:textfield id="amount" name="amount" cssClass="form-control"/>
3340
</div>
3441
</div>
35-
<div class="form-actions">
36-
<s:submit cssClass="btn btn-primary"/>
42+
<div class="form-group">
43+
<div class="col-sm-offset-2 col-sm-4">
44+
<s:submit cssClass="btn btn-primary"/>
45+
</div>
3746
</div>
3847
</s:form>
3948
<a href="${pageContext.request.contextPath}/orders" class="btn btn-info">
40-
<i class="icon icon-arrow-left"></i> Back to Orders
49+
<span class="glyphicon glyphicon-arrow-left"></apan> Back to Orders
4150
</a>
42-
</div><!--/row-->
43-
</div><!--/span-->
44-
</div><!--/row-->
51+
</div><!--/col-md-12--->
52+
</div><!--/row-->
53+
</div><!--/container-->
4554
</body>
4655
</html>
4756

‎apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,26 @@
44
<html lang="en">
55
<head>
66
<meta charset="utf-8">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
79
<title>Orders</title>
8-
<link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
9-
<link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
10+
<link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
11+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
12+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
13+
<!--[if lt IE 9]>
14+
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
15+
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
16+
<![endif]-->
1017
</head>
1118
<body>
1219
<div class="container-fluid">
13-
<div class="row-fluid">
14-
<div class="span12">
20+
<div class="row">
21+
<div class="col-md-12">
1522

1623
<div class="page-header">
1724
<h1>Orders</h1>
1825
</div>
19-
<s:actionmessage cssClass="alert alert-error"/>
26+
<s:actionmessage cssClass="alert alert-danger"/>
2027
<table class="table table-striped">
2128
<tr>
2229
<th>ID</th>
@@ -31,18 +38,18 @@
3138
<td><s:property value="amount"/></td>
3239
<td>
3340
<div class="btn-group">
34-
<a href="orders/${id}" class="btn"><i class="icon icon-eye-open"></i> View</a>
35-
<a href="orders/${id}/edit" class="btn"><i class="icon icon-edit"></i> Edit</a>
36-
<a href="orders/${id}/deleteConfirm" class="btn btn-danger"><i class="icon icon-trash"></i> Delete</a>
41+
<a href="orders/${id}" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> View</a>
42+
<a href="orders/${id}/edit" class="btn btn-default"><span class="glyphicon glyphicon-edit"></span> Edit</a>
43+
<a href="orders/${id}/deleteConfirm" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> Delete</a>
3744
</div>
3845
</td>
3946
</tr>
4047
</s:iterator>
4148
</table>
42-
<a href="orders/new" class="btn btn-primary"><i class="icon icon-file"></i> Create a new order</a>
43-
</div><!--/row-->
44-
</div><!--/span-->
45-
</div><!--/row-->
49+
<a href="orders/new" class="btn btn-primary"><span class="glyphicon glyphicon-file"></span> Create a new order</a>
50+
</div><!--/col-md-12--->
51+
</div><!--/row-->
52+
</div><!--/container-->
4653
</body>
4754
</html>
4855

‎apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@
44
<html lang="en">
55
<head>
66
<meta charset="utf-8">
7-
<title>Order ${id}</title>
8-
<link href="${pageContext.request.contextPath}/css/bootstrap.css" rel="stylesheet">
9-
<link href="${pageContext.request.contextPath}/css/bootstrap-responsive.css" rel="stylesheet">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
<title>Orders</title>
10+
<link href="${pageContext.request.contextPath}/css/bootstrap.min.css" rel="stylesheet">
11+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
12+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
13+
<!--[if lt IE 9]>
14+
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
15+
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
16+
<![endif]-->
1017
</head>
1118
<body>
1219
<div class="container-fluid">
13-
<div class="row-fluid">
14-
<div class="span12">
20+
<div class="row">
21+
<div class="col-md-12">
1522
<div class="page-header">
1623
<h1>Order ${id}</h1>
1724
</div>
@@ -30,11 +37,11 @@
3037
</tr>
3138
</table>
3239
<a href="${pageContext.request.contextPath}/orders" class="btn btn-info">
33-
<i class="icon icon-arrow-left"></i> Back to Orders
40+
<span class="glyphicon glyphicon-arrow-left"></span> Back to Orders
3441
</a>
35-
</div><!--/row-->
36-
</div><!--/span-->
37-
</div><!--/row-->
42+
</div><!--/col-md-12--->
43+
</div><!--/row-->
44+
</div><!--/container-->
3845
</body>
3946
</html>
4047

0 commit comments

Comments
 (0)