Merge branch '2.5' of git@github.com:demoiselle/framework.git into 2.5

Cleverson Sacramento
2 parents b798bcc8 26ff59ea
Showing 5 changed files with 43 additions and 105 deletions Show diff stats
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-edit.html
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-list.html
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/css/bookmark.css
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/home.html
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html
@@ -13,7 +13,6 @@
 </head>
 <body>
-
 	<div class="container">
 		<div id="menu"></div>
 		<form class="well" role="form">
@@ -40,9 +39,7 @@
 				<button id="back" class="btn btn-warning">Voltar</button>
 			</div>
 		</form>
-
 	</div>
-	<!-- /container -->
 	<p class="demoiselle">Aplicação de exemplo do Demoiselle 2.5.0</p>
 	<script src="js/lib/jquery-2.1.0.min.js" type="text/javascript"></script>
@@ -53,5 +50,5 @@
 	<script src="js/proxy/bookmark.js" type="text/javascript"></script>
 	<script src="js/controller/bookmark-edit.js" type="text/javascript"></script>
 	<script src="js/controller/menu.js" type="text/javascript"></script>
-	
+
 </body>
 \ No newline at end of file
@@ -8,86 +8,28 @@
 <title>Bookmark List</title>
-<link rel="stylesheet" href="css/bookmark.css">
 <link rel="stylesheet" href="css/bootstrap.min.css">
+<link rel="stylesheet" href="css/bookmark.css">
 <link rel="stylesheet" href="css/datatables.css">
 </head>
 <body>
-	<form>
-		<div id="wrap">
-			<div class="container">
-				<div id="menu">
-				<nav class="navbar navbar-default" role="navigation">
-  <div class="container-fluid">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="#">Brand</a>
-    </div>
-
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-      <ul class="nav navbar-nav">
-        <li class="active"><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-            <li class="divider"></li>
-            <li><a href="#">One more separated link</a></li>
-          </ul>
-        </li>
-      </ul>
-      <form class="navbar-form navbar-left" role="search">
-        <div class="form-group">
-          <input type="text" class="form-control" placeholder="Search">
-        </div>
-        <button type="submit" class="btn btn-default">Submit</button>
-      </form>
-      <ul class="nav navbar-nav navbar-right">
-        <li><a href="#">Link</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
-				</div>
-				<p>
-					<button id="new" class="btn btn-success">Novo</button>
-					<button id="delete" class="btn btn-danger">Excluir</button>
-				</p>
-				<table id="resultList" cellpadding="0" cellspacing="0" border="0" class="datatable table table-striped table-bordered">
-					<thead>
-						<tr>
-							<th width="3px"></th>
-							<th>Description</th>
-							<th>Link</th>
-						</tr>
-					</thead>
-				</table>
-			</div>
-		</div>
-	</form>
+	<div class="container">
+		<div id="menu"></div>
+		<p>
+			<button id="new" class="btn btn-success">Novo</button>
+			<button id="delete" class="btn btn-danger">Excluir</button>
+		</p>
+		<table id="resultList" cellpadding="0" cellspacing="0" border="0" class="datatable table table-striped table-bordered">
+			<thead>
+				<tr>
+					<th width="3px"></th>
+					<th>Description</th>
+					<th>Link</th>
+				</tr>
+			</thead>
+		</table>
+	</div>
 	<p class="demoiselle">Aplicação de exemplo do Demoiselle 2.5.0</p>
 	<script src="js/lib/jquery-2.1.0.min.js" type="text/javascript"></script>
@@ -100,4 +42,4 @@
 	<script src="js/controller/bookmark-list.js" type="text/javascript"></script>
 	<script src="js/controller/menu.js" type="text/javascript"></script>
 </body>
 -</html>
+</html>
 \ No newline at end of file
 body {
-	padding-top: 20px;
-	padding-bottom: 20px;
-	margin-top: 20px;
+	padding-top: 30px;
 }
-input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button {
+input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button
+	{
 	-webkit-appearance: none;
 	margin: 0;
 }
 #username {
-  color: #777;
-  display: block;
+	color: #777;
+	display: block;
 	line-height: 20px;
-  padding: 15px 15px;
+	padding: 15px 15px;
 	position: relative;
 }
 .demoiselle {
-	position: fixed;
 	text-align: center;
-	margin-bottom: 100px;
-	bottom: 0;
-	left: 0;
-	right: 0;
+}
+
+.navbar-brand {
+	font-size: 22pt;
 }
 \ No newline at end of file
 <!DOCTYPE html>
 <html>
-<head> 
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Bookmark</title>
-	<link href="css/bootstrap.min.css" rel="stylesheet">
-	<link href="css/bookmark.css" rel="stylesheet">
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+
+<title>Bookmark</title>
+
+<link href="css/bootstrap.min.css" rel="stylesheet">
+<link href="css/bookmark.css" rel="stylesheet">
 </head>
 <body>
 	<div class="container">
 		<div id="menu"></div>
 		<div class="jumbotron">
-  		<h3>
-  			Bem-vindo à aplicação de exemplo Bookmark usando arquétipo html-rest. <br/>
-  			Este é o seu ponto de partida, portanto sinta-se à vontade para modificar esta aplicação.
-  		</h3>
+			<h3>
+				Bem-vindo à aplicação de exemplo Bookmark usando arquétipo html-rest. <br /> Este é o seu ponto de partida, portanto sinta-se à vontade para
+				modificar esta aplicação.
+			</h3>
 		</div>
 	</div>
 	<p class="demoiselle">Aplicação de exemplo do Demoiselle 2.5.0</p>
