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

Header style change

Browse Source
This commit is contained in:
Jef van Schendel 2012-03-25 21:33:52 +02:00
parent 5101f84404
commit afcb08553e
2 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,10 +113,10 @@ input, textarea {
}
header {
width: 100%;
padding-top: 14px;
width: 98%;
padding: 6px 1% 0;
margin-bottom: 20px;
border-bottom: 1px solid #333;
background-color: #222;
}
.header_right {
@ -144,7 +144,7 @@ footer {
height: 30px;
border-top: 1px solid #333;
bottom: 0px;
padding-top: 8px;
padding: 8px 0;
text-align: center;
font-size: 0.875em;
clear: both;
@ -560,11 +560,6 @@ table.media_panel th {
padding: 9px 14px;
}
.header_right {
float: none;
display: inline-block;
}
header {
text-align: center;
}

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

@ -36,44 +36,42 @@
</head>
<body>
{% block mediagoblin_body %}
<div class="container">
{% block mediagoblin_header %}
<header>
{% block mediagoblin_logo %}
<a class="logo"
href="{{ request.urlgen('index') }}"
><img src="{{ request.staticdirect('/images/logo.png') }}"
alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a>
{% endblock mediagoblin_logo %}
{% if request.user and request.user.status == 'active' %}
<a class="button_action"
href="{{ request.urlgen('mediagoblin.submit.start') }}">
{% trans %}Add media{% endtrans %}
</a>
{% endif %}
{% block mediagoblin_header_title %}{% endblock %}
<div class="header_right">
{% if request.user %}
{# the following link should only appear when verification is needed #}
{% if request.user.status == "needs_email_verification" %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user=request.user.username) }}"
class="button_action_highlight">
{% trans %}Verify your email!{% endtrans %}</a>
{% endif %}
<header>
{% block mediagoblin_logo %}
<a class="logo"
href="{{ request.urlgen('index') }}"
><img src="{{ request.staticdirect('/images/logo.png') }}"
alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a>
{% endblock mediagoblin_logo %}
{% if request.user and request.user.status == 'active' %}
<a class="button_action"
href="{{ request.urlgen('mediagoblin.submit.start') }}">
{% trans %}Add media{% endtrans %}
</a>
{% endif %}
{% block mediagoblin_header_title %}{% endblock %}
<div class="header_right">
{% if request.user %}
{# the following link should only appear when verification is needed #}
{% if request.user.status == "needs_email_verification" %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user= request.user.username) }}">
{{ request.user.username }}</a>
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
{% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">
{% trans %}Log in{% endtrans %}</a>
user=request.user.username) }}"
class="button_action_highlight">
{% trans %}Verify your email!{% endtrans %}</a>
{% endif %}
</div>
</header>
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user= request.user.username) }}">
{{ request.user.username }}</a>
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
{% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">
{% trans %}Log in{% endtrans %}</a>
{% endif %}
</div>
</header>
{% endblock %}
<div class="container">
<div class="mediagoblin_content">
{% include "mediagoblin/utils/messages.html" %}
{% block mediagoblin_content %}