Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Toying with twig #34

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Toying with twig #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c3c8622
ignore .htaccess
bumpux Jan 17, 2012
149a36c
Merge remote-tracking branch 'upstream/master'
bumpux Jan 19, 2012
8a08635
dont ignore htaccess
bumpux Jan 19, 2012
d0fb146
Merge remote-tracking branch 'upstream/master'
bumpux Jan 30, 2012
01eca61
Merge remote-tracking branch 'upstream/master'
bumpux Feb 4, 2012
acbde31
Merge remote-tracking branch 'upstream/master'
bumpux Feb 7, 2012
ff1429e
got the extends template thing working
bumpux Feb 7, 2012
207e800
figuring out the new stacey vars
bumpux Feb 7, 2012
88cd0f1
hmmm
bumpux Feb 7, 2012
2d36690
Update with Twig Dir
bumpux Feb 7, 2012
87a3f93
Renamed back to default
bumpux Feb 7, 2012
f1cfbfa
Using Twig "extends" to consolidate shared code between templates
bumpux Feb 7, 2012
3ca1dfa
ignore espresso
bumpux Feb 7, 2012
cda5fcf
kill espresso
bumpux Feb 7, 2012
f64f4d8
cleanup
bumpux Feb 7, 2012
c21a659
updated .twig setup showing nested block (footer)
bumpux Feb 8, 2012
142c77a
update twig stuff
bumpux Feb 8, 2012
cdadf67
quick update
bumpux Feb 13, 2012
3849c9b
Merge remote-tracking branch 'upstream/master' into toying_with_twig
bumpux Feb 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions gitignore_back
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.DS_Store
app/_cache/pages/*
!app/_cache/pages/.gitignore
app/_cache/templates/*
!app/_cache/templates/.gitignore
<<<<<<< HEAD
logs
.htaccess
*.esproj
*.espressostorage
gh-stacey.esproj*
=======
app/_cache/images/*
!app/_cache/images/.gitignore

logs
>>>>>>> upstream/master
22 changes: 22 additions & 0 deletions templates/base/base.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
{% block head %}
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>{% block title %}{{ page.name }}'s Portfolio{% endblock title %}</title>
<link rel="alternate" type="application/atom+xml" href="{{ page.root_path }}/?/feed/">
<link rel="stylesheet" href="//{{ page.base_url }}/public/docs/css/screen.css" type="text/css" media="screen">
</head>
{% endblock head %}

{% block content %}
<!-- default to be over-written -->

{% block footer %}
<p id="footer" class="col six">&copy; Copyright {{ page.name }} {{ page.current_year }} <a class="atom-rss" href="{{ page.root_path }}/?/feed/">RSS</a><br>
<em>Content managed by <a href="http://www.staceyapp.com">stacey</a></em></p>
{% endblock footer %}

{% endblock content %}
</html>
27 changes: 14 additions & 13 deletions templates/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>{{ page.name }}'s Portfolio </title>
<link rel="alternate" type="application/atom+xml" href="{{ page.root_path }}/?/feed/">
<link rel="stylesheet" href="{{ page.root_path }}/public/docs/css/screen.css" type="text/css" media="screen">
</head>
{% extends "base/base.twig" %}

{% block title %}{{ page.title }}, {{ parent() }} {% endblock title %}
{% block head %}
{{ parent() }}
{% endblock head %}
{% block content %}
<body>
<div id="container">
<h1 class="col three">
Expand All @@ -20,8 +20,9 @@ <h1 class="col three">
{% include 'partials/navigation/category-lists.html' %}
</div>
<hr>
<p id="footer" class="col six">&copy; Copyright {{ page.name }} {{ page.current_year }} <a class="atom-rss" href="{{ page.root_path }}/?/feed/">RSS</a><br>
<em>Content managed by <a href="http://www.staceyapp.com">stacey</a></em></p>
{% block footer %}
{{ parent() }}
{% endblock footer %}
</div>
</body>
</html>
</body>
{% endblock content %}
16 changes: 6 additions & 10 deletions templates/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>{{ page.title }}, {{ page.name }}'s Portfolio </title>
<link rel="alternate" type="application/atom+xml" href="{{ page.root_path }}/?/feed/">
<link rel="stylesheet" href="{{ page.root_path }}/public/docs/css/screen.css" type="text/css" media="screen">
</head>
{% extends "base/base.twig" %}

{% block title %}{{ page.title }}, {{ parent() }} {% endblock %}

{% block content %}
<body>
<div id="container" class="{{ page.id }}">
<h1 class="col three">
Expand All @@ -31,4 +27,4 @@ <h2 class="col six"><a href="{{ page.root_path }}">{{ page.title }}</a></h2>
</div>
<script src="{{ page.root_path }}/public/docs/js/jquery-1.3.2.js" type="text/javascript" charset="utf-8"></script>
</body>
</html>
{% endblock %}
16 changes: 6 additions & 10 deletions templates/project.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>{{ page.title }}, {{ page.name }}'s Portfolio </title>
<link rel="alternate" type="application/atom+xml" href="{{ page.root_path }}/?/feed/">
<link rel="stylesheet" href="{{ page.root_path }}/public/docs/css/screen.css" type="text/css" media="screen">
</head>
{% extends "base/base.twig" %}

{% block title %}{{ page.title }}, {{ parent() }} {% endblock %}

{% block content %}
<body>
<div id="container" class="{{ page.id }}">
<h1 class="col three">
Expand Down Expand Up @@ -50,4 +46,4 @@ <h2 class="col six"><a href="{{ page.root_path }}">{{ page.title }}</a></h2>
<script src="{{ page.root_path }}/public/docs/js/gallery.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ page.root_path }}/public/docs/js/init-gallery.js" type="text/javascript" charset="utf-8"></script>
</body>
</html>
{% endblock %}