heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added header to base.html

Browse Source
This commit is contained in:
Jef van Schendel 2011-05-13 15:34:26 -05:00 committed by Christopher Allan Webber
parent 8d2a42d435
commit 4a0f823e51
4 changed files with 22 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/static/css/base.css
View File

@ -28,15 +28,15 @@ a {
text-decoration: none;
}
.header {
.mediagoblin_header {
width:100%;
height:60px;
background-image:url('header_back.png');
background-image:url('../images/header_back.png');
padding-top:40px;
margin-bottom:80px;
}
.container {
.mediagoblin_content {
width: 800px;
margin-left: auto;
margin-right: auto;

10
mediagoblin/static/css/base.css~
View File

@ -28,15 +28,15 @@ a {
text-decoration: none;
}
.header {
.mediagoblin_header {
width:100%;
height:60px;
background-image:url('header_back.png');
background-image:url('../images/header_back.png');
padding-top:40px;
margin-bottom:80px;
}
.container {
.mediagoblin_content {
width: 800px;
margin-left: auto;
margin-right: auto;
@ -61,10 +61,10 @@ a {
}
.button_red {
background-image: url('button_red.png');
background-image: url('../images/button_red.png');
}
.button_green {
background-image: url('button_green.png');
background-image: url('../images/button_green.png');
}

31
mediagoblin/templates/mediagoblin/base.html
View File

@ -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>

31
mediagoblin/templates/mediagoblin/base.html~
View File

@ -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>