From 7a6e650c421c0b404019acce1f64bf2e39b26db8 Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <jr@2600hz.com>
Date: Tue, 3 Feb 2015 10:35:47 -0800
Subject: [PATCH] UI-1119: Added the ignore completed elsewhere feature to the
 same places it was setup in Kazoo-UI

---
 i18n/en-US.json                |  6 ++++++
 submodules/devices/devices.css | 13 ++++++-------
 views/devices-mobile.html      | 19 ++++++++++++++-----
 views/devices-sip_device.html  | 17 +++++++++++++----
 views/devices-softphone.html   | 17 +++++++++++++----
 5 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/i18n/en-US.json b/i18n/en-US.json
index 8e5d2b5..bc34305 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -151,6 +151,12 @@
 					"type": "Type of encryption: ",
 					"srtp": "SRTP",
 					"zrtp": "ZRTP"
+				},
+				"__comment": "UI-1119: Adding ignore_complete_elsewhere",
+				"__version": "3.19",
+				"ignoreCompletedElsewhere": {
+					"label": "Ignore Completed Elsewhere",
+					"help": "When checked supporting phones will show a call missed if it was part of a ring group answered elsewhere."
 				}
 			},
 			"restrictions": {
diff --git a/submodules/devices/devices.css b/submodules/devices/devices.css
index fbb68a4..5e24d5c 100644
--- a/submodules/devices/devices.css
+++ b/submodules/devices/devices.css
@@ -334,13 +334,12 @@
 }
 
 /* RTP Special CSS */
-.edit-device .content .rtp-line {
-	margin-left: 100px;
-}
-
 .edit-device .content .rtp-line > * {
 	float: left;
-	font-size: 14px;
-	line-height: 28px;
-	margin: 0 10px;
+	margin-right: 10px;
+}
+
+.edit-device .form-horizontal .control-label.checkbox {
+	width: inherit;
+	margin-left: 35px;
 }
diff --git a/views/devices-mobile.html b/views/devices-mobile.html
index 7c8fdc8..10482be 100644
--- a/views/devices-mobile.html
+++ b/views/devices-mobile.html
@@ -206,16 +206,25 @@
 					{{ i18n.devices.popupSettings.miscellaneous.sectionTitle }}
 				</div>
 
-				<div class="rtp-line">
-					<label>
-						<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
-						{{ i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+				<div class="control-group">
+					<label class="control-label checkbox">
+						<input type="checkbox" name="ignore_completed_elsewhere"{{#if ignore_completed_elsewhere}} checked="checked"{{/if}}></input>
+						{{ i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }} <i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
 					</label>
+				</div>
+
+				<div class="rtp-line">
+					<div class="control-group">
+						<label class="control-label checkbox">
+							<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
+							{{ i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+						</label>
+					</div>
 
 					<div id="rtp_method">
 						{{ i18n.devices.popupSettings.miscellaneous.rtp.type }}
 
-						<select name="extra.rtpMethod" class="input-small">
+						<select class="input-small" name="extra.rtpMethod">
 							<option value="srtp"{{#compare extra.rtpMethod "===" "srtp"}} selected{{/compare}}>{{ i18n.devices.popupSettings.miscellaneous.rtp.srtp }}</option>
 							<option value="zrtp"{{#compare extra.rtpMethod "===" "zrtp"}} selected{{/compare}}>{{ i18n.devices.popupSettings.miscellaneous.rtp.zrtp }}</option>
 						</select>
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index a1ee42e..67c5d02 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -248,11 +248,20 @@
 					{{ i18n.devices.popupSettings.miscellaneous.sectionTitle }}
 				</div>
 
-				<div class="rtp-line">
-					<label>
-						<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
-						{{ i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+				<div class="control-group">
+					<label class="control-label checkbox">
+						<input type="checkbox" name="ignore_completed_elsewhere"{{#if ignore_completed_elsewhere}} checked="checked"{{/if}}></input>
+						{{ i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }} <i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
 					</label>
+				</div>
+
+				<div class="rtp-line">
+					<div class="control-group">
+						<label class="control-label checkbox">
+							<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
+							{{ i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+						</label>
+					</div>
 
 					<div id="rtp_method">
 						{{ i18n.devices.popupSettings.miscellaneous.rtp.type }}
diff --git a/views/devices-softphone.html b/views/devices-softphone.html
index cdd00bb..d5e4d1a 100644
--- a/views/devices-softphone.html
+++ b/views/devices-softphone.html
@@ -205,11 +205,20 @@
 					{{ i18n.devices.popupSettings.miscellaneous.sectionTitle }}
 				</div>
 
-				<div class="rtp-line">
-					<label>
-						<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
-						{{ i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+				<div class="control-group">
+					<label class="control-label checkbox">
+						<input type="checkbox" name="ignore_completed_elsewhere"{{#if ignore_completed_elsewhere}} checked="checked"{{/if}}></input>
+						{{ i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.label }} <i class="help-popover icon-question-sign icon-large" data-original-title="{{i18n.devices.popupSettings.miscellaneous.ignoreCompletedElsewhere.help}}" data-placement="top" data-toggle="tooltip"></i>
 					</label>
+				</div>
+
+				<div class="rtp-line">
+					<div class="control-group">
+						<label class="control-label checkbox">
+							<input type="checkbox" id="secure_rtp" name="media.encryption.enforce_security"{{#if media.encryption.enforce_security}} checked="checked"{{/if}}></input>
+							{{ i18n.devices.popupSettings.miscellaneous.rtp.enable }}
+						</label>
+					</div>
 
 					<div id="rtp_method">
 						{{ i18n.devices.popupSettings.miscellaneous.rtp.type }}