FWK-223: Atualizar o arquétipo com os novos experimentos

Task-Url: https://demoiselle.atlassian.net/browse/FWK-223

FWK-223: Atualizar o arquétipo com os novos experimentos
Task-Url: https://demoiselle.atlassian.net/browse/FWK-223
Cleverson Sacramento
1 parent 0e4e9693
Showing 5 changed files with 32 additions and 20 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/home.html
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/menu.js
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/proxy/auth.js
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html
@@ -15,17 +15,14 @@
 		<div id="menu"></div>
 		<form class="well" role="form">
 			<div id="id-row" hidden="true" class="form-group">
-				<label for="id">ID</label> <span id="id-text" class="form-control-static"></span>
-				<input id="id" type="hidden">
+				<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">
+				<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">
+				<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">
@@ -41,7 +38,6 @@
 	<script type="text/javascript" src="js/lib/jquery-2.1.0.min.js"></script>
 	<script type="text/javascript" src="js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="js/lib/purl.js"></script>
 	<script type="text/javascript" src="js/lib/bootbox.js"></script>
 	<script type="text/javascript" src="js/lib/app.js"></script>
 	<script type="text/javascript" src="js/proxy/metadata.js"></script>
@@ -49,4 +45,4 @@
 	<script type="text/javascript" src="js/proxy/bookmark.js"></script>
 	<script type="text/javascript" src="js/controller/menu.js"></script>
 	<script type="text/javascript" src="js/controller/bookmark-edit.js"></script>
 -</body>
+</body>
 \ No newline at end of file
@@ -15,8 +15,8 @@
 		<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>
 $(function() {
 	$("#menu").load("menu.html", function() {
-		$("#username").html(App.auth.getLoggedInUser().name);
+		if (App.auth.isLoggedIn()) {
+			$("#username").html(App.auth.getLoggedInUser().name);
-		$("#logout").click(function(event) {
-			event.preventDefault();
-			AuthProxy.logout().done(logoutOk);
-		});
+			$("#logout").click(function(event) {
+				event.preventDefault();
+				AuthProxy.logout().done(logoutOk);
+			});
+
+			$("#logout").parent().show();
+
+		} else {
+			$("#login").click(function(event) {
+				location.href = "login.html";
+			});
+
+			$("#login").parent().show();
+		}
 	});
 });
@@ -15,7 +15,10 @@ var AuthProxy = {
 	logout : function() {
 		return $.ajax({
 			url : this.url + "/logout",
-			type : "POST"
+			type : "POST",
+			beforeSend : function(jqXHR) {
+				App.auth.setHeader(jqXHR)
+			}
 		});
 	}
 };
@@ -2,14 +2,15 @@
 	<div class="container-fluid">
 		<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>
+				<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="home.html">Bookmark</a>
 		</div>
 		<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 			<ul class="nav navbar-nav">
-				<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-th-list"></span>
-						Bookmark<b class="caret"></b></a>
+				<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">
 						<li><a href="bookmark-edit.html"><span class="glyphicon glyphicon glyphicon-edit"></span> Novo</a></li>
 						<li><a href="bookmark-list.html"><span class="glyphicon glyphicon-list-alt"></span> Listar</a></li>
@@ -17,7 +18,8 @@
 			</ul>
 			<ul class="nav navbar-nav navbar-right">
 				<li id="username"></li>
-				<li><a id="logout" href="#">Sair</a></li>
+				<li style="display: none;"><a id="logout" href="#">Sair</a></li>
+				<li style="display: none;"><a id="login" href="#">Entrar</a></li>
 			</ul>
 		</div>
 	</div>
1	$(function() {	1	$(function() {
2	$("#menu").load("menu.html", function() {	2	$("#menu").load("menu.html", function() {
3	- $("#username").html(App.auth.getLoggedInUser().name);	3	+ if (App.auth.isLoggedIn()) {
		4	+ $("#username").html(App.auth.getLoggedInUser().name);
4		5
5	- $("#logout").click(function(event) {
6	- event.preventDefault();
7	- AuthProxy.logout().done(logoutOk);
8	- });	6	+ $("#logout").click(function(event) {
		7	+ event.preventDefault();
		8	+ AuthProxy.logout().done(logoutOk);
		9	+ });
		10	+
		11	+ $("#logout").parent().show();
		12	+
		13	+ } else {
		14	+ $("#login").click(function(event) {
		15	+ location.href = "login.html";
		16	+ });
		17	+
		18	+ $("#login").parent().show();
		19	+ }
9	});	20	});
10	});	21	});
11		22