community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #497 from rasika/release-2.0.x

Browse Source 
Removing device-view button
This commit is contained in:
Charitha Goonetilleke 2016-12-22 16:14:08 +05:30 committed by GitHub
commit af8902f392
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
View File

@ -258,8 +258,10 @@ function loadDevices(searchType, searchParam) {
data: 'name', data: 'name',
class: 'remove-padding icon-only content-fill', class: 'remove-padding icon-only content-fill',
render: function (data, type, row, meta) { render: function (data, type, row, meta) {
return '<div class="thumbnail icon"><img class="square-element text fw " src="' + getDeviceTypeThumb( return '<a href="' + context + '/device/' + row.deviceType + '?id=' + row.deviceIdentifier
row.deviceType) + '"/></div>'; + '"><div class="thumbnail icon"><img class="square-element text fw " src="'
+ getDeviceTypeThumb(
row.deviceType) + '"/></div></a>';
} }
}, },
{ {
@ -333,21 +335,13 @@ function loadDevices(searchType, searchParam) {
var deviceIdentifier = row.deviceIdentifier; var deviceIdentifier = row.deviceIdentifier;
var html = '<span></span>'; var html = '<span></span>';
if (status != 'REMOVED') { if (status != 'REMOVED') {
html = html = '';
'<a href="device/' + deviceType + '?id=' + deviceIdentifier + '" data-click-event="remove-form"'
+
' class="btn padding-reduce-on-grid-view"><span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>'
+
'<i class="fw fw-view fw-stack-1x"></i></span><span class="hidden-xs hidden-on-grid-view">View</span></a>';
if (analyticsEnabled(row.deviceType)) { if (analyticsEnabled(row.deviceType)) {
html += html += '<a href="' + context + '/device/' + deviceType + '/analytics?deviceId=' +
'<a href="device/' + deviceType + '/analytics?deviceId=' + deviceIdentifier + '&deviceName=' deviceIdentifier + '&deviceName=' + row.name + '" ' + 'data-click-event="remove-form"' +
+ row.name + '" ' + ' class="btn padding-reduce-on-grid-view"><span class="fw-stack">' +
'data-click-event="remove-form" class="btn padding-reduce-on-grid-view"><span class="fw-stack">' '<i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>' +
+
'<i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>'
+
'<span class="hidden-xs hidden-on-grid-view">Analytics</span>'; '<span class="hidden-xs hidden-on-grid-view">Analytics</span>';
} }

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
View File

@ -6547,7 +6547,7 @@ select > option:hover {
@media (min-width: 1200px){ @media (min-width: 1200px){
table tbody tr { table tbody tr {
width: 18% !important; width: 14% !important;
} }
.table .fw-stack{ .table .fw-stack{
font-size: 1.2vw; font-size: 1.2vw;
@ -6556,7 +6556,7 @@ select > option:hover {
@media (min-width: 1500px){ @media (min-width: 1500px){
table tbody tr { table tbody tr {
width: 14% !important; width: 10% !important;
} }
.table .fw-stack{ .table .fw-stack{
font-size: 0.8vw; font-size: 0.8vw;