Skip to content

Commit ffe8428

Browse files
author
cfoe
committed
removed enclosing div from a.button and button elements
1 parent 1e50e37 commit ffe8428

File tree

72 files changed

+387
-423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+387
-423
lines changed

‎interface/web/themes/default-v2/css/styles.css‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -745,29 +745,37 @@ table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
745745
#ir-No { background-image:url("../icons/x16/cross_circle.png"); height:16px; }
746746

747747
/* BUTTONS */
748-
.buttons a, .buttons button{
749-
display:block;
750-
float:left;
751-
margin:0 7px 0 0;
752-
background-color:#f5f5f5;
753-
border:1px solid #777777;
754-
border-top: 1px solid #c8c8c8;
755-
border-left:1px solid #c8c8c8;
756-
757-
font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
758-
font-size:90%;
759-
line-height:130%;
760-
text-decoration:none;
761-
font-weight:bold;
762-
color:#565656;
763-
cursor:pointer;
764-
padding:5px 10px 6px 7px; /* Links */
748+
a.button,
749+
.button {
750+
display: inline-block;
751+
margin: 0 2px;
752+
padding: 2px 5px;
753+
color: #525252;
754+
text-shadow: 0px 1px 1px #fff;
755+
border: 1px solid #c6c6c6;
756+
border-radius: 4px;
757+
background: #f7f7f7;
758+
background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
759+
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
760+
background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
761+
background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
762+
background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
763+
box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
764+
-o-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
765+
-webkit-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
766+
-moz-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
767+
text-decoration: none;
765768
}
766-
.buttons button{
767-
width:auto;
768-
overflow:visible;
769-
padding:4px 10px 3px 7px; /* IE6 */
769+
a.button:focus,
770+
input.button:focus {
771+
border-color: #4fadd5;
772+
box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
773+
-moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
774+
-webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
775+
-o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
776+
outline: none;
770777
}
778+
771779
.buttons button[type]{
772780
padding:5px 10px 5px 7px; /* Firefox */
773781
line-height:17px; /* Safari */

‎interface/web/themes/default-v2/templates/admin/firewall_list.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
66
<div class="pnl_toolsarea">
77
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
88
<div class="buttons">
9-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
9+
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
1010
<span>{tmpl_var name="add_new_record_txt"}</span>
1111
</button>
1212
</div>
@@ -29,7 +29,9 @@ <h2><tmpl_var name="list_head_txt"></h2>
2929
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
3030
<td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
3131
<td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
32-
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
32+
<td class="tbl_col_buttons">
33+
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
34+
</td>
3335
</tr>
3436
</thead>
3537
<tbody>
@@ -40,9 +42,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
4042
<td class="tbl_col_tcp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
4143
<td class="tbl_col_udp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
4244
<td class="tbl_col_buttons">
43-
<div class="buttons icons16">
44-
<a class="icons16 icoDelete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
45-
</div>
45+
<a class="button icons16 icoDelete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
4646
</td>
4747
</tr>
4848
</tmpl_loop>

‎interface/web/themes/default-v2/templates/admin/groups_list.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
66
<div class="pnl_toolsarea">
77
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
88
<div class="buttons">
9-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
9+
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
1010
<span>{tmpl_var name="add_new_record_txt"}</span>
1111
</button>
1212
<p><tmpl_var name="warning_txt"></p>
@@ -26,7 +26,9 @@ <h2><tmpl_var name="list_head_txt"></h2>
2626
<tr class="filter">
2727
<td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
2828
<td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
29-
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
29+
<td class="tbl_col_buttons">
30+
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
31+
</td>
3032
</tr>
3133
</thead>
3234
<tbody>
@@ -35,9 +37,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
3537
<td class="tbl_col_name"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
3638
<td class="tbl_col_description"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
3739
<td class="tbl_col_buttons">
38-
<div class="buttons icons16">
39-
<a class="icons16 icoDelete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
40-
</div>
40+
<a class="button icons16 icoDelete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
4141
</td>
4242
</tr>
4343
</tmpl_loop>

‎interface/web/themes/default-v2/templates/admin/iptables_list.htm‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
55
<div class="pnl_toolsarea">
66
<fieldset><legend>Tools</legend>
77
<div class="buttons">
8-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/iptables_edit.php');">
8+
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/iptables_edit.php');">
99
<span>{tmpl_var name="add_new_rule_txt"}</span>
1010
</button>
1111
</div>
@@ -37,9 +37,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
3737
<td class="tbl_col_state"></td>
3838
<td class="tbl_col_target"><select name="search_target">{tmpl_var name='search_target'}</select></td>
3939
<td class="tbl_col_buttons">
40-
<div class="buttons">
41-
<button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');"><span>{tmpl_var name="filter_txt"}filter_txt</span></button>
42-
</div>
40+
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');"><span>{tmpl_var name="filter_txt"}filter_txt</span></button>
4341
</td>
4442
</tr>
4543
</thead>
@@ -55,9 +53,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
5553
<td class="tbl_col_state"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="state"}</a></td>
5654
<td class="tbl_col_target"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="target"}</a></td>
5755
<td class="tbl_col_buttons">
58-
<div class="buttons icons16">
59-
<a class="icons16 icoDelete" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
60-
</div>
56+
<a class="button icons16 icoDelete" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
6157
</td>
6258
</tr>
6359
</tmpl_loop>

‎interface/web/themes/default-v2/templates/admin/remote_user_list.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
55
<div class="pnl_toolsarea">
66
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
77
<div class="buttons">
8-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/remote_user_edit.php');">
8+
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/remote_user_edit.php');">
99
<span>{tmpl_var name="add_new_record_txt"}</span>
1010
</button>
1111
</div>
@@ -24,7 +24,9 @@ <h2><tmpl_var name="list_head_txt"></h2>
2424
<tr class="filter">
2525
<td class="tbl_col_remote_userid"></td>
2626
<td class="tbl_col_remote_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
27-
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
27+
<td class="tbl_col_buttons">
28+
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
29+
</td>
2830
</tr>
2931
</thead>
3032
<tbody>
@@ -33,9 +35,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
3335
<td class="tbl_col_remote_userid"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
3436
<td class="tbl_col_remote_username"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
3537
<td class="tbl_col_buttons">
36-
<div class="buttons icons16">
37-
<a class="icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
38-
</div>
38+
<a class="button icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
3939
</td>
4040
</tr>
4141
</tmpl_loop>

‎interface/web/themes/default-v2/templates/admin/server_config_list.htm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ <h2><tmpl_var name="list_head_txt"></h2>
1313
</tr>
1414
<tr class="filter">
1515
<td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
16-
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
16+
<td class="tbl_col_buttons">
17+
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
18+
</td>
1719
</tr>
1820
</thead>
1921
<tbody>
2022
<tmpl_loop name="records">
2123
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
2224
<td class="tbl_col_server_name"><a href="#" onClick="loadContent('admin/server_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
2325
<td class="tbl_col_buttons">
24-
<div class="buttons icons16">
25-
<a class="icons16 icoDelete" href="javascript: del_record('admin/server_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
26-
</div>
26+
<a class="button icons16 icoDelete" href="javascript: del_record('admin/server_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
2727
</td>
2828
</tr>
2929
</tmpl_loop>

‎interface/web/themes/default-v2/templates/admin/server_ip_list.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
55
<div class="pnl_toolsarea">
66
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
77
<div class="buttons">
8-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
8+
<button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
99
<span>{tmpl_var name="add_new_record_txt"}</span>
1010
</button>
1111
</div>
@@ -32,7 +32,9 @@ <h2><tmpl_var name="list_head_txt"></h2>
3232
<td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
3333
<td class="tbl_col_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
3434
<td class="tbl_col_virtualhost_port"><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></td>
35-
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
35+
<td class="tbl_col_buttons">
36+
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
37+
</td>
3638
</tr>
3739
</thead>
3840
<tbody>
@@ -45,9 +47,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
4547
<td class="tbl_col_virtualhost"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>
4648
<td class="tbl_col_virtualhost_port"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost_port"}</a></td>
4749
<td class="tbl_col_buttons">
48-
<div class="buttons icons16">
49-
<a class="icons16 icoDelete" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
50-
</div>
50+
<a class="button icons16 icoDelete" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
5151
</td>
5252
</tr>
5353
</tmpl_loop>

0 commit comments

Comments
 (0)