Browse Source

UI-1019: Use the same header on devices listing than on users and groups

4.3
Joris Tirado 11 years ago
parent
commit
ee08315750
4 changed files with 55 additions and 15 deletions
  1. +1
    -1
      i18n/en-US.json
  2. +1
    -1
      i18n/fr-FR.json
  3. +48
    -12
      submodules/devices/devices.css
  4. +5
    -1
      views/devices-layout.html

+ 1
- 1
i18n/en-US.json View File

@ -293,7 +293,7 @@
"realm": "Realm"
},
"spare": "Spare",
"title": "Devices",
"title": "Total Devices",
"titleGrid": {
"edit": "Edit",
"enable": "Enable",


+ 1
- 1
i18n/fr-FR.json View File

@ -268,7 +268,7 @@
"realm": "Royaume"
},
"spare": "Disponibles",
"title": "Téléphones",
"title": " Nombre de Téléphones",
"titleGrid": {
"edit": "Modifier",
"enable": "Activer",


+ 48
- 12
submodules/devices/devices.css View File

@ -1,36 +1,72 @@
#devices_container .devices-header {
background: #fcfcfc;
border: 1px solid #ddd;
border-radius: 4px;
font-size: 18px;
height: 30px;
line-height: 30px;
padding: 15px;
}
#devices_container .devices-header > * {
display: inline-block;
}
#devices_container .devices-header .title {
padding: 15px;
border: 1px solid #dcdcdc;
border-radius: 4px 0 0 4px;
}
#devices_container .devices-header .count-devices {
color: #22ccff;
display: inline-block;
font-size: 28px;
font-weight: 600;
margin-left: 10px;
margin-right: 25px;
margin-top: -5px;
margin-left: 15px;
color: #22ccff;
font-weight: 600;
font-size: 28px;
}
#devices_container .devices-header .dropdown {
vertical-align: bottom;
}
#devices_container .devices-header .add-device {
font-size: 14px;
display: block;
margin: 0;
padding: 9px 13px;
border: 1px solid #dcdcdc;
border-left: 0;
border-radius: 0 4px 4px 0;
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%);
height: 42px;
vertical-align: top;
text-align: center;
font-size: 12px;
}
#devices_container .devices-header .add-device:hover {
background-image: none;
background-color: #eee;
text-decoration: none;
}
#devices_container .devices-header .add-device i {
display: block;
margin: 0;
color: #929799;
text-decoration: none;
margin-right: 5px;
}
#devices_container .devices-header .add-device:hover i {
color: #22ccff;
}
#devices_container .devices-header .search-box { margin: 16px 0 16px 15px; }
#devices_container .devices-grid {
background: #fcfcfc;
border: 1px solid #ddd;


+ 5
- 1
views/devices-layout.html View File

@ -4,8 +4,12 @@
{{ i18n.devices.title }}
<span class="count-devices">{{countDevices}}</span>
</div>
<div class="dropdown">
<a href="#" class="add-device monster-link dropdown-toggle" data-toggle="dropdown"><i class="icon-plus-sign icon-green"></i>{{i18n.devices.add }}</a>
<a href="#" class="add-device monster-link dropdown-toggle" data-toggle="dropdown">
<i class="icon-plus-sign"></i>
{{i18n.devices.add }}
</a>
<ul class="dropdown-menu">
<li><a class="create-device" data-type="sip_device"><i class="icon-telicon-voip-phone"></i>{{ i18n.devices.types.sip_device }}</a></li>
<li><a class="create-device" data-type="cellphone"><i class="icon-phone"></i>{{ i18n.devices.types.cellphone }}</a></li>


Loading…
Cancel
Save