Download as
Browse Code »

Commit 0e47cd46ec1c59993e38b81fba46f808414a6f94

Authored by Cleverson Sacramento
1 parent 0e4e9693
Exists in master

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

Task-Url: https://demoiselle.atlassian.net/browse/FWK-223
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
  Diff comments   View file @0e47cd4
... ... @@ -15,17 +15,14 @@
15 15 <div id="menu"></div>
16 16 <form class="well" role="form">
17 17 <div id="id-row" hidden="true" class="form-group">
18   - <label for="id">ID</label> <span id="id-text" class="form-control-static"></span>
19   - <input id="id" type="hidden">
  18 + <label for="id">ID</label> <span id="id-text" class="form-control-static"></span> <input id="id" type="hidden">
20 19 </div>
21 20 <div class="form-group">
22   - <label for="description">Description</label>
23   - <input id="description" type="text" class="form-control">
  21 + <label for="description">Description</label> <input id="description" type="text" class="form-control">
24 22 <div id="description-message" class="label label-danger"></div>
25 23 </div>
26 24 <div class="form-group">
27   - <label for="link">Link</label>
28   - <input id="link" type="text" class="form-control">
  25 + <label for="link">Link</label> <input id="link" type="text" class="form-control">
29 26 <div id="link-message" class="label label-danger"></div>
30 27 </div>
31 28 <div class="form-group">
... ... @@ -41,7 +38,6 @@
41 38  
42 39 <script type="text/javascript" src="js/lib/jquery-2.1.0.min.js"></script>
43 40 <script type="text/javascript" src="js/lib/bootstrap.min.js"></script>
44   - <script type="text/javascript" src="js/lib/purl.js"></script>
45 41 <script type="text/javascript" src="js/lib/bootbox.js"></script>
46 42 <script type="text/javascript" src="js/lib/app.js"></script>
47 43 <script type="text/javascript" src="js/proxy/metadata.js"></script>
... ... @@ -49,4 +45,4 @@
49 45 <script type="text/javascript" src="js/proxy/bookmark.js"></script>
50 46 <script type="text/javascript" src="js/controller/menu.js"></script>
51 47 <script type="text/javascript" src="js/controller/bookmark-edit.js"></script>
52 48 -</body>
  49 +</body>
53 50 \ No newline at end of file
... ...
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/home.html
  Diff comments   View file @0e47cd4
... ... @@ -15,8 +15,8 @@
15 15 <div id="menu"></div>
16 16 <div class="jumbotron">
17 17 <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.
  18 + Bem-vindo à aplicação de exemplo Bookmark usando arquétipo html-rest. <br /> Este é o seu ponto de partida,
  19 + portanto sinta-se à vontade para modificar esta aplicação.
20 20 </h3>
21 21 </div>
22 22 </div>
... ...
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/menu.js
  Diff comments   View file @0e47cd4
1 1 $(function() {
2 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  
... ...
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/proxy/auth.js
  Diff comments   View file @0e47cd4
... ... @@ -15,7 +15,10 @@ var AuthProxy = {
15 15 logout : function() {
16 16 return $.ajax({
17 17 url : this.url + "/logout",
18   - type : "POST"
  18 + type : "POST",
  19 + beforeSend : function(jqXHR) {
  20 + App.auth.setHeader(jqXHR)
  21 + }
19 22 });
20 23 }
21 24 };
... ...
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html
  Diff comments   View file @0e47cd4
... ... @@ -2,14 +2,15 @@
2 2 <div class="container-fluid">
3 3 <div class="navbar-header">
4 4 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
5   - <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
  5 + <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span
  6 + class="icon-bar"></span>
6 7 </button>
7 8 <a class="navbar-brand" href="home.html">Bookmark</a>
8 9 </div>
9 10 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
10 11 <ul class="nav navbar-nav">
11   - <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-th-list"></span>
12   - Bookmark<b class="caret"></b></a>
  12 + <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><span
  13 + class="glyphicon glyphicon-th-list"></span> Bookmark<b class="caret"></b></a>
13 14 <ul class="dropdown-menu">
14 15 <li><a href="bookmark-edit.html"><span class="glyphicon glyphicon glyphicon-edit"></span> Novo</a></li>
15 16 <li><a href="bookmark-list.html"><span class="glyphicon glyphicon-list-alt"></span> Listar</a></li>
... ... @@ -17,7 +18,8 @@
17 18 </ul>
18 19 <ul class="nav navbar-nav navbar-right">
19 20 <li id="username"></li>
20   - <li><a id="logout" href="#">Sair</a></li>
  21 + <li style="display: none;"><a id="logout" href="#">Sair</a></li>
  22 + <li style="display: none;"><a id="login" href="#">Entrar</a></li>
21 23 </ul>
22 24 </div>
23 25 </div>
... ...