added a plugin to display information about entries in processing

Conflicts:
	mediagoblin/templates/mediagoblin/base.html -- resolved by using
	the original file and manually adding pieces from my commit

diff --git a/mediagoblin/plugins/processing_info/README.rst b/mediagoblin/plugins/processing_info/README.rst
new file mode 100644 (file)
index 0000000..3bacbf5
--- /dev/null
+++ b/mediagoblin/plugins/processing_info/README.rst
@@ -0,0 +1,5 @@
+==============
+ sampleplugin
+==============
+
+A plugin to insert some useful information about processing to templates

diff --git a/mediagoblin/plugins/processing_info/__init__.py b/mediagoblin/plugins/processing_info/__init__.py
new file mode 100644 (file)
index 0000000..f89378f
--- /dev/null
+++ b/mediagoblin/plugins/processing_info/__init__.py
@@ -0,0 +1,50 @@
+# 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/>.
+
+
+import logging
+import os
+
+from mediagoblin.tools.pluginapi import get_config
+from mediagoblin.db.models import MediaEntry
+from mediagoblin.tools import pluginapi
+
+_log = logging.getLogger(__name__)
+
+PLUGIN_DIR = os.path.dirname(__file__)
+
+def setup_plugin():
+    pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
+    pluginapi.register_template_hooks(
+            {'header_left': 'mediagoblin/processing_info/header_left.html'})
+    return
+
+def make_stats(context):
+    request = context['request']
+    user = request.user
+    num_queued = MediaEntry.query.filter_by(
+            uploader=user.id, state=u'processing').count()
+    context['num_queued'] = num_queued
+    num_failed = MediaEntry.query.filter_by(
+            uploader=user.id, state=u'failed').count()
+    context['num_failed'] = num_failed
+    return context
+                    
+
+hooks = {
+    'setup': setup_plugin,
+    'template_context_prerender': make_stats
+    }

diff --git a/mediagoblin/plugins/processing_info/templates/mediagoblin/processing_info/header_left.html b/mediagoblin/plugins/processing_info/templates/mediagoblin/processing_info/header_left.html
new file mode 100644 (file)
index 0000000..d635afc
--- /dev/null
+++ b/mediagoblin/plugins/processing_info/templates/mediagoblin/processing_info/header_left.html
@@ -0,0 +1,32 @@
+{#
+# 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/>.
+#}
+{#This injects some information about entries in processing #}
+{% if request.user and request.user.has_privilege('active') %}
+{% if num_queued is defined and num_queued != 0 %}
+{% set panel_url = request.urlgen('mediagoblin.user_pages.processing_panel',
+                                  user=request.user.username) %}
+<span class="num_queued status_icon">
+    <a href="{{ panel_url }}">&#9203; {{ num_queued }}</a>
+</span>
+{% endif %}
+{% if num_failed is defined and num_failed != 0 %}
+<span class="num_failed status_icon">
+    <a href="{{ panel_url }}">&#9785; {{ num_failed }}</a>
+</span>
+{% endif %}
+{% endif %}

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index e84f51f3132e913a5a2ad9e01ba7263903a2470b..52c1f2dc1895dbe84bf35443b1b6bcb312f0b939 100644 (file)
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -171,6 +171,26 @@ header {
 a.logo {
   color: #fff;
   font-weight: bold;
+  text-decoration: none;
+}
+
+.status_icon {
+  border-radius: 2px;
+  padding: 4px;
+  margin: 0px 4px;
+}
+
+.num_queued {
+  background: #56446F;
+}
+
+.num_failed {
+  background: #87453B;
+}
+
+.status_icon a {
+  display: inline-block;
+  color: #C3C3C3;
 }
 
 .logo img {

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 778cc3f90989edfdb6bb99292fe51b756c3a1526..9b0b716878d2a775a5afe2b54cd221e95d2678c8 100644 (file)
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -72,6 +72,7 @@
               <div class="row foot">
               <div class="header_left">
                 {%- include "mediagoblin/bits/logo.html" -%}
+               {% template_hook("header_left") %}
                 {% block mediagoblin_header_title %}{% endblock %}
               </div>
               <div class="header_right">