Merge branch 'master' of github.com:2600hz/monster-ui-voip

i18n/en-US.json

@@ -225,6 +225,12 @@
 					"label": "Allow Reprovision",
 					"button": "Unlock",
 					"success": "This device is unlocked for the next 24 hours"
+				},
+				"__comment": "UI-1917: Add button to unlock device on SmartPBX app",
+				"__version": "3.22",
+				"mediaWebrtc": {
+					"help": "If checked, forces a WebRTC compatible SDP on the INVITE.",
+					"label": "WebRTC"
 				}
 			},
 			"restrictions": {
@@ -435,7 +441,7 @@
 			"password": "Password",
 			"confirmPassword": "Re-type Password",
 			"passwordPlaceholder": "Password (Min. 6 characters)",
-			"title": "Update Email and password",
+			"title": "Update Credentials",
 			"username": "User's Email address",
 			"resetPassword": {
 				"linkTitle": "here",

views/devices-softphone.html

@@ -179,6 +179,15 @@
 					</label>
 				</div>
 
+				<div class="control-group">
+					<label class="control-label checkbox">
+						{{#monsterCheckbox i18n.devices.popupSettings.miscellaneous.mediaWebrtc.label }}
+							<input type="checkbox" name="media.webrtc" id="media_webrtc" {{#if media.webrtc}}checked{{/if}} />
+						{{/monsterCheckbox}}
+						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.miscellaneous.mediaWebrtc.help}}" data-placement="top" data-toggle="tooltip"></i>
+					</label>
+				</div>
+
 				<div class="rtp-line">
 					<div class="control-group">
 						<label class="control-label checkbox">

views/users-changePassword.html

@@ -7,25 +7,29 @@
 					<input name="username" type="email" id="inputEmail" placeholder="Email" value="{{username}}">
 				</div>
 			</div>
-			<div class="control-group">
-				<label class="control-label" for="inputPassword">{{ i18n.users.dialogChangePassword.password }}</label>
-				<div class="controls">
-					<input name="password" type="password" id="inputPassword" placeholder="{{ i18n.users.dialogChangePassword.passwordPlaceholder }}">
+			{{#unless _whitelabel.hide_user_passwords}}
+				<div class="control-group">
+					<label class="control-label" for="inputPassword">{{ i18n.users.dialogChangePassword.password }}</label>
+					<div class="controls">
+						<input name="password" type="password" id="inputPassword" placeholder="{{ i18n.users.dialogChangePassword.passwordPlaceholder }}">
+					</div>
 				</div>
-			</div>
-			<div class="control-group">
-				<label class="control-label" for="confirm_password">{{ i18n.users.dialogChangePassword.confirmPassword }}</label>
-				<div class="controls">
-					<input name="confirm_password" type="password" id="confirm_password">
+				<div class="control-group">
+					<label class="control-label" for="confirm_password">{{ i18n.users.dialogChangePassword.confirmPassword }}</label>
+					<div class="controls">
+						<input name="confirm_password" type="password" id="confirm_password">
+					</div>
 				</div>
-			</div>
+			{{/unless}}
 		</form>
-		{{#monsterText}}
-			{{i18n.users.dialogChangePassword.help}}
-			<br/><br/>
-			{{i18n.users.dialogChangePassword.resetPassword.text}}
-			<a class="monster-link blue reset-password" href="javascript:void(0)">{{i18n.users.dialogChangePassword.resetPassword.linkTitle}}</a>.
-		{{/monsterText}}
+		{{#unless _whitelabel.hide_user_passwords}}
+			{{#monsterText}}
+				{{i18n.users.dialogChangePassword.help}}
+				<br/><br/>
+				{{i18n.users.dialogChangePassword.resetPassword.text}}
+				<a class="monster-link blue reset-password" href="javascript:void(0)">{{i18n.users.dialogChangePassword.resetPassword.linkTitle}}</a>.
+			{{/monsterText}}
+		{{/unless}}
 	</div>
 
 	<div class="actions clearfix">

views/users-creation.html

@@ -16,12 +16,14 @@
 			</div>
 		</div>
 
-		<div class="control-group">
-			<label class="control-label" for="password"><i class="fa fa-unlock"></i></label>
-			<div class="controls">
-				<input required type="password" name="user.password" id="password" placeholder="{{i18n.users.dialogCreationUser.password}}"/>
+		{{#unless _whitelabel.hide_user_passwords}}
+			<div class="control-group">
+				<label class="control-label" for="password"><i class="fa fa-unlock"></i></label>
+				<div class="controls">
+					<input required type="password" name="user.password" id="password" placeholder="{{i18n.users.dialogCreationUser.password}}"/>
+				</div>
 			</div>
-		</div>
+		{{/unless}}
 	</div>
 
 	<div>