Skip to content

Commit

Permalink
Merge branch 'master' into 3.22
Browse files Browse the repository at this point in the history 
Conflicts:
	i18n/en-US.json
	submodules/strategy/strategy.js
	submodules/users/users.js
	views/devices-mobile.html
	views/users-numbers.html
  • Loading branch information
@JRMaitre
JRMaitre committed Jan 12, 2016
2 parents 377fa50 + 051c56d commit 8f662e1
Show file tree
Hide file tree
Showing 17 changed files with 972 additions and 317 deletions.
35 changes: 21 additions & 14 deletions i18n/en-US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,11 @@
"5": "Autoprovision one of our supported devices. The UI comes complete with pre-populated manufacturers and devices. Once complete it will automatically be assigned to the specific user.",
"6": "Manage what features Users can access. Turn on/off and manage any of the specific User Features."
}
}
},

"__comment": "UI-1888: ",
"__version": "4.0",
"confirmMobileUnAssignment": "You are about to un-assign a Mobile device. Be aware the phone number associated with this device ({{variable}}) will also be un-assigned from this user. Are you sure?"
},

"strategy": {
Expand Down Expand Up @@ -797,7 +801,10 @@
"directory": "Directory",
"__comment": "UI-1742: Can now select a callflow created in Advanced Callflows in Main Number",
"__version": "3.22",
"advancedCallflows": "Advanced Callflows"
"advancedCallflows": "Advanced Callflows",
"__comment": "UI-1886: Can now select a media in virtual receptionist",
"__version": "3.23",
"media": "Media"
},
"confirmMessages": {
"deleteHoliday": "This holiday will be permanently deleted. Continue?",
Expand Down Expand Up @@ -970,23 +977,23 @@
"__comment": "UI-1220: Adding a Main VMBox automatically when they first load the SmartPBX if they don't have one",
"__version": "3.19",
"mainVMBoxName": "Main Voicemail Box",

"__comment": "UI-1604: Walkthrough dashboard",
"__version": "3.21",
"walkthrough": {
"steps": {
"1": "Review your entire office setup including your users, devices, numbers, main number and conference number",
"2": "Create and manage most of your services in the Users tab. Create new users, purchase port, and assign numbers, add an autoprovision devices, and manage User Features.",
"3": "Once you have created enough users, create user groups. This is extremely useful if you have users that work in the same department, such as a sales team.",
"4": "Create a main number for your business. Manage call handling with Virtual Receptionist, and route calls depending on Office Hours and Holidays"
}
},
"__comment": "UI-1210: Display the Main Faxbox number on the dashboard",
"__version": "3.22",
"faxingNumberLabel": "Faxbox Number",
"__comment": "UI-1197: Display company directory on the dashboard",
"__version": "3.22",
"directoryLabel": "Company Directory Users:",

"__comment": "UI-1851: Update walkthrough dashboard text",
"__version": "3.23",
"walkthrough": {
"steps": {
"1": "Welcome to SmartPBX, the easiest way to set up your office phone system! This is the main dashboard. From here you can see your users, devices, numbers all in one place!",
"2": "Setting up Users is a breeze in SmartPBX. Create and manage most of your services in the Users tab. Create new users, purchase port, and assign numbers, add an autoprovision devices, and manage User Features.",
"3": "Once you have created enough users, create user groups. This is extremely useful if you have users that work in the same department, such as a sales team.",
"4": "Main Number services are highly important for your business! Manage call handling with Virtual Receptionist, and route calls depending on Office Hours and Holidays."
}
},
"__comment": "UI-1856: On the dashboard, hide cnam related actions when the feature is disabled on the account",
"__version": "3.23",
"missingCnamE911Message": "Please setup your Company Caller ID and e911 on a Main Number.",
Expand Down Expand Up @@ -1121,7 +1128,7 @@
"recipients": {
"menuTitle": "Recipients",
"sectionTitle": "Recipients",
"header": "This panel lets you manage who will be notified when someones leave a message on this voicemail box. Click on \"Add New Recipient\" to add an e-mail address to the list",
"header": "This panel lets you manage who will be notified when someone leaves a message in this voicemail box. Click on \"Add New Recipient\" to add an e-mail address to the list",
"create": "Add New Recipient"
},
"__comment": "UI-975: Adding the prepend feature to numbers",
Expand Down
4 changes: 3 additions & 1 deletion i18n/fr-FR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,9 @@
"5": "Ajouter des téléphones à vos utilisateurs via cette case.",
"6": "Gérez les différentes fonctionnalités disponibles pour vos utilisateurs via ce menu."
}
}
},

