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

Cleverson Sacramento
2 parents 0ee2d1e5 60c2553a
Showing 10 changed files with 27 additions and 63 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/home.html
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/index.html
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-edit.js
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-list.js
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/home.js
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/login.js
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/login.html
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html
 <!DOCTYPE html>
 <html lang="pt-br">
-
 <head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-
-<title>Bookmark Edit</title>
-
-<link rel="stylesheet" href="css/bootstrap.min.css">
-<link rel="stylesheet" href="css/bookmark.css">
+	<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 Edit</title>
+	<link rel="stylesheet" href="css/bootstrap.min.css">
+	<link rel="stylesheet" href="css/bookmark.css">
 </head>
-
 <body>
 	<div class="container">
 		<div id="menu"></div>
@@ -20,19 +16,16 @@
 				<label for="id">ID</label> <span id="id-text" class="form-control-static"></span>
 				<input id="id" type="hidden">
 			</div>
-
 			<div class="form-group">
 				<label for="description">Description</label>
 				<input id="description" type="text" class="form-control">
 				<div id="description-message" class="label label-danger"></div>
 			</div>
-
 			<div class="form-group">
 				<label for="link">Link</label>
 				<input id="link" type="text" class="form-control">
 				<div id="link-message" class="label label-danger"></div>
 			</div>
-
 			<div class="form-group">
 				<button id="save" class="btn btn-primary">Salvar</button>
 				<button id="delete" class="btn btn-danger" hidden="true">Excluir</button>
@@ -41,7 +34,6 @@
 		</form>
 	</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>
 	<script src="js/lib/bootstrap.min.js" type="text/javascript"></script>
 	<script src="js/lib/purl.js" type="text/javascript"></script>
@@ -50,5 +42,4 @@
 	<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
 <!DOCTYPE html>
 <html lang="pt-br">
-
 <head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-
-<title>Bookmark List</title>
-
-<link rel="stylesheet" href="css/bootstrap.min.css">
-<link rel="stylesheet" href="css/bookmark.css">
-<link rel="stylesheet" href="css/datatables.css">
+	<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 List</title>
+	<link rel="stylesheet" href="css/bootstrap.min.css">
+	<link rel="stylesheet" href="css/bookmark.css">
+	<link rel="stylesheet" href="css/datatables.css">
 </head>
-
 <body>
 	<div class="container">
 		<div id="menu"></div>
@@ -31,7 +27,6 @@
 		</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>
 	<script src="js/lib/bootstrap.min.js"></script>
 	<script src="js/lib/jquery.dataTables.js"></script>
 <!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">
+	<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.
+				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>
 <html>
