Skip to content

Commit

Permalink
Navbar is now generated from navbar.js
Browse files Browse the repository at this point in the history
  • Loading branch information
@clj13001
clj13001 committed Dec 2, 2016
1 parent 8c29722 commit c250299
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 126 deletions.
1 change: 1 addition & 0 deletions html/javascript/navbar.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 4 additions & 21 deletions html/webpages/homePage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,8 @@

<body>

<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><img src="../imgs/synchrony-financial-logo-dlpx.png" style = "height: 100%;"></a>
</div>
<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
<ul class="nav navbar-nav navbar-right">
<li><a href="homePage.html">Home</a></li>
<li><a href="requestPage.html">Request Device</a></li>
<li><a href="returnPage.html">Return Device</a></li>
<li><a href="listingPage.html">Device Listing</a></li>
<li><a href="shoppingCart.html">Shopping Cart</a></li>
</ul>
</div>
</div>
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbar">

</nav>

<div class = "menuBox">
Expand Down Expand Up @@ -94,5 +75,7 @@ <h2>Map</h2>
</div>
</div>

<script src = "../javascript/navbar.js"></script>

</body>
</html>
23 changes: 2 additions & 21 deletions html/webpages/listingPage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,27 +58,7 @@
</head>

<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><img src="../imgs/synchrony-financial-logo-dlpx.png" style = "height: 100%"></a>
</div>
<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
<ul class="nav navbar-nav navbar-right">
<li><a href="homePage.html">Home</a></li>
<li><a href="requestPage.html">Request Device</a></li>
<li><a href="#">Return Device</a></li>
<li><a href="listingPage.html">Device Listing</a></li>
<li><a href="shoppingCart.html">Shopping Cart</a></li>
</ul>
</div>
</div>
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbar">
</nav>
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
Expand All @@ -101,5 +81,6 @@ <h2>Available Devices</h2>
</div>

<script src="../javascript/listing.js"></script>
<script src = "../javascript/navbar.js"></script>
</body>
</html>
23 changes: 2 additions & 21 deletions html/webpages/map.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,7 @@

<body>

<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><img src="../imgs/synchrony-financial-logo-dlpx.png" style = "height: 100%;"></a>
</div>
<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
<ul class="nav navbar-nav navbar-right">
<li><a href="homePage.html">Home</a></li>
<li><a href="requestPage.html">Request Device</a></li>
<li><a href="#">Return Device</a></li>
<li><a href="listingPage.html">Device Listing</a></li>
<li><a href="shoppingCart.html">Shopping Cart</a></li>
</ul>
</div>
</div>
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbar">
</nav>

<h2>Our Wonderful Synchrony Financial Map!</h2>
Expand Down Expand Up @@ -224,6 +204,7 @@ <h2>Our Wonderful Synchrony Financial Map!</h2>
<script async defer
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCndOcexx4GAOGkRKBeK1E43u_sB9gjcaU&callback=initMap">
</script>
<script src = "../javascript/navbar.js"></script>

</body>
</html>
23 changes: 2 additions & 21 deletions html/webpages/requestPage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,27 +63,7 @@
</head>

<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><img src="../imgs/synchrony-financial-logo-dlpx.png" style = "height: 100%"></a>
</div>
<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
<ul class="nav navbar-nav navbar-right">
<li><a href="homePage.html">Home</a></li>
<li><a href="requestPage.html">Request Device</a></li>
<li><a href="#">Return Device</a></li>
<li><a href="listingPage.html">Device Listing</a></li>
<li><a href="shoppingCart.html">Shopping Cart</a></li>
</ul>
</div>
</div>
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbar">
</nav>
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
Expand All @@ -106,5 +86,6 @@ <h2>Available Devices</h2>
</div>

<script src="../javascript/request.js"></script>
<script src = "../javascript/navbar.js"></script>
</body>
</html>
23 changes: 2 additions & 21 deletions html/webpages/returnPage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,7 @@
padding: 0px;
}
</style>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><img src="../imgs/synchrony-financial-logo-dlpx.png" style = "height: 100%;"></a>
</div>
<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
<ul class="nav navbar-nav navbar-right">
<li><a href="homePage.html">Home</a></li>
<li><a href="requestPage.html">Request Device</a></li>
<li><a href="returnPage.html">Return Device</a></li>
<li><a href="listingPage.html">Device Listing</a></li>
<li><a href="shoppingCart.html">Shopping Cart</a></li>
</ul>
</div>
</div>
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbar">
</nav>
</head>
<body>
Expand Down Expand Up @@ -113,5 +93,6 @@ <h2>Devices to Be Returned</h2>
<br>
</div>
<script src="../javascript/return.js" href></script>
<script src = "../javascript/navbar.js"></script>
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> -->
</body>
23 changes: 2 additions & 21 deletions html/webpages/shoppingCart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,7 @@
</head>

<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><img src="../imgs/synchrony-financial-logo-dlpx.png" style = "height: 100%;"></a>
</div>
<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
<ul class="nav navbar-nav navbar-right">
<li><a href="homePage.html">Home</a></li>
<li><a href="requestPage.html">Request Device</a></li>
<li><a href="#">Return Device</a></li>
<li><a href="listingPage.html">Device Listing</a></li>
<li><a href="shoppingCart.html">Shopping Cart</a></li>
</ul>
</div>
</div>
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbar">
</nav>

<div class="col-sm-3 col-md-2 sidebar">
Expand All @@ -90,5 +70,6 @@ <h2>Welcome to your shopping cart!</h2>
</div>

<script src="../javascript/shoppingCart.js"></script>
<script src = "../javascript/navbar.js"></script>
</body>
</html>

0 comments on commit c250299

Please sign in to comment.