← Back to branch summary

~rvb/maas/bug-1413030

« back to all changes in this revision

Viewing changes to src/maasserver/templates/maasserver/node_view.html

  • Committer: MaaS Lander
  • Author(s): ricgard
  • Date: 2015-01-20 14:37:15 UTC
  • mfrom: (3454.3.27 nodes)
  • Revision ID: maas_lander-20150120143715-taq25wqrh4a2p84a
[r=blake-rouse][bug=][author=ricgard] Updates to node view, listing other pages & header

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/templates/maasserver/node_view.html
94
94
{% endblock %}
95
95
 
96
96
{% block content %}
97
 
<style type="text/css">
98
 
#content-discovery-data {
99
 
    width: 945px;
100
 
}
101
 
</style>
102
 
<div id="content-with-sidebar">
103
 
    <ul class="data-list">
104
 
        <li class="block size3 first">
 
97
<div class="nine-col last-col">
 
98
    <ul>
 
99
        <li class="three-col">
105
100
            <h4><abbr title="Fully Qualified Domain Name">FQDN</abbr></h4>
106
101
            <span data-field="fqdn">{{ node.fqdn }}</span>
107
102
        </li>
108
 
        <li id="network-interfaces" class="block size5">
 
103
        <li id="network-interfaces" class="three-col">
109
104
            <h4>Network interfaces</h4>
110
105
            <span>
111
106
                <ul class="data-list">
118
113
                </ul>
119
114
            </span>
120
115
        </li>
121
 
        <li class="block size3">
 
116
        <li class="three-col last-col">
122
117
            <h4>Status</h4>
123
118
            <span data-field="status">{{ node.display_status }}</span>
124
119
        </li>
125
 
        <li class="block first size3">
 
120
        <li class="three-col">
126
121
            <h4>Architecture</h4>
127
122
            <span data-field="architecture">{{ node.architecture }}</span>
128
123
        </li>
129
 
        <li class="block size3">
 
124
        <li class="three-col">
130
125
            <h4>CPU Count</h4>
131
126
            <span data-field="cpu_count">{{ node.cpu_count }}</span>
132
127
        </li>
133
 
        <li class="block size3">
 
128
        <li class="three-col last-col">
134
129
            <h4>Memory</h4>
135
130
            <span>
136
131
                <span data-field="memory">{{ node.display_memory }}</span> GiB
137
132
            </span>
138
133
        </li>
139
 
        <li class="block size3 first">
 
134
        <li class="six-col">
140
135
            <h4>Tags</h4>
141
136
            <span id="node_tags">
142
137
                {% for tag in node.tags.all %}
149
144
        </li>
150
145
        {% with ip_addresses=node.ip_addresses %}
151
146
        {% if ip_addresses|length %}
152
 
        <li class="block size3" id="ip-addresses">
 
147
        <li class="six-col" id="ip-addresses">
153
148
            <h4>IP addresses
154
149
            {% if unconfigured_ips_warning %}
155
150
            <img src="{{ STATIC_URL }}img/warning.png" title="This node's IPv6 addresses are not automatically configured." id="unconfigured-ips-warning" />
164
159
        {% endif %}
165
160
        {% endwith %}
166
161
        {% if kernel_opts.value %}
167
 
        <li class="block size10 first">
 
162
        <li class="six-col">
168
163
            <h4>Kernel Parameters
169
164
                {% if kernel_opts.is_global %}
170
165
                - from: <a class="kernelopts-global-link" href="{% url 'settings' %}">Global Kernel Parameters</a>
176
171
        </li>
177
172
        {% endif %}
178
173
        {% if third_party_drivers_enabled and drivers %}
179
 
        <li class="block size10 first">
 
174
        <li class="six-col">
180
175
            <h4>Third Party Drivers</h4>
181
176
            <span id="third_party_drivers">{{ drivers.module }} ({{ drivers.comment }})</span>
182
177
        </li>
183
178
        {% endif %}
184
179
        {% if error_text %}
185
 
        <li class="block first">
 
180
        <li class="nine-col">
186
181
            <h4>Error output</h4>
187
182
            <span>{{ error_text }}</span>
188
183
        </li>
189
184
        {% endif %}
190
185
        {% if status_text %}
