Download as
Browse Code »

Commit 072e5aa2c55f77ab4564e00385f214945bde71f2

Authored by Cleverson Sacramento
2 parents b798bcc8 26ff59ea
Exists in master

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

Showing 5 changed files with 43 additions and 105 deletions   Show diff stats
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-edit.html
  Diff comments   View file @072e5aa
... ... @@ -13,7 +13,6 @@
13 13 </head>
14 14  
15 15 <body>
16   -
17 16 <div class="container">
18 17 <div id="menu"></div>
19 18 <form class="well" role="form">
... ... @@ -40,9 +39,7 @@
40 39 <button id="back" class="btn btn-warning">Voltar</button>
41 40 </div>
42 41 </form>
43   -
44 42 </div>
45   - <!-- /container -->
46 43 <p class="demoiselle">Aplicação de exemplo do Demoiselle 2.5.0</p>
47 44  
48 45 <script src="js/lib/jquery-2.1.0.min.js" type="text/javascript"></script>
... ... @@ -53,5 +50,5 @@
53 50 <script src="js/proxy/bookmark.js" type="text/javascript"></script>
54 51 <script src="js/controller/bookmark-edit.js" type="text/javascript"></script>
55 52 <script src="js/controller/menu.js" type="text/javascript"></script>
56   -
  53 +
57 54 </body>
58 55 \ No newline at end of file
... ...
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-list.html
  Diff comments   View file @072e5aa
... ... @@ -8,86 +8,28 @@
8 8  
9 9 <title>Bookmark List</title>
10 10  
11   -<link rel="stylesheet" href="css/bookmark.css">
12 11 <link rel="stylesheet" href="css/bootstrap.min.css">
  12 +<link rel="stylesheet" href="css/bookmark.css">
13 13 <link rel="stylesheet" href="css/datatables.css">
14 14 </head>
15 15  
16 16 <body>
17   - <form>
18   - <div id="wrap">
19   - <div class="container">
20   - <div id="menu">
21   - <nav class="navbar navbar-default" role="navigation">
22   - <div class="container-fluid">
23   - <!-- Brand and toggle get grouped for better mobile display -->
24   - <div class="navbar-header">
25   - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
26   - <span class="sr-only">Toggle navigation</span>
27   - <span class="icon-bar"></span>
28   - <span class="icon-bar"></span>
29   - <span class="icon-bar"></span>
30   - </button>
31   - <a class="navbar-brand" href="#">Brand</a>
32   - </div>
33   -
34   - <!-- Collect the nav links, forms, and other content for toggling -->
35   - <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
36   - <ul class="nav navbar-nav">
37   - <li class="active"><a href="#">Link</a></li>
38   - <li><a href="#">Link</a></li>
39   - <li class="dropdown">
40   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
41   - <ul class="dropdown-menu">
42   - <li><a href="#">Action</a></li>
43   - <li><a href="#">Another action</a></li>
44   - <li><a href="#">Something else here</a></li>
45   - <li class="divider"></li>
46   - <li><a href="#">Separated link</a></li>
47   - <li class="divider"></li>
48   - <li><a href="#">One more separated link</a></li>
49   - </ul>
50   - </li>
51   - </ul>
52   - <form class="navbar-form navbar-left" role="search">
53   - <div class="form-group">
54   - <input type="text" class="form-control" placeholder="Search">
55   - </div>
56   - <button type="submit" class="btn btn-default">Submit</button>
57   - </form>
58   - <ul class="nav navbar-nav navbar-right">
59   - <li><a href="#">Link</a></li>
60   - <li class="dropdown">
61   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
62   - <ul class="dropdown-menu">
63   - <li><a href="#">Action</a></li>
64   - <li><a href="#">Another action</a></li>
65   - <li><a href="#">Something else here</a></li>
66   - <li class="divider"></li>
67   - <li><a href="#">Separated link</a></li>
68   - </ul>
69   - </li>
70   - </ul>
71   - </div><!-- /.navbar-collapse -->
72   - </div><!-- /.container-fluid -->
73   -</nav>
74   - </div>
75   - <p>
76   - <button id="new" class="btn btn-success">Novo</button>
77   - <button id="delete" class="btn btn-danger">Excluir</button>
78   - </p>
79   - <table id="resultList" cellpadding="0" cellspacing="0" border="0" class="datatable table table-striped table-bordered">
80   - <thead>
81   - <tr>
82   - <th width="3px"></th>
83   - <th>Description</th>
84   - <th>Link</th>
85   - </tr>
86   - </thead>
87   - </table>
88   - </div>
89   - </div>
90   - </form>
  17 + <div class="container">
  18 + <div id="menu"></div>
  19 + <p>
  20 + <button id="new" class="btn btn-success">Novo</button>
  21 + <button id="delete" class="btn btn-danger">Excluir</button>
  22 + </p>
  23 + <table id="resultList" cellpadding="0" cellspacing="0" border="0" class="datatable table table-striped table-bordered">
  24 + <thead>
  25 + <tr>
  26 + <th width="3px"></th>
  27 + <th>Description</th>
  28 + <th>Link</th>
  29 + </tr>
  30 + </thead>
  31 + </table>
  32 + </div>
