From 09da289c2fb18475f372bee24e885617da484e0b Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 17 Oct 2015 22:19:49 -0400 Subject: Move slack, hipchat and jabber integrations to plugins --- app/Template/project/integrations.php | 74 +--------------------------------- app/Template/project/notifications.php | 20 +++++++++ app/Template/project/sidebar.php | 7 +++- 3 files changed, 27 insertions(+), 74 deletions(-) create mode 100644 app/Template/project/notifications.php (limited to 'app/Template/project') diff --git a/app/Template/project/integrations.php b/app/Template/project/integrations.php index eb5faddf..c4d9385b 100644 --- a/app/Template/project/integrations.php +++ b/app/Template/project/integrations.php @@ -2,9 +2,10 @@

-
+ form->csrf() ?> + hook->render('template:project:integrations', array('values' => $values)) ?>

 

@@ -12,86 +13,15 @@

url->doc(t('Help on Github webhooks'), 'github-webhooks') ?>

-

 


url->doc(t('Help on Gitlab webhooks'), 'gitlab-webhooks') ?>

-

 


url->doc(t('Help on Bitbucket webhooks'), 'bitbucket-webhooks') ?>

- - -

-
- form->checkbox('jabber', t('Send notifications to Jabber'), 1, isset($values['jabber']) && $values['jabber'] == 1) ?> - - form->label(t('XMPP server address'), 'jabber_server') ?> - form->text('jabber_server', $values, $errors, array('placeholder="tcp://myserver:5222"')) ?> -

- - form->label(t('Jabber domain'), 'jabber_domain') ?> - form->text('jabber_domain', $values, $errors, array('placeholder="example.com"')) ?> - - form->label(t('Username'), 'jabber_username') ?> - form->text('jabber_username', $values, $errors) ?> - - form->label(t('Password'), 'jabber_password') ?> - form->password('jabber_password', $values, $errors) ?> - - form->label(t('Jabber nickname'), 'jabber_nickname') ?> - form->text('jabber_nickname', $values, $errors) ?> - - form->label(t('Multi-user chat room'), 'jabber_room') ?> - form->text('jabber_room', $values, $errors, array('placeholder="myroom@conference.example.com"')) ?> - -

url->doc(t('Help on Jabber integration'), 'jabber') ?>

- -
- -
-
- - -

-
- form->checkbox('hipchat', t('Send notifications to Hipchat'), 1, isset($values['hipchat']) && $values['hipchat'] == 1) ?> - - form->label(t('API URL'), 'hipchat_api_url') ?> - form->text('hipchat_api_url', $values, $errors) ?> - - form->label(t('Room API ID or name'), 'hipchat_room_id') ?> - form->text('hipchat_room_id', $values, $errors) ?> - - form->label(t('Room notification token'), 'hipchat_room_token') ?> - form->text('hipchat_room_token', $values, $errors) ?> - -

url->doc(t('Help on Hipchat integration'), 'hipchat') ?>

- -
- -
-
- - -

 

-
- form->checkbox('slack', t('Send notifications to a Slack channel'), 1, isset($values['slack']) && $values['slack'] == 1) ?> - - form->label(t('Webhook URL'), 'slack_webhook_url') ?> - form->text('slack_webhook_url', $values, $errors) ?> - form->label(t('Channel/Group/User (Optional)'), 'slack_webhook_channel') ?> - form->text('slack_webhook_channel', $values, $errors) ?> - -

url->doc(t('Help on Slack integration'), 'slack') ?>

- -
- -
-
\ No newline at end of file diff --git a/app/Template/project/notifications.php b/app/Template/project/notifications.php new file mode 100644 index 00000000..ac743087 --- /dev/null +++ b/app/Template/project/notifications.php @@ -0,0 +1,20 @@ + + +

+ +
+ + form->csrf() ?> + +

+ form->checkboxes('notification_types', $types, $notifications) ?> + +
+ + + url->link(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?> +
+
+ \ No newline at end of file diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php index 971ed950..fb5dd3bd 100644 --- a/app/Template/project/sidebar.php +++ b/app/Template/project/sidebar.php @@ -12,8 +12,11 @@
  • app->getRouterController() === 'project' && $this->app->getRouterAction() === 'share' ? 'class="active"' : '' ?>> url->link(t('Public access'), 'project', 'share', array('project_id' => $project['id'])) ?>
  • -
  • app->getRouterController() === 'project' && $this->app->getRouterAction() === 'integration' ? 'class="active"' : '' ?>> - url->link(t('Integrations'), 'project', 'integration', array('project_id' => $project['id'])) ?> +
  • app->getRouterController() === 'project' && $this->app->getRouterAction() === 'notifications' ? 'class="active"' : '' ?>> + url->link(t('Notifications'), 'project', 'notifications', array('project_id' => $project['id'])) ?> +
  • +
  • app->getRouterController() === 'project' && $this->app->getRouterAction() === 'integrations' ? 'class="active"' : '' ?>> + url->link(t('Integrations'), 'project', 'integrations', array('project_id' => $project['id'])) ?>
  • app->getRouterController() === 'project' && $this->app->getRouterAction() === 'edit' ? 'class="active"' : '' ?>> url->link(t('Edit project'), 'project', 'edit', array('project_id' => $project['id'])) ?> -- cgit v1.2.3