Skip to content

Commit

Permalink
Fixed issue #13 Footer fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ybayle committed May 22, 2017
1 parent d6832d8 commit 794cb64
Show file tree
Hide file tree
Showing 17 changed files with 215 additions and 514 deletions.
26 changes: 26 additions & 0 deletions 404.php
@@ -0,0 +1,26 @@
<html>
<head>
<?php include 'head.php'; ?>
</head>

<body>
<div id="container">
<?php include 'header.php'; ?>
<div id="spacer"><img src="img/barstaff.png" alt="staff2circuit" style="width:900px"></div>
<div id="content-container">
<?php include 'navigation.php'; ?>
<div id="content">

<h2>Ack! That's a 404 error.</h2>
<p>Sorry, but the page you have requested cannot be found.</p>
<p> Please contact the <a href="mailto:webmaster@ismir.net">webmaster</a> and pass along this information.</p>
</br>
</br>
</br>
</br>
</br>
<?php include 'footer.php'; ?>
</div>
</div>
</body>
</html>
53 changes: 0 additions & 53 deletions 404.shtml

This file was deleted.

48 changes: 4 additions & 44 deletions conferences.html → conferences.php
@@ -1,45 +1,14 @@

<html>
<head>
<link rel="stylesheet" href="./style.css" type="text/css"/>
<title>The International Society of Music Information Retrieval</title>
<script>
(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','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-48096804-1', 'auto');
ga('send', 'pageview');

</script>
<?php include 'head.php'; ?>
</head>

<body>
<div id="container">
<div id="header">
<h1>
<a href="http://ismir.net">
<img src="img/ismir_04.png" alt="The International Society of Music Information Retrieval"
style="width:300px;margin-left:-48px; margin-bottom:-100px"></a>
</h1>
</div>
<?php include 'header.php'; ?>
<div id="spacer"><img src="img/barstaff.png" alt="staff2circuit" style="width:900px"></div>
<div id="content-container">
<div id="navigation">
<ul>
<li><a href="index.html">Home</a></li>
<li><a href="conferences.html">Previous Conferences</a></li>
<li><a href="http://www.informatik.uni-trier.de/~ley/db/conf/ismir/index.html" target="_blank">Proceedings</a></li>
<li><a href="resources.html">Resources</a></li>
<li><a href="society.html">About the Society</a></li>
<li><a href="stats.html">Membership and Paper Statistics</a></li>
<li><a href="wimir.html">Women in MIR</a></li>
<li><a href="http://transactions.ismir.net/">Transactions of the International Society for Music Information Retrieval</a></li>
<li><a href="membership.html">Membership</a></li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div>
<?php include 'navigation.php'; ?>
<div id="content">


Expand Down Expand Up @@ -146,16 +115,7 @@ <h2>Past Conferences</h2>


</div>

<div class="footer-container">
<div class="div-right">
<ul class="footer">
<li>Copyright &copy; ISMIR, 2016</li>
<li><a href="https://github.com/ismir/ismir_web">
<img src="img/GitHub-Mark-32px.png" alt="The International Society of Music Information Retrieval"></a></li>
</ul></div>
</div>

<?php include 'footer.php'; ?>
</div>
</div>
</body>
Expand Down
74 changes: 0 additions & 74 deletions contact.html

This file was deleted.

35 changes: 35 additions & 0 deletions contact.php
@@ -0,0 +1,35 @@
<html>
<head>
<?php include 'head.php'; ?>
</head>

<body>
<div id="container">
<?php include 'header.php'; ?>
<div id="spacer"><img src="img/barstaff.png" alt="staff2circuit" style="width:900px"></div>
<div id="content-container">
<?php include 'navigation.php'; ?>
<div id="content">
<h2>Contact Us</h2>
<ul>
<li>Community announcements and questions: <a href="mailto:community@ismir.net" target="_top">community@ismir.net</a></li>
<li>Technical support with the website: <a href="mailto:webmaster@ismir.net" target="_top">webmaster@ismir.net</a></li>
<li>ISMIR Board: <a href="mailto:board@ismir.net" target="_top">board@ismir.net</a></li>
<li>ISMIR 2016: <a href="mailto:ismir2016@ismir.net" target="_top">ismir2016@ismir.net</a></li>

</ul>

<h2>Notice something wrong? Want to help?</h2>
<p>Good news! This website is maintained on <a href="https://github.com/ismir/ismir_web">github</a>.
</p>
<ul>
<li>If you find any mistakes or missing information, please add to our backlog of <a href="https://github.com/ismir/ismir_web/issues">issues</a>.</li>
<li>If you're feeling particularly ambitious and would like to help out, we gladly welcome <a href="https://github.com/ismir/ismir_web/pulls">pull requests</a> and collaborators!</li>
</ul>

</div>
<?php include 'footer.php'; ?>
</div>
</div>
</body>
</html>
8 changes: 8 additions & 0 deletions footer.php
@@ -0,0 +1,8 @@
<div class="footer-container">
<div class="div-right">
<ul class="footer">
<li>Copyright &copy; ISMIR, 2000-2017</li>
<li><a href="https://github.com/ismir/ismir_web">
<img src="img/GitHub-Mark-32px.png" alt="The International Society of Music Information Retrieval"></a></li>
</ul></div>
</div>
10 changes: 10 additions & 0 deletions head.php
@@ -0,0 +1,10 @@
<link rel="stylesheet" href="./style.css" type="text/css"/>
<title>The International Society of Music Information Retrieval</title>
<script>
(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','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-48096804-1', 'auto');
ga('send', 'pageview');
</script>
7 changes: 7 additions & 0 deletions header.php
@@ -0,0 +1,7 @@
<div id="header">
<h1>
<a href="http://ismir.net">
<img src="img/ismir_04.png" alt="The International Society of Music Information Retrieval"
style="width:300px;margin-left:-48px; margin-bottom:-100px"></a>
</h1>
</div>
47 changes: 4 additions & 43 deletions index.html → index.php
@@ -1,44 +1,14 @@
<html>
<head>
<link rel="stylesheet" href="./style.css" type="text/css"/>
<title>The International Society of Music Information Retrieval</title>
<script>
(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','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-48096804-1', 'auto');
ga('send', 'pageview');

</script>
<?php include 'head.php'; ?>
</head>

<body>
<div id="container">
<div id="header">
<h1>
<a href="http://ismir.net">
<img src="img/ismir_04.png" alt="The International Society of Music Information Retrieval"
style="width:300px;margin-left:-48px; margin-bottom:-100px"></a>
</h1>
</div>
<?php include 'header.php'; ?>
<div id="spacer"><img src="img/barstaff.png" alt="staff2circuit" style="width:900px"></div>
<div id="content-container">
<div id="navigation">
<ul>
<li><a href="index.html">Home</a></li>
<li><a href="conferences.html">Previous Conferences</a></li>
<li><a href="http://www.informatik.uni-trier.de/~ley/db/conf/ismir/index.html" target="_blank">Proceedings</a></li>
<li><a href="resources.html">Resources</a></li>
<li><a href="society.html">About the Society</a></li>
<li><a href="stats.html">Membership and Paper Statistics</a></li>
<li><a href="wimir.html">Women in MIR</a></li>
<li><a href="http://transactions.ismir.net/">Transactions of the International Society for Music Information Retrieval</a></li>
<li><a href="membership.html">Membership</a></li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div>
<?php include 'navigation.php'; ?>
<div id="content">

<h2>Upcoming Conferences</h2>
Expand Down Expand Up @@ -96,16 +66,7 @@ <h2>Be a part of the Community!</h2>
</p>

</div>

<div class="footer-container">
<div class="div-right">
<ul class="footer">
<li>Copyright &copy; ISMIR, 2016</li>
<li><a href="https://github.com/ismir/ismir_web">
<img src="img/GitHub-Mark-32px.png" alt="The International Society of Music Information Retrieval"></a></li>
</ul></div>
</div>

<?php include 'footer.php'; ?>
</div>
</div>
</body>
Expand Down

0 comments on commit 794cb64

Please sign in to comment.