From 054cfee4b428b52de26803bfa2b0ce0d309eacc4 Mon Sep 17 00:00:00 2001 From: jpope777 Date: Tue, 31 Dec 2013 14:50:21 -0600 Subject: [PATCH 1/8] add skeleton submodule --- .gitmodules | 3 +++ extlib/skeleton | 1 + 2 files changed, 4 insertions(+) create mode 160000 extlib/skeleton diff --git a/.gitmodules b/.gitmodules index 95a76e1f..f179ae1d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,3 +5,6 @@ path = extlib/pdf.js url = git://github.com/mozilla/pdf.js.git +[submodule "extlib/skeleton"] + path = extlib/skeleton + url = git://github.com/dhg/Skeleton.git diff --git a/extlib/skeleton b/extlib/skeleton new file mode 160000 index 00000000..7ab68209 --- /dev/null +++ b/extlib/skeleton @@ -0,0 +1 @@ +Subproject commit 7ab682091d1032035cfcb668e6bd4b465bfa4679 From 3e2a1f155ef10e1979032b19ab4a61d3e048cdac Mon Sep 17 00:00:00 2001 From: jpope777 Date: Tue, 31 Dec 2013 15:00:16 -0600 Subject: [PATCH 2/8] add symlinks to skeleton --- mediagoblin/static/css/extlib/baseskeleton.css | 1 + mediagoblin/static/css/extlib/layout.css | 1 + mediagoblin/static/css/extlib/skeleton.css | 1 + mediagoblin/static/extlib/skeleton | 1 + 4 files changed, 4 insertions(+) create mode 120000 mediagoblin/static/css/extlib/baseskeleton.css create mode 120000 mediagoblin/static/css/extlib/layout.css create mode 120000 mediagoblin/static/css/extlib/skeleton.css create mode 120000 mediagoblin/static/extlib/skeleton diff --git a/mediagoblin/static/css/extlib/baseskeleton.css b/mediagoblin/static/css/extlib/baseskeleton.css new file mode 120000 index 00000000..ee4f8c52 --- /dev/null +++ b/mediagoblin/static/css/extlib/baseskeleton.css @@ -0,0 +1 @@ +../../../../extlib/skeleton/stylesheets/base.css \ No newline at end of file diff --git a/mediagoblin/static/css/extlib/layout.css b/mediagoblin/static/css/extlib/layout.css new file mode 120000 index 00000000..87c79a92 --- /dev/null +++ b/mediagoblin/static/css/extlib/layout.css @@ -0,0 +1 @@ +../../../../extlib/skeleton/stylesheets/layout.css \ No newline at end of file diff --git a/mediagoblin/static/css/extlib/skeleton.css b/mediagoblin/static/css/extlib/skeleton.css new file mode 120000 index 00000000..6ecf4919 --- /dev/null +++ b/mediagoblin/static/css/extlib/skeleton.css @@ -0,0 +1 @@ +../../../../extlib/skeleton/stylesheets/skeleton.css \ No newline at end of file diff --git a/mediagoblin/static/extlib/skeleton b/mediagoblin/static/extlib/skeleton new file mode 120000 index 00000000..737bfce4 --- /dev/null +++ b/mediagoblin/static/extlib/skeleton @@ -0,0 +1 @@ +../../../extlib/skeleton/ \ No newline at end of file From b5ab205d3c28f3810fc01d23840a62bd32f2f4e1 Mon Sep 17 00:00:00 2001 From: jpope777 Date: Tue, 31 Dec 2013 15:52:44 -0600 Subject: [PATCH 3/8] update base.html --- mediagoblin/templates/mediagoblin/base.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index e71f9d12..6e2bca20 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -29,6 +29,12 @@ href="{{ request.staticdirect('/css/extlib/reset.css') }}"/> + + + - - - {# For clarification, the difference between the extra_head.html template # and the head template hook is that the former should be used by @@ -183,4 +170,13 @@ {%- endblock mediagoblin_body %} {% include 'mediagoblin/bits/body_end.html' %} + + + + diff --git a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html index dfe2ebe2..64b30815 100644 --- a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html @@ -19,15 +19,15 @@ {% from "mediagoblin/utils/pagination.html" import render_pagination %} {% macro media_grid(request, collection_items, col_number=5) %} - +
{% for row in collection_items|batch(col_number) %} -
{% for item in row %} {% set media_entry = item.get_media_entry %} {% set entry_url = media_entry.url_for_self(request.urlgen) %} - + {% endfor %} - + {% endfor %} -
@@ -49,11 +49,11 @@ {%- trans %}(remove){% endtrans -%} {% endif %} -
+ {%- endmacro %} {# diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html index d328b552..1b4a15ed 100644 --- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html @@ -19,14 +19,14 @@ {% from "mediagoblin/utils/pagination.html" import render_pagination %} {% macro media_grid(request, media_entries, col_number=5) %} - +
{% for row in media_entries|batch(col_number) %} -
{% for entry in row %} {% set entry_url = entry.url_for_self(request.urlgen) %} - + {% endfor %} - + {% endfor %} -
@@ -35,11 +35,11 @@ {% if entry.title %} {{ entry.title }} {% endif %} -
+ {%- endmacro %} {# From 1e298b10c7cba2d27cb19f1aee03134f66ef6e20 Mon Sep 17 00:00:00 2001 From: jpope Date: Wed, 1 Jan 2014 11:54:23 -0600 Subject: [PATCH 5/8] fix misplaced body tag when I moved the javascript to bottom of page --- mediagoblin/templates/mediagoblin/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 69b28685..93086205 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -169,7 +169,6 @@ {%- endblock mediagoblin_body %} {% include 'mediagoblin/bits/body_end.html' %} - + From 3db134b88c0fe5365866ae80865385de372ebd98 Mon Sep 17 00:00:00 2001 From: jpope Date: Sun, 5 Jan 2014 16:56:47 -0600 Subject: [PATCH 6/8] updated --- mediagoblin/static/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index f998bbb3..dcf5bc3d 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -496,7 +496,7 @@ ul#action_to_resolve {list-style:none; margin-left:10px;} border-radius: 0 0 5px 5px; padding: 0 0 6px; text-overflow: ellipsis; - white-space: nowrap; +/* white-space: nowrap;*/ overflow: hidden; border-color: #0D0D0D; border-style: solid; From f13016943ffadfc6d03b643a6087d9277be863f8 Mon Sep 17 00:00:00 2001 From: jpope Date: Sun, 5 Jan 2014 17:12:13 -0600 Subject: [PATCH 7/8] undo that "update" --- mediagoblin/static/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index dcf5bc3d..f998bbb3 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -496,7 +496,7 @@ ul#action_to_resolve {list-style:none; margin-left:10px;} border-radius: 0 0 5px 5px; padding: 0 0 6px; text-overflow: ellipsis; -/* white-space: nowrap;*/ + white-space: nowrap; overflow: hidden; border-color: #0D0D0D; border-style: solid; From 8b8698eff5bda8afa94a5e597756125bb11cf150 Mon Sep 17 00:00:00 2001 From: jpope Date: Sun, 5 Jan 2014 20:47:36 -0600 Subject: [PATCH 8/8] start moving more to skeleton --- mediagoblin/static/css/base.css | 9 - mediagoblin/templates/mediagoblin/base.html | 196 ++++++++++---------- 2 files changed, 99 insertions(+), 106 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index f998bbb3..ae4c42fc 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -105,17 +105,8 @@ input, textarea { /* website structure */ -.container { - margin: auto; -/* width: 96%;*/ - max-width: 940px; -} - header { width: 100%; - max-width: 940px; - margin-left: auto; - margin-right: auto; padding: 0; margin-bottom: 42px; border-bottom: 1px solid #333; diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index ecc24f89..2d6f03d9 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -54,110 +54,112 @@ {% include 'mediagoblin/bits/body_start.html' %} {% block mediagoblin_body %} {% block mediagoblin_header %} -
- {%- include "mediagoblin/bits/logo.html" -%} - {% block mediagoblin_header_title %}{% endblock %} -
- {%- if request.user %} - {% if request.user and - request.user.has_privilege('active') and - not request.user.is_banned() %} +
+
+ {%- include "mediagoblin/bits/logo.html" -%} + {% block mediagoblin_header_title %}{% endblock %} +
+ {%- if request.user %} + {% if request.user and + request.user.has_privilege('active') and + not request.user.is_banned() %} - {% set notification_count = get_notification_count(request.user.id) %} - {% if notification_count %} - - {{ notification_count }} - {% endif %} - ▼ - ▲ - {% elif request.user and not request.user.has_privilege('active') %} - {# the following link should only appear when verification is needed #} - - {% trans %}Verify your email!{% endtrans %} - or {% trans %}log out{% endtrans %} - {% elif request.user and request.user.is_banned() %} - {% trans %}log out{% endtrans %} - {% endif %} - {%- elif auth %} - - {%- trans %}Log in{% endtrans -%} - - {%- endif %} -
-
- {% if request.user and request.user.has_privilege('active') %} -
-

- - {% trans user_url=request.urlgen('mediagoblin.user_pages.user_home', - user=request.user.username), - user_name=request.user.username -%} - {{ user_name }}'s account - {%- endtrans %} - - · - {%- trans %}Change account settings{% endtrans -%} - · - - {%- trans %}Media processing panel{% endtrans -%} - - · - {% template_hook("blog_dashboard_home") %} - + {{ notification_count }} {% endif %} - >{% trans %}Log out{% endtrans %} -

- - {%- trans %}Add media{% endtrans -%} - - - {%- trans %}Create new collection{% endtrans -%} - - {% if request.user.has_privilege('admin','moderator') %} + ▼ + ▲ + {% elif request.user and not request.user.has_privilege('active') %} + {# the following link should only appear when verification is needed #} + + {% trans %}Verify your email!{% endtrans %} + or {% trans %}log out{% endtrans %} + {% elif request.user and request.user.is_banned() %} + {% trans %}log out{% endtrans %} + {% endif %} + {%- elif auth %} + + {%- trans %}Log in{% endtrans -%} + + {%- endif %} +
+
+ {% if request.user and request.user.has_privilege('active') %} +

- Moderation powers: - + + {% trans user_url=request.urlgen('mediagoblin.user_pages.user_home', + user=request.user.username), + user_name=request.user.username -%} + {{ user_name }}'s account + {%- endtrans %} + + · + {%- trans %}Change account settings{% endtrans -%} + · + {%- trans %}Media processing panel{% endtrans -%} · - - {%- trans %}User management panel{% endtrans -%} - - · - - {%- trans %}Report management panel{% endtrans -%} - + {% template_hook("blog_dashboard_home") %} + {% trans %}Log out{% endtrans %}

- {% endif %} - {% include 'mediagoblin/fragments/header_notifications.html' %} -
- {% endif %} -
+ + {%- trans %}Add media{% endtrans -%} + + + {%- trans %}Create new collection{% endtrans -%} + + {% if request.user.has_privilege('admin','moderator') %} +

+ Moderation powers: + + {%- trans %}Media processing panel{% endtrans -%} + + · + + {%- trans %}User management panel{% endtrans -%} + + · + + {%- trans %}Report management panel{% endtrans -%} + +

+ {% endif %} + {% include 'mediagoblin/fragments/header_notifications.html' %} +
+ {% endif %} +
+ {% endblock %}
{% include 'mediagoblin/bits/above_content.html' %}