Browse Source

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

4.3
Maxime Roux 11 years ago
parent
commit
9f4735691a
4 changed files with 12 additions and 3 deletions
  1. +9
    -0
      submodules/users/users.css
  2. +1
    -1
      submodules/users/users.js
  3. +1
    -1
      views/users-devices.html
  4. +1
    -1
      views/users-numbers.html

+ 9
- 0
submodules/users/users.css View File

@ -251,6 +251,15 @@
margin-right: 10px;
}
#users_container .actions .spare-devices {
line-height: 30px;
margin-left: 10px;
}
#users_container .actions .buy-dropdown {
margin-top: 2px;
}
/* Detail User */
#users_container .detail-user .user-fields {
-webkit-box-sizing: border-box;


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

@ -1404,7 +1404,7 @@ define(function(require){
if(typeof previousIterationNumber !== 'undefined') {
// If there's a gap for a number between the last number and the current number, we check if it's a valid possible number (ie, greater than minNumber)
// And If yes, we return it, if not we just continue
if(currentNumber - previousIterationNumber !== increment && previousIterationNumber > minNumber) {
if(currentNumber - previousIterationNumber !== increment && previousIterationNumber >= minNumber) {
return previousIterationNumber + increment;
}
}


+ 1
- 1
views/users-devices.html View File

@ -31,7 +31,7 @@
<li><a class="create-device" data-type="ata"><i class="icon-telicon-fax"></i>{{ i18n.devices.types.ata }}</a></li>
</ul>
</div>
<a class="spare-devices monster-link" href="javascript:void(0);"><i class="icon-telicon-voip-phone monster-green"></i>{{ i18n.users.devices.spareDevice }}</a>
<a class="spare-devices monster-link" href="javascript:void(0);"><i class="fa fa-phone monster-green"></i>{{ i18n.users.devices.spareDevice }}</a>
<div class="pull-right">
<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>


+ 1
- 1
views/users-numbers.html View File

@ -56,7 +56,7 @@
<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
<i class="fa fa-plus monster-green fa-lg"></i>{{ i18n.users.addFromSpare }}
</a>
<ul class="nav pull-left">
<ul class="buy-dropdown nav pull-left">
<li class="dropdown">
<a href="#" class="dropdown-toggle buy-dropdown monster-link" data-toggle="dropdown" data-target="#"><i class="fa fa-shopping-cart monster-green fa-lg"></i>{{ i18n.strategy.numberLinks.buy.link }}</a>
<ul class="dropdown-menu" role="menu">


Loading…
Cancel
Save