diff --git a/piwik/indico_statistics/__init__.py b/piwik/indico_piwik/__init__.py similarity index 65% rename from piwik/indico_statistics/__init__.py rename to piwik/indico_piwik/__init__.py index 6f3482f..b9a8eef 100644 --- a/piwik/indico_statistics/__init__.py +++ b/piwik/indico_piwik/__init__.py @@ -3,25 +3,25 @@ from indico.core.plugins import IndicoPlugin, IndicoPluginBlueprint, url_for_plu from MaKaC.i18n import _ from MaKaC.webinterface.wcomponents import SideMenuItem -from controllers import RHStatisticsView +from controllers import RHStatistics from forms import SettingsForm -class StatisticsPlugin(IndicoPlugin): - """Statistics plugin +class PiwikPlugin(IndicoPlugin): + """Piwik statistics plugin - This statistics plugin provides statistics of conferences, meetings and - contributions. Notice it's not designed to provide general analytics. + Piwik statistics plugin provides statistics of conferences, meetings + and contributions. """ settings_form = SettingsForm def init(self): - super(StatisticsPlugin, self).init() + super(PiwikPlugin, self).init() self.connect(signals.event_management_sidemenu, self.add_sidemenu_item) def add_sidemenu_item(self, event): - menu_item = SideMenuItem(_("Statistics (new)"), url_for_plugin('statistics.view', event)) + menu_item = SideMenuItem(_("Piwik Statistics"), url_for_plugin('piwik.view', event)) return ('statistics', menu_item) def get_blueprints(self): @@ -34,5 +34,5 @@ class StatisticsPlugin(IndicoPlugin): self.register_css_bundle('jqtree_css', 'js/lib/jqTree/jqtree.css') -blueprint = IndicoPluginBlueprint('statistics', __name__) -blueprint.add_url_rule('/event//manage/statistics_new', 'view', RHStatisticsView) +blueprint = IndicoPluginBlueprint('piwik', __name__) +blueprint.add_url_rule('/event//manage/statistics_new', 'view', RHStatistics) diff --git a/piwik/indico_statistics/controllers.py b/piwik/indico_piwik/controllers.py similarity index 87% rename from piwik/indico_statistics/controllers.py rename to piwik/indico_piwik/controllers.py index caaeea5..bd3db87 100644 --- a/piwik/indico_statistics/controllers.py +++ b/piwik/indico_piwik/controllers.py @@ -3,7 +3,7 @@ from MaKaC.webinterface.rh.conferenceModif import RHConferenceModifBase from .views import WPStatistics -class RHStatisticsView(RHConferenceModifBase): +class RHStatistics(RHConferenceModifBase): def _checkParams(self, params): RHConferenceModifBase._checkParams(self, params) self._params = params diff --git a/piwik/indico_statistics/forms.py b/piwik/indico_piwik/forms.py similarity index 100% rename from piwik/indico_statistics/forms.py rename to piwik/indico_piwik/forms.py diff --git a/piwik/indico_statistics/static/css/statistics.css b/piwik/indico_piwik/static/css/statistics.css similarity index 100% rename from piwik/indico_statistics/static/css/statistics.css rename to piwik/indico_piwik/static/css/statistics.css diff --git a/piwik/indico_statistics/static/js/lib/jqTree/circle.png b/piwik/indico_piwik/static/js/lib/jqTree/circle.png similarity index 100% rename from piwik/indico_statistics/static/js/lib/jqTree/circle.png rename to piwik/indico_piwik/static/js/lib/jqTree/circle.png diff --git a/piwik/indico_statistics/static/js/lib/jqTree/jqtree.css b/piwik/indico_piwik/static/js/lib/jqTree/jqtree.css similarity index 100% rename from piwik/indico_statistics/static/js/lib/jqTree/jqtree.css rename to piwik/indico_piwik/static/js/lib/jqTree/jqtree.css diff --git a/piwik/indico_statistics/static/js/lib/jqTree/tree.jquery.js b/piwik/indico_piwik/static/js/lib/jqTree/tree.jquery.js similarity index 100% rename from piwik/indico_statistics/static/js/lib/jqTree/tree.jquery.js rename to piwik/indico_piwik/static/js/lib/jqTree/tree.jquery.js diff --git a/piwik/indico_statistics/static/js/lib/jqTree/treeDownTriangleBlack.png b/piwik/indico_piwik/static/js/lib/jqTree/treeDownTriangleBlack.png similarity index 100% rename from piwik/indico_statistics/static/js/lib/jqTree/treeDownTriangleBlack.png rename to piwik/indico_piwik/static/js/lib/jqTree/treeDownTriangleBlack.png diff --git a/piwik/indico_statistics/static/js/lib/jqTree/treeRightTriangleBlack.png b/piwik/indico_piwik/static/js/lib/jqTree/treeRightTriangleBlack.png similarity index 100% rename from piwik/indico_statistics/static/js/lib/jqTree/treeRightTriangleBlack.png rename to piwik/indico_piwik/static/js/lib/jqTree/treeRightTriangleBlack.png diff --git a/piwik/indico_statistics/static/js/statistics.js b/piwik/indico_piwik/static/js/statistics.js similarity index 100% rename from piwik/indico_statistics/static/js/statistics.js rename to piwik/indico_piwik/static/js/statistics.js diff --git a/piwik/indico_statistics/templates/test.html b/piwik/indico_piwik/templates/test.html similarity index 100% rename from piwik/indico_statistics/templates/test.html rename to piwik/indico_piwik/templates/test.html diff --git a/piwik/indico_statistics/views.py b/piwik/indico_piwik/views.py similarity index 100% rename from piwik/indico_statistics/views.py rename to piwik/indico_piwik/views.py diff --git a/piwik/setup.py b/piwik/setup.py index a345482..bd1cb11 100644 --- a/piwik/setup.py +++ b/piwik/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( - name='indico_statistics', + name='indico_piwik', version='0.1', packages=find_packages(), zip_safe=False, @@ -11,5 +11,5 @@ setup( install_requires=[ 'indico>=1.9.1' ], - entry_points={'indico.plugins': {'statistics = indico_statistics:StatisticsPlugin'}} + entry_points={'indico.plugins': {'piwik = indico_piwik:PiwikPlugin'}} )