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; text-decoration: none;
} }
.header { .mediagoblin_header {
width:100%; width:100%;
height:60px; height:60px;
background-image:url('header_back.png'); background-image:url('../images/header_back.png');
padding-top:40px; padding-top:40px;
margin-bottom:80px; margin-bottom:80px;
} }
.container { .mediagoblin_content {
width: 800px; width: 800px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;

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

@ -28,15 +28,15 @@ a {
text-decoration: none; text-decoration: none;
} }
.header { .mediagoblin_header {
width:100%; width:100%;
height:60px; height:60px;
background-image:url('header_back.png'); background-image:url('../images/header_back.png');
padding-top:40px; padding-top:40px;
margin-bottom:80px; margin-bottom:80px;
} }
.container { .mediagoblin_content {
width: 800px; width: 800px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@ -61,10 +61,10 @@ a {
} }
.button_red { .button_red {
background-image: url('button_red.png'); background-image: url('../images/button_red.png');
} }
.button_green { .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> <body>
{% block mediagoblin_body %} {% block mediagoblin_body %}
{% block mediagoblin_header %} {% block mediagoblin_header %}
<table id="mediagoblin_header"> <div class="mediagoblin_header">
<tr> <div class="mediagoblin_content">
<td id="mediagoblin_logo">
{% block mediagoblin_logo %} {% block mediagoblin_logo %}
<a href="{{ request.urlgen('index') }}">MediaGoblin</a> <a href="{{ request.urlgen('index') }}">MediaGoblin</a>
{% endblock %} {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}
</td>
<td>{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}</td>
</tr>
<tr>
<td></td>
<td>
{% block mediagoblin_header_subtitle %} {% block mediagoblin_header_subtitle %}
Clever subtitle here! Clever subtitle here!
{% endblock %}</td> {% endblock %}
</tr>
{% if request.user %} {% if request.user %}
<tr>
<td></td>
<td>
Welcome {{ request.user['username'] }}! -- Welcome {{ request.user['username'] }}! --
<a href="{{ request.urlgen('mediagoblin.auth.logout') }}"> <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
Logout</a> Logout</a>
</td>
</tr>
{% else %} {% else %}
<tr>
<td></td>
<td>
<a href="{{ request.urlgen('mediagoblin.auth.login') }}"> <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
Login</a> Login</a>
</td>
</tr>
{% endif %} {% endif %}
</table> </div>
</div>
{% endblock %} {% endblock %}
<div id="mediagoblin_content"> <div class="mediagoblin_content">
{% block mediagoblin_content %} {% block mediagoblin_content %}
{% endblock mediagoblin_content %} {% endblock mediagoblin_content %}
</div> </div>

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

@ -25,43 +25,26 @@
<body> <body>
{% block mediagoblin_body %} {% block mediagoblin_body %}
{% block mediagoblin_header %} {% block mediagoblin_header %}
<table id="mediagoblin_header"> <div class="mediagoblin_header">
<tr> <div class="mediagoblin_content">
<td id="mediagoblin_logo">
{% block mediagoblin_logo %} {% block mediagoblin_logo %}
<a href="{{ request.urlgen('index') }}">MediaGoblin</a> <a href="{{ request.urlgen('index') }}">MediaGoblin</a>
{% endblock %} {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}
</td>
<td>{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %}</td>
</tr>
<tr>
<td></td>
<td>
{% block mediagoblin_header_subtitle %} {% block mediagoblin_header_subtitle %}
Clever subtitle here! Clever subtitle here!
{% endblock %}</td> {% endblock %}
</tr>
{% if request.user %} {% if request.user %}
<tr>
<td></td>
<td>
Welcome {{ request.user['username'] }}! -- Welcome {{ request.user['username'] }}! --
<a href="{{ request.urlgen('mediagoblin.auth.logout') }}"> <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
Logout</a> Logout</a>
</td>
</tr>
{% else %} {% else %}
<tr>
<td></td>
<td>
<a href="{{ request.urlgen('mediagoblin.auth.login') }}"> <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
Login</a> Login</a>
</td>
</tr>
{% endif %} {% endif %}
</table> </div>
</div>
{% endblock %} {% endblock %}
<div id="mediagoblin_content"> <div class="mediagoblin_content">
{% block mediagoblin_content %} {% block mediagoblin_content %}
{% endblock mediagoblin_content %} {% endblock mediagoblin_content %}
</div> </div>