From 9f7a56e4cdcbe14809008748522c3f2e62584262 Mon Sep 17 00:00:00 2001 From: Jacques Dafflon Date: Thu, 26 Mar 2015 18:18:52 +0100 Subject: [PATCH] VC_Dummy: updated to work with latest VC version - updated the vc_dummy plugin to work with the latest version of the VC module --- vc_dummy/MANIFEST.in | 3 ++ vc_dummy/indico_vc_dummy/plugin.py | 30 ++++++++++++++++-- .../static/images/dummy_icon.png | Bin 0 -> 3380 bytes .../static/images/dummy_logo.png | Bin 0 -> 6790 bytes .../indico_vc_dummy/templates/info_box.html | 13 ++++++++ .../templates/manage_event_info_box.html | 13 ++++++++ 6 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 vc_dummy/MANIFEST.in create mode 100644 vc_dummy/indico_vc_dummy/static/images/dummy_icon.png create mode 100644 vc_dummy/indico_vc_dummy/static/images/dummy_logo.png create mode 100644 vc_dummy/indico_vc_dummy/templates/info_box.html create mode 100644 vc_dummy/indico_vc_dummy/templates/manage_event_info_box.html diff --git a/vc_dummy/MANIFEST.in b/vc_dummy/MANIFEST.in new file mode 100644 index 0000000..81cb029 --- /dev/null +++ b/vc_dummy/MANIFEST.in @@ -0,0 +1,3 @@ +graft indico_vc_vidyo/static +graft indico_vc_vidyo/templates +graft indico_vc_vidyo/translations diff --git a/vc_dummy/indico_vc_dummy/plugin.py b/vc_dummy/indico_vc_dummy/plugin.py index 2db26ca..d380d1f 100644 --- a/vc_dummy/indico_vc_dummy/plugin.py +++ b/vc_dummy/indico_vc_dummy/plugin.py @@ -16,9 +16,10 @@ from __future__ import unicode_literals +from sqlalchemy.orm.attributes import flag_modified from wtforms.fields.core import BooleanField -from indico.core.plugins import IndicoPlugin +from indico.core.plugins import IndicoPlugin, url_for_plugin, IndicoPluginBlueprint from indico.modules.vc import VCPluginMixin from indico.modules.vc.forms import VCRoomFormBase from indico.web.forms.widgets import SwitchWidget @@ -37,7 +38,32 @@ class DummyPlugin(VCPluginMixin, IndicoPlugin): """ configurable = True vc_room_form = VCRoomForm + friendly_name = "Dummy" @property def logo_url(self): - return "http://fc05.deviantart.net/fs70/f/2011/257/7/7/_dummy__vector_by_phlum-d49u7mk.png" + return url_for_plugin(self.name + '.static', filename='images/dummy_logo.png') + + @property + def icon_url(self): + return url_for_plugin(self.name + '.static', filename='images/dummy_icon.png') + + def get_blueprints(self): + return IndicoPluginBlueprint('vc_dummy', __name__) + + def create_room(self, vc_room, event): + pass + + def delete_room(self, vc_room, event): + pass + + def update_room(self, vc_room, event): + pass + + def update_data_association(self, event, vc_room, event_vc_room, data): + super(DummyPlugin, self).update_data_association(event, vc_room, event_vc_room, data) + event_vc_room.data.update({key: data.pop(key) for key in [ + 'show_phone_numbers' + ]}) + + flag_modified(event_vc_room, 'data') diff --git a/vc_dummy/indico_vc_dummy/static/images/dummy_icon.png b/vc_dummy/indico_vc_dummy/static/images/dummy_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2eaa7cad5ce130bde1fb1349d00320b989073e1a GIT binary patch literal 3380 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 KMNUMnLSTYOgIGEM literal 0 HcmV?d00001 diff --git a/vc_dummy/indico_vc_dummy/static/images/dummy_logo.png b/vc_dummy/indico_vc_dummy/static/images/dummy_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a1bcfbc7d4a9f3580e8ebd6c5d90cf75e0d6d1 GIT binary patch literal 6790 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 o!I?#TjPmi11Im=7 +
{% trans %}Plugin type{% endtrans %}
+
{{ vc_room.type }}
+
{% trans %}Favorite color{% endtrans %}
+
+
+ diff --git a/vc_dummy/indico_vc_dummy/templates/manage_event_info_box.html b/vc_dummy/indico_vc_dummy/templates/manage_event_info_box.html new file mode 100644 index 0000000..2f9e480 --- /dev/null +++ b/vc_dummy/indico_vc_dummy/templates/manage_event_info_box.html @@ -0,0 +1,13 @@ +
+
{% trans %}Plugin type{% endtrans %}
+
{{ vc_room.type }}
+
{% trans %}Favorite color{% endtrans %}
+
+
+