-<h1 id="title">Bookmark</h1>
 <nav class="navbar navbar-default" role="navigation">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
@@ -9,12 +8,12 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
+      <a class="navbar-brand" href="home.html">Bookmark</a>
     </div>
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">
-      	<li><a href="home.html">Home</a></li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-th-list"></span> Bookmark<b class="caret"></b></a>
           <ul class="dropdown-menu">
	@@ -8,86 +8,28 @@		@@ -8,86 +8,28 @@
8		8
9	<title>Bookmark List</title>	9	<title>Bookmark List</title>
10		10
11	-<link rel="stylesheet" href="css/bookmark.css">
12	<link rel="stylesheet" href="css/bootstrap.min.css">	11	<link rel="stylesheet" href="css/bootstrap.min.css">
		12	+<link rel="stylesheet" href="css/bookmark.css">
13	<link rel="stylesheet" href="css/datatables.css">	13	<link rel="stylesheet" href="css/datatables.css">
14	</head>	14	</head>
15		15
16	<body>	16	<body>
17	- <form>
18	- <div id="wrap">
19	- <div class="container">
20	- <div id="menu">
21	- <nav class="navbar navbar-default" role="navigation">
22	- <div class="container-fluid">
23	- <!-- Brand and toggle get grouped for better mobile display -->
24	- <div class="navbar-header">
25	- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
26	- <span class="sr-only">Toggle navigation</span>
27	- <span class="icon-bar"></span>
28	- <span class="icon-bar"></span>
29	- <span class="icon-bar"></span>
30	- </button>
31	- <a class="navbar-brand" href="#">Brand</a>
32	- </div>
33	-
34	- <!-- Collect the nav links, forms, and other content for toggling -->
35	- <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
36	- <ul class="nav navbar-nav">
37	- <li class="active"><a href="#">Link</a></li>
38	- <li><a href="#">Link</a></li>
39	- <li class="dropdown">
40	- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
41	- <ul class="dropdown-menu">
42	- <li><a href="#">Action</a></li>
43	- <li><a href="#">Another action</a></li>
44	- <li><a href="#">Something else here</a></li>
45	- <li class="divider"></li>
46	- <li><a href="#">Separated link</a></li>
47	- <li class="divider"></li>
48	- <li><a href="#">One more separated link</a></li>
49	- </ul>
50	- </li>
51	- </ul>
52	- <form class="navbar-form navbar-left" role="search">
53	- <div class="form-group">
54	- <input type="text" class="form-control" placeholder="Search">
55	- </div>
56	- <button type="submit" class="btn btn-default">Submit</button>
57	- </form>
58	- <ul class="nav navbar-nav navbar-right">
59	- <li><a href="#">Link</a></li>
60	- <li class="dropdown">
61	- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
62	- <ul class="dropdown-menu">
63	- <li><a href="#">Action</a></li>
64	- <li><a href="#">Another action</a></li>
65	- <li><a href="#">Something else here</a></li>
66	- <li class="divider"></li>
67	- <li><a href="#">Separated link</a></li>
68	- </ul>
69	- </li>
70	- </ul>
71	- </div><!-- /.navbar-collapse -->
72	- </div><!-- /.container-fluid -->
73	-</nav>
74	- </div>
75	- <p>
76	- <button id="new" class="btn btn-success">Novo</button>
77	- <button id="delete" class="btn btn-danger">Excluir</button>
78	- </p>
79	- <table id="resultList" cellpadding="0" cellspacing="0" border="0" class="datatable table table-striped table-bordered">
80	- <thead>
81	- <tr>
82	- <th width="3px"></th>
83	- <th>Description</th>
84	- <th>Link</th>
85	- </tr>
86	- </thead>
87	- </table>
88	- </div>
89	- </div>
90	- </form>	17	+ <div class="container">
		18	+ <div id="menu"></div>
		19	+ <p>
		20	+ <button id="new" class="btn btn-success">Novo</button>
		21	+ <button id="delete" class="btn btn-danger">Excluir</button>
		22	+ </p>
		23	+ <table id="resultList" cellpadding="0" cellspacing="0" border="0" class="datatable table table-striped table-bordered">
		24	+ <thead>
		25	+ <tr>
		26	+ <th width="3px"></th>
		27	+ <th>Description</th>
		28	+ <th>Link</th>
		29	+ </tr>
		30	+ </thead>
		31	+ </table>
		32	+ </div>
91	<p class="demoiselle">Aplicação de exemplo do Demoiselle 2.5.0</p>	33	<p class="demoiselle">Aplicação de exemplo do Demoiselle 2.5.0</p>
92		34
93	<script src="js/lib/jquery-2.1.0.min.js" type="text/javascript"></script>	35	<script src="js/lib/jquery-2.1.0.min.js" type="text/javascript"></script>
	@@ -100,4 +42,4 @@		@@ -100,4 +42,4 @@
100	<script src="js/controller/bookmark-list.js" type="text/javascript"></script>	42	<script src="js/controller/bookmark-list.js" type="text/javascript"></script>
101	<script src="js/controller/menu.js" type="text/javascript"></script>	43	<script src="js/controller/menu.js" type="text/javascript"></script>
102	</body>	44	</body>
103	-</html>	45	-</html>
		46	+</html>
104	\ No newline at end of file	47	\ No newline at end of file