added docker dev environment and fixed some bugs
This commit is contained in:
parent
1a907de8ba
commit
99c67eaaba
16 changed files with 1897 additions and 34 deletions
|
|
@ -3,7 +3,7 @@
|
|||
<Context reloadable="true">
|
||||
|
||||
<Environment type="java.lang.String" name="WEBSITE_NAME" value="Gallery" />
|
||||
<Environment type="java.lang.String" name="WEBSITE_URL" value="http://example.com/Zallery/" />
|
||||
<Environment type="java.lang.String" name="WEBSITE_URL" value="http://localhost:8080/zallery" />
|
||||
<Environment type="java.lang.String" name="ADMIN_EMAIL" value="admin@example.com" />
|
||||
<Environment type="java.lang.String" name="ADMIN_EMAIL_NICE" value="Example.com Admin" />
|
||||
<Environment type="java.lang.String" name="SMTP_HOST" value="127.0.0.1" />
|
||||
|
|
@ -13,10 +13,10 @@
|
|||
name="jdbc/mysql"
|
||||
auth="Container"
|
||||
type="javax.sql.DataSource"
|
||||
username="username"
|
||||
username="zallery"
|
||||
password="password"
|
||||
driverClassName="com.mysql.jdbc.Driver"
|
||||
url="jdbc:mysql://host:3306/database"
|
||||
url="jdbc:mysql://db:3306/zallery"
|
||||
maxActive="8"
|
||||
maxIdle="4"
|
||||
validationQuery="SELECT 1"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ body{
|
|||
margin-bottom: 200px;
|
||||
}
|
||||
|
||||
/***** Nav *******/
|
||||
|
||||
.navbar {
|
||||
margin-top: 20px;
|
||||
margin-bottom: 0px;
|
||||
|
|
@ -10,6 +12,17 @@ body{
|
|||
color: #5a5ada !important;
|
||||
}
|
||||
|
||||
.navbar .divider-vertical {
|
||||
height: 40px;
|
||||
margin: 5px 14px;
|
||||
border-right: 2px solid #ffffff;
|
||||
border-left: 2px solid #f2f2f2;
|
||||
}
|
||||
.navbar-inverse .divider-vertical {
|
||||
border-right-color: #222222;
|
||||
border-left-color: #111111;
|
||||
}
|
||||
|
||||
.subnav {
|
||||
width: 80%;
|
||||
height: 10px;
|
||||
|
|
@ -17,6 +30,8 @@ body{
|
|||
padding: 0 20px;
|
||||
}
|
||||
|
||||
/***** Content *******/
|
||||
|
||||
.content {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
|
@ -34,16 +49,6 @@ body{
|
|||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.navbar .divider-vertical {
|
||||
height: 40px;
|
||||
margin: 5px 14px;
|
||||
border-right: 2px solid #ffffff;
|
||||
border-left: 2px solid #f2f2f2;
|
||||
}
|
||||
.navbar-inverse .divider-vertical {
|
||||
border-right-color: #222222;
|
||||
border-left-color: #111111;
|
||||
}
|
||||
@media (max-width: 767px) {
|
||||
.navbar-collapse .nav > .divider-vertical {
|
||||
display: none;
|
||||
|
|
|
|||
|
|
@ -9,10 +9,13 @@
|
|||
<title>Koc.se</title>
|
||||
|
||||
<!-- Bootstrap core CSS -->
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="css/bootstrap-theme.min.css">
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
|
||||
<link href="css/zallery.css" rel="stylesheet">
|
||||
<link rel="stylesheet" href="css/form-elements.css">
|
||||
<link rel="stylesheet" href="css/register3.css">
|
||||
<link rel="stylesheet" href="css/zallery.css">
|
||||
|
||||
|
||||
<!-- Bootstrap core JavaScript -->
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<jsp:include page="header.jsp" />
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-offset-3 col-md-6">
|
||||
<div class="form-box">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<jsp:include page="header.jsp" />
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-offset-3 col-md-6">
|
||||
<div class="form-box">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue