start moving more to skeleton
This commit is contained in:
parent
f13016943f
commit
8b8698eff5
@ -105,17 +105,8 @@ input, textarea {
|
|||||||
|
|
||||||
/* website structure */
|
/* website structure */
|
||||||
|
|
||||||
.container {
|
|
||||||
margin: auto;
|
|
||||||
/* width: 96%;*/
|
|
||||||
max-width: 940px;
|
|
||||||
}
|
|
||||||
|
|
||||||
header {
|
header {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 940px;
|
|
||||||
margin-left: auto;
|
|
||||||
margin-right: auto;
|
|
||||||
padding: 0;
|
padding: 0;
|
||||||
margin-bottom: 42px;
|
margin-bottom: 42px;
|
||||||
border-bottom: 1px solid #333;
|
border-bottom: 1px solid #333;
|
||||||
|
@ -54,110 +54,112 @@
|
|||||||
{% include 'mediagoblin/bits/body_start.html' %}
|
{% include 'mediagoblin/bits/body_start.html' %}
|
||||||
{% block mediagoblin_body %}
|
{% block mediagoblin_body %}
|
||||||
{% block mediagoblin_header %}
|
{% block mediagoblin_header %}
|
||||||
<header>
|
<div class="container">
|
||||||
{%- include "mediagoblin/bits/logo.html" -%}
|
<header>
|
||||||
{% block mediagoblin_header_title %}{% endblock %}
|
{%- include "mediagoblin/bits/logo.html" -%}
|
||||||
<div class="header_right">
|
{% block mediagoblin_header_title %}{% endblock %}
|
||||||
{%- if request.user %}
|
<div class="header_right">
|
||||||
{% if request.user and
|
{%- if request.user %}
|
||||||
request.user.has_privilege('active') and
|
{% if request.user and
|
||||||
not request.user.is_banned() %}
|
request.user.has_privilege('active') and
|
||||||
|
not request.user.is_banned() %}
|
||||||
|
|
||||||
{% 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" title="Notifications">
|
||||||
{{ notification_count }}</a>
|
{{ notification_count }}</a>
|
||||||
{% endif %}
|
|
||||||
<a href="javascript:;" class="button_action header_dropdown_down">▼</a>
|
|
||||||
<a href="javascript:;" class="button_action header_dropdown_up">▲</a>
|
|
||||||
{% elif request.user and not request.user.has_privilege('active') %}
|
|
||||||
{# the following link should only appear when verification is needed #}
|
|
||||||
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
|
||||||
user=request.user.username) }}"
|
|
||||||
class="button_action_highlight">
|
|
||||||
{% trans %}Verify your email!{% endtrans %}</a>
|
|
||||||
or <a id="logout" href=
|
|
||||||
{% if persona is not defined %}
|
|
||||||
"{{ request.urlgen('mediagoblin.auth.logout') }}"
|
|
||||||
{% else %}
|
|
||||||
"javascript:;"
|
|
||||||
{% endif %}
|
|
||||||
>{% trans %}log out{% endtrans %}</a>
|
|
||||||
{% elif request.user and request.user.is_banned() %}
|
|
||||||
<a id="logout" href=
|
|
||||||
{% if persona is not defined %}
|
|
||||||
"{{ request.urlgen('mediagoblin.auth.logout') }}"
|
|
||||||
{% else %}
|
|
||||||
"javascript:;"
|
|
||||||
{% endif %}
|
|
||||||
>{% trans %}log out{% endtrans %}</a>
|
|
||||||
{% endif %}
|
|
||||||
{%- elif auth %}
|
|
||||||
<a href=
|
|
||||||
{% if persona_auth is defined %}
|
|
||||||
"javascript:;" id="persona_login"
|
|
||||||
{% else %}
|
|
||||||
"{{ request.urlgen('mediagoblin.auth.login') }}"
|
|
||||||
{% endif %}
|
|
||||||
>
|
|
||||||
{%- trans %}Log in{% endtrans -%}
|
|
||||||
</a>
|
|
||||||
{%- endif %}
|
|
||||||
</div>
|
|
||||||
<div class="clear"></div>
|
|
||||||
{% if request.user and request.user.has_privilege('active') %}
|
|
||||||
<div class="header_dropdown">
|
|
||||||
<p>
|
|
||||||
<span class="dropdown_title">
|
|
||||||
{% trans user_url=request.urlgen('mediagoblin.user_pages.user_home',
|
|
||||||
user=request.user.username),
|
|
||||||
user_name=request.user.username -%}
|
|
||||||
<a href="{{ user_url }}">{{ user_name }}</a>'s account
|
|
||||||
{%- endtrans %}
|
|
||||||
</span>
|
|
||||||
·
|
|
||||||
<a href="{{ request.urlgen('mediagoblin.edit.account') }}">{%- trans %}Change account settings{% endtrans -%}</a>
|
|
||||||
·
|
|
||||||
<a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
|
|
||||||
user=request.user.username) }}">
|
|
||||||
{%- trans %}Media processing panel{% endtrans -%}
|
|
||||||
</a>
|
|
||||||
·
|
|
||||||
{% template_hook("blog_dashboard_home") %}
|
|
||||||
<a id="logout" href=
|
|
||||||
{% if persona is not defined %}
|
|
||||||
"{{ request.urlgen('mediagoblin.auth.logout') }}"
|
|
||||||
{% else %}
|
|
||||||
"javascript:;"
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
>{% trans %}Log out{% endtrans %}</a>
|
<a href="javascript:;" class="button_action header_dropdown_down">▼</a>
|
||||||
</p>
|
<a href="javascript:;" class="button_action header_dropdown_up">▲</a>
|
||||||
<a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">
|
{% elif request.user and not request.user.has_privilege('active') %}
|
||||||
{%- trans %}Add media{% endtrans -%}
|
{# the following link should only appear when verification is needed #}
|
||||||
</a>
|
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
||||||
<a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}">
|
user=request.user.username) }}"
|
||||||
{%- trans %}Create new collection{% endtrans -%}
|
class="button_action_highlight">
|
||||||
</a>
|
{% trans %}Verify your email!{% endtrans %}</a>
|
||||||
{% if request.user.has_privilege('admin','moderator') %}
|
or <a id="logout" href=
|
||||||
|
{% if persona is not defined %}
|
||||||
|
"{{ request.urlgen('mediagoblin.auth.logout') }}"
|
||||||
|
{% else %}
|
||||||
|
"javascript:;"
|
||||||
|
{% endif %}
|
||||||
|
>{% trans %}log out{% endtrans %}</a>
|
||||||
|
{% elif request.user and request.user.is_banned() %}
|
||||||
|
<a id="logout" href=
|
||||||
|
{% if persona is not defined %}
|
||||||
|
"{{ request.urlgen('mediagoblin.auth.logout') }}"
|
||||||
|
{% else %}
|
||||||
|
"javascript:;"
|
||||||
|
{% endif %}
|
||||||
|
>{% trans %}log out{% endtrans %}</a>
|
||||||
|
{% endif %}
|
||||||
|
{%- elif auth %}
|
||||||
|
<a href=
|
||||||
|
{% if persona_auth is defined %}
|
||||||
|
"javascript:;" id="persona_login"
|
||||||
|
{% else %}
|
||||||
|
"{{ request.urlgen('mediagoblin.auth.login') }}"
|
||||||
|
{% endif %}
|
||||||
|
>
|
||||||
|
{%- trans %}Log in{% endtrans -%}
|
||||||
|
</a>
|
||||||
|
{%- endif %}
|
||||||
|
</div>
|
||||||
|
<div class="clear"></div>
|
||||||
|
{% if request.user and request.user.has_privilege('active') %}
|
||||||
|
<div class="header_dropdown">
|
||||||
<p>
|
<p>
|
||||||
<span class="dropdown_title">Moderation powers:</span>
|
<span class="dropdown_title">
|
||||||
<a href="{{ request.urlgen('mediagoblin.moderation.media_panel') }}">
|
{% trans user_url=request.urlgen('mediagoblin.user_pages.user_home',
|
||||||
|
user=request.user.username),
|
||||||
|
user_name=request.user.username -%}
|
||||||
|
<a href="{{ user_url }}">{{ user_name }}</a>'s account
|
||||||
|
{%- endtrans %}
|
||||||
|
</span>
|
||||||
|
·
|
||||||
|
<a href="{{ request.urlgen('mediagoblin.edit.account') }}">{%- trans %}Change account settings{% endtrans -%}</a>
|
||||||
|
·
|
||||||
|
<a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
|
||||||
|
user=request.user.username) }}">
|
||||||
{%- trans %}Media processing panel{% endtrans -%}
|
{%- trans %}Media processing panel{% endtrans -%}
|
||||||
</a>
|
</a>
|
||||||
·
|
·
|
||||||
<a href="{{ request.urlgen('mediagoblin.moderation.users') }}">
|
{% template_hook("blog_dashboard_home") %}
|
||||||
{%- trans %}User management panel{% endtrans -%}
|
<a id="logout" href=
|
||||||
</a>
|
{% if persona is not defined %}
|
||||||
·
|
"{{ request.urlgen('mediagoblin.auth.logout') }}"
|
||||||
<a href="{{ request.urlgen('mediagoblin.moderation.reports') }}">
|
{% else %}
|
||||||
{%- trans %}Report management panel{% endtrans -%}
|
"javascript:;"
|
||||||
</a>
|
{% endif %}
|
||||||
|
>{% trans %}Log out{% endtrans %}</a>
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
<a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">
|
||||||
{% include 'mediagoblin/fragments/header_notifications.html' %}
|
{%- trans %}Add media{% endtrans -%}
|
||||||
</div>
|
</a>
|
||||||
{% endif %}
|
<a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}">
|
||||||
</header>
|
{%- trans %}Create new collection{% endtrans -%}
|
||||||
|
</a>
|
||||||
|
{% if request.user.has_privilege('admin','moderator') %}
|
||||||
|
<p>
|
||||||
|
<span class="dropdown_title">Moderation powers:</span>
|
||||||
|
<a href="{{ request.urlgen('mediagoblin.moderation.media_panel') }}">
|
||||||
|
{%- trans %}Media processing panel{% endtrans -%}
|
||||||
|
</a>
|
||||||
|
·
|
||||||
|
<a href="{{ request.urlgen('mediagoblin.moderation.users') }}">
|
||||||
|
{%- trans %}User management panel{% endtrans -%}
|
||||||
|
</a>
|
||||||
|
·
|
||||||
|
<a href="{{ request.urlgen('mediagoblin.moderation.reports') }}">
|
||||||
|
{%- trans %}Report management panel{% endtrans -%}
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
{% include 'mediagoblin/fragments/header_notifications.html' %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</header>
|
||||||
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<div class="container">
|
<div class="container">
|
||||||
{% include 'mediagoblin/bits/above_content.html' %}
|
{% include 'mediagoblin/bits/above_content.html' %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user