Skip to content
Browse files

Includes were working this whole time. I'm just dumb

  • Loading branch information...
1 parent 68c841f commit d15474c3f3ed11a32e5b430a5dc2c5bbd1b10b54 @joequery committed Jul 10, 2012
View
1 contact/templates/contact.html
@@ -1,5 +1,4 @@
{% from "macros" import render_field, img %}
-{% from "sections" import what_now %}
{% extends "layout.html" %}
{% block body %}
<div id="sub_page_intro">
View
1 templates/404.html
@@ -1,4 +1,3 @@
-{% from "sections" import what_now %}
{% extends "layout.html" %}
{% block body %}
View
3 templates/about.html
@@ -1,5 +1,4 @@
{% from "macros" import img %}
-{% from "sections" import what_now %}
{% extends "layout.html" %}
{% block body %}
<div id="sub_page_intro">
@@ -82,7 +81,7 @@
</div>
<div id="tertiary">
-{{ what_now()|safe}}
+ {% include "includes/what_now.html" %}
</div><!--END tertiary-->
{% endblock body %}
View
7 templates/includes/footer.html
@@ -0,0 +1,7 @@
+<div id="footer">
+ <div class="hr"><hr /></div>
+ <p>
+ <a href="mailto:hi@vertstudios.com">hi@vertstudios.com</a> |
+ <a href="http://www.twitter.com/vertstudios">@vertstudios</a>
+ </p>
+</div>
View
28 templates/includes/javascripts.html
@@ -0,0 +1,28 @@
+{% from "macros" import js %}
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+
+<!-- Start of StatCounter Code -->
+<script type="text/javascript">
+var sc_project=6297856;
+var sc_invisible=1;
+var sc_security="f601122c";
+</script>
+<script type="text/javascript"
+src="http://www.statcounter.com/counter/counter.js"></script>
+<noscript><div class="statcounter">
+<img class="statcounter"
+src="http://c.statcounter.com/6297856/0/f601122c/1/"
+alt=""></noscript>
+<!-- End of StatCounter Code -->
+
+{% if g.env == "production" %}
+ {{js(g, "vertlib")}}
+ {{js(g, "compressed.min")}}
+{% else %}
+ {% for file in
+ ["vertlib", "jsCSS", "index_init", "easing", "slaveshow.min",
+ "carousel", "carousel-init", "easing", "Scroller", "work_init", "contact",
+ "prettify"] %}
+ {{ js(g, file)|safe }}
+ {% endfor %}
+{% endif %}
View
25 templates/includes/meta_and_css.html
@@ -0,0 +1,25 @@
+{% from "macros" import css %}
+<head>
+ <script type="text/javascript">
+ //Credit: Doug Neiner - http://dougneiner.com/
+ document.documentElement.className += " js"
+ </script>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta name="google-site-verification" content="36dXXZZompgqJf0oUzUyoTOKJzW1wQ8uAVOJBpYimR8" />
+ {% if description %}
+ <meta name="description" content="{{description}}" />
+ {% endif %}
+ {% if title %}
+ <title>{{title}} | Vert Studios</title>
+ {% else %}
+ <title>Web Design that Doesn't Suck | Vert Studios | Tyler, Texas</title>
+ {% endif %}
+ {% if g.env == "production" %}
+ {{ css(g, "compressed.min") }}
+ {% else %}
+ {% for file in ["reset", "js", "text", "main", "codestream", "prettify"] %}
+ {{ css(g, file)|safe }}
+ {% endfor %}
+ {% endif %}
+</head>
+
View
28 templates/includes/nav.html
@@ -0,0 +1,28 @@
+{% from "macros" import img %}
+<div id="header">
+ <div id="vertStudios">
+ <a href="/">Vert Studios{{img(g,"vert_logo_header.png", "Vert Studios")|safe}}</a>
+ </div>
+ <ul id="main_nav">
+ <li>
+ <h5><a href="{{url_for("about")}}">About</a></h5>
+ <p>We're a small web design company with big ideas in Tyler, Texas.</p>
+ </li>
+ <li>
+ <h5><a href="{{url_for("work")}}">Work</a></h5>
+ <p>See what our work has to say. <b>WARNING</b>: <br />It might get loud.</p>
+ </li>
+ <li>
+ <h5><a href="{{url_for("services")}}">Services</a></h5>
+ <p>We design web sites that don't suck. We're quite proud of that.</p>
+ </li>
+ <li>
+ <h5><a href="{{url_for("blog.blog_index")}}">Blog</a></h5>
+ <p>Read our articles on programming, development, and software.</p>
+ </li>
+ <li>
+ <h5><a href="{{url_for('contact_page.contact')}}">Contact Us</a></h5>
+ <p>Contact us for a new website, for contract work, or just to say hi!</p>
+ </li>
+ </ul>
+</div>
View
5 templates/includes/what_now.html
@@ -0,0 +1,5 @@
+<div id="what_now">
+<h2>What Now?</h2>
+<p>To see our capabilities in action, check out <a href="{{url_for("work")}}">our work</a>.</p>
+<p>Interested in keeping up with web design or East Texas? Follow us on Twitter: <a href="http://www.twitter.com/vertstudios">@vertstudios</a>, and subscribe to the <a href="blog/">Vert Studios Blog</a>.</p>
+</div>
View
9 templates/layout.html
@@ -1,15 +1,14 @@
-{% from "sections" import meta_and_css, nav, javascripts, footer %}
<!DOCTYPE html>
<html lang="en">
- {{ meta_and_css(g, title)|safe }}
+ {% include "includes/meta_and_css.html" %}
<body onload="prettyPrint()" id="{{g.bodyID}}">
<div id="wrapper">
- {{ nav(g)|safe }}
+ {% include "includes/nav.html" %}
<div id="content">
{% block body %}{% endblock body %}
</div><!--content-->
- {{ footer()|safe }}
+ {% include "includes/footer.html" %}
</div><!--wrapper-->
-{{ javascripts(g)|safe }}
+{% include "includes/javascripts.html" %}
</body>
</html>
View
89 templates/sections
@@ -1,89 +0,0 @@
-{% from "macros" import img, js, css %}
-{% macro meta_and_css(g, title) %}
-<head>
- <script type="text/javascript">
- //Credit: Doug Neiner - http://dougneiner.com/
- document.documentElement.className += " js"
- </script>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta name="description" content="Your website is your company's first impression. Together, we can make it a lasting one. Vert Studios is a web design company in Tyler, Texas." />
- <meta name="google-site-verification" content="36dXXZZompgqJf0oUzUyoTOKJzW1wQ8uAVOJBpYimR8" />
- <link rel="apple-touch-icon" href="apple-touch-icon.png"/>
- {% if title %}
- <title>{{title}} | Vert Studios</title>
- {% else %}
- <title>Web Design that Doesn't Suck | Vert Studios | Tyler, Texas</title>
- {% endif %}
- {% if g.env == "production" %}
- {{ css(g, "compressed.min") }}
- {% else %}
- {% for file in ["reset", "js", "text", "main", "codestream", "prettify"] %}
- {{ css(g, file) }}
- {% endfor %}
- {% endif %}
-</head>
-{% endmacro %}
-
-{% macro nav(g) %}
-<div id="header">
- <div id="vertStudios">
- <a href="/">Vert Studios{{img(g,"vert_logo_header.png", "Vert Studios")}}</a>
- </div>
- <ul id="main_nav">
- <li>
- <h5><a href="{{url_for("about")}}">About</a></h5>
- <p>We're a small web design company with big ideas in Tyler, Texas.</p>
- </li>
- <li>
- <h5><a href="{{url_for("work")}}">Work</a></h5>
- <p>See what our work has to say. <b>WARNING</b>: <br />It might get loud.</p>
- </li>
- <li>
- <h5><a href="{{url_for("services")}}">Services</a></h5>
- <p>We design web sites that don't suck. We're quite proud of that.</p>
- </li>
- <li>
- <h5><a href="{{url_for("blog.blog_index")}}">Blog</a></h5>
- <p>Read our articles on programming, development, and software.</p>
- </li>
- <li>
- <h5><a href="{{url_for('contact_page.contact')}}">Contact Us</a></h5>
- <p>Contact us for a new website, for contract work, or just to say hi!</p>
- </li>
- </ul>
-</div>
-{% endmacro %}
-
-{% macro javascripts(g) %}
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-
-{% if g.env == "production" %}
- {{js(g, "vertlib")}}
- {{js(g, "compressed.min")}}
-{% else %}
- {% for file in
- ["vertlib", "jsCSS", "index_init", "easing", "slaveshow.min",
- "carousel", "carousel-init", "easing", "Scroller", "work_init", "contact",
- "prettify"] %}
- {{ js(g, file) }}
- {% endfor %}
-{% endif %}
-{% endmacro %}
-
-{% macro footer() %}
-<div id="footer">
- <div class="hr"><hr /></div>
- <p>
- <a href="mailto:hi@vertstudios.com">hi@vertstudios.com</a> |
- <a href="http://www.twitter.com/vertstudios">@vertstudios</a>
- </p>
-</div>
-{% endmacro %}
-
-{% macro what_now() %}
-<div id="what_now">
-<h2>What Now?</h2>
-<p>To see our capabilities in action, check out <a href="{{url_for("work")}}">our work</a>.</p>
-<p>Interested in keeping up with web design or East Texas? Follow us on Twitter: <a href="http://www.twitter.com/vertstudios">@vertstudios</a>, and subscribe to the <a href="blog/">Vert Studios Blog</a>.</p>
-</div>
-{% endmacro %}
View
3 templates/services.html
@@ -1,5 +1,4 @@
{% from "macros" import img %}
-{% from "sections" import what_now %}
{% extends "layout.html" %}
{% block body %}
<div id="sub_page_intro">
@@ -41,6 +40,6 @@
</div>
<div id="tertiary">
-{{ what_now()|safe}}
+ {% include "includes/what_now.html" %}
</div>
{% endblock body %}

0 comments on commit d15474c

Please sign in to comment.
Something went wrong with that request. Please try again.