← Back to branch summary

~blake-rouse/maas/fix-1484696

« back to all changes in this revision

Viewing changes to src/maasserver/static/partials/node-details.html

  • Committer: Jeffrey C Jones
  • Date: 2015-09-23 01:01:49 UTC
  • mfrom: (4293 maas)
  • mto: This revision was merged to the branch mainline in revision 4294.
  • Revision ID: jeff.jones@canonical.com-20150923010149-x0r6ym7dx014e370
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/static/partials/node-details.html
212
212
                            </dd>
213
213
                        <dt class="two-col">Storage</dt>
214
214
                            <dd class="four-col last-col">
215
 
                                {$ node.storage $}GB over {$ node.disks $} disks
 
215
                                {$ node.storage $}GB over {$ node.physical_disk_count $} disks
216
216
                            </dd>
217
217
                        <dt class="two-col">Operating System</dt>
218
218
                            <dd class="four-col last-col">{$ getOSText() $}</dd>
321
321
        </div>
322
322
    </div>
323
323
    <div class="row">
324
 
        <div class="inner-wrapper">
 
324
        <div class="inner-wrapper" ng-controller="NodeStorageController">
325
325
            <form>
326
326
                <div class="twelve-col">
327
327
                    <h3 class="title">Storage</h3>
328
328
                </div>
329
329
                <div class="twelve-col">
330
 
                    <h4 data-ng-hide="storage.physicalDisks.length">
 
330
                    <h4 data-ng-hide="disks.length">
331
331
                        No storage information. Commissioning this node will gather the storage information.
332
332
                    </h4>
333
 
                    <table class="table-listing ng-hide" data-ng-show="storage.physicalDisks.length">
 
333
                    <table class="table-listing ng-hide" data-ng-show="disks.length">
334
334
                        <thead>
335
335
                            <tr>
336
336
                                <th class="t20">Name</th>
338
338
                                <th class="t10">Size (GB)</th>
339
339
                                <th class="table-listing__header" class="t25" colspan="2">
340
340
                                    <!-- XXX blake_r 2015-02-18 - Need to add e2e test. -->
341
 
                                    <a class="table-listing__header-link" href="" data-ng-click="storage.column = 'model'" data-ng-class="{active: storage.column === 'model'}">
 
341
                                    <a class="table-listing__header-link" href="" data-ng-click="column = 'model'" data-ng-class="{active: column === 'model'}">
342
342
                                        Model
343
343
                                    </a>
344
344
                                    <span class="divide"></span>
345
 
                                    <a class="table-listing__header-link" href="" data-ng-click="storage.column = 'serial'" data-ng-class="{active: storage.column === 'serial'}">
 
345
                                    <a class="table-listing__header-link" href="" data-ng-click="column = 'serial'" data-ng-class="{active: column === 'serial'}">
346
346
                                        Serial
347
347
                                    </a>
348
348
                                </th>
350
350
                            </tr>
351
351
                        </thead>
352
352
                        <tbody>
353
 
                            <tr class="table-listing__row" data-ng-repeat="disk in storage.physicalDisks">
 
353
                            <tr class="table-listing__row" data-ng-repeat="disk in disks">
354
354
                                <td class="t20">{$ disk.name $}</td>
355
355
                                <td class="t25">{$ disk.path $}</td>
356
356
                                <td class="t10">{$ disk.size_gb $}</td>
357
 
                                <td class="t25" colspan="2" data-ng-show="storage.column === 'model'">{$ disk.model $}</td>
358
 
                                <td class="t25 ng-hide" colspan="2" data-ng-show="storage.column === 'serial'">{$ disk.serial $}</td>
 
357
                                <td class="t25" colspan="2" data-ng-show="column === 'model'">{$ disk.model $}</td>
 
358
                                <td class="t25 ng-hide" colspan="2" data-ng-show="column === 'serial'">{$ disk.serial $}</td>
359
359
                                <td class="t20">
360
 
                                    <span class="tag-link" data-ng-repeat="tag in disk.tags" data-ng-hide="storage.editing">
 
360
                                    <span class="tag-link" data-ng-repeat="tag in disk.tags" data-ng-hide="editing">
361
361
                                        <a href="#/nodes/?query=storage_tags:({$ tag.text $})">{$ tag.text $}</a>
362
362
                                    </span>
363
363
                                    <tags-input ng-model="disk.tags"
364
 
                                        data-ng-show="storage.editing" allowed-tags-pattern="[\w-]+">
 
364
                                        data-ng-show="editing" allowed-tags-pattern="[\w-]+">
365
365
                                    </tags-input>
366
366
                                </td>
367
367
                            </tr>
368
368
                        </tbody>
369
369
                    </table>
370
370
                </div>
371
 
                <div class="controls" data-ng-show="storage.physicalDisks.length && !storage.editing">
 
371
                <div class="controls" data-ng-show="disks.length && !editing">
372
372
                    <a href="" class="link-cta-ubuntu secondary"
373
373
                        data-ng-show="canEdit()"
374
 
                        data-ng-click="editStorage()">Edit</a>
 
374
                        data-ng-click="edit()">Edit</a>
375
375
                </div>
376
 
                <div class="controls ng-hide" data-ng-show="storage.editing">
 
376
                <div class="controls ng-hide" data-ng-show="editing">
377
377
                    <a href="" class="link-cta-ubuntu clear"
378
 
                        data-ng-click="cancelEditStorage()">Cancel</a>
 
378
                        data-ng-click="cancel()">Cancel</a>
379
379
                    <button class="cta-ubuntu"
380
 
                        data-ng-click="saveEditStorage()">Save changes</button>
 
380
                        data-ng-click="save()">Save changes</button>
381
381
                </div>
382
382
 
383
383