diff --git a/i18n/en-US.json b/i18n/en-US.json index db08706..6b811da 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -197,6 +197,15 @@ "new": "New SIP Device", "deviceName": "Device Name" }, + "sip_uri": { + "addTitle": "Adding a SIP URI", + "deviceName": "Name", + "editTitle": "Editing SIP URI: {{name}}", + "new": "New SIP URI", + "uri": "SIP URI", + "uriPlaceholder": "sip:device@my.company.com", + "hideContactList": "Hide from Contact List" + }, "landline": { "addTitle": "Adding a Landline", "deviceName": "Device Name", @@ -282,7 +291,8 @@ "softphone": "Soft Phone", "landline": "Landline", "fax": "Fax", - "ata": "ATA" + "ata": "ATA", + "sip_uri": "SIP URI" }, "unassignedDevice": "-" }, diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json index 6493790..acf76e6 100644 --- a/i18n/fr-FR.json +++ b/i18n/fr-FR.json @@ -175,6 +175,15 @@ "new": "Nouveau téléphone SIP", "deviceName": "Nom du téléphone" }, + "sip_uri": { + "addTitle": "Ajouter une URI SIP", + "deviceName": "Nom", + "editTitle": "Modification d'une URI SIP: {{name}}", + "new": "Nouvelle URI SIP", + "uri": "URI SIP", + "uriPlaceholder": "sip:device@my.company.com", + "hideContactList": "Cacher de la liste de Contacts" + }, "landline": { "addTitle": "Ajout d'une ligne fixe", "deviceName": "Nom", @@ -260,7 +269,8 @@ "softphone": "Softphone", "landline": "Ligne fixe", "fax": "Fax", - "ata": "ATA" + "ata": "ATA", + "sip_uri": "URI SIP" }, "unassignedDevice": "-" }, diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index 182c8be..cc5b7e9 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -374,7 +374,7 @@ define(function(require){ devicesMergeData: function(originalData, template) { var self = this, - hasCodecs = $.inArray(originalData.device_type, ['sip_device', 'landline', 'fax', 'ata', 'softphone', 'smartphone', 'mobile']) > -1, + hasCodecs = $.inArray(originalData.device_type, ['sip_device', 'landline', 'fax', 'ata', 'softphone', 'smartphone', 'mobile', 'sip_uri']) > -1, hasSIP = $.inArray(originalData.device_type, ['fax', 'ata', 'softphone', 'smartphone', 'mobile']) > -1, hasCallForward = $.inArray(originalData.device_type, ['landline', 'cellphone', 'smartphone']) > -1, hasRTP = $.inArray(originalData.device_type, ['sip_device', 'mobile', 'softphone']) > -1, @@ -578,6 +578,15 @@ define(function(require){ realm: monster.apps['auth'].currentAccount.realm, username: 'user_' + monster.util.randomString(10) } + }, + sip_uri: { + sip: { + password: monster.util.randomString(12), + username: 'user_' + monster.util.randomString(10), + expire_seconds: 360, + invite_format: 'route', + method: 'password' + } } }; @@ -664,6 +673,7 @@ define(function(require){ mobile: 'icon-telicon-sprint-phone', softphone: 'icon-telicon-soft-phone', sip_device: 'icon-telicon-voip-phone', + sip_uri: 'icon-telicon-voip-phone', fax: 'icon-telicon-fax', ata: 'icon-telicon-fax' }; diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index a57b40e..076e7f4 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -78,6 +78,7 @@ define(function(require){ "#698BF7", // Purple ~ Dark Blue "#009AD6", // Blue "#6CC5E9", // Light Blue + "#719B11", // Dark Green "#BDE55F", // Light Green "#F1E87C", // Pale Yellow "#EF8F25", // Orange @@ -282,7 +283,7 @@ define(function(require){ "sip_device": { label: self.i18n.active().devices.types.sip_device, count: 0, - color: self.chartColors[4] + color: self.chartColors[5] }, "cellphone": { label: self.i18n.active().devices.types.cellphone, @@ -307,17 +308,22 @@ define(function(require){ "landline": { label: self.i18n.active().devices.types.landline, count: 0, - color: self.chartColors[5] + color: self.chartColors[6] }, "fax": { label: self.i18n.active().devices.types.fax, count: 0, - color: self.chartColors[6] + color: self.chartColors[7] }, "ata": { label: self.i18n.active().devices.types.ata, count: 0, - color: self.chartColors[7] + color: self.chartColors[8] + }, + "sip_uri": { + label: self.i18n.active().devices.types.sip_uri, + count: 0, + color: self.chartColors[4] }, totalCount: 0 }, @@ -325,7 +331,7 @@ define(function(require){ "spare": { label: self.i18n.active().myOffice.numberChartLegend.spare, count: 0, - color: self.chartColors[7] + color: self.chartColors[8] }, "assigned": { label: self.i18n.active().myOffice.numberChartLegend.assigned, diff --git a/views/devices-layout.html b/views/devices-layout.html index af5922e..0c4268a 100644 --- a/views/devices-layout.html +++ b/views/devices-layout.html @@ -15,6 +15,7 @@
  • {{ i18n.devices.types.landline }}
  • {{ i18n.devices.types.fax }}
  • {{ i18n.devices.types.ata }}
    • +
  • {{ i18n.devices.types.sip_uri }}
    • diff --git a/views/devices-sip_uri.html b/views/devices-sip_uri.html new file mode 100644 index 0000000..29b4706 --- /dev/null +++ b/views/devices-sip_uri.html @@ -0,0 +1,77 @@ +
    +
    +
    +
    + +
    + + {{#if id}} +
    {{name}}
    + {{else}} +
    {{i18n.devices.sip_uri.new}}
    + {{/if}} +
    + + +
    + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + {{#if id}} + {{ i18n.devices.deleteDevice }} + {{/if}} + +
    + {{ i18n.cancel }} + +
    +
    +