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

skeletonize frontpage welcome

Browse Source
This commit is contained in:
jpope 2014-01-07 12:09:02 -06:00
parent 7b40694e7b
commit fe024f0be7
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,6 +161,10 @@ a.logo {
margin: 6px 8px 6px 0; margin: 6px 8px 6px 0;
} }
.welcomeimage {
float: right;
}
.fine_print { .fine_print {
font-size: 0.8em; font-size: 0.8em;
} }
@ -816,6 +820,7 @@ pre {
.button_action, .button_action_highlight, .button_form { .button_action, .button_action_highlight, .button_form {
padding: 5px 14px; padding: 5px 14px;
margin-bottom: 0.5em;
} }
} }
@ -861,6 +866,14 @@ pre {
.header_right { .header_right {
text-align: center; text-align: center;
} }
.welcomeimage {
float: none;
display: inherit;
margin-left: auto;
margin-right: auto;
margin-top: 1em;
}
} }
/* Exif display */ /* Exif display */

49
mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
View File

@ -19,29 +19,34 @@
{% if request.user %} {% if request.user %}
<h1>{% trans %}Explore{% endtrans %}</h1> <h1>{% trans %}Explore{% endtrans %}</h1>
{% else %} {% else %}
<img class="right_align" src="{{ request.staticdirect('/images/home_goblin.png') }}" /> <div class="row hell">
<h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1> <div class="eleven columns">
<p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p> <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
{% if auth %} <p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
<p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p> {% if auth %}
{% if allow_registration %} <p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
<p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p> {% if allow_registration %}
<a class="button_action_highlight" href= <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
{% if persona_auth is defined %} <a class="button_action_highlight" href=
"javascript:;" id="persona_login1" {% if persona_auth is defined %}
{% else %} "javascript:;" id="persona_login1"
"{{ request.urlgen('mediagoblin.auth.register') }}" {% else %}
"{{ request.urlgen('mediagoblin.auth.register') }}"
{% endif %}
{% trans %}
>Create an account at this site</a>
or
{%- endtrans %}
{% endif %} {% endif %}
{% trans %} {% endif %}
>Create an account at this site</a> {% trans %}
or <a class="button_action" href="http://mediagoblin.readthedocs.org/">Set up MediaGoblin on your own server</a>
{%- endtrans %} {%- endtrans %}
{% endif %} </div>
{% endif %} <div class="four columns offset-by-one">
{% trans %} <img class="welcomeimage" src="/mgoblin_static/images/home_goblin.png">
<a class="button_action" href="http://mediagoblin.readthedocs.org/">Set up MediaGoblin on your own server</a> </div>
{%- endtrans %} </div>
<div class="clear"></div> <div class="clear"></div>
{% endif %} {% endif %}