191
 
        <li class="block first">
 
186
        <li class="nine-col">
192
187
            <h4>Console output</h4>
193
188
            <span>{{ status_text }}</span>
194
189
        </li>
195
190
        {% endif %}
196
 
        <li id="owner" data-field="owner" data-field-if="hidden" class="block size3 {% if not node.owner %}hidden{% endif %}">
 
191
        <li id="owner" data-field="owner" data-field-if="hidden" class="five-col {% if not node.owner %}hidden{% endif %}">
197
192
            <h4>Owner</h4>
198
193
            <span data-field="owner">{{ node.owner }}</span>
199
194
        </li>
200
 
        <li id="zone" class="block size3">
 
195
        <li id="zone" class="five-col">
201
196
            <h4>Physical zone</h4>
202
197
            <span>
203
198
                <a data-field="zone_url" data-field-attr="href" href="{% url 'zone-view' node.zone.name %}">
206
201
            </span>
207
202
        </li>
208
203
        {% if node.routers %}
209
 
        <li id="routers" class="block first size3">
 
204
        <li id="routers" class="five-col">
210
205
            <h4>Switch MAC addresses</h4>
211
206
            <span>{{ node.routers|join:", " }}</span>
212
207
        </li>
213
208
        {% endif %}
214
209
        {% if can_edit %}
215
210
        {% if nodeinstallresults != None %}
216
 
        <li class="block first size5 separate" id="nodeinstallresults">
 
211
        <li class="five-col" id="nodeinstallresults">
217
212
            <h4>Installation output</h4>
218
213
            {% for install_result in nodeinstallresults %}
219
214
            <span>
223
218
        </li>
224
219
        {% endif %}
225
220
        {% if nodecommissionresults > 0 %}
226
 
        <li class="block first size5 separate" id="nodecommissionresults">
 
221
        <li class="five-col" id="nodecommissionresults">
227
222
            <h4>Commissioning output</h4>
228
223
            <span>
229
224
            <a href="{% url 'nodecommissionresult-list' %}?node={{node.system_id}}">
236
231
        {% endif %}
237
232
        {% with physicalblockdevices=node.physicalblockdevice_set %}
238
233
        {% if physicalblockdevices|length %}
239
 
        <li class="block first separate" id="storage">
 
234
        <li class="nine-col" id="storage">
240
235
            <h2>Storage</h2>
241
236
            <table class="list">
242
237
                <thead>
265
260
        </li>
266
261
        {% endif %}
267
262
        {% endwith %}
268
 
        <li class="block first separate" id="node-events">
 
263
        <li class="nine-col" id="node-events">
269
264
            <h2>Latest node events</h2>
270
265
            <div id="node_event_list">
271
266
                <div class="spinner spin"></div>
276
271
</div>
277
272
<div class="clear"></div>
278
273
{% if probed_details_xml %}
279
 
<div id="content-discovery-data">
 
274
<div id="content-discovery-data" class="nine-col">
280
275
    <ul class="data-list">
281
 
        <li class="block first separate">
282
 
            <h2 class="first size6">Discovery data</h2>
 
276
        <li class="nine-col">
 
277
            <h2 class="four-col">Discovery data</h2>
283
278
            <!-- Button link for the Reveal widget that shows/hides LLDP output. -->
284
 
            <a class="last size6 align-right space-top" href="#" id="details-trigger"></a>
 
279
            <a class="four-col" href="#" id="details-trigger"></a>
285
280
            <!-- Content div for the probed details output. -->
286
281
        </li>
287
 
        <li class="block first pad-top-small">
288
 
            <div class="row first" id="details-output">
289
 
                <ul class="list col1 no-background normal">
 
282
        <li class="nine-col">
 
283
            <div id="details-output">
 
284
                <ul class="one-col">
290
285
                    <li><a href="#yaml">YAML</a>
291
286
                    </li>
292
287
                    <li><a href="#xml">XML</a>
293
288
                    </li>
294
289
                </ul>
295
 
                <div class="last col10 no-background normal">
 
290
                <div class="eight-col last-col">
296
291
                    <div id="yaml">
297
292
                        <pre>{{ probed_details_yaml }}</pre>
298
293
                    </div>