From 0e47cd46ec1c59993e38b81fba46f808414a6f94 Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Thu, 30 Apr 2015 15:25:44 -0300
Subject: [PATCH] FWK-223: Atualizar o arquétipo com os novos experimentos

---
 archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-edit.html    | 12 ++++--------
 archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/home.html             |  4 ++--
 archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/menu.js | 21 ++++++++++++++++-----
 archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/proxy/auth.js      |  5 ++++-
 archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html             | 10 ++++++----
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-edit.html b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-edit.html
index ab08c85..872a630 100644
--- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-edit.html
+++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-edit.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
diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/home.html b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/home.html
index acd18bc..e1090b8 100644
--- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/home.html
+++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/home.html
@@ -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>
diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/menu.js b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/menu.js
index 9f0c409..b58e771 100644
--- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/menu.js
+++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/menu.js
@@ -1,11 +1,22 @@
 $(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();
+		}
 	});
 });
 
diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/proxy/auth.js b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/proxy/auth.js
index 8da5f1b..2df9612 100644
--- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/proxy/auth.js
+++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/proxy/auth.js
@@ -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)
+			}
 		});
 	}
 };
diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html
index 93a168a..cc76c0e 100644
--- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html
+++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html
@@ -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>
--
libgit2 0.21.2