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

Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton

Browse Source
This commit is contained in:
jpope777 2014-01-07 17:53:36 -06:00
commit ab6cb46617
7 changed files with 113 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
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;
} }
@ -198,6 +202,20 @@ footer {
display:block; display:block;
} }
.media_pane {
border-bottom: 1px solid #333333;
}
.media_sidebar {
border-left: 1px solid #333333;
padding-left: 1em;
padding-top: 1em;
}
.media_comments {
padding-top: 1em;
}
/* common website elements */ /* common website elements */
.button_action, .button_action_highlight, .button_form { .button_action, .button_action_highlight, .button_form {
@ -221,6 +239,17 @@ footer {
color: #283F35; color: #283F35;
} }
.button_info {
background-color: #508BB5;
border-color: #5899C7 #437699 #427496;
color: #C3C3C3;
}
.button_warning {
background-color: #8A2D2D;
border-color: #913030 #451717 #431212;
color: #C3C3C3;
}
.button_form { .button_form {
min-width: 99px; min-width: 99px;
@ -245,6 +274,13 @@ text-align: center;
padding-top: 70px; padding-top: 70px;
} }
.no_background {
background-image: none;
height: 0;
padding-top: 0;
display: inline-block;
}
.right_align { .right_align {
float: right; float: right;
} }
@ -274,13 +310,13 @@ text-align: center;
} }
.media_sidebar h3 { .media_sidebar h3 {
font-size: 1em; font-size: 1em;
margin: 0 0 5px; margin: 0 0 5px;
border: none; border: none;
} }
.media_sidebar p { .media_sidebar p {
margin-left: 8px; margin-left: 8px;
} }
.alpha { .alpha {
@ -816,6 +852,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 +898,25 @@ 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;
}
.media_sidebar {
border-left: none;
padding-left: 0;
padding-top: 1em;
margin-top: 1em;
}
.media_comments {
border-bottom: 1px solid #333333;
}
} }
/* Exif display */ /* Exif display */

2
mediagoblin/templates/mediagoblin/banned.html
View File

@ -21,7 +21,7 @@
{% block mediagoblin_content %} {% block mediagoblin_content %}
<img class="right_align" src="{{ request.staticdirect('/images/404.png') }}" <img class="right_align" src="{{ request.staticdirect('/images/404.png') }}"
alt="{% trans %}Image of goblin stressing out{% endtrans %}" /> alt="{% trans %}Image of goblin stressing out{% endtrans %}" style="max-width:100%;"/>
<h1>{% trans %}You have been banned{% endtrans %} <h1>{% trans %}You have been banned{% endtrans %}
{% if expiration_date %} {% if expiration_date %}

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

@ -78,7 +78,7 @@
{% set notification_count = get_notification_count(request.user.id) %} {% set notification_count = get_notification_count(request.user.id) %}
{% if notification_count %} {% if notification_count %}
<a href="javascript:;" class="notification-gem button_action" title="Notifications"> <a href="javascript:;" class="notification-gem button_action button_info" title="Notifications">
{{ notification_count }}</a> {{ notification_count }}</a>
{% endif %} {% endif %}
<a href="javascript:;" class="button_action header_dropdown_down">&#9660;</a> <a href="javascript:;" class="button_action header_dropdown_down">&#9660;</a>

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 %}

2
mediagoblin/templates/mediagoblin/error.html
View File

@ -21,7 +21,7 @@
{% block mediagoblin_content %} {% block mediagoblin_content %}
<img class="right_align" src="{{ request.staticdirect('/images/404.png') }}" <img class="right_align" src="{{ request.staticdirect('/images/404.png') }}"
alt="{% trans %}Image of goblin stressing out{% endtrans %}" /> alt="{% trans %}Image of goblin stressing out{% endtrans %}" style="max-width:100%;"/>
<h1>{{ title }}</h1> <h1>{{ title }}</h1>
<p>{{ err_msg|safe }}</p> <p>{{ err_msg|safe }}</p>
<div class="clear"></div> <div class="clear"></div>

10
mediagoblin/templates/mediagoblin/moderation/user.html
View File

