Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
This commit is contained in:
Christopher Allan Webber
commit
76dd312ff5
@ -245,8 +245,12 @@ text-align: center;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
.comment_content {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
.comment_content p {
|
||||
margin-bottom: 4px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
/* media galleries */
|
||||
@ -286,13 +290,16 @@ img.media_icon{
|
||||
/* navigation */
|
||||
|
||||
.navigation_button{
|
||||
width: 139px;
|
||||
width: 135px;
|
||||
display: block;
|
||||
float: left;
|
||||
text-align: center;
|
||||
background-color: #222;
|
||||
background-color: #1d1d1d;
|
||||
border: 1px solid;
|
||||
border-color: #2c2c2c #232323 #1a1a1a;
|
||||
border-radius: 3px;
|
||||
text-decoration: none;
|
||||
padding: 12px 0pt;
|
||||
padding: 8px 0px 14px;
|
||||
font-size: 2em;
|
||||
margin: 0 0 20px
|
||||
}
|
||||
@ -302,7 +309,7 @@ p.navigation_button{
|
||||
}
|
||||
|
||||
.navigation_left{
|
||||
margin-right: 2px;
|
||||
margin-right: 6px;
|
||||
}
|
||||
|
||||
/* messages */
|
||||
|
||||
BIN
mediagoblin/static/images/icon_comment.png
Normal file
BIN
mediagoblin/static/images/icon_comment.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 283 B |
@ -20,20 +20,15 @@
|
||||
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
|
||||
|
||||
{% block mediagoblin_content %}
|
||||
|
||||
<form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}"
|
||||
method="POST" enctype="multipart/form-data">
|
||||
{{ csrf_token }}
|
||||
|
||||
<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) }}
|
||||
<div class="form_submit_buttons">
|
||||
<input type="submit" value="submit" class="button"/>
|
||||
<input type="submit" value="{% trans %}Send instructions{% endtrans %}" class="button"/>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@ -30,7 +30,17 @@
|
||||
{% trans %}Logging in failed!{% endtrans %}
|
||||
</div>
|
||||
{% 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) }}
|
||||
<p>
|
||||
<a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}">
|
||||
{% trans %}Forgot your password?{% endtrans %}</a>
|
||||
</p>
|
||||
<div class="form_submit_buttons">
|
||||
<input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/>
|
||||
</div>
|
||||
@ -38,20 +48,6 @@
|
||||
<input type="hidden" name="next" value="{{ next }}" class="button"
|
||||
style="display: none;"/>
|
||||
{% 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>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
||||
@ -24,30 +24,21 @@
|
||||
<h1>{% trans %}Explore{% endtrans %}</h1>
|
||||
{% else %}
|
||||
<div class="grid_11 alpha">
|
||||
<h1>{% trans %}Hi there, media lover! MediaGoblin is...{% endtrans %}</h1>
|
||||
<ul>
|
||||
<li>{% trans %}The perfect place for your media!{% endtrans %}</li>
|
||||
<li>{% trans %}A place for people to collaborate and show off original and derived creations!{% endtrans %}</li>
|
||||
<li>{% trans %}Free, as in freedom. (We’re 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>
|
||||
|
||||
<h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
|
||||
<p>{% trans %}Your finest source for all goblin-related media.{% endtrans %}</p>
|
||||
<p>{% trans %}To add your own media, place comments, save your favourites and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
|
||||
{% 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') -%}
|
||||
<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
|
||||
<a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
|
||||
{%- endtrans %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="grid_5 omega">
|
||||
<img src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
|
||||
</div>
|
||||
|
||||
<div class="clear"></div>
|
||||
{% endif %}
|
||||
<h2>{% trans %}Most recent media{% endtrans %}</h2>
|
||||
|
||||
@ -47,28 +47,22 @@
|
||||
<h2 class="media_title">
|
||||
{{ media.title }}
|
||||
</h2>
|
||||
|
||||
{% autoescape False %}
|
||||
<p>{{ media.description_html }}</p>
|
||||
{% endautoescape %}
|
||||
<p class="media_uploader">
|
||||
{% trans date=media.created.strftime("%Y-%m-%d"),
|
||||
user_url=request.urlgen(
|
||||
'mediagoblin.user_pages.user_home',
|
||||
user=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 %}
|
||||
</p>
|
||||
|
||||
{% autoescape False %}
|
||||
<p>{{ media.description_html }}</p>
|
||||
{% endautoescape %}
|
||||
|
||||
<br />
|
||||
<h3>{% trans %}Comments{% endtrans %}</h3>
|
||||
|
||||
<h3></h3>
|
||||
{% if request.user %}
|
||||
<p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
|
||||
{% endif %}
|
||||
|
||||
{% if comments %}
|
||||
{% for comment in comments %}
|
||||
{% set comment_author = comment.author() %}
|
||||
@ -79,14 +73,10 @@
|
||||
<div class="comment_wrapper" id="comment-{{ comment['_id'] }}">
|
||||
{% endif %}
|
||||
|
||||
<div class="comment_content">
|
||||
{% autoescape False %}
|
||||
{{ comment.content_html }}
|
||||
<div class="comment_content">{% autoescape False %}{{ comment.content_html }}
|
||||
{% endautoescape %}
|
||||
</div>
|
||||
|
||||
<div class="comment_author">—
|
||||
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
||||
<img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
|
||||
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
||||
user = comment_author['username']) }}">
|
||||
{{ comment_author['username'] }}</a>
|
||||
{% trans %}at{% endtrans %}
|
||||
@ -94,7 +84,7 @@
|
||||
comment = comment['_id'],
|
||||
user = media.uploader().username,
|
||||
media = media._id) }}#comment">
|
||||
{{ comment.created.strftime("%Y-%m-%d %I:%M%p") }}
|
||||
{{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user