Skip to content

Commit

Permalink
Merge pull request #2 from Kevin-Chung/master
Browse files Browse the repository at this point in the history 
Implemented Kirk's changes and added a link to James Fielder's Campus Sy...
  • Loading branch information
@UTA-Mobi
UTA-Mobi committed Feb 3, 2014
2 parents 822b84e + d1446ee commit 5a99c2a
Show file tree
Hide file tree
Showing 5 changed files with 260 additions and 252 deletions.
240 changes: 119 additions & 121 deletions AboutUs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,48 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />

<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">

<!-- Optional theme -->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
<script src="js/Scripts.js"></script>




<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>

<link href="styles/styles.css" media="screen" rel="stylesheet" type="text/css" />
<script src="js/script.js" type="text/javascript"></script>
<title>Sample Page</title>
</head>
<body>
<!-- Top nav bar -->



<div class="navbar navbar-fixed-top">
<div class="navbar-header">
<button type="button" class="navbar-toggle btn-custom" data-toggle="collapse" data-target=".navbar-collapse" id = "button" style="text-color:white;">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<center><a class="navbar-brand" href="index.html">Mobi</a>
</center>
</div>
<div class="navbar-collapse collapse">
<center>
<ul class="nav navbar-nav">
<li><a href="OurProjects.html" id="tiki">OUR PROJECTS </a></li>
<li><a href="GetInvolved.html" id="tiki">GET INVOLVED</a></li>
<li><a href="Resources.html" id="tiki">RESOURCES</a></li>
<li><a class="active" href="#" id="tiki"> ABOUT US</a></li>


</ul></center>
</div><!--/.navbar-collapse -->
</div>



<!-- Top nav bar -->



<div class="navbar navbar-fixed-top">
<div class="navbar-header">
<button type="button" class="navbar-toggle btn-custom" data-toggle="collapse" data-target=".navbar-collapse" id = "button" style="text-color:white;">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<center><a class="navbar-brand" href="index.html">Mobi</a>
</center>
</div>
<div class="navbar-collapse collapse">
<center>
<ul class="nav navbar-nav">
<li><a href="OurProjects.html" id="tiki">OUR PROJECTS </a></li>
<li><a href="GetInvolved.html" id="tiki">GET INVOLVED</a></li>
<li><a href="Resources.html" id="tiki">RESOURCES</a></li>
<li><a class="active" href="#" id="tiki"> ABOUT US</a></li>


</ul></center>
</div><!--/.navbar-collapse -->
</div>



<!-- end top nav bar -->

<!-- Side nav bar (stacked) -->
Expand All @@ -66,119 +63,120 @@

<!-- body -->
<h1 id="MissionStatement">Who we are</h1>
<p>Mobi(formerly known as SAAMD) is a student organization that aims
to engage its members in an active learning environment for mobile development while promoting scholastic excellence.</p>

<p>Students will be able to apply their knowledge in Java, OOP, Algorithms, Database,
OS, Mobile Systems, and Networks to their own projects that involve mobile development
using the iPhone and Android OS as an integral part in their projects.</p>

<p>Entrepreneurial thinking is encouraged as Mobi explores the tools that start-ups
are using to make the rapid development process possible in such a fast moving world.
These objectives aim to harbor creativity and leadership skills in our members.
They also promote a sense of commitment and teamwork when students carry these projects
through full business models taking them from the white-board to the real market.</p>
<!--
<h1 id="CEO">CEO Initiatives</h1>
<p>Releasing UTA Radio 2.0 and campus synergy, making a new image for mobile on UTA campus, exploring CloudIDE technology, and researching agile . </p>
<h1 id="2013Officers">2013-14 Officers</h1>
<p style="text-align: left;"><strong>CEO: </strong><button type="button" class="btn btn-sm btn-primary">James Staud</button></p>
<p style="text-align: left;"><strong>COO: </strong><button type="button" class="btn btn-sm btn-primary">Kevin Chung</button></p>
<p style="text-align: left;"><strong>Faculty Advisor: </strong> <button type="button" class="btn btn-sm btn-primary">Gergely Zaruba</button> </p>
<p style="text-align: left;"><strong>Staff Members: </strong> <button type="button" class="btn btn-sm btn-primary">Pamela Mcbride</button> <button type="button" class="btn btn-sm btn-primary">Bito Irie</button> <button type="button" class="btn btn-sm btn-primary">Todd Mcdaniel</button></p>
<p>Mobi(formerly known as SAAMD) is a student organization that aims
to engage its members in an active learning environment for mobile development while promoting scholastic excellence.</p>

