Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

This commit is contained in:
Christopher Allan Webber 2011-11-04 08:23:48 -05:00
commit 76dd312ff5
6 changed files with 38 additions and 59 deletions

View File

@ -245,8 +245,12 @@ text-align: center;
font-size: 0.9em; font-size: 0.9em;
} }
.comment_content {
margin-bottom: 30px;
}
.comment_content p { .comment_content p {
margin-bottom: 4px; margin-bottom: 0px;
} }
/* media galleries */ /* media galleries */
@ -286,13 +290,16 @@ img.media_icon{
/* navigation */ /* navigation */
.navigation_button{ .navigation_button{
width: 139px; width: 135px;
display: block; display: block;
float: left; float: left;
text-align: center; text-align: center;
background-color: #222; background-color: #1d1d1d;
border: 1px solid;
border-color: #2c2c2c #232323 #1a1a1a;
border-radius: 3px;
text-decoration: none; text-decoration: none;
padding: 12px 0pt; padding: 8px 0px 14px;
font-size: 2em; font-size: 2em;
margin: 0 0 20px margin: 0 0 20px
} }
@ -302,7 +309,7 @@ p.navigation_button{
} }
.navigation_left{ .navigation_left{
margin-right: 2px; margin-right: 6px;
} }
/* messages */ /* messages */

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

View File

