~maas-committers/maas/trunk

« back to all changes in this revision

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

  • Committer: MAAS Lander
  • Author(s): Blake Rouse
  • Date: 2015-10-09 21:36:55 UTC
  • mfrom: (4363.4.2 hide-os-when-not-valid)
  • Revision ID: maas_lander-20151009213655-uc6c915h47tx9ggz
[r=andreserl][bug=1476719][author=blake-rouse] Don't show the OS information in the machine summary unless it is in a state where it should be shown.

Show diffs side-by-side

added added

removed removed

Lines of Context:
236
236
                            <dd class="four-col last-col">
237
237
                                {$ node.storage $}GB over {$ node.physical_disk_count $} disks
238
238
                            </dd>
239
 
                        <dt class="two-col">Operating System</dt>
240
 
                            <dd class="four-col last-col">{$ getOSText() $}</dd>
241
 
                        <dt class="two-col">Kernel</dt>
242
 
                            <dd class="four-col last-col">{$ node.hwe_kernel $}</dd>
243
 
                        <dt class="two-col ng-hide" data-ng-show="node.third_party_driver">Third Party Driver</dt>
244
 
                            <dd class="four-col last-col ng-hide" data-ng-show="node.third_party_driver">
 
239
                        <dt class="two-col ng-hide" data-ng-show="node.show_os_info">Operating System</dt>
 
240
                            <dd class="four-col last-col ng-hide" data-ng-show="node.show_os_info">{$ getOSText() $}</dd>
 
241
                        <dt class="two-col ng-hide" data-ng-show="node.show_os_info">Kernel</dt>
 
242
                            <dd class="four-col last-col ng-hide" data-ng-show="node.show_os_info">{$ node.hwe_kernel $}</dd>
 
243
                        <dt class="two-col ng-hide" data-ng-show="node.show_os_info && node.third_party_driver">Third Party Driver</dt>
 
244
                            <dd class="four-col last-col ng-hide" data-ng-show="node.show_os_info && node.third_party_driver">
245
245
                                {$ node.third_party_driver.module $} "{$ node.third_party_driver.comment $}"
246
246
                            </dd>
247
247
                    </dl>