Browse Source

UI-724: Group users are now sortable in SmartPbx

4.3
Maxime Roux 11 years ago
parent
commit
a5f51f0e32
3 changed files with 16 additions and 5 deletions
  1. +10
    -4
      submodules/groups/groups.css
  2. +5
    -0
      submodules/groups/groups.js
  3. +1
    -1
      views/myOffice-layout.html

+ 10
- 4
submodules/groups/groups.css View File

@ -257,6 +257,12 @@
}
/* Members */
#groups_container .detail-group .grid-time .group-row-placeholder {
height: 60px;
width: 100%;
background: #EEE;
}
#groups_container .detail-group .grid-time .group-row {
position: relative;
-webkit-box-sizing: border-box;
@ -268,10 +274,6 @@
background: #FFF;
}
#groups_container .detail-group .grid-time .group-row:nth-child(2) {
padding-top: 25px;
}
#groups_container .detail-group .grid-time .group-row > div {
display: inline-block;
-webkit-box-sizing: border-box;
@ -280,6 +282,10 @@
box-sizing: border-box;
}
#groups_container .detail-group .grid-time .group-row:not(.title) {
cursor: move;
}
#groups_container .detail-group .grid-time .group-row.title {
margin-top: 1px;
background-color: transparent;


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

@ -498,6 +498,11 @@ define(function(require){
self.groupsBindMembers(template, results);
template.find('.grid-time').sortable({
items: '.group-row:not(.title)',
placeholder: 'group-row-placeholder'
});
template.find('[data-toggle="tooltip"]').tooltip();
callback && callback(template, results);


+ 1
- 1
views/myOffice-layout.html View File

@ -1,6 +1,6 @@
<div id="myoffice_container">
<div class="dashboard-header">
<div class="header-title">{{account.name}}</div>{{debug mainNumbers.length}}
<div class="header-title">{{account.name}}</div>
<a href="#" class="header-link caller-id{{#compare mainNumbers.length "===" 0}} disabled{{/compare}}">
<div class="header-link-icon"><i class="icon-white icon-large icon-user"></i></div>
<div class="header-link-title">{{i18n.myOffice.topBarLinks.callerID}}</div>


Loading…
Cancel
Save