ruhnet
/
monster-ui-voip
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

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

4.3
Joris Tirado 12 years ago
parent
35935227fd 92c5edb968
commit
74c33ebe1b
8 changed files with 35 additions and 153 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -142
      app.css
  2. +7
    -3
      i18n/en-US.json
  3. +7
    -3
      i18n/fr-FR.json
  4. +5
    -1
      submodules/groups/groups.js
  5. +5
    -1
      submodules/myOffice/myOffice.js
  6. +5
    -1
      submodules/strategy/strategy.js
  7. +5
    -1
      submodules/users/users.js
  8. +1
    -1
      views/app.html

+ 0
- 142
app.css View File

@ -5,145 +5,3 @@
@import url('submodules/strategy/strategy.css');
@import url('submodules/callLogs/callLogs.css');
@import url('submodules/users/users.css');
#voip_container {
margin: auto;
max-width: 1024px;
}
#voip_container > .left-menu {
float: left;
margin: 5px 10px 0 11px;
width: 179px;
}
#voip_container > .left-menu .category {
position: relative;
display: block;
padding: 15px 5px;
height: 30px;
border: 1px solid #dcdcdc;
border-radius: 4px;
background-color: #f6f6f6;
background-image: -webkit-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
background-image: -moz-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
background-image: -ms-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
background-image: -o-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
background-image: linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
color: #555;
font-size: 18px;
line-height: 30px;
cursor: pointer;
}
#voip_container > .left-menu .category:hover { background: #eee; }
#voip_container > .left-menu .category.active {
position: relative;
background: none #22ccff;
color: #fff;
}
#voip_container > .left-menu .category.active::after {
position: absolute;
top: 21px;
right: -9px;
display: block;
border-top: 9px solid transparent;
border-bottom: 9px solid transparent;
border-left: 9px solid #22ccff;
content: "";
}
#voip_container > .left-menu .category.active .title i { color: #fff; }
#voip_container > .left-menu .category.simple { margin: 10px auto 0 auto; }
#voip_container > .left-menu .category .title {
display: inline-block;
overflow: hidden;
max-width: 126px;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 16px;
}
#voip_container > .left-menu .category.simple .title { max-width: 165px; }
#voip_container > .left-menu .category .title i {
margin: 0px 8px 0px 4px;
color: #555;
}
#voip_container > .left-menu .category-group { margin-top: 20px; }
#voip_container > .left-menu .category-group .category {
border-top: 0;
border-bottom: 1px solid #dcdcdc;
border-radius: 0;
}
#voip_container > .left-menu .category-group .category:not(:first-child)::before {
position: absolute;
top: 0px;
right: 0px;
display: block;
width: 100%;
height: 100%;
border-top: 1px solid #fff;
content: "";
}
#voip_container > .left-menu .category-group .category:not(:first-child):hover::before { border-top: 1px solid #eee; }
#voip_container > .left-menu .category-group .category.active:not(:first-child)::before { border-top: 1px solid #22ccff; }
#voip_container > .left-menu .category-group .category:first-child {
border: 1px solid #dcdcdc;
border-radius: 4px 4px 0 0;
}
#voip_container > .left-menu .category-group .category:last-child {
border-radius: 0 0 4px 4px;
}
/* For smaller Icons */
#voip_container > .left-menu .category .title i.larger-margin { margin-right: 12px; }
#voip_container .right-content {
margin-bottom: 20px;
margin-left: 201px;
padding: 15px 15px 0;
}
#voip_container .right-content > * {
margin-top: 0;
padding-top: 0;
}
@media (max-width: 979px) {
#voip_container > .left-menu {
width: 59px;
-webkit-transition:width 0.5s;
-moz-transition:width 0.5s;
-o-transition:width 0.5s;
transition:width 0.5s;
}
#voip_container > .left-menu .category {
padding: 15px !important;
text-align: center;
}
#voip_container > .left-menu .category i {
margin: 0 !important;
font-size: 26px;
}
#voip_container .right-content {
margin-left: 81px;
-webkit-transition: margin 0.5s;
-moz-transition:margin 0.5s;
-o-transition:margin 0.5s;
transition:margin 0.5s;
}
}

+ 7
- 3
i18n/en-US.json View File

