135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use blockquote to make dialog more readable

Browse Source
This commit is contained in:
Oliver Gorwits
2013-08-31 08:26:39 +01:00
parent bab8e4d00c
commit 80513dd206
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Netdisco/share/views/ajax/admintask/pseudodevice.tt
View File

@@ -41,10 +41,10 @@
<h3 id="nd_devdel_label-[% count %]">Are you sure?</h3> <h3 id="nd_devdel_label-[% count %]">Are you sure?</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>The following pseudo-device will be deleted:</p> <blockquote>
<ul> <p class="text-info">
<li>[% row.dns | html_entity %] / [% row.ip | html_entity %]</li> Pseudo-device &quot;[% row.dns | html_entity %] / [% row.ip | html_entity %]&quot; will be deleted.</p>
</ul> </blockquote>
<input data-form="del" name="dns" type="hidden" value="[% row.dns | html_entity %]"> <input data-form="del" name="dns" type="hidden" value="[% row.dns | html_entity %]">
<input data-form="del" name="ip" type="hidden" value="[% row.ip | html_entity %]"> <input data-form="del" name="ip" type="hidden" value="[% row.ip | html_entity %]">
<input data-form="del" name="ports" type="hidden" value="[% row.port_count | html_entity %]"> <input data-form="del" name="ports" type="hidden" value="[% row.port_count | html_entity %]">

11
Netdisco/share/views/ajax/admintask/topology.tt
View File

@@ -60,11 +60,16 @@
<h3 id="nd_devdel_label-[% count %]">Are you sure?</h3> <h3 id="nd_devdel_label-[% count %]">Are you sure?</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>The link between these two ports will be removed:</p> <blockquote>
<p class="text-info">The link between these two ports will be removed:</p>
<p>&nbsp;</p>
<ul> <ul>
<li>[% (row.device1.dns || row.device1.name || row.device1.ip) | html_entity %], [% row.port1 | html_entity %]</li> <li><p class="text-info">[% (row.device1.dns || row.device1.name || row.device1.ip) | html_entity %],&nbsp;
<li>[% (row.device2.dns || row.device2.name || row.device2.ip) | html_entity %], [% row.port2 | html_entity %]</li> [% row.port1 | html_entity %]</p></li>
<li><p class="text-info">[% (row.device2.dns || row.device2.name || row.device2.ip) | html_entity %],&nbsp;
[% row.port2 | html_entity %]</p></li>
</ul> </ul>
</blockquote>
<input data-form="del" name="dev1" type="hidden" value="[% row.dev1 | html_entity %]"> <input data-form="del" name="dev1" type="hidden" value="[% row.dev1 | html_entity %]">
<input data-form="del" name="port1" type="hidden" value="[% row.port1 | html_entity %]"> <input data-form="del" name="port1" type="hidden" value="[% row.port1 | html_entity %]">
<input data-form="del" name="dev2" type="hidden" value="[% row.dev2 | html_entity %]"> <input data-form="del" name="dev2" type="hidden" value="[% row.dev2 | html_entity %]">

14
Netdisco/share/views/ajax/device/details.tt
View File

@@ -115,12 +115,14 @@
<h3 id="nd_devdel_label">Confirm Delete: [% d.dns || d.ip | html_entity %]</h3> <h3 id="nd_devdel_label">Confirm Delete: [% d.dns || d.ip | html_entity %]</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<ul> <blockquote>
<li>This action is immediate and not reversible</li> <ul>
<li>All associated Nodes will be removed from the database</li> <li><p>This action is immediate and not reversible</p></li>
</ul> <li><p>All associated Nodes will be removed from the database</p></li>
<p>Log message:</p> </ul>
<textarea class="input-block-level" rows="2" data-form="delete" name="log"></textarea> </blockquote>
<textarea class="input-block-level" rows="2" data-form="delete"
placeholder="Enter a log message" name="log"></textarea>
<input type="hidden" data-form="delete" value="[% d.ip %]" name="device"/> <input type="hidden" data-form="delete" value="[% d.ip %]" name="device"/>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">