diff options
author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-05-13 15:34:26 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-05-13 15:34:26 -0500 |
commit | 4a0f823e51c575e10430be1a2f3c439eef23d06b (patch) | |
tree | e36db55d396c6020c1591aadc2f5794cd9c4d567 /mediagoblin/templates | |
parent | 8d2a42d43561456782d103f4ef40703d7b2bde28 (diff) | |
download | mediagoblin-4a0f823e51c575e10430be1a2f3c439eef23d06b.tar.lz mediagoblin-4a0f823e51c575e10430be1a2f3c439eef23d06b.tar.xz mediagoblin-4a0f823e51c575e10430be1a2f3c439eef23d06b.zip |
Added header to base.html
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 31 | ||||
-rw-r--r-- | mediagoblin/templates/mediagoblin/base.html~ | 31 |
2 files changed, 14 insertions, 48 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index d73d8c20..4b634cf1 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -25,43 +25,26 @@ <body> {% block mediagoblin_body %} {% block mediagoblin_header %} - <table id="mediagoblin_header"> - <tr> - <td id="mediagoblin_logo"> + <div class="mediagoblin_header"> + <div class="mediagoblin_content"> {% block mediagoblin_logo %} <a href="{{ request.urlgen('index') }}">MediaGoblin</a> - {% endblock %} - </td> - <td>{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}</td> - </tr> - <tr> - <td></td> - <td> + {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %} {% block mediagoblin_header_subtitle %} Clever subtitle here! - {% endblock %}</td> - </tr> + {% endblock %} {% if request.user %} - <tr> - <td></td> - <td> Welcome {{ request.user['username'] }}! -- <a href="{{ request.urlgen('mediagoblin.auth.logout') }}"> Logout</a> - </td> - </tr> {% else %} - <tr> - <td></td> - <td> <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> Login</a> - </td> - </tr> {% endif %} - </table> + </div> + </div> {% endblock %} - <div id="mediagoblin_content"> + <div class="mediagoblin_content"> {% block mediagoblin_content %} {% endblock mediagoblin_content %} </div> diff --git a/mediagoblin/templates/mediagoblin/base.html~ b/mediagoblin/templates/mediagoblin/base.html~ index d73d8c20..4b634cf1 100644 --- a/mediagoblin/templates/mediagoblin/base.html~ +++ b/mediagoblin/templates/mediagoblin/base.html~ @@ -25,43 +25,26 @@ <body> {% block mediagoblin_body %} {% block mediagoblin_header %} - <table id="mediagoblin_header"> - <tr> - <td id="mediagoblin_logo"> + <div class="mediagoblin_header"> + <div class="mediagoblin_content"> {% block mediagoblin_logo %} <a href="{{ request.urlgen('index') }}">MediaGoblin</a> - {% endblock %} - </td> - <td>{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}</td> - </tr> - <tr> - <td></td> - <td> + {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %} {% block mediagoblin_header_subtitle %} Clever subtitle here! - {% endblock %}</td> - </tr> + {% endblock %} {% if request.user %} - <tr> - <td></td> - <td> Welcome {{ request.user['username'] }}! -- <a href="{{ request.urlgen('mediagoblin.auth.logout') }}"> Logout</a> - </td> - </tr> {% else %} - <tr> - <td></td> - <td> <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> Login</a> - </td> - </tr> {% endif %} - </table> + </div> + </div> {% endblock %} - <div id="mediagoblin_content"> + <div class="mediagoblin_content"> {% block mediagoblin_content %} {% endblock mediagoblin_content %} </div> |