@ -83,7 +83,8 @@
"dropdownLabel": "Ringback media:",
"silence": "Silence",
"defaultRingback": "Default Ringback",
"emptyUploadAlert": "Please select a file to upload"
"emptyUploadAlert": "Please select a file to upload",
"fileTooBigAlert": "You can not upload a file with a size exceeding 5MB"
}
},
@ -408,7 +409,8 @@
"headline": "User Music-On-Hold Settings",
"dropdownLabel": "Music on Hold:",
"silence": "Silence",
"emptyUploadAlert": "Please select a file to upload"
"emptyUploadAlert": "Please select a file to upload",
"fileTooBigAlert": "You can not upload a file with a size exceeding 5MB"
},
"hotdesk": {
"label": "Does it require a PIN?",
@ -542,6 +544,7 @@
"undefinedMenu": "You selected a Virtual Receptionist without setting it up. Please set it up by clicking on the Virtual Receptionist link, or choose a different option.",
"emptyTtsGreeting": "You must type in your greeting message to enable Text to Speech functionality.",
"emptyUploadGreeting": "Please select a file to upload",
"fileTooBigAlert": "You can not upload a file with a size exceeding 5MB",
"uniqueMenuNumbers": "Numbers within the menu must be unique and non-empty.",
"lastE911Error": "You need e911 set up on at least one of your Main Numbers. Please set up e911 on another Main Number before deleting this one."
},
@ -611,7 +614,8 @@
"dropdownLabel": "Music on Hold:",
"silence": "Silence",
"default": "Default Music",
"emptyUploadAlert": "Please select a file to upload"
"emptyUploadAlert": "Please select a file to upload",
"fileTooBigAlert": "You can not upload a file with a size exceeding 5MB"
},
"callerId": {
"title": "Company Caller ID",


+ 7
- 3
i18n/fr-FR.json View File

@ -83,7 +83,8 @@
"dropdownLabel": "Tonalité d'appel:",
"silence": "Silence",
"defaultRingback": "Tonalité par défaut",
"emptyUploadAlert": "Veuillez sélectionner un fichier à uploader"
"emptyUploadAlert": "Veuillez sélectionner un fichier à uploader",
"fileTooBigAlert": "Vous ne pouvez pas uploader un fichier de taille excédant 5MB"
}
},
@ -409,7 +410,8 @@
"headline": "Réglages de la musique d'attente",
"dropdownLabel": "Musique d'attente:",
"silence": "Silence",
"emptyUploadAlert": "Veuillez sélectionner un fichier à uploader"
"emptyUploadAlert": "Veuillez sélectionner un fichier à uploader",
"fileTooBigAlert": "Vous ne pouvez pas uploader un fichier de taille excédant 5MB"
},
"hotdesk": {
"label": "Cela requiert-il un PIN?",
@ -543,6 +545,7 @@
"undefinedMenu": "Vous avez sélectionner un réceptionniste virtuel sans le configurer. Veuillez le configurer en cliquant sur le lien, ou choisissez une option différente.",
"emptyTtsGreeting": "Vous devez entrer un message afin d'activer le Text to Speech.",
"emptyUploadGreeting": "Veuillez sélectionner un fichier à uploader",
"fileTooBigAlert": "Vous ne pouvez pas uploader un fichier de taille excédant 5MB",
"uniqueMenuNumbers": "Les numéros doivent être uniques et non-vide.",
"lastE911Error": "E911 doit être configuré sur au moins un de vos Numéros principaux. Veuillez configurer e911 sur un autre numéro principal avant de supprimer celui-ci."
},
@ -612,7 +615,8 @@
"dropdownLabel": "Musique d'attente:",
"silence": "Silence",
"default": "Musique par défaut",
"emptyUploadAlert": "Veuillez sélectionner un fichier à uploader"
"emptyUploadAlert": "Veuillez sélectionner un fichier à uploader",
"fileTooBigAlert": "Vous ne pouvez pas uploader un fichier de taille excédant 5MB"
},
"callerId": {
"title": "Caller ID d'entreprise",


+ 5
- 1
submodules/groups/groups.js View File

@ -697,7 +697,11 @@ define(function(require){
};
if(file) {
fileReader.readAsDataURL(file);
if(file.size >= (Math.pow(2,20) * 5)) { //If size bigger than 5MB
monster.ui.alert(self.i18n.active().groups.ringback.fileTooBigAlert);
} else {
fileReader.readAsDataURL(file);
}
} else {
monster.ui.alert(self.i18n.active().groups.ringback.emptyUploadAlert);
}


+ 5
- 1
submodules/myOffice/myOffice.js View File

@ -552,7 +552,11 @@ define(function(require){
};
if(file) {
fileReader.readAsDataURL(file);
if(file.size >= (Math.pow(2,20) * 5)) { //If size bigger than 5MB
monster.ui.alert(self.i18n.active().myOffice.musicOnHold.fileTooBigAlert);
} else {
fileReader.readAsDataURL(file);
}
} else {
monster.ui.alert(self.i18n.active().myOffice.musicOnHold.emptyUploadAlert);
}


+ 5
- 1
submodules/strategy/strategy.js View File

@ -1629,7 +1629,11 @@ define(function(require){
};
if(file) {
fileReader.readAsDataURL(file);
if(file.size >= (Math.pow(2,20) * 5)) { //If size bigger than 5MB
monster.ui.alert(self.i18n.active().strategy.alertMessages.fileTooBigAlert);
} else {
fileReader.readAsDataURL(file);
}
} else {
monster.ui.alert(self.i18n.active().strategy.alertMessages.emptyUploadGreeting);
}


+ 5
- 1
submodules/users/users.js View File

@ -2087,7 +2087,11 @@ define(function(require){
};
if(file) {
fileReader.readAsDataURL(file);
if(file.size >= (Math.pow(2,20) * 5)) { //If size bigger than 5MB
monster.ui.alert(self.i18n.active().users.music_on_hold.fileTooBigAlert);
} else {
fileReader.readAsDataURL(file);
}
} else {
monster.ui.alert(self.i18n.active().users.music_on_hold.emptyUploadAlert);
}


+ 1
- 1
views/app.html View File

@ -1,4 +1,4 @@
<div id="voip_container" class="clearfix">
<div id="voip_container" class="clearfix container-menu">
<div class="left-menu">
<div id="my_office" class="category simple separated">
<div class="title">


Write Preview
Loading…
Cancel
Save