91 33 <p class="demoiselle">Aplicação de exemplo do Demoiselle 2.5.0</p>
92 34  
93 35 <script src="js/lib/jquery-2.1.0.min.js" type="text/javascript"></script>
... ... @@ -100,4 +42,4 @@
100 42 <script src="js/controller/bookmark-list.js" type="text/javascript"></script>
101 43 <script src="js/controller/menu.js" type="text/javascript"></script>
102 44 </body>
103 45 -</html>
  46 +</html>
104 47 \ No newline at end of file
... ...
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/css/bookmark.css
  Diff comments   View file @072e5aa
1 1 body {
2   - padding-top: 20px;
3   - padding-bottom: 20px;
4   - margin-top: 20px;
  2 + padding-top: 30px;
5 3 }
6 4  
7   -input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button {
  5 +input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button
  6 + {
8 7 -webkit-appearance: none;
9 8 margin: 0;
10 9 }
11 10  
12 11 #username {
13   - color: #777;
14   - display: block;
  12 + color: #777;
  13 + display: block;
15 14 line-height: 20px;
16   - padding: 15px 15px;
  15 + padding: 15px 15px;
17 16 position: relative;
18 17 }
19 18  
20 19 .demoiselle {
21   - position: fixed;
22 20 text-align: center;
23   - margin-bottom: 100px;
24   - bottom: 0;
25   - left: 0;
26   - right: 0;
  21 +}
  22 +
  23 +.navbar-brand {
  24 + font-size: 22pt;
27 25 }
28 26 \ No newline at end of file
... ...
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/home.html
  Diff comments   View file @072e5aa
1 1 <!DOCTYPE html>
2 2 <html>
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   - <title>Bookmark</title>
8   - <link href="css/bootstrap.min.css" rel="stylesheet">
9   - <link href="css/bookmark.css" rel="stylesheet">
  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">
10 12 </head>
11 13 <body>
12 14 <div class="container">
13 15 <div id="menu"></div>
14 16 <div class="jumbotron">
15   - <h3>
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.
18   - </h3>
  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.
  20 + </h3>
19 21 </div>
20 22 </div>
21 23 <p class="demoiselle">Aplicação de exemplo do Demoiselle 2.5.0</p>
... ...
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/menu.html
  Diff comments   View file @072e5aa
1   -<h1 id="title">Bookmark</h1>
2 1 <nav class="navbar navbar-default" role="navigation">
3 2 <div class="container-fluid">
4 3 <!-- Brand and toggle get grouped for better mobile display -->
... ... @@ -9,12 +8,12 @@
9 8 <span class="icon-bar"></span>
10 9 <span class="icon-bar"></span>
11 10 </button>
  11 + <a class="navbar-brand" href="home.html">Bookmark</a>
12 12 </div>
13 13  
14 14 <!-- Collect the nav links, forms, and other content for toggling -->
15 15 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
16 16 <ul class="nav navbar-nav">
17   - <li><a href="home.html">Home</a></li>
18 17 <li class="dropdown">
19 18 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-th-list"></span> Bookmark<b class="caret"></b></a>
20 19 <ul class="dropdown-menu">
... ...