"confirmMobileUnAssignment": "Vous allez retirer un téléphone mobile. Le numéro lié à ce téléphone ({{variable}}) sera aussi retiré de cet utilisateur. Voulez-vous continuer ?"
},

"strategy": {
Expand Down
76 changes: 40 additions & 36 deletions submodules/devices/devices.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,28 +223,28 @@
overflow: visible;
}

.edit-device {
.voip-edit-device-popup .edit-device {
width: 700px;
}

.edit-device .actions {
.voip-edit-device-popup .edit-device .actions {
border-top: 1px solid #CCCCCC;
height: 30px;
line-height: 30px;
padding: 15px;
}

.edit-device .actions button {
.voip-edit-device-popup .edit-device .actions button {
margin-left: 10px;
}

.edit-device .title-bar {
.voip-edit-device-popup .edit-device .title-bar {
border-bottom: 1px solid #ccc;
margin-bottom: 20px;
padding: 15px 0;
}

.edit-device .title-bar .device-title > div {
.voip-edit-device-popup .edit-device .title-bar .device-title > div {
display: inline-block;
float: left;
font-size: 18px;
Expand All @@ -253,157 +253,161 @@
margin-left: 40px;
}

.edit-device .title-bar .device-title .device-icon {
.voip-edit-device-popup .edit-device .title-bar .device-title .device-icon {
height: 75px;
line-height: 75px;
}

.edit-device .title-bar .device-title .device-icon > i {
.voip-edit-device-popup .edit-device .title-bar .device-title .device-icon > i {
font-size: 48px;
vertical-align: middle;
}

.edit-device .title-bar .device-title .device-image {
.voip-edit-device-popup .edit-device .title-bar .device-title .device-image {
border-radius: 2px;
border: 1px solid #CCC;
}

.edit-device .title-bar .nav-pills {
.voip-edit-device-popup .edit-device .title-bar .nav-pills {
margin-top: 24px;
margin-right: 15px;
}

.edit-device .content .tabs-section .title {
.voip-edit-device-popup .edit-device .content .tabs-section .title {
color: #22a5ff;
font-size: 24px;
margin-bottom: 30px;
margin-left: 40px;
text-shadow: 1px 0 1px #CCCCCC;
}

.edit-device .content .tabs-section .helper {
.voip-edit-device-popup .edit-device .content .tabs-section .helper {
position: relative;
margin: 0 40px 15px 40px;
}

.edit-device .content .tabs-section .helper i {
.voip-edit-device-popup .edit-device .content .tabs-section .helper i {
position: absolute;
top: 0;
left: -25px;
}

.edit-device .content .tabs-section .number-address {
.voip-edit-device-popup .edit-device .content .tabs-section .number-address {
display: none;
}

.edit-device .help-box.red-box {
margin: 10px 25px
.voip-edit-device-popup .edit-device .help-box.red-box {
margin: 10px 25px;
}

.edit-device .content #form_device .displayed-realm {
.voip-edit-device-popup .edit-device .content #form_device .controls .text {
padding-top: 5px;
}

.voip-edit-device-popup .edit-device .content #form_device .displayed-realm {
line-height: 30px;
font-weight: bold;
}

.edit-device .restrictions-container {
.voip-edit-device-popup .edit-device .restrictions-container {
position: relative;
}

.edit-device .restriction-matcher-div {
.voip-edit-device-popup .edit-device .restriction-matcher-div {
margin-right: 40px;
float: right;
}

.edit-device .restriction-matcher-input {
.voip-edit-device-popup .edit-device .restriction-matcher-input {
width: 120px;
margin-right: 10px;
margin-left: 5px;
}

.edit-device .restriction-matcher-sign {
.voip-edit-device-popup .edit-device .restriction-matcher-sign {
margin-left: 20px;
width: 25px;
vertical-align: middle;
display: none;
}

.edit-device .restriction-list {
.voip-edit-device-popup .edit-device .restriction-list {
display: inline-block;
}

.edit-device .restriction-message {
.voip-edit-device-popup .edit-device .restriction-message {
width: 275px;
margin: 0 0 0 30px !important;
padding: 10px;
vertical-align: top;
display: none;
}

.edit-device .disabled-restrictions-info {
.voip-edit-device-popup .edit-device .disabled-restrictions-info {
width: 270px;
position: absolute;
bottom: 0px;
right: 40px;
}

.edit-device .restriction-list .restriction-line.disabled .control-label,
.edit-device .restriction-list .restriction-line.disabled .control-label > i {
.voip-edit-device-popup .edit-device .restriction-list .restriction-line.disabled .control-label,
.voip-edit-device-popup .edit-device .restriction-list .restriction-line.disabled .control-label > i {
cursor: default;
color: #aaa;
}

.edit-device .feature-key-value {
.voip-edit-device-popup .edit-device .feature-key-value {
display: none;
margin-left: 20px;
}

.edit-device .feature-key-value.active {
.voip-edit-device-popup .edit-device .feature-key-value.active {
display: inline-block;
}

.edit-device .feature-key-value label {
.voip-edit-device-popup .edit-device .feature-key-value label {
display: inline-block;
margin-right: 10px;
}

/* Codecs selector */
.edit-device .content .codec-selector .box-selector {
.voip-edit-device-popup .edit-device .content .codec-selector .box-selector {
float: left;
width: 300px;
}

.edit-device .content .codec-selector .box-selector:first-child {
.voip-edit-device-popup .edit-device .content .codec-selector .box-selector:first-child {
margin-left: 30px;
margin-right: 40px;
}
.edit-device .content .codec-selector .box-selector ul {
.voip-edit-device-popup .edit-device .content .codec-selector .box-selector ul {
height: 328px;
overflow: auto;
}

.edit-device .content #video_codec_selector .box-selector ul {
.voip-edit-device-popup .edit-device .content #video_codec_selector .box-selector ul {
min-height: 123px;
}

/* RTP Special CSS */
.edit-device .content .rtp-line > * {
.voip-edit-device-popup .edit-device .content .rtp-line > * {
float: left;
font-size: 14px;
margin-right: 10px;
}

.edit-device .form-horizontal .control-label.checkbox {
.voip-edit-device-popup .edit-device .form-horizontal .control-label.checkbox {
width: inherit;
margin-left: 35px;
padding-top: 3px;
}

/* Restart Button */
.edit-device #restart_device {
.voip-edit-device-popup .edit-device #restart_device {
margin-left: 10px;
}

/* Special checkbox case */
.edit-device .form-horizontal .control-label.checkbox-basic {
.voip-edit-device-popup .edit-device .form-horizontal .control-label.checkbox-basic {
margin-left: 160px;
}
22 changes: 12 additions & 10 deletions submodules/devices/devices.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,19 +394,21 @@ define(function(require){
}
});

templateDevice.find('#delete_device').on('click', function() {
var deviceId = $(this).parents('.edit-device').data('id');
if (type !== 'mobile') {
templateDevice.find('#delete_device').on('click', function() {
var deviceId = $(this).parents('.edit-device').data('id');

monster.ui.confirm(self.i18n.active().devices.confirmDeleteDevice, function() {
self.devicesDeleteDevice(deviceId, function(device) {
popup.dialog('close').remove();
monster.ui.confirm(self.i18n.active().devices.confirmDeleteDevice, function() {
self.devicesDeleteDevice(deviceId, function(device) {
popup.dialog('close').remove();

toastr.success(monster.template(self, '!' + self.i18n.active().devices.deletedDevice, { deviceName: device.name }));
toastr.success(monster.template(self, '!' + self.i18n.active().devices.deletedDevice, { deviceName: device.name }));

callbackDelete && callbackDelete(device);
callbackDelete && callbackDelete(device);
});
});
});
});
}

templateDevice.find('.actions .cancel-link').on('click', function() {
popup.dialog('close').remove();
Expand Down Expand Up @@ -507,7 +509,7 @@ define(function(require){
var popup = monster.ui.dialog(templateDevice, {
position: ['center', 20],
title: popupTitle,
dialogClass: 'overflow-visible'
dialogClass: 'voip-edit-device-popup overflow-visible'
});
},

Expand Down Expand Up @@ -811,7 +813,7 @@ define(function(require){
mapIconClass = {
cellphone: 'fa fa-phone',
smartphone: 'icon-telicon-mobile-phone',
landline: 'icon-telicon-home-phone',
landline: 'icon-telicon-home',
mobile: 'icon-telicon-sprint-phone',
softphone: 'icon-telicon-soft-phone',
sip_device: 'icon-telicon-voip-phone',
Expand Down
Loading

0 comments on commit 8f662e1

Please sign in to comment.