heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

* Rename mediagoblin_header, mediagoblin_body, mediagoblin_footer, mediagoblin_header_right, mediagoblin_logo

Browse Source 
* Add html5shiv for older browsers
* Small size fix (940px instead of 960pgx)
This commit is contained in:
Jef van Schendel
2012-01-05 23:36:16 +01:00
parent a91e4e07e7
commit 7945cd21ba
5 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,13 +84,13 @@ input, textarea {
/* website structure */
.mediagoblin_body {
.container {
margin: auto;
width: 96%;
max-width: 960px;
max-width: 940px;
}
.mediagoblin_header {
header {
width: 100%;
height: 36px;
padding-top: 14px;
@@ -98,17 +98,17 @@ input, textarea {
border-bottom: 1px solid #333;
}
.mediagoblin_header_right {
.header_right {
float: right;
}
a.mediagoblin_logo {
a.logo {
color: #fff;
font-weight: bold;
margin-right: 8px;
}
.mediagoblin_logo img {
.logo img {
vertical-align: middle;
}
@@ -117,7 +117,7 @@ a.mediagoblin_logo {
padding-bottom: 74px;
}
.mediagoblin_footer {
footer {
width: 100%;
height: 30px;
border-top: 1px solid #333;

1
mediagoblin/static/js/extlib/html5shiv.js vendored Symbolic link
View File

@@ -0,0 +1 @@
../../../../extlib/html5shiv/html5shiv.js

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

@@ -29,22 +29,24 @@
href="{{ request.staticdirect('/css/video-js.css') }}"/>
<link rel="shortcut icon"
href="{{ request.staticdirect('/images/goblin.ico') }}" />
<script type="text/javascript"
src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script>
<script src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script>
<!--[if lt IE 9]>
<script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script>
<![endif]-->
{% block mediagoblin_head %}
{% endblock mediagoblin_head %}
</head>
<body>
{% block mediagoblin_body %}
<div class="mediagoblin_body">
<div class="container">
{% block mediagoblin_header %}
<div class="mediagoblin_header">
<header>
{% block mediagoblin_logo %}
<a class="mediagoblin_logo"
<a class="logo"
href="{{ request.urlgen('index') }}"
><img src="{{ request.staticdirect('/images/logo.png') }}"
alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a>
{% endblock %}
{% endblock mediagoblin_logo %}
{% if request.user and request.user.status == 'active' %}
<a class="button_action"
href="{{ request.urlgen('mediagoblin.submit.start') }}">
@@ -52,7 +54,7 @@
</a>
{% endif %}
{% block mediagoblin_header_title %}{% endblock %}
<div class="mediagoblin_header_right">
<div class="header_right">
{% if request.user %}
{# the following link should only appear when verification is needed #}
{% if request.user.status == "needs_email_verification" %}
@@ -72,7 +74,7 @@
{% trans %}Log in{% endtrans %}</a>
{% endif %}
</div>
</div>
</header>
{% endblock %}
<div class="mediagoblin_content">
{% include "mediagoblin/utils/messages.html" %}
@@ -80,12 +82,12 @@
{% endblock mediagoblin_content %}
</div>
{% block mediagoblin_footer %}
<div class="mediagoblin_footer">
<footer>
{% trans -%}
Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project
{%- endtrans %}
</div>
{% endblock %}
</footer>
{% endblock mediagoblin_footer %}
{% endblock mediagoblin_body %}
</div>
</body>