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 d95a2bf..f0af565 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 @@ -1,17 +1,13 @@ - - - - - -Bookmark Edit - - - + + + + Bookmark Edit + + -
@@ -20,19 +16,16 @@
-
-
-
@@ -41,7 +34,6 @@

Aplicação de exemplo do Demoiselle 2.5.0

- @@ -50,5 +42,4 @@ - \ No newline at end of file diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-list.html b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-list.html index a2ab4ea..c55455c 100644 --- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-list.html +++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-list.html @@ -1,18 +1,14 @@ - - - - - -Bookmark List - - - - + + + + Bookmark List + + + -
@@ -31,7 +27,6 @@

Aplicação de exemplo do Demoiselle 2.5.0

- 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 93bdea8..89b1fe6 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 @@ -1,22 +1,20 @@ - - - - -Bookmark - - - + + + + Bookmark + +

- Bem-vindo à aplicação de exemplo Bookmark usando arquétipo html-rest.
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.
+ Este é o seu ponto de partida, portanto sinta-se à vontade para modificar esta aplicação.

diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/index.html b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/index.html index 68fd478..ae29ef0 100644 --- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/index.html +++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/index.html @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-edit.js b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-edit.js index 3836097..0a71a13 100644 --- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-edit.js +++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-edit.js @@ -1,15 +1,11 @@ $(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(); diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-list.js b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-list.js index f78356b..9b88341 100644 --- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-list.js +++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-list.js @@ -1,15 +1,11 @@ $(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(); diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/home.js b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/home.js index e6c25d7..810ac25 100644 --- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/home.js +++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/home.js @@ -1,15 +1,11 @@ $(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"; }); - }); }); diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/login.js b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/login.js index adfa578..1802956 100644 --- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/login.js +++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/login.js @@ -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"; diff --git a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/login.html b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/login.html index 3bbf39f..27e3170 100644 --- a/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/login.html +++ b/archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/login.html @@ -4,7 +4,7 @@ - Notifica | Login + Bookmark 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 40b3dca..b681804 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 @@ -1,6 +1,5 @@ \ No newline at end of file -- libgit2 0.21.2