-<head>
-<meta http-equiv="Refresh" content="0; URL=home.html">
-</head>
+	<head>
+		<meta http-equiv="Refresh" content="0; URL=home.html">
+	</head>
 </html>
 \ No newline at end of file
 $(function() {
  
-	// Carregando o menu na página home
 	$("#menu").load("menu.html", function() {
-
 		AuthProxy.getUser(getUserOk, getUserFailed);
-
 		$("#logout").on("click", function() {
 			sessionStorage.removeItem('credentials');
 			location.href = "home.html";
 		});
-
 	});
  
 	$("#delete").hide();
 $(function() {
  
-	// Carregando o menu na página home
 	$("#menu").load("menu.html", function() {
-
 		AuthProxy.getUser(getUserOk, getUserFailed);
-
 		$("#logout").on("click", function() {
 			sessionStorage.removeItem('credentials');
 			location.href = "home.html";
 		});
-
 	});
  
 	$("#new").focus();
 $(function() {
  
-	// Carregando o menu na página home
 	$("#menu").load("menu.html", function() {
-
 		AuthProxy.getUser(getUserOk, getUserFailed);
-
 		$("#logout").on("click", function() {
 			sessionStorage.removeItem('credentials');
 			location.href = "home.html";
 		});
-
 	});
  
 });
@@ -8,21 +8,16 @@ $(function() {
 			'username' : $("#username").val().trim(),
 			'password' : $("#password").val().trim()
 		};
-
 		AuthProxy.login(form, loginOk, loginFail);
 	});
-
 });
  
-// Função utilitária
 function make_base_auth(user, password) {
 	var tok = user + ':' + password;
 	var hash = btoa(tok);
 	return "Basic " + hash;
 }
  
-// Funções de Callback
-
 function loginOk(data) {
 	sessionStorage.setItem('credentials', make_base_auth($("#username").val().trim(), $("#password").val().trim()));
 	location.href = "home.html";
@@ -4,7 +4,7 @@
 	<meta charset="UTF-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Notifica | Login</title>
+	<title>Bookmark</title>
 	<link href="css/bootstrap.min.css" rel="stylesheet">
 	<link href="css/bookmark.css" rel="stylesheet">
 </head>
 <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>
@@ -10,8 +9,6 @@
       </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 class="dropdown">
@@ -26,6 +23,6 @@
       	<li id="username"></li>
       	<li><a id="logout" href="#">Sair</a></li>
       </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
+    </div>
+  </div>
 </nav>
 \ No newline at end of file
1	1	<!DOCTYPE html>
2	2	<html lang="pt-br">
3		-
4	3	<head>
5		-<meta charset="utf-8">
6		-<meta http-equiv="X-UA-Compatible" content="IE=edge">
7		-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
8		-
9		-<title>Bookmark Edit</title>
10		-
11		-<link rel="stylesheet" href="css/bootstrap.min.css">
12		-<link rel="stylesheet" href="css/bookmark.css">
	4	+ <meta charset="utf-8">
	5	+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
	6	+ <meta name="viewport" content="width=device-width, initial-scale=1">
	7	+ <title>Bookmark Edit</title>
	8	+ <link rel="stylesheet" href="css/bootstrap.min.css">
	9	+ <link rel="stylesheet" href="css/bookmark.css">
13	10	</head>
14		-
15	11	<body>
16	12	<div class="container">
17	13	<div id="menu"></div>
...	...	@@ -20,19 +16,16 @@
20	16	<label for="id">ID</label> <span id="id-text" class="form-control-static"></span>
21	17	<input id="id" type="hidden">
22	18	</div>
23		-
24	19	<div class="form-group">
25	20	<label for="description">Description</label>
26	21	<input id="description" type="text" class="form-control">
27	22	<div id="description-message" class="label label-danger"></div>
28	23	</div>
29		-
30	24	<div class="form-group">
31	25	<label for="link">Link</label>
32	26	<input id="link" type="text" class="form-control">
33	27	<div id="link-message" class="label label-danger"></div>
34	28	</div>
35		-
36	29	<div class="form-group">
37	30	<button id="save" class="btn btn-primary">Salvar</button>
38	31	<button id="delete" class="btn btn-danger" hidden="true">Excluir</button>
...	...	@@ -41,7 +34,6 @@
41	34	</form>
42	35	</div>
43	36	<p class="demoiselle">Aplicação de exemplo do Demoiselle 2.5.0</p>
44		-
45	37	<script src="js/lib/jquery-2.1.0.min.js" type="text/javascript"></script>
46	38	<script src="js/lib/bootstrap.min.js" type="text/javascript"></script>
47	39	<script src="js/lib/purl.js" type="text/javascript"></script>
...	...	@@ -50,5 +42,4 @@
50	42	<script src="js/proxy/bookmark.js" type="text/javascript"></script>
51	43	<script src="js/controller/bookmark-edit.js" type="text/javascript"></script>
52	44	<script src="js/controller/menu.js" type="text/javascript"></script>
53		-
54	45	</body>
55	46	\ No newline at end of file
...	...
1	1	<!DOCTYPE html>
2	2	<html>
3	3	<head>
4		-<meta charset="UTF-8">
5		-<meta http-equiv="X-UA-Compatible" content="IE=edge">
6		-<meta name="viewport" content="width=device-width, initial-scale=1">
7		-
8		-<title>Bookmark</title>
9		-
10		-<link href="css/bootstrap.min.css" rel="stylesheet">
11		-<link href="css/bookmark.css" rel="stylesheet">
	4	+ <meta charset="UTF-8">
	5	+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
	6	+ <meta name="viewport" content="width=device-width, initial-scale=1">
	7	+ <title>Bookmark</title>
	8	+ <link href="css/bootstrap.min.css" rel="stylesheet">
	9	+ <link href="css/bookmark.css" rel="stylesheet">
12	10	</head>
13	11	<body>
14	12	<div class="container">
15	13	<div id="menu"></div>
16	14	<div class="jumbotron">
17	15	<h3>
18		- Bem-vindo à aplicação de exemplo Bookmark usando arquétipo html-rest. <br /> Este é o seu ponto de partida, portanto sinta-se à vontade para
19		- modificar esta aplicação.
	16	+ Bem-vindo à aplicação de exemplo Bookmark usando arquétipo html-rest. <br />
	17	+ Este é o seu ponto de partida, portanto sinta-se à vontade para modificar esta aplicação.
20	18	</h3>
21	19	</div>
22	20	</div>
...	...
1	1	<html>
2		-<head>
3		-<meta http-equiv="Refresh" content="0; URL=home.html">
4		-</head>
	2	+ <head>
	3	+ <meta http-equiv="Refresh" content="0; URL=home.html">
	4	+ </head>
5	5	</html>
6	6	\ No newline at end of file
...	...
1	1	$(function() {
2	2
3		- // Carregando o menu na página home
4	3	$("#menu").load("menu.html", function() {
5		-
6	4	AuthProxy.getUser(getUserOk, getUserFailed);
7		-
8	5	$("#logout").on("click", function() {
9	6	sessionStorage.removeItem('credentials');
10	7	location.href = "home.html";
11	8	});
12		-
13	9	});
14	10
15	11	$("#delete").hide();
...	...
...	...	@@ -8,21 +8,16 @@ $(function() {
8	8	'username' : $("#username").val().trim(),
9	9	'password' : $("#password").val().trim()
10	10	};
11		-
12	11	AuthProxy.login(form, loginOk, loginFail);
13	12	});
14		-
15	13	});
16	14
17		-// Função utilitária
18	15	function make_base_auth(user, password) {
19	16	var tok = user + ':' + password;
20	17	var hash = btoa(tok);
21	18	return "Basic " + hash;
22	19	}
23	20
24		-// Funções de Callback
25		-
26	21	function loginOk(data) {
27	22	sessionStorage.setItem('credentials', make_base_auth($("#username").val().trim(), $("#password").val().trim()));
28	23	location.href = "home.html";
...	...
...	...	@@ -4,7 +4,7 @@
4	4	<meta charset="UTF-8">
5	5	<meta http-equiv="X-UA-Compatible" content="IE=edge">
6	6	<meta name="viewport" content="width=device-width, initial-scale=1">
7		- <title>Notifica \| Login</title>
	7	+ <title>Bookmark</title>
8	8	<link href="css/bootstrap.min.css" rel="stylesheet">
9	9	<link href="css/bookmark.css" rel="stylesheet">
10	10	</head>
...	...
1	1	<nav class="navbar navbar-default" role="navigation">
2	2	<div class="container-fluid">
3		- <!-- Brand and toggle get grouped for better mobile display -->
4	3	<div class="navbar-header">
5	4	<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
6	5	<span class="sr-only">Toggle navigation</span>
...	...	@@ -10,8 +9,6 @@
10	9	</button>
11	10	<a class="navbar-brand" href="home.html">Bookmark</a>
12	11	</div>
13		-
14		- <!-- Collect the nav links, forms, and other content for toggling -->
15	12	<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
16	13	<ul class="nav navbar-nav">
17	14	<li class="dropdown">
...	...	@@ -26,6 +23,6 @@
26	23	<li id="username"></li>
27	24	<li><a id="logout" href="#">Sair</a></li>
28	25	</ul>
29		- </div><!-- /.navbar-collapse -->
30		- </div><!-- /.container-fluid -->
	26	+ </div>
	27	+ </div>
31	28	</nav>
32	29	\ No newline at end of file
...	...