@ -20,20 +20,15 @@
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
{% block mediagoblin_content %} {% block mediagoblin_content %}
<form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" <form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">
{{ csrf_token }} {{ csrf_token }}
<div class="grid_6 prefix_1 suffix_1 form_box"> <div class="grid_6 prefix_1 suffix_1 form_box">
<h1>{% trans %}Enter your username or email{% endtrans %}</h1> <h1>{% trans %}Recover password{% endtrans %}</h1>
{{ wtforms_util.render_divs(fp_form) }} {{ wtforms_util.render_divs(fp_form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="submit" class="button"/> <input type="submit" value="{% trans %}Send instructions{% endtrans %}" class="button"/>
</div> </div>
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

View File

@ -30,7 +30,17 @@
{% trans %}Logging in failed!{% endtrans %} {% trans %}Logging in failed!{% endtrans %}
</div> </div>
{% endif %} {% endif %}
{% if allow_registration %}
<p>
{% trans %}Don't have an account yet?{% endtrans %} <a href="{{ request.urlgen('mediagoblin.auth.register') }}">
{%- trans %}Create one here!{% endtrans %}</a>
</p>
{% endif %}
{{ wtforms_util.render_divs(login_form) }} {{ wtforms_util.render_divs(login_form) }}
<p>
<a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}">
{% trans %}Forgot your password?{% endtrans %}</a>
</p>
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/> <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/>
</div> </div>
@ -38,20 +48,6 @@
<input type="hidden" name="next" value="{{ next }}" class="button" <input type="hidden" name="next" value="{{ next }}" class="button"
style="display: none;"/> style="display: none;"/>
{% endif %} {% endif %}
{% if allow_registration %}
<p>
{% trans %}Don't have an account yet?{% endtrans %}
<br />
<a href="{{ request.urlgen('mediagoblin.auth.register') }}">
{%- trans %}Create one here!{% endtrans %}</a>
</p>
<p>
{% trans %}Forgot your password?{% endtrans %}
<br />
<a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}">
{%- trans %}Change it!{% endtrans %}</a>
</p>
{% endif %}
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

View File

@ -24,30 +24,21 @@
<h1>{% trans %}Explore{% endtrans %}</h1> <h1>{% trans %}Explore{% endtrans %}</h1>
{% else %} {% else %}
<div class="grid_11 alpha"> <div class="grid_11 alpha">
<h1>{% trans %}Hi there, media lover! MediaGoblin is...{% endtrans %}</h1> <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
<ul> <p>{% trans %}Your finest source for all goblin-related media.{% endtrans %}</p>
<li>{% trans %}The perfect place for your media!{% endtrans %}</li> <p>{% trans %}To add your own media, place comments, save your favourites and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
<li>{% trans %}A place for people to collaborate and show off original and derived creations!{% endtrans %}</li>
<li>{% trans %}Free, as in freedom. (Were a <a href="http://gnu.org">GNU</a> project, after all.){% endtrans %}</li>
<li>{% trans %}Aiming to make the world a better place through decentralization and (eventually, coming soon!) federation!{% endtrans %}</li>
<li>{% trans %}Built for extensibility. (Multiple media types coming soon to the software, including video support!){% endtrans %}</li>
<li>{% trans %}Powered by people like you. (<a href="http://mediagoblin.org/pages/join.html">You can help us improve this software!</a>){% endtrans %}</li>
</ul>
{% if allow_registration %} {% if allow_registration %}
<p>{% trans %}Excited to join us?{% endtrans %}<p> <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
{% trans register_url=request.urlgen('mediagoblin.auth.register') -%} {% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
<a class="header_submit_highlight" href="{{ register_url }}">Create a free account</a> <a class="header_submit_highlight" href="{{ register_url }}">Create an account at this site</a>
or or
<a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a> <a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
{%- endtrans %} {%- endtrans %}
{% endif %} {% endif %}
</div> </div>
<div class="grid_5 omega"> <div class="grid_5 omega">
<img src="{{ request.staticdirect('/images/frontpage_image.png') }}" /> <img src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
</div> </div>
<div class="clear"></div> <div class="clear"></div>
{% endif %} {% endif %}
<h2>{% trans %}Most recent media{% endtrans %}</h2> <h2>{% trans %}Most recent media{% endtrans %}</h2>

View File

@ -47,28 +47,22 @@
<h2 class="media_title"> <h2 class="media_title">
{{ media.title }} {{ media.title }}
</h2> </h2>
{% autoescape False %}
<p>{{ media.description_html }}</p>
{% endautoescape %}
<p class="media_uploader"> <p class="media_uploader">
{% trans date=media.created.strftime("%Y-%m-%d"), {% trans date=media.created.strftime("%Y-%m-%d"),
user_url=request.urlgen( user_url=request.urlgen(
'mediagoblin.user_pages.user_home', 'mediagoblin.user_pages.user_home',
user=media.uploader().username), user=media.uploader().username),
username=media.uploader().username -%} username=media.uploader().username -%}
Uploaded on {{ date }} by <a href="{{ user_url }}">{{ username }}</a> By <a href="{{ user_url }}">{{ username }}</a> on {{ date }}
{%- endtrans %} {%- endtrans %}
</p> </p>
<h3></h3>
{% autoescape False %}
<p>{{ media.description_html }}</p>
{% endautoescape %}
<br />
<h3>{% trans %}Comments{% endtrans %}</h3>
{% if request.user %} {% if request.user %}
<p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p> <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
{% endif %} {% endif %}
{% if comments %} {% if comments %}
{% for comment in comments %} {% for comment in comments %}
{% set comment_author = comment.author() %} {% set comment_author = comment.author() %}
@ -79,14 +73,10 @@
<div class="comment_wrapper" id="comment-{{ comment['_id'] }}"> <div class="comment_wrapper" id="comment-{{ comment['_id'] }}">
{% endif %} {% endif %}
<div class="comment_content"> <div class="comment_content">{% autoescape False %}{{ comment.content_html }}
{% autoescape False %}
{{ comment.content_html }}
{% endautoescape %} {% endautoescape %}
</div> <img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
<div class="comment_author">&mdash;
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user = comment_author['username']) }}"> user = comment_author['username']) }}">
{{ comment_author['username'] }}</a> {{ comment_author['username'] }}</a>
{% trans %}at{% endtrans %} {% trans %}at{% endtrans %}
@ -94,7 +84,7 @@
comment = comment['_id'], comment = comment['_id'],
user = media.uploader().username, user = media.uploader().username,
media = media._id) }}#comment"> media = media._id) }}#comment">
{{ comment.created.strftime("%Y-%m-%d %I:%M%p") }} {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
</a> </a>
</div> </div>
</div> </div>