Skip to content

Commit

Permalink
Coding Standards
Browse files Browse the repository at this point in the history 
Standardized tabs/spaces…for better or worse, now using only spaces
  • Loading branch information
@Fromalaska49
Fromalaska49 committed Aug 8, 2018
1 parent a039dad commit 5e7d844
Show file tree
Hide file tree
Showing 19 changed files with 2,802 additions and 2,802 deletions.
130 changes: 65 additions & 65 deletions common/footer.php
View file
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
<footer>
<div id="footer" class="container">
<div class="row">
<div class="col-sm-6" id="copyright-container">
Copyright &copy; <?php echo(date('Y')); ?> ACM UTSA
</div>
<div class="col-sm-6" id="social-media-container">
<div class="row" style="">
<div class="hidden-xs col-sm-12">
<a href="mailto:[email protected]" class="footer-social">
<div class="fa fa-envelope-square fa-3x">
</div>
</a>
<a href="http://acm-utsa.slack.com" class="footer-social">
<div class="fa fa-slack fa-3x">
</div>
</a>
<a href="http://github.com/UTSA-ACM" class="footer-social">
<div class="fa fa-github fa-3x">
</div>
</a>
<a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
<div class="fa fa-facebook-square fa-3x">
</div>
</a>
<a href="http://twitter.com/acm_utsa" class="footer-social">
<div class="fa fa-twitter-square fa-3x">
</div>
</a>
<a href="http://www.linkedin.com/groups/8413611" class="footer-social">
<div class="fa fa-linkedin-square fa-3x">
</div>
</a>
</div>
<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl">
<a href="mailto:[email protected]" class="footer-social">
<div class="fa fa-envelope-square fa-3x">
</div>
</a>
<a href="http://acm-utsa.slack.com" class="footer-social">
<div class="fa fa-slack fa-3x">
</div>
</a>
<a href="http://github.com/UTSA-ACM" class="footer-social">
<div class="fa fa-github fa-3x">
</div>
</a>
</div>
<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl">
<a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
<div class="fa fa-facebook-square fa-3x">
</div>
</a>
<a href="http://twitter.com/acm_utsa" class="footer-social">
<div class="fa fa-twitter-square fa-3x">
</div>
</a>
<a href="http://www.linkedin.com/groups/8413611" class="footer-social">
<div class="fa fa-linkedin-square fa-3x">
</div>
</a>
</div>
</div>
</div>
</div>
</div>
<div id="footer" class="container">
<div class="row">
<div class="col-sm-6" id="copyright-container">
Copyright &copy; <?php echo(date('Y')); ?> ACM UTSA
</div>
<div class="col-sm-6" id="social-media-container">
<div class="row" style="">
<div class="hidden-xs col-sm-12">
<a href="mailto:[email protected]" class="footer-social">
<div class="fa fa-envelope-square fa-3x">
</div>
</a>
<a href="http://acm-utsa.slack.com" class="footer-social">
<div class="fa fa-slack fa-3x">
</div>
</a>
<a href="http://github.com/UTSA-ACM" class="footer-social">
<div class="fa fa-github fa-3x">
</div>
</a>
<a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
<div class="fa fa-facebook-square fa-3x">
</div>
</a>
<a href="http://twitter.com/acm_utsa" class="footer-social">
<div class="fa fa-twitter-square fa-3x">
</div>
</a>
<a href="http://www.linkedin.com/groups/8413611" class="footer-social">
<div class="fa fa-linkedin-square fa-3x">
</div>
</a>
</div>
<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl">
<a href="mailto:[email protected]" class="footer-social">
<div class="fa fa-envelope-square fa-3x">
</div>
</a>
<a href="http://acm-utsa.slack.com" class="footer-social">
<div class="fa fa-slack fa-3x">
</div>
</a>
<a href="http://github.com/UTSA-ACM" class="footer-social">
<div class="fa fa-github fa-3x">
</div>
</a>
</div>
<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl">
<a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
<div class="fa fa-facebook-square fa-3x">
</div>
</a>
<a href="http://twitter.com/acm_utsa" class="footer-social">
<div class="fa fa-twitter-square fa-3x">
</div>
</a>
<a href="http://www.linkedin.com/groups/8413611" class="footer-social">
<div class="fa fa-linkedin-square fa-3x">
</div>
</a>
</div>
</div>
</div>
</div>
</div>
</footer>
6 changes: 3 additions & 3 deletions common/google-analytics.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script type="text/javascript">
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-71408623-1', 'auto');
ga('send', 'pageview');
ga('create', 'UA-71408623-1', 'auto');
ga('send', 'pageview');
</script>
28 changes: 14 additions & 14 deletions common/head-includes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript">
$(document).ready(function(){
$("#shell-link").on("mouseenter", function(){
$("#shell-link").css("background-color", "#296097");
});
$("#shell-link").on("click", function(e){
e.preventDefault();
var new_window = window.open("shell", "_blank", "menubar=1,resizable=0,width=570,height=320");
$("#shell-link").css("background-color", $("#main-menu-container").css("background-color"));
});
$("#shell-link").on("mouseleave", function(e){
$("#shell-link").css("background-color", $("#main-menu-container").css("background-color"));
});
});
$(document).ready(function(){
$("#shell-link").on("mouseenter", function(){
$("#shell-link").css("background-color", "#296097");
});
$("#shell-link").on("click", function(e){
e.preventDefault();
var new_window = window.open("shell", "_blank", "menubar=1,resizable=0,width=570,height=320");
$("#shell-link").css("background-color", $("#main-menu-container").css("background-color"));
});
$("#shell-link").on("mouseleave", function(e){
$("#shell-link").css("background-color", $("#main-menu-container").css("background-color"));
});
});
</script>
<?php
include('common/google-analytics.php');
include('common/google-analytics.php');
?>
102 changes: 51 additions & 51 deletions common/menu.php
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
<div id="menu-container">
<div id="main-menu-container">
<nav class="navbar">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-collapse" aria-expanded="false">
<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 id="logo" src="images/logo-bordered.png" alt="The Assocation for Computing Machinery - UTSA Chapter">
</a>
<h1>
Association for
<br />
Computing
<br />
Machinery
</h1>
</div> <!-- .navbar-header -->
<div class="collapse navbar-collapse" id="nav-collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href=".">Home</a></li>
<li><a href="about">About</a></li>
<li><a href="groups">Groups</a></li>
<!-- <li><a href="resources">Resources</a></li> -->
<li><a href="shell" id="shell-link">Shell</a></li>
<li><a href="officers">Officers</a></li>
<li><a href="contact">Contact Us</a></li>
<!-- collapse-only menu items -->
<li class="main-sub-menu-item">
<a href="join">Join ACM</a>
</li>
<li class="main-sub-menu-item">
<a href="dues">Pay Dues</a>
</li>
<li class="main-sub-menu-item">
<a href="calendar">Calendar</a>
</li>
<li class="main-sub-menu-item">
<a href="http://rowdyhacks.com">RowdyHacks</a>
</li>
</ul>
</div><!-- .navbar-collapse -->
</div> <!-- .container -->
</nav>
</div> <!-- #main-menu-container -->
<div id="sub-menu-container" class="container">
<div id="sub-menu" class="pull-right">
<div id="main-menu-container">
<nav class="navbar">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-collapse" aria-expanded="false">
<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 id="logo" src="images/logo-bordered.png" alt="The Assocation for Computing Machinery - UTSA Chapter">
</a>
<h1>
Association for
<br />
Computing
<br />
Machinery
</h1>
</div> <!-- .navbar-header -->
<div class="collapse navbar-collapse" id="nav-collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href=".">Home</a></li>
<li><a href="about">About</a></li>
<li><a href="groups">Groups</a></li>
<!-- <li><a href="resources">Resources</a></li> -->
<li><a href="shell" id="shell-link">Shell</a></li>
<li><a href="officers">Officers</a></li>
<li><a href="contact">Contact Us</a></li>
<!-- collapse-only menu items -->
<li class="main-sub-menu-item">
<a href="join">Join ACM</a>
</li>
<li class="main-sub-menu-item">
<a href="dues">Pay Dues</a>
</li>
<li class="main-sub-menu-item">
<a href="calendar">Calendar</a>
</li>
<li class="main-sub-menu-item">
<a href="http://rowdyhacks.com">RowdyHacks</a>
</li>
</ul>
</div><!-- .navbar-collapse -->
</div> <!-- .container -->
</nav>
</div> <!-- #main-menu-container -->
<div id="sub-menu-container" class="container">
<div id="sub-menu" class="pull-right">
<a href="join" id="sub-menu-item-1" class="sub-menu-item">Join ACM</a>
<a href="dues" id="sub-menu-item-2" class="sub-menu-item">Pay Dues</a>
<a href="calendar" id="sub-menu-item-3" class="sub-menu-item">Calendar</a>
<a href="http://rowdyhacks.com" id="sub-menu-item-4" class="sub-menu-item">RowdyHacks</a>
</div>
</div>
</div>
</div> <!-- #menu-container -->
Loading

0 comments on commit 5e7d844

Please sign in to comment.