Skip to content

Commit

Permalink
Menambahkan dropdown Menu Acount Admin di library Header
Browse files Browse the repository at this point in the history
  • Loading branch information
@dedediana
dedediana committed Sep 30, 2017
1 parent 79d82b6 commit 5d6389a
Show file tree
Hide file tree
Showing 11 changed files with 193 additions and 131 deletions.
2 changes: 1 addition & 1 deletion nbproject/project.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ j2ee.compile.on.save=true
j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=true
j2ee.platform=1.7-web
j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
j2ee.platform.classpath=
j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
Expand Down
3 changes: 0 additions & 3 deletions web/Assets2/css/responsive.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ MEDIA QUERIES

.kotak-acount{
float: right;
padding: 1px;
margin: 1px;
overflow: hidden;
}

.acount-nama{
Expand Down
135 changes: 102 additions & 33 deletions web/Assets2/css/styletraveller.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ h3{
margin: 2px;
font: 18px Arial;
font-weight: bold;
color: #616161;
margin-bottom: 20px;
border-bottom: 3px solid #2979FF;
}
Expand All @@ -50,8 +51,8 @@ h4{
float: left;
padding: 6px;
margin: 6px;
font: 18px Arial;
color: #454545;
font: 16px Arial;
color: #616161;
font-weight: bold;
background: none;
border: none;
Expand All @@ -74,36 +75,39 @@ h4{
}

.icon-search img{
width: 45px;
height: 30px;
width: 35px;
height: 35px;
}


.search{
float: left;
padding: 7px;
margin: 7px;
padding: 5px;
margin: 5px;
font: 16px Arial;
font-weight: bold;
color: #454545;
background: none;
border: none;
border-radius: 50px;
}


.icon-setting{
float: left;
padding: 4px;
margin: 4px;
float: left;
overflow: hidden;
border: none;
background: #E0E0E0;
border-radius: 100px;
box-shadow: 0 1px 2px #BDBDBD;
}

.icon-setting img{
width: 30px;
height: 30px;
float: left;
padding: 2px;
margin: 2px;
width: 26px;
height: 26px;
}

.action, .action2{
Expand Down Expand Up @@ -131,14 +135,14 @@ h5{
float: left;
padding: 7px;
margin: 7px;
font: 20px Arial;
font: 18px sans-serif;
color: #616161;
font-weight: bold;
color: #454545;
}

a{
text-decoration: none;
color: #454545;
color: #EEEEEE;
}
a:hover{
color: #666;
Expand All @@ -147,7 +151,7 @@ a:hover{

.jarak-atas{
max-width: 100%;
height: 60px;
height: 62px;
background: none;
overflow: hidden;
}
Expand All @@ -158,33 +162,32 @@ a:hover{
height: auto;
background: #1565C0;
position: fixed;
overflow: hidden;
border-top: 3px solid #1976D2;
box-shadow: 0 2px 2px #727272;
top: 0;
left: 0;
z-index: 9999;
}

.logo{
float: left;
padding: 2px;
margin: 2px;
margin-left: 10px;
overflow: hidden;
}

.kotak-acount{
float: right;
padding: 1px;
margin: 1px;
overflow: hidden;
margin-right: 6%;
background: #1976D2;
}

.acount-nama{
float:left;
padding:7px;
margin:7px;
font: 16px Arial;
padding:8px;
margin:8px;
font: 17px sans-serif;
font-weight: bold;
color:#fafafa;
}

Expand All @@ -202,6 +205,63 @@ a:hover{

}





.dropbtn {
margin-right: 6%;
background-color: #4CAF50;
color: white;
padding: 2px;
margin: 2px;
font-size: 16px;
border: none;
cursor: pointer;
}

.dropbtn:hover, .dropbtn:focus {
background-color: #3e8e41;
}

.dropdown {
float: right;
position: relative;
display: inline-block;

}

.dropdown-content {
display: none;
position: absolute;
background-color: #f9f9f9;
min-width: 160px;
overflow: auto;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
right: 0;
z-index: 1;
}

.dropdown-content a {
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
}

.dropdown a:hover {background-color: #f1f1f1}

.show {display:block;}










.dropdown-location{
margin-top: 5px;
margin-bottom: 5px;
Expand Down Expand Up @@ -258,31 +318,40 @@ a:hover{
}


.menu-admin{
background: #BDBDBD;
overflow: hidden;
border: none;
border-radius: 0.5em 0.5em 0 0;
border-bottom: 3px solid #1565C0;
}

.menu-manage{
background: #f4f4f4;
overflow: hidden;
border: 1px solid #ddd;
border: 1.2px solid #ddd;
}


.menu-manage:hover{
background: #42A5F5;
transition: 0.3s;
transition: 0.4s;
color: #fafafa;
}

h2{
float: left;
padding: 7px;
margin: 7px;
font: 18px Arial;
color: #454545;
}

h2:hover{
color: #fafafa;
font: 17px Arial;
color: #3d4f5d;
}

.text-admin{
font: 18px sans-serif;
font-weight: bold;
color: #fafafa;
}

#myBtn{

Expand Down Expand Up @@ -559,7 +628,7 @@ a:hover{
.kotak-traveller{
padding: 3px;
margin: 3px;
background: #fafafa;
background: #f6f6f6;
overflow: hidden;
border: none;
border-radius: 0.2em;
Expand Down Expand Up @@ -588,7 +657,7 @@ a:hover{
*/
table {
width: 100%;
border-collapse: collapse;
border-collapse: collapse;
}
/* Zebra striping */
tr:nth-of-type(odd) {
Expand Down
Binary file added web/Assets2/icon/welcome.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/Assets2/images/background1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions web/DistanceMatrix/edit.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/Assets2/css/styledistance.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/Assets2/css/styletraveller.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/Assets2/css/responsive.css">
<title>JSP Page</title>
Expand Down Expand Up @@ -59,7 +58,7 @@
<div class="text-edit"> Edit Distance </div>
<input class="edtp" type="text" placeholder="(in kilometer)">
<br/>
<a href="index.jsp"><button class="update-distance"> Update </button></a>
<a href="index.jsp"><button class="update-traveller"> Update </button></a>
</div> <!--kotak-traveller-->

</div> <!--/ .middle -->
Expand Down
6 changes: 3 additions & 3 deletions web/DistanceMatrix/index.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@

<div class="middle">

<div class="kotak-distance">
<div class="kotak-traveller">
<h4> Distance Matrix </h4>
<div class="kotak-search">
<div class="icon-search">
<img src="${pageContext.request.contextPath}/Assets2/icon/search.png">
</div> <!--icon-search-->
<input class="search "type="text" placeholder="Search Here ... "/>
</div> <!--kotak-search-->
</div> <!--kotak-distance-->
</div> <!--kotak-traveller-->

<div class="kotak-distance">
<div class="kotak-traveller">
<table>
<thead>
<tr>
Expand Down
64 changes: 1 addition & 63 deletions web/EstimationTime/edit.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,69 +22,7 @@

<div class="main">

<div class="left">
<h3>Administrator</h3>

<div class="hides">

<button onclick="javascript:show()">
<div class="turun">
<img src="${pageContext.request.contextPath}/Assets2/icon/responsive.png">
</div>
</button>

</div>


<div id="hidden-mobile">


<div class="menu-manage">
<div class="icon-setting">
<img src="${pageContext.request.contextPath}/Assets2/icon/setting.png">
</div> <!--icon-setting-->
<h2><a href="../Traveller/index.jsp">Traveller</a></h2>

</div> <!--menu-manage-->

<div class="menu-manage">
<div class="icon-setting">
<img src="${pageContext.request.contextPath}/Assets2/icon/setting.png">
</div> <!--icon-setting-->
<h2><a href="../Location/index.jsp">Location </a></h2>
</div>

<div class="menu-manage">
<div class="icon-setting">
<img src="${pageContext.request.contextPath}/Assets2/icon/setting.png">
</div> <!--icon-setting-->
<h2><a href="../TransportationMode/index.jsp">Transportation Mode </a></h2>
</div> <!--menu-manage-->

<div class="menu-manage">
<div class="icon-setting">
<img src="${pageContext.request.contextPath}/Assets2/icon/setting.png">
</div> <!--icon-setting-->
<h2> <a href="../DistanceMatrix/index.jsp">Distance Matrix </a></h2>
</div>

<div class="menu-manage">
<div class="icon-setting">
<img src="${pageContext.request.contextPath}/Assets2/icon/setting.png">
</div> <!--icon-setting-->
<h2><a href="../EstimationTime/index.jsp">Estimation Time</a></h2>
</div> <!--menu-manage-->

<div class="menu-manage">
<div class="icon-setting">
<img src="${pageContext.request.contextPath}/Assets2/icon/setting.png">
</div> <!--icon-setting-->
<h2><a href="../CalendarEvent/index.jsp">Calendar Event</a></h2>
</div>

</div>

</div> <!--/ .header -->
<%@include file="../Sidebar/sidebar.jsp" %>

<div class="middle">
<div class="judul-manage"> MANAGE ESTIMATION TIME </div>
Expand Down
Loading

0 comments on commit 5d6389a

Please sign in to comment.