Skip to content
This repository has been archived by the owner on Dec 12, 2018. It is now read-only.

Boostrap intro #2

Merged
merged 2 commits into from
Oct 14, 2015
Merged

Boostrap intro #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58eca0f
Merge branch 'master' into boostrap-intro
mattxwang Oct 14, 2015
e593903
test files for bstrap navbar
mattxwang Oct 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions about_us.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
<h2>Meet the WAC Team</h2>
</div>
</br>
<div id="carousel-example-generic" class="carousel-mod carousel slide" data-ride="carousel">
<div align="middle">
<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
<li data-target="#carousel-example-generic" data-slide-to="1"></li>
Expand All @@ -84,10 +85,10 @@
<img src="/img/bio/mwang.png" alt="Matthew Wang">
</div>
<div class="carousel-mod item">
<img src="slide2.png" alt="Second slide">
<img src="/img/bio/mwang.png" alt="Second slide">
</div>
<div class="carousel-mod item">
<img src="slide3.png" alt="Third slide">
<img src="/img/bio/mwang.png" alt="Third slide">
</div>
</div>
<a class="carousel-mod left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
Expand All @@ -99,6 +100,7 @@
<span class="sr-only">Next</span>
</a>
</div>
</div>
</br>

</br>
Expand Down
23 changes: 23 additions & 0 deletions navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<!-- navbar -->
<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="index.php"><img src="img/logo_bg.png"></img></a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="index.php">Home</a></li>
<li><a href="about.html">Keynote</a></li>
<li><a href="workshops.html">Workshops</a></li>
<li><a href="resources.html">Resources</a></li>
<li><a href="contactus.html">Contact</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
101 changes: 101 additions & 0 deletions test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?php
//Start the PHP session
session_start();

//Calls to base hit counter with unique visitors IP tracking.
include_once("hit_counter.php");

//Connect to SQL Database and include custom sqlQuerry function.
include_once("../includes/sql.php");
?>
<!DOCTYPE html>
<html>
<!-- || Page Head || -->
<head>
<link href='http://fonts.googleapis.com/css?family=Raleway:400,300' rel='stylesheet' type='text/css'>
<title>Page Under Construction</title>
<link rel="icon" href="css/favicon.ico" />
<!-- Bootstrap core CSS -->
<link href="css/bootstrap/bootstrap.css" rel="stylesheet">
<link href="css/bootstrap/bootstrap-theme.css" rel="stylesheet">
<link rel="stylesheet" href="css/base.css" />
<link href="css/custom.css" rel="stylesheet">
<script src="http://code.jquery.com/jquery-latest.min.js"></script>
<script type="text/javascript">
window.onload=function() {
if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
$(".border_bottom").remove();
}
$(".fit_me_height").each(function() {
$(this).height($(this.parentNode).innerHeight());
})
}
</script>
</head>

<!-- || Main Page Content || -->
<body style="position:relative;">
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<!-- navbar -->
<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="index.php"><img src="img/logo_bg.png"></img></a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="index.php">Home</a></li>
<li><a href="about.html">Keynote</a></li>
<li><a href="workshops.html">Workshops</a></li>
<li><a href="resources.html">Resources</a></li>
<li><a href="contactus.html">Contact</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>


<?php include_once("tracking.php") ?>
<!-- | Menu Bar (Construction) | -->

<?php
$rando = rand(1,2);
$randa = rand(1,3);
if($rando == 1){
$teamNames = "Jack Sarick, and Matthew Wang";
if($randa == 1){
$lteamNames = "Nick Elder, Derek Lam, and Kinton Cheung";
}
elseif($randa == 2){
$lteamNames = "Derek Lam, Kinton Cheung, and Nick Elder";
}
elseif($randa == 3){
$lteamNames = "Kinton Cheung, Nick Elder, and Derek Lam";
}
}
elseif($rando == 2){
$teamNames = "Matthew Wang, and Jack Sarick";
if($randa == 1){
$lteamNames = "Nick Elder, Derek Lam, and Kinton Cheung";
}
elseif($randa == 2){
$lteamNames = "Derek Lam, Kinton Cheung, and Nick Elder";
}
elseif($randa == 3){
$lteamNames = "Kinton Cheung, Nick Elder, and Derek Lam";
}
}

?>

<span style="text-align:right; width:100%; color:#888; font-size:11px; vertical-align:middle; display:table-cell;">Handmade by the WAC Webmaster Team:<br /><?php echo $teamNames; ?><br />With help from last year's team:<br /><?php echo $lteamNames; ?></span>



</body>
</html>