From 4fee0b22d8d32b6c682aff3ce21d83625bb7adec Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 24 Nov 2017 19:22:06 +0100
Subject: [PATCH] Elastic: Support forwarding interface, added missing labels

---
 .../lib/Roundcube/rcube_sieve_forward.php     |  8 +++----
 .../lib/Roundcube/rcube_sieve_vacation.php    |  5 ++--
 plugins/managesieve/localization/en_US.inc    |  2 ++
 .../skins/elastic/templates/forward.html      | 23 +++++++++++++++++++
 4 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 plugins/managesieve/skins/elastic/templates/forward.html

diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_forward.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_forward.php
index e8ba570de..66d0696c9 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_forward.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_forward.php
@@ -5,7 +5,7 @@
  *
  * Engine part of Managesieve plugin implementing UI and backend access.
  *
- * Copyright (C) 2011-2014, Kolab Systems AG
+ * Copyright (C) 2011-2017, Kolab Systems AG
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -300,18 +300,18 @@ class rcube_sieve_forward extends rcube_sieve_engine
         }
 
         // redirect target
-        $action_target = ' <span id="action_target_span">'
+        $action_target = '<span id="action_target_span" class="input-group">'
             . '<input type="text" name="action_target" id="action_target"'
             . ' value="' .($redirect ? rcube::Q($this->forward['target'], 'strict', false) : '') . '"'
             . (!empty($domains) ? ' size="20"' : ' size="35"') . '/>'
-            . (!empty($domains) ? ' @ ' . $domain_select->show($this->forward['domain']) : '')
+            . (!empty($domains) ? ' <span class="input-group-addon">@</span> ' . $domain_select->show($this->forward['domain']) : '')
             . '</span>';
 
         // Message tab
         $table = new html_table(array('cols' => 2));
 
         $table->add('title', html::label('forward_action', $this->plugin->gettext('forward.action')));
-        $table->add('forward', $action->show($this->forward['action']) . $action_target);
+        $table->add('forward', $action->show($this->forward['action']) . ' ' . $action_target);
 
         $table->add('title', html::label('forward_status', $this->plugin->gettext('forward.status')));
         $table->add(null, $status->show(!isset($this->forward['disabled']) || $this->forward['disabled'] ? 'off' : 'on'));
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
index 1957c4876..dd1b2cba8 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
@@ -443,7 +443,6 @@ class rcube_sieve_vacation extends rcube_sieve_engine
         // force domain selection in redirect email input
         $domains  = (array) $this->rc->config->get('managesieve_domains');
         $redirect = $this->vacation['action'] == 'redirect' || $this->vacation['action'] == 'copy';
-
         if (!empty($domains)) {
             sort($domains);
 
@@ -460,11 +459,11 @@ class rcube_sieve_vacation extends rcube_sieve_engine
         }
 
         // redirect target
-        $action_target = ' <span id="action_target_span" style="display:' . ($redirect ? 'inline' : 'none') . '">'
+        $action_target = ' <span id="action_target_span" class="input-group" style="display:' . ($redirect ? 'inline' : 'none') . '">'
             . '<input type="text" name="action_target" id="action_target"'
             . ' value="' .($redirect ? rcube::Q($this->vacation['target'], 'strict', false) : '') . '"'
             . (!empty($domains) ? ' size="20"' : ' size="35"') . '/>'
-            . (!empty($domains) ? ' @ ' . $domain_select->show($this->vacation['domain']) : '')
+            . (!empty($domains) ? ' <span class="input-group-addon">@</span> ' . $domain_select->show($this->vacation['domain']) : '')
             . '</span>';
 
         // Message tab
diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc
index b983b4854..3c5758dc4 100644
--- a/plugins/managesieve/localization/en_US.inc
+++ b/plugins/managesieve/localization/en_US.inc
@@ -196,6 +196,7 @@ $labels['forward.on'] = 'On';
 $labels['forward.off'] = 'Off';
 $labels['forward.status'] = 'Status:';
 $labels['forward.action'] = 'For incoming mails execute the following action:';
+$labels['forward.saving'] = 'Saving data...';
 $labels['filladdresses'] = 'Fill with all my addresses';
 $labels['arialabelfiltersetactions'] = 'Filter set actions';
 $labels['arialabelfilteractions'] = 'Filter actions';
@@ -204,6 +205,7 @@ $labels['ariasummaryfilterslist'] = 'List of filters';
 $labels['ariasummaryfiltersetslist'] = 'List of filter sets';
 $labels['filterstitle'] = 'Edit incoming mail filters';
 $labels['vacationtitle'] = 'Edit out-of-office rule';
+$labels['forwardtitle'] = 'Edit mail forwarding rule';
 $labels['message'] = 'Message';
 $labels['duplicate'] = 'is duplicate';
 $labels['notduplicate'] = 'is not duplicate';
diff --git a/plugins/managesieve/skins/elastic/templates/forward.html b/plugins/managesieve/skins/elastic/templates/forward.html
new file mode 100644
index 000000000..e68737247
--- /dev/null
+++ b/plugins/managesieve/skins/elastic/templates/forward.html
@@ -0,0 +1,23 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+<roundcube:include file="includes/settings-menu.html" />
+
+<h1 class="voice"><roundcube:label name="managesieve.forward" /></h1>
+
+<div class="content selected" role="main">
+	<div class="header">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"></span>
+	</div>
+	<div class="formcontainer scroller" aria-labelledby="aria-label-forwardform">
+		<div class="formcontent">
+			<h2 class="voice" id="aria-label-forwardform"><roundcube:label name="managesieve.forward" /></h2>
+			<roundcube:object name="forwardform" id="forwardform" class="propform" />
+		</div>
+		<div class="formbuttons">
+			<roundcube:button command="plugin.managesieve-save" class="btn btn-primary submit" label="save" />
+		</div>
+	</div>
+</div>
+
+<roundcube:include file="includes/footer.html" />