corrade-nucleus-nucleons – Diff between revs 16 and 17

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 16 Rev 17
Line 18... Line 18...
18 <!-- Customized bootstrap style. --> 18 <!-- Customized bootstrap style. -->
19 <link href="/css/nucleus/nucleus.css" rel="stylesheet" type="text/css"> 19 <link href="/css/nucleus/nucleus.css" rel="stylesheet" type="text/css">
Line 20... Line 20...
20   20  
21 <!-- jsTree style --> 21 <!-- jsTree style -->
-   22 <link href="/pack-rat/bower_components/jstree/dist/themes/default/style.min.css" rel="stylesheet" type="text/css">
-   23 <!-- Bootstrap table -->
22 <link href="/pack-rat/bower_components/jstree/dist/themes/default/style.min.css" rel="stylesheet" type="text/css"> 24 <link href="/pack-rat/bower_components/bootstrap-table/dist/bootstrap-table.min.css" rel="stylesheet" type="text/css">
23 </script> 25 </script>
Line 24... Line 26...
24 </head> 26 </head>
25   27  
Line 35... Line 37...
35   37  
36 <h1 id="title" class="modal-title"></h1> 38 <h1 id="title" class="modal-title"></h1>
Line 37... Line 39...
37 </div> 39 </div>
-   40  
-   41 <div id="content" class="modal-body">
38   42 <table id="info" data-height="460">
-   43 <thead>
39 <div id="content" class="modal-body"> 44 <tr>
-   45 <th data-field="AssetUUID">Asset UUID</th>
-   46 <th data-field="CreationDate">Creation Date</th>
-   47 <th data-field="Description">Description</th>
40 <div class="progress"> 48 <th data-field="Permissions">Permissions</th>
41 <div id="progressbar" class="progress-bar" role="progressbar" aria-valuenow="2" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em; width: 2%;"> 49 <th data-field="UUID">Inventory UUID</th>
-   50 </tr>
42 0% 51 </thead>
43 </div> -  
44 </div> 52 </table>
45   53 </div>
46 <div class="modal-footer"> -  
47 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> 54 <div class="modal-footer">
48 </div> 55 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
49 </div> 56 </div>
50 </div> 57 </div>
Line 69... Line 76...
69 <script src="/bower_components/jquery/dist/jquery.min.js" type="text/javascript"></script> 76 <script src="/bower_components/jquery/dist/jquery.min.js" type="text/javascript"></script>
70 <!-- Wizardry and Steamworks JavaScript Includes --> 77 <!-- Wizardry and Steamworks JavaScript Includes -->
71 <script src="/bower_components/was/dist/was.min.js" type="text/javascript"></script> 78 <script src="/bower_components/was/dist/was.min.js" type="text/javascript"></script>
72 <!-- Bootstrap Javascript --> 79 <!-- Bootstrap Javascript -->
73 <script type="text/javascript" src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script> 80 <script type="text/javascript" src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
-   81 <script type="text/javascript" src="/pack-rat/bower_components/bootstrap-table/dist/bootstrap-table.min.js"></script>
74 <!-- Bootstrap Form Validator --> 82 <!-- Bootstrap Form Validator -->
75 <script src="/pack-rat/bower_components/bootstrap-validator/dist/validator.min.js" type="text/javascript"></script> 83 <script src="/pack-rat/bower_components/bootstrap-validator/dist/validator.min.js" type="text/javascript"></script>
76 <!-- XML <-> JSON --> 84 <!-- XML <-> JSON -->
77 <!-- <script src="/bootstrap/bower_components/x2js/xml2json.min.js" type="text/javascript"></script> --> 85 <!-- <script src="/bootstrap/bower_components/x2js/xml2json.min.js" type="text/javascript"></script> -->
78 <!-- CryptoJS --> 86 <!-- CryptoJS -->
Line 96... Line 104...
96 var items = { 104 var items = {
97 // Grab information about the item. 105 // Grab information about the item.
98 infoItem: { 106 infoItem: {
99 label: "Get Info", 107 label: "Get Info",
100 action: function(obj) { 108 action: function(obj) {
101 $('#popup').dialog({ -  
102 width: 800, -  
103 height: 600, -  
104 modal: true, -  
105 resizable: false, -  
106 dialogClass: 'no-close texture-dialog' -  
107 }).on('dialogclose', function(event) { -  
108 $('#content').html(''); -  
109 }); -  
110 $.ajax({ 109 $.ajax({
-   110 //async: false,
111 type: 'POST', 111 type: 'POST',
112 url: '/', 112 url: '/',
113 dataType: 'json', 113 dataType: 'json',
114 data: { 114 data: {
115 command: 'getinventorydata', 115 command: 'getinventorydata',
116 item: node.id.split(/[\/]+/).pop(), 116 item: node.id,
117 data: [ 117 data: wasArrayToCSV([
118 'AssetUUID', 118 'AssetUUID',
119 'CreationDate', 119 'CreationDate',
120 'Description', 120 'Description',
121 'Permissions', 121 'Permissions',
122 'UUID' // part of InventoryBase 122 'UUID' // part of InventoryBase
123 ] 123 ])
124 } 124 }
125 }).done(function(data) { 125 $('#info').bootstrapTable({
-   126 data: [ wasKeyValueObjectify(wasCSVToArray(response.data)) ]
-   127 });
126 $('#content').html(ConvertJsonToTable(data, null, null, null)); 128 $('#popup').modal('show');
127 }); 129 });
128 } 130 }
129 } 131 }
130 }; 132 };