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

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

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