Revision: 11323
http://freenas.svn.sourceforge.net/freenas/?rev=11323&view=rev
Author: zippybr
Date: 2012-04-27 15:55:24 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Tree menu icon for firefly (untested)
Modified Paths:
--------------
trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/urls.py
trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/utils.py
trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/views.py
Modified: trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/urls.py
===================================================================
--- trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/urls.py 2012-04-27 15:49:41 UTC (rev 11322)
+++ trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/urls.py 2012-04-27 15:55:24 UTC (rev 11323)
@@ -2,6 +2,7 @@
urlpatterns = patterns('fireflyUI.freenas.views',
url(r'^edit$', 'edit', name="firefly_edit"),
+ url(r'^treemenu-icon$', 'treemenu_icon', name="treemenu_icon"),
url(r'^_s/treemenu$', 'treemenu', name="treemenu"),
url(r'^_s/start$', 'start', name="start"),
url(r'^_s/stop$', 'stop', name="stop"),
Modified: trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/utils.py
===================================================================
--- trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/utils.py 2012-04-27 15:49:41 UTC (rev 11322)
+++ trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/utils.py 2012-04-27 15:55:24 UTC (rev 11323)
@@ -9,6 +9,7 @@
firefly_fcgi_wwwdir = os.path.join(firefly_pbi_path, "www")
firefly_control = "/usr/local/etc/rc.d/mt-daapd"
firefly_config = os.path.join(firefly_etc_path, "mt-daapd.conf")
+firefly_icon = os.path.join(firefly_pbi_path, "default.png")
firefly_oauth_file = os.path.join(firefly_pbi_path, ".oauth")
Modified: trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/views.py
===================================================================
--- trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/views.py 2012-04-27 15:49:41 UTC (rev 11322)
+++ trunk/nanobsd/plugins/firefly_pbi/resources/fireflyUI/freenas/views.py 2012-04-27 15:55:24 UTC (rev 11323)
@@ -289,7 +289,7 @@
plugin = {
'name': 'Firefly',
'append_to': 'services.PluginsJail',
- 'icon': 'SettingsIcon',
+ 'icon': reverse("treemenu_icon"),
'type': 'pluginsfcgi',
'url': reverse('firefly_edit'),
'kwargs': {'plugin_name': 'firefly'},
@@ -325,3 +325,10 @@
'pid': pid,
}),
content_type='application/json')
+
+
+def treemenu_icon(request):
+ with open(utils.firefly_icon, 'rb') as f:
+ icon = f.read()
+
+ return HttpResponse(icon, content_type='image/png')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
