Commits

Sean Davis committed facc57a

Added home.html based on base.html and removed old index.html

This is just a cleanup. All the pages inherit from base.html now.

Comments (0)

Files changed (3)

 
 @app.route("/")
 def hello():
-    return render_template('index.html')
+    return render_template('home.html')
 
 @app.route('/software/')
 def software_list():

templates/home.html

+{% extends "base.html" %}
+{% block title %}Home{% endblock %}
+{% block content %}
+      <div class="hero-unit">
+	
+	<h1>Bioinformatics@CCR</h1>
+	<p class="lead">Bioinformatics Training, Education, and Collaboration at the Center for Cancer Research</p>
+      </div>
+      <div class="row">
+	<div class="span12">
+          <div id="main-carousel" class="carousel slide">
+            <!-- Carousel items -->
+            <div class="carousel-inner">
+              <div class="item active">
+		<img src="{{ url_for('static',filename='img/heatmap_960x400-0.png') }}" />
+		<div class="carousel-caption">
+		  <h4>Computational Genomics</h4>
+		  <p>We apply computational and statistical approaches to improve the understanding
+		    of normal and tumor genomes.
+		  </p>
+		</div>
+	      </div>
+	      <div class="item">
+		<img src="{{ url_for('static',filename='img/codeListing_960x400-0.png') }}" />
+		<div class="carousel-caption">
+		  <h4>Genomics Software Development</h4>
+		  <p>We develop and apply algorithms and tools for the comprehension of genomic data.
+		  </p>
+		</div>
+	      </div>
+	      <div class="item">
+		<img src="{{ url_for('static',filename='img/circos-maxzoom_960x400-0.png') }}" />
+		<div class="carousel-caption">
+		  <h4>Cancer Biology</h4>
+		  <p>We aim to understand the order and disorder in genomes that drive cancer using
+		    cutting-edge computational applications and approaches.
+		  </p>
+		</div>
+	      </div>
+	      <div class="item">
+		<img src="{{ url_for('static',filename='img/F3.large_960x400-0.png') }}" />
+		<div class="carousel-caption">
+		  <h4>Translational Medicine</h4>
+		  <p>Application of genomics technologies to rare and common cancers can provide
+		    valuable clues to specific and potentially effective therapeutics.
+		  </p>
+		</div>
+	      </div>
+	    </div>
+	    <!-- Carousel nav -->
+	    <a class="carousel-control left" href="#main-carousel" data-slide="prev">&lsaquo;</a>
+	    <a class="carousel-control right" href="#main-carousel" data-slide="next">&rsaquo;</a>
+	  </div>
+
+      <!-- Typography
+	   ================================================== -->
+      <section id="mainsection">
+	<!-- Headings & Paragraph Copy -->
+	<div class="row">
+	  <div class="span4">
+	    <div class="well" id="forumposts">
+	      <h3>Recent Biostar posts</h3>
+	      <ul>
+	      </ul>
+	    </div>
+	  </div>
+
+	  <div class="span4">
+	    <div class="well" id="bioinformaticstwitter">
+	      <h3>Bioinformatics Tweets</h3>
+	      <ul>
+	      </ul>
+	    </div>
+	  </div>
+
+	  <div class="span4">
+	    <div class="well" id="eventsfeed">
+	      <h3>Upcoming Events</h3>
+	      <ul>
+	      </ul>
+	    </div>
+	  </div>
+	</div>
+
+      </section>
+
+{% endblock %}

templates/index.html