<p>Students will be able to apply their knowledge in Java, OOP, Algorithms, Database,
OS, Mobile Systems, and Networks to their own projects that involve mobile development
using the iPhone and Android OS as an integral part in their projects.</p>

<p>Entrepreneurial thinking is encouraged as Mobi explores the tools that start-ups
are using to make the rapid development process possible in such a fast moving world.
These objectives aim to harbor creativity and leadership skills in our members.
They also promote a sense of commitment and teamwork when students carry these projects
through full business models taking them from the white-board to the real market.</p>

<!--
<h1 id="CEO">CEO Initiatives</h1>
<p>Releasing UTA Radio 2.0 and campus synergy, making a new image for mobile on UTA campus, exploring CloudIDE technology, and researching agile . </p>
<h1 id="2013Officers">2013-14 Officers</h1>
<p style="text-align: left;"><strong>CEO: </strong><button type="button" class="btn btn-sm btn-primary">James Staud</button></p>
<p style="text-align: left;"><strong>COO: </strong><button type="button" class="btn btn-sm btn-primary">Kevin Chung</button></p>
<p style="text-align: left;"><strong>Faculty Advisor: </strong> <button type="button" class="btn btn-sm btn-primary">Gergely Zaruba</button> </p>
<p style="text-align: left;"><strong>Staff Members: </strong> <button type="button" class="btn btn-sm btn-primary">Pamela Mcbride</button> <button type="button" class="btn btn-sm btn-primary">Bito Irie</button> <button type="button" class="btn btn-sm btn-primary">Todd Mcdaniel</button></p>
<p style="text-align: left;"><strong>Board of Directors: </strong> <button type="button" class="btn btn-sm btn-primary">Thaddeus Madison</button> <button type="button" class="btn btn-sm btn-primary">Essa Haddad</button></p>
-->
<div class="panel-group" id="accordion">
<div class="panel-group" id="accordion">


<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
<p style="text-align: left;"><strong>CEO: </strong><button onclick="James_Staud()" type="button" class="btn btn-sm btn-primary">James Staud</button></p>
</a>
</h4>
</div>
<div id="collapseOne" class="panel-collapse collapse">
<div class="panel-body">
</a>
</h4>
</div>
<div id="collapseOne" class="panel-collapse collapse">
<div class="panel-body">
<div id = "James_Staud" ></div>
</div>
</div>
</div>
</div>
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
<p style="text-align: left;"><strong>COO: </strong><button onclick="Kevin_Chung()" type="button" class="btn btn-sm btn-primary">Kevin Chung</button></p>
</a>
</h4>
</div>
<div id="collapseTwo" class="panel-collapse collapse">
<div class="panel-body">
</a>
</h4>
</div>
<div id="collapseTwo" class="panel-collapse collapse">
<div class="panel-body">
<div id = "Kevin_Chung"></div>
</div>
</div>
</div>
</div>
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
<p style="text-align: left;"><strong>Faculty Advisor: </strong>
<button onclick="Gergely_Zaruba()" type="button" class="btn btn-sm btn-primary">Gergely Zaruba</button></p>
</a>
</h4>
</div>
<div id="collapseThree" class="panel-collapse collapse">
<div class="panel-body">
</a>
</h4>
</div>
<div id="collapseThree" class="panel-collapse collapse">
<div class="panel-body">
<div id = "Gergely_Zaruba"></div>