@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="eight columns"> <div class="six columns">
{# If no user... #} {# If no user... #}
{% if not user %} {% if not user %}
<p>{% trans %}Sorry, no such user found.{% endtrans %}</p> <p>{% trans %}Sorry, no such user found.{% endtrans %}</p>
@ -100,7 +100,7 @@
{% endif %} {% endif %}
</div> </div>
{% if user %} {% if user %}
<div class="eight columns"> <div class="ten columns">
<h2> <h2>
{%- trans username=user.username -%} {%- trans username=user.username -%}
Active Reports on {{ username }} Active Reports on {{ username }}
@ -163,14 +163,14 @@
<div class="row hell"> <div class="row hell">
<h2>{% trans username=user.username -%} <h2>{% trans username=user.username -%}
{{ username }}'s Privileges{% endtrans %}</h2> {{ username }}'s Privileges{% endtrans %}</h2>
<div class="eight columns"> <div class="six columns">
<form action="{{ request.urlgen('mediagoblin.moderation.give_or_take_away_privilege', <form action="{{ request.urlgen('mediagoblin.moderation.give_or_take_away_privilege',
user=user.username) }}" user=user.username) }}"
method=post > method=post >
<table class="admin_side_panel"> <table class="admin_side_panel">
<tr> <tr>
<th>{% trans %}Privilege{% endtrans %}</th> <th>{% trans %}Privilege{% endtrans %}</th>
<th>{% trans %}User Has Privilege{% endtrans %}</th> <th>{% trans %}Granted{% endtrans %}</th>
</tr> </tr>
{% for privilege in privileges %} {% for privilege in privileges %}
<tr> <tr>
@ -201,7 +201,7 @@
<input type=hidden name=privilege_name id=hidden_privilege_name /> <input type=hidden name=privilege_name id=hidden_privilege_name />
</form> </form>
</div> </div>
<div class="eight columns"> <div class="five columns">
<form method=POST action="{{ request.urlgen( <form method=POST action="{{ request.urlgen(
'mediagoblin.moderation.ban_or_unban', 'mediagoblin.moderation.ban_or_unban',
user=user.username) }}"> user=user.username) }}">

24
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -46,7 +46,7 @@
{% include "mediagoblin/utils/prev_next.html" %} {% include "mediagoblin/utils/prev_next.html" %}
</div> </div>
</div> </div>
<div class="media_pane eleven columns"> <div class="media_pane sixteen columns">
<div class="media_image_container"> <div class="media_image_container">
{% block mediagoblin_media %} {% block mediagoblin_media %}
{% set display_media = request.app.public_store.file_url( {% set display_media = request.app.public_store.file_url(
@ -70,12 +70,14 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
</div> </div>
<div class="row heaven hell">
<h2 class="media_title"> <h2 class="media_title">
{{ media.title }} {{ media.title }}
</h2> </h2>
{% if request.user and {% if request.user and
(media.uploader == request.user.id or (media.uploader == request.user.id or
request.user.has_privilege('admin')) %} request.user.has_privilege('admin')) %}
<div class="pull-right" style="padding-top:20px;">
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media', {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
user= media.get_uploader.username, user= media.get_uploader.username,
media_id=media.id) %} media_id=media.id) %}
@ -83,13 +85,18 @@
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user= media.get_uploader.username, user= media.get_uploader.username,
media_id=media.id) %} media_id=media.id) %}
<a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a> <a class="button_action button_warning" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
</div>
{% endif %} {% endif %}
{% autoescape False %} {% autoescape False %}
<p>{{ media.description_html }}</p> <p>{{ media.description_html }}</p>
{% endautoescape %} {% endautoescape %}
</div>
</div>
<div class="eleven columns omega">
{% if comments and request.user and request.user.has_privilege('commenter') %} {% if comments and request.user and request.user.has_privilege('commenter') %}
<div class="media_comments">
{% if app_config['allow_comments'] %} {% if app_config['allow_comments'] %}
<a <a
{% if not request.user %} {% if not request.user %}
@ -163,9 +170,13 @@
</ul> </ul>
{{ render_pagination(request, pagination, {{ render_pagination(request, pagination,
media.url_for_self(request.urlgen)) }} media.url_for_self(request.urlgen)) }}
{% else %}
<div class="empty_space no_background">
{% endif %} {% endif %}
</div><!--end media_pane--> </div>
<div class="five columns media_sidebar"> </div>
<div class="five columns alpha media_sidebar">
<h3>{% trans %}Added{% endtrans %}</h3> <h3>{% trans %}Added{% endtrans %}</h3>
<p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}"> <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}">
{%- trans formatted_time=timesince(media.created) -%} {%- trans formatted_time=timesince(media.created) -%}
@ -223,6 +234,7 @@
{% block mediagoblin_sidebar %} {% block mediagoblin_sidebar %}
{% endblock %} {% endblock %}
</div> </div><!--end media_sidebar-->
<div class="clear"></div> <div class="clear"></div>
{% endblock %} {% endblock %}