aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/themes
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/themes')
-rw-r--r--mediagoblin/themes/airy/assets/css/airy.css31
-rw-r--r--mediagoblin/themes/airy/assets/images/empty_dots.pngbin0 -> 205 bytes
-rw-r--r--mediagoblin/themes/airy/assets/images/icon_feed.pngbin0 -> 473 bytes
-rw-r--r--mediagoblin/themes/airy/templates/mediagoblin/base.html32
-rw-r--r--mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html23
5 files changed, 49 insertions, 37 deletions
diff --git a/mediagoblin/themes/airy/assets/css/airy.css b/mediagoblin/themes/airy/assets/css/airy.css
index 22f12d5e..c63345b2 100644
--- a/mediagoblin/themes/airy/assets/css/airy.css
+++ b/mediagoblin/themes/airy/assets/css/airy.css
@@ -3,22 +3,19 @@ body {
background-color: #F7F7F7;
}
-h1,h2 {
- color: #787878;
-}
-
-h3 {
+h1,h2,h3 {
color: #4a4a4a;
}
a {
- color: #37BD85;
+ color: #37AB74;
}
.navigation_button {
background-color: #fff;
border: 1px solid;
- border-color: #F3F3F3 #ECECEC #C7C7C7;
+ border-color: #e4e4e4;
+ border-width: 1px 1px 2px;
color: #4a4a4a;
font-weight: bold;
}
@@ -44,14 +41,16 @@ footer {
color: #4a4a4a;
background-color: #fff;
border: 1px solid;
- border-color: #F3F3F3 #ECECEC #C7C7C7;
+ border-color: #E4E4E4;
+ border-width: 1px 1px 2px;
padding: 5px 10px;
}
.button_action_highlight, .button_form {
color: #fff;
- background-color: #37BD85;
- border-color: #A2DEC3 #6CAA8E #5C9179;
+ background-color: #37AB74;
+ border-color: #6CAA8E;
+ border-width: 1px 1px 2px;
}
input, textarea {
@@ -66,20 +65,12 @@ input, textarea {
.media_thumbnail {
background-color: #fff;
- border: 1px solid #e4e4e4;
- margin: 0 3px 10px;
}
.media_thumbnail a {
color: #4a4a4a;
}
-.dropdown {
- color: #4a4a4a;
- border: 1px solid #e4e4e4;
- background-color: #fff;
-}
-
-.dropdown_items {
- background-color: #fff;
+.empty_space {
+ background-image: url("../images/empty_dots.png");
}
diff --git a/mediagoblin/themes/airy/assets/images/empty_dots.png b/mediagoblin/themes/airy/assets/images/empty_dots.png
new file mode 100644
index 00000000..5ee050b2
--- /dev/null
+++ b/mediagoblin/themes/airy/assets/images/empty_dots.png
Binary files differ
diff --git a/mediagoblin/themes/airy/assets/images/icon_feed.png b/mediagoblin/themes/airy/assets/images/icon_feed.png
new file mode 100644
index 00000000..18c085b4
--- /dev/null
+++ b/mediagoblin/themes/airy/assets/images/icon_feed.png
Binary files differ
diff --git a/mediagoblin/themes/airy/templates/mediagoblin/base.html b/mediagoblin/themes/airy/templates/mediagoblin/base.html
index 8bd9a7f9..6e177ddb 100644
--- a/mediagoblin/themes/airy/templates/mediagoblin/base.html
+++ b/mediagoblin/themes/airy/templates/mediagoblin/base.html
@@ -28,8 +28,6 @@
<link rel="shortcut icon"
href="{{ request.staticdirect('/images/goblin.ico') }}" />
<script src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script>
- <script type="text/javascript"
- src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script>
<!--[if lt IE 9]>
<script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script>
<![endif]-->
@@ -47,31 +45,31 @@
<a class="logo"
href="{{ request.urlgen('index') }}">
<img src="{{ request.staticdirect('/images/logo.png', 'theme') }}"
- alt="{% trans %}MediaGoblin logo{% endtrans %}" />
+ alt="{% trans %}MediaGoblin logo{% endtrans %}" />
</a>
{% endblock mediagoblin_logo %}
{% block mediagoblin_header_title %}{% endblock %}
<div class="header_right">
{% if request.user %}
+ {% 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 %}
+ (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
+ {% if request.user and request.user.status == 'active' %}
+ <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Add media{% endtrans %}</a>
+ {% elif request.user and request.user.status == "needs_email_verification" %}
{# the following link should only appear when verification is needed #}
- {% if request.user.status == "needs_email_verification" %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
- user=request.user.username) }}"
+ user=request.user.username) }}"
class="button_action_highlight">
- {% trans %}Verify your email!{% endtrans %}</a>
+ {% trans %}Verify your email!{% endtrans %}</a>
{% endif %}
- <div class="dropdown">
- {{ request.user.username }} ▾
- <div class="dropdown_items">
- {% if request.user and request.user.status == 'active' %}
- <a href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}+ Add media{% endtrans %}</a>
- {% endif %}
- <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{% trans %}View your profile{% endtrans %}</a>
- <a class="button_action" href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a>
- </div>
- </div>
{% else %}
- <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
+ <a href="{{ request.urlgen('mediagoblin.auth.login') }}?next={{
+ request.base_url|urlencode }}">
{% trans %}Log in{% endtrans %}</a>
{% endif %}
</div>
diff --git a/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html b/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html
new file mode 100644
index 00000000..cf5099a2
--- /dev/null
+++ b/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html
@@ -0,0 +1,23 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#}
+
+<a href="{{ feed_url }}">
+ <img src="{{ request.staticdirect('/images/icon_feed.png', 'theme') }}"
+ class="media_icon" alt="{% trans %}feed icon{% endtrans %}" />
+</a>
+<a href="{{ feed_url }}">{%- trans %}Atom feed{% endtrans -%}</a>
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-09 16:12:34 +0000