</div>
</div>
</div>
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
<p style="text-align: left;"><strong>Staff Members: </strong>
<button onclick="Pamela_McBride()" type="button" class="btn btn-sm btn-primary">Pamela McBride</button>
<button onclick="Bito_Irie()" type="button" class="btn btn-sm btn-primary">Bito Irie</button>
<button onclick="Todd_McDaniel()" type="button" class="btn btn-sm btn-primary">Todd McDaniel</button>
</p>
</a>
</h4>
</div>
<div id="collapseFour" class="panel-collapse collapse">
<div class="panel-body">
<div id = "Staff_Members"></div>
</div>
</div>
</a>
</h4>
</div>
<div id="collapseFour" class="panel-collapse collapse">
<div class="panel-body">
<div id = "Staff_Members"></div>
</div>
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#" href="#collapseFive">

<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#" href="#collapseFive">
<p style="text-align: left;"><strong>Board of Directors: </strong>
<button onclick="Thaddeus_Madison()" type="button" class="btn btn-sm btn-primary">Thadeus Madison</button>
<button onclick="Essa_Haddad()" type="button" class="btn btn-sm btn-primary">Essa Haddad</button>
</p>
</a>
</h4>
</div>
<div id="collapseFive" class="panel-collapse collapse">
<div class="panel-body">
<div id = "Board_Of_Directors"></div>
</div>
</div>
</div>
</div>



</a>
</h4>
</div>
<div id="collapseFive" class="panel-collapse collapse">
<div class="panel-body">
<div id = "Board_Of_Directors"></div>
</div>
</div>
</div>
</div>






Expand Down
64 changes: 32 additions & 32 deletions GetInvolved.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,46 @@
<head>
<meta content="text/html; charset=UTF-8" http-equiv="content-type" />
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">

<!-- Optional theme -->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">

<!-- Latest compiled and minified JavaScript -->
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<title>Sample Page</title>
<link href="styles/styles.css" media="screen" rel="stylesheet" type="text/css" />
<script src="js/script.js" type="text/javascript"></script> </head>
<body>
<!-- Top nav bar -->



<div class="navbar navbar-fixed-top">
<div class="navbar-header">
<button type="button" class="navbar-toggle btn-custom" data-toggle="collapse" data-target=".navbar-collapse" id = "button" style="text-color:white;">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<center><a class="navbar-brand" href="index.html">Mobi</a>
</center>
</div>
<div class="navbar-collapse collapse">
<center>
<ul class="nav navbar-nav">
<li><a href="OurProjects.html" id="tiki">OUR PROJECTS </a></li>
<li><a class = "active " href="#" id="tiki">GET INVOLVED</a></li>
<li><a href="Resources.html" id="tiki">RESOURCES</a></li>
<li><a href="AboutUs.html" id="tiki"> ABOUT US</a></li>


</ul></center>
</div><!--/.navbar-collapse -->
</div>



<!-- Top nav bar -->



<div class="navbar navbar-fixed-top">
<div class="navbar-header">
<button type="button" class="navbar-toggle btn-custom" data-toggle="collapse" data-target=".navbar-collapse" id = "button" style="text-color:white;">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<center><a class="navbar-brand" href="index.html">Mobi</a>
</center>
</div>
<div class="navbar-collapse collapse">
<center>
<ul class="nav navbar-nav">
<li><a href="OurProjects.html" id="tiki">OUR PROJECTS </a></li>
<li><a class = "active " href="#" id="tiki">GET INVOLVED</a></li>
<li><a href="Resources.html" id="tiki">RESOURCES</a></li>
<li><a href="AboutUs.html" id="tiki"> ABOUT US</a></li>


</ul></center>
</div><!--/.navbar-collapse -->
</div>



<!-- end top nav bar -->

<!-- Side nav bar (stacked) -->
Expand Down
Loading

0 comments on commit 5a99c2a

Please sign in to comment.