-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Bioinformatics@CCR</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-	<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-	<![endif]-->
-
-    <!-- Le styles -->
-    <link href="{{ url_for('static',filename='css/bootstrap.min.css') }}" rel="stylesheet">
-    <link href="{{ url_for('static',filename='css/bootstrap-responsive.css') }}" rel="stylesheet">
-    <style type="text/css">
-      body {
-      padding-top: 60px;
-      padding-bottom: 40px;
-      }
-    </style>
-    <script src="http://code.jquery.com/jquery-latest.js"></script>
-    <script src="{{ url_for('static',filename='js/bootstrap.min.js') }}"></script>
-    <script src="{{ url_for('static',filename='js/page.js') }}"></script>
-    <script>
-      $('#main-carousel').ready(function() {
-          $('#main-carousel').carousel('cycle');
-      });
-</script>
-  </head>
-
-  <body>
-
-
-
-
-    <!-- Masthead
-	 ================================================== -->
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-	<div class="container">
-	  <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          <div class="nav-collapse">
-	    <a class="brand" href="#">Bioinformatics@CCR</a>
-            <ul class="nav">
-	      {%- for endpoint, caption in [
-	      ('hello', 'Home'),
-	      ('software_list', 'Software'),
-	      ('publication_list', 'Publications'),
-	      ] %}
-	      <li{% if endpoint == request.endpoint %} class="active"{% endif
-		    %}><a href={{ url_for(endpoint) }}>{{ caption }}</a>
-	      {%- endfor %}
-              <li><a href="/training">Training & Education</a></li>
-            </ul>
-            <ul class="nav pull-right">
-              <li class="divider-vertical"></li>
-              <li class="dropdown">
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown">Quick Links<b class="caret"></b></a>
-		<ul class="dropdown-menu">
-                  <li><a href="http://genome.ucsc.edu/">UCSC Genome Browser</a></li>
-                  <li><a href="http://bioconductor.org/">Bioconductor</a></li>
-                  <li class="divider"></li>
-		  <li><a href="http://ostp.nci.nih.gov/">Office of Science and Technology Partnerships</a></li>
-                  <li><a href="http://www.ncbi.nlm.nih.gov/">NCBI</a></li>
-                  <li><a href="http://helix.nih.gov/">NIH Helix & Biowulf</a></li>
-                  <li><a href="http://galaxy.cit.nih.gov/">NIH Galaxy Server</a></li>		
-		</ul>
-              </li>
-            </ul>
-          </div><!-- /.nav-collapse -->
-	</div>
-      </div><!-- /navbar-inner -->
-    </div><!-- /navbar -->
-    <div class="container">
-
-
-
-      <div class="hero-unit">
-	
-	<h1>Bioinformatics@CCR</h1>
-	<p class="lead">Bioinformatics Training, Education, and Collaboration at the Center for Cancer Research</p>
-      </div>
-      <div class="row">
-	<div class="span12">
-          <div id="main-carousel" class="carousel slide">
-            <!-- Carousel items -->
-            <div class="carousel-inner">
-              <div class="item active">
-		<img src="{{ url_for('static',filename='img/heatmap_960x400-0.png') }}" />
-		<div class="carousel-caption">
-		  <h4>Computational Genomics</h4>
-		  <p>We apply computational and statistical approaches to improve the understanding
-		    of normal and tumor genomes.
-		  </p>
-		</div>
-	      </div>
-	      <div class="item">
-		<img src="{{ url_for('static',filename='img/codeListing_960x400-0.png') }}" />
-		<div class="carousel-caption">
-		  <h4>Genomics Software Development</h4>
-		  <p>We develop and apply algorithms and tools for the comprehension of genomic data.
-		  </p>
-		</div>
-	      </div>
-	      <div class="item">
-		<img src="{{ url_for('static',filename='img/circos-maxzoom_960x400-0.png') }}" />
-		<div class="carousel-caption">
-		  <h4>Cancer Biology</h4>
-		  <p>We aim to understand the order and disorder in genomes that drive cancer using
-		    cutting-edge computational applications and approaches.
-		  </p>
-		</div>
-	      </div>
-	      <div class="item">
-		<img src="{{ url_for('static',filename='img/F3.large_960x400-0.png') }}" />
-		<div class="carousel-caption">
-		  <h4>Translational Medicine</h4>
-		  <p>Application of genomics technologies to rare and common cancers can provide
-		    valuable clues to specific and potentially effective therapeutics.
-		  </p>
-		</div>
-	      </div>
-	    </div>
-	    <!-- Carousel nav -->
-	    <a class="carousel-control left" href="#main-carousel" data-slide="prev">&lsaquo;</a>
-	    <a class="carousel-control right" href="#main-carousel" data-slide="next">&rsaquo;</a>
-	  </div>
-
-      <!-- Typography
-	   ================================================== -->
-      <section id="mainsection">
-	<!-- Headings & Paragraph Copy -->
-	<div class="row">
-	  <div class="span4">
-	    <div class="well" id="forumposts">
-	      <h3>Recent Biostar posts</h3>
-	      <ul>
-	      </ul>
-	    </div>
-	  </div>
-
-	  <div class="span4">
-	    <div class="well" id="bioinformaticstwitter">
-	      <h3>Bioinformatics Tweets</h3>
-	      <ul>
-	      </ul>
-	    </div>
-	  </div>
-
-	  <div class="span4">
-	    <div class="well" id="eventsfeed">
-	      <h3>Upcoming Events</h3>
-	      <ul>
-	      </ul>
-	    </div>
-	  </div>
-	</div>
-
-      </section>
-
-      <footer>
-	<center>
-	  <a href="http://www.cancer.gov"><img src="http://ccrod.cancer.gov//confluence/images/themebuilder/foot_nci.jpg" alt="National Cancer Institute"/></a>
-	  <a href="http://www.nih.gov"><img src="http://ccrod.cancer.gov//confluence/images/themebuilder/foot_nih.jpg" alt="National Institutes of Health"/></a>
-	  <a href="http://www.dhhs.gov"><img src="http://ccrod.cancer.gov//confluence/images/themebuilder/foot_hhs.jpg" alt="Department of Health and Human Services"/></a>
-	  <a href="http://www.usa.gov"><img src="http://ccrod.cancer.gov//confluence/images/themebuilder/foot_usa.jpg" alt="USA.gov"/></a>
-	</center>
-      </footer>
-      <script type="text/javascript">
-
-	var _gaq = _gaq || [];
-	_gaq.push(['_setAccount', 'UA-20569571-1']);
-	_gaq.push(['_trackPageview']);
-
-	(function() {
-	var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-	ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-	var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-	})();
-
-      </script>
-
-  </body>
-</html>