mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Buttons update to new design:wq

Browse Source
This commit is contained in:
Stephen Beaver 2015-11-04 12:40:03 -05:00
parent 09415b9e56
commit 2ec8f0baec
20 changed files with 159 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/usr/local/www/firewall_schedule.php
View File

@ -271,12 +271,17 @@ endforeach;
<?=($i > 0) ? gettext(CLOCK . ' Indicates that the schedule is currently active.'):''?>
<nav class="action-buttons">
<a href="firewall_schedule_edit.php" class="btn btn-sm btn-success"><?=gettext("Add new schedule")?></a>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="firewall_schedule_edit.php" class="btn btn-sm btn-success">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
<div id="infoblock">
<?=print_info_box(gettext('Schedules act as placeholders for time ranges to be used in Firewall Rules.'), info)?>
</div>
<?php
print_info_box(gettext('Schedules act as placeholders for time ranges to be used in Firewall Rules.'));
include("foot.inc");

16
src/usr/local/www/firewall_virtual_ip.php
View File

@ -355,13 +355,17 @@ endforeach;
</div>
</div>
<nav class="action-buttons">
<a href="firewall_virtual_ip_edit.php" class="btn btn-sm btn-success"><?=gettext('Add Virtual IP')?></a>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="firewall_virtual_ip_edit.php" class="btn btn-sm btn-success">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext('Add')?>
</a>
</nav>
<div id="infoblock">
<?=print_info_box(gettext('The virtual IP addresses defined on this page may be used in ') . '<a href="firewall_nat.php">' . gettext('NAT') . '</a>' . gettext(' mappings.') . '<br />' .
gettext('You can check the status of your CARP Virtual IPs and interfaces ') . '<a href="carp_status.php">' . gettext('here') . '</a>', info)?>
</div>
<?php
print_info_box(gettext('The virtual IP addresses defined on this page may be used in ') . '<a href="firewall_nat.php">' . gettext('NAT') . '</a>' . gettext(' mappings.') . '<br />' .
gettext('You can check the status of your CARP Virtual IPs and interfaces ') . '<a href="carp_status.php">' . gettext('here') . '</a>');
include("foot.inc");

7
src/usr/local/www/interfaces_bridge.php
View File

@ -183,8 +183,11 @@ foreach ($a_bridges as $bridge) {
</tbody>
</table>
<nav class="action-buttons">
<a href="interfaces_bridge_edit.php" class="btn btn-success"><?=gettext("Add")?></a>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="interfaces_bridge_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
</div>

5
src/usr/local/www/interfaces_gif.php
View File

@ -158,8 +158,9 @@ display_top_tabs($tab_array);
</table>
</div>
<nav class="action-buttons">
<a href="interfaces_gif_edit.php" class="btn btn-success">
<nav class="action-buttons" style="margin-top: 10px;">
<a href="interfaces_gif_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>

5
src/usr/local/www/interfaces_gre.php
View File

@ -157,8 +157,9 @@ display_top_tabs($tab_array);
</table>
</div>
<nav class="action-buttons">
<a href="interfaces_gre_edit.php" class="btn btn-success">
<nav class="action-buttons" style="margin-top: 10px;">
<a href="interfaces_gre_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>

13
src/usr/local/www/interfaces_groups.php
View File

@ -106,9 +106,6 @@ $tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php");
$tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
print_info_box(gettext('Interface Groups allow you to setup rules for multiple interfaces without duplicating the rules.<br />' .
'If you remove members from an interface group, the group rules are no longer applicable to that interface.'));
?>
<div class="table-responsive">
<table class="table table-striped table-hover table-condensed">
@ -155,12 +152,18 @@ print_info_box(gettext('Interface Groups allow you to setup rules for multiple i
</table>
</div>
<nav class="action-buttons">
<nav class="action-buttons" style="margin-top: 10px;">
<a class="btn btn-success btn-sm" href="interfaces_groups_edit.php" role="button">
<?=gettext("Add Group");?>
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add");?>
</a>
</nav>
<div id="infoblock">
<?=print_info_box(gettext('Interface Groups allow you to setup rules for multiple interfaces without duplicating the rules.<br />' .
'If you remove members from an interface group, the group rules are no longer applicable to that interface.'), info)?>
</div>
<?php
include("fend.inc");

7
src/usr/local/www/interfaces_lagg.php
View File

@ -171,8 +171,11 @@ foreach ($a_laggs as $lagg) {
</tbody>
</table>
<nav class="action-buttons">
<a href="interfaces_lagg_edit.php" class="btn btn-success"><?=gettext("Add")?></a>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="interfaces_lagg_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
</div>
<?php

7
src/usr/local/www/interfaces_ppps.php
View File

@ -166,8 +166,11 @@ foreach ($a_ppps as $id => $ppp) {
</tbody>
</table>
<nav class="action-buttons">
<a href="interfaces_ppps_edit.php" class="btn btn-success"><?=gettext("Add")?></a>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="interfaces_ppps_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
</div>
<?php

16
src/usr/local/www/interfaces_qinq.php
View File

@ -133,10 +133,6 @@ $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q QinQ tagging properly. <br />On cards that do not explicitly support it, ' .
'QinQ tagging will still work, but the reduced MTU may cause problems.<br />' .
'See the %s handbook for information on supported cards.'), $g['product_name']));
?>
<div class="table-responsive">
<table class="table table-striped table-hover table-condensed">
@ -180,10 +176,18 @@ endforeach;
</table>
</div>
<nav class="action-buttons">
<a href="interfaces_qinq_edit.php" class="btn btn-success">
<nav class="action-buttons" style="margin-top: 10px;">
<a href="interfaces_qinq_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
<div id="infoblock">
<?=print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q QinQ tagging properly. <br />On cards that do not explicitly support it, ' .
'QinQ tagging will still work, but the reduced MTU may cause problems.<br />' .
'See the %s handbook for information on supported cards.'), $g['product_name']), info)?>
</div>
<?php
include("foot.inc");

17
src/usr/local/www/interfaces_vlan.php
View File

@ -129,10 +129,6 @@ $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php");
$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
display_top_tabs($tab_array);
print_info_box(sprintf(gettext('NOTE: Not all drivers/NICs support 802.1Q '.
'VLAN tagging properly. <br />On cards that do not explicitly support it, VLAN '.
'tagging will still work, but the reduced MTU may cause problems.<br />See the '.
'%s handbook for information on supported cards.'),$g['product_name']));
?>
<form action="interfaces_vlan.php" method="post">
<input id="act" type="hidden" name="act" value="" />
@ -166,12 +162,21 @@ print_info_box(sprintf(gettext('NOTE: Not all drivers/NICs support 802.1Q '.
}
?>
</table>
<nav class="action-buttons">
<a class="btn btn-success" role="button" href="interfaces_vlan_edit.php"><?=gettext('Add VLAN'); ?></a>
<nav class="action-buttons" style="margin-top: 10px;">
<a class="btn btn-success btn-sm" role="button" href="interfaces_vlan_edit.php">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext('Add'); ?>
</a>
</nav>
</div>
</form>
<div id="infoblock">
<?=print_info_box(sprintf(gettext('NOTE: Not all drivers/NICs support 802.1Q '.
'VLAN tagging properly. <br />On cards that do not explicitly support it, VLAN '.
'tagging will still work, but the reduced MTU may cause problems.<br />See the '.
'%s handbook for information on supported cards.'),$g['product_name']), info)?>
</div>
<script>
//<![CDATA[
events.push(function(){

6
src/usr/local/www/interfaces_wireless.php
View File

@ -167,8 +167,10 @@ foreach ($a_clones as $clone) {
</tbody>
</table>
<nav class="action-buttons">
<a href="interfaces_wireless_edit.php" class="btn btn-success"><?=gettext("Add")?></a>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="interfaces_wireless_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?></a>
</nav>
</div>
<?php

13
src/usr/local/www/load_balancer_monitor.php
View File

@ -172,15 +172,16 @@ foreach($a_monitor as $monitor) {
</tbody>
</table>
</div>
<nav class="action-buttons">
<a href="load_balancer_monitor_edit.php" class="btn btn-success"><?=gettext('Add')?></a>
</nav>
</div>
</form>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="load_balancer_monitor_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext('Add')?>
</a>
</nav>
<?php
include("foot.inc");

12
src/usr/local/www/load_balancer_pool.php
View File

@ -207,12 +207,14 @@ foreach($a_pool as $pool) {
</tbody>
</table>
</div>
<nav class="action-buttons">
<a href="load_balancer_pool_edit.php" class="btn btn-success"><?=gettext('Add')?></a>
</nav>
</div>
</form>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="load_balancer_pool_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext('Add')?>
</a>
</nav>
<?php include("foot.inc");

12
src/usr/local/www/load_balancer_virtual_server.php
View File

@ -198,13 +198,15 @@ if(!empty($a_vs)) {
</table>
</div>
</div>
<nav class="action-buttons">
<a href="load_balancer_virtual_server_edit.php" class="btn btn-success"><?=gettext("Add")?></a>
</nav>
</form>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="load_balancer_virtual_server_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
<?php
include("foot.inc");

40
src/usr/local/www/services_captiveportal_filemanager.php
View File

@ -260,17 +260,19 @@ if (is_array($a_cp[$cpzone]['element'])):
endif;
?>
<nav class="action-buttons">
<button id="btnnotes" class="btn btn-default">Show Notes</button>
<nav class="action-buttons" style="margin-top: 10px;">
<?php if (!$_GET['act'] == 'add'): ?>
<a href="services_captiveportal_filemanager.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success">Add</a>
<a href="services_captiveportal_filemanager.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
<?php endif; ?>
</nav>
<?php
// The notes displayed on the page are large, the page content comparitively small. A "Note" button
// is provided so that you only see the notes if you ask for them
?>
<div class="help-block panel panel-default">
<div id="infoblock" class="panel panel-default">
<div class="panel-heading"><h2 class="panel-title">Notes</h2></div>
<div class="panel-body">
<?=gettext("Any files that you upload here with the filename prefix of captiveportal- will " .
@ -278,38 +280,12 @@ endif;
"You may reference them directly from your portal page HTML code using relative paths. " .
"Example: you've uploaded an image with the name 'captiveportal-test.jpg' using the " .
"file manager. Then you can include it in your portal page like this:")?><br /><br />
<pre>&lt;img src=&quot;captiveportal-test.jpg&quot; width=... height=...&gt;</pre><br /><br />
<pre>&lt;img src=&quot;captiveportal-test.jpg&quot; width=... height=...&gt;</pre><br />
<?=gettext("In addition, you can also upload .php files for execution. You can pass the filename " .
"to your custom page from the initial page by using text similar to:")?><br /><br />
<pre>&lt;a href="/captiveportal-aup.php?zone=$PORTAL_ZONE$&amp;redirurl=$PORTAL_REDIRURL$"&gt;<?=gettext("Acceptable usage policy"); ?>&lt;/a&gt;</pre><br /><br />
<pre>&lt;a href="/captiveportal-aup.php?zone=$PORTAL_ZONE$&amp;redirurl=$PORTAL_REDIRURL$"&gt;<?=gettext("Acceptable usage policy"); ?>&lt;/a&gt;</pre><br />
<?=sprintf(gettext("The total size limit for all files is %s."), format_bytes($g['captiveportal_element_sizelimit']))?>
</div>
</div>
<script>
//<![CDATA[
events.push(function(){
var hidenotes = true;
// Hides all elements of the specified class.
function hideClass(s_class, hide) {
if(hide)
$('.' + s_class).hide();
else
$('.' + s_class).show();
}
hideClass('help-block', hidenotes);
$(function () {
$('#btnnotes').on('click', function () {
hidenotes = !hidenotes;
hideClass('notes', hidenotes);
});
});
});
</script>
<?php
include("foot.inc");

16
src/usr/local/www/services_captiveportal_hostname.php
View File

@ -187,11 +187,19 @@ else :
<?php
endif;
?>
<nav class="action-buttons">
<a href="services_captiveportal_hostname_edit.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success">Add</a>
</nav>
</div>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="services_captiveportal_hostname_edit.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
<div id="infoblock">
<?=print_info_box($notestr)?>
</div>
<?php
print_info_box($notestr);
include("foot.inc");

17
src/usr/local/www/services_captiveportal_ip.php
View File

@ -135,7 +135,7 @@ $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveporta
$tab_array[] = array(gettext("Vouchers"), false, "services_captiveportal_vouchers.php?zone={$cpzone}");
$tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php?zone={$cpzone}");
display_top_tabs($tab_array, true);
?>
<div class="table-responsive">
<table class="table table-hover table-striped table-condensed">
@ -185,12 +185,17 @@ endif;
?>
</div>
<nav class="action-buttons">
<a href="services_captiveportal_ip_edit.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success">Add</a>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="services_captiveportal_ip_edit.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
<?php
print_info_box(gettext('Adding allowed IP addresses will allow IP access to/from these addresses through the captive portal without being taken to the portal page. ' .
'This can be used for a web server serving images for the portal page or a DNS server on another network, for example.'));
<div id="infoblock">
<?=print_info_box(gettext('Adding allowed IP addresses will allow IP access to/from these addresses through the captive portal without being taken to the portal page. ' .
'This can be used for a web server serving images for the portal page or a DNS server on another network, for example.'), info)?>
</div>
<?php
include("foot.inc");

17
src/usr/local/www/services_captiveportal_mac.php
View File

@ -78,11 +78,9 @@ if (isset($_POST['zone'])) {
$cpzone = $_POST['zone'];
}
if (empty($cpzone) || empty($config['captiveportal'][$cpzone])) {
header("Location: services_captiveportal_zones.php");
exit;
}
if (!is_array($config['captiveportal'])) {
$config['captiveportal'] = array();
@ -245,12 +243,17 @@ else :
<?php
endif;
?>
<nav class="action-buttons">
<a href="services_captiveportal_mac_edit.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success">Add</a>
</nav>
</div>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="services_captiveportal_mac_edit.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
<div id="infoblock">
<?=print_info_box(gettext('Adding MAC addresses as "pass" MACs allows them access through the captive portal automatically without being taken to the portal page.'), info)?>
</div>
<?php
print_info_box(gettext('Adding MAC addresses as "pass" MACs allows them access through the captive portal automatically without being taken to the portal page.'));
include("foot.inc");

9
src/usr/local/www/services_captiveportal_vouchers.php
View File

@ -491,8 +491,11 @@ endforeach;
<?php
if ($pconfig['enable']) : ?>
<nav class="action-buttons">
<a href="services_captiveportal_vouchers_edit.php?zone=<?=$cpzone?>" class="btn btn-success"><?=gettext("Add Voucher")?></a>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="services_captiveportal_vouchers_edit.php?zone=<?=$cpzone?>" class="btn btn-success">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext("Add")?>
</a>
</nav>
<?php
endif;
@ -633,7 +636,7 @@ print($form);
<div class="rolledit">
<?php
print_info_box(gettext('Changing any Voucher parameter (apart from managing the list of Rolls) on this page will render existing vouchers useless if they were generated with different settings. ' .
'Specifying the Voucher Database Synchronization options will not record any other value from the other options. They will be retrieved/synced from the master.'));
'Specifying the Voucher Database Synchronization options will not record any other value from the other options. They will be retrieved/synced from the master.'), info);
?>
</div>

39
src/usr/local/www/services_captiveportal_zones.php
View File

@ -94,18 +94,15 @@ $pgtitle = array(gettext("Captive Portal"), gettext("Zones"));
$shortcut_section = "captiveportal";
include("head.inc");
if ($savemsg)
print_info_box($savemsg, success);
if (is_subsystem_dirty('captiveportal'))
print_info_box_np(gettext("The CaptivePortal entry list has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));
?>
<html>
<body>
<form action="services_captiveportal_zones.php" method="post">
<?php if ($savemsg) print_info_box($savemsg); ?>
<?php if (is_subsystem_dirty('captiveportal')): ?><p>
<?php print_info_box_np(gettext("The CaptivePortal entry list has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?>
<?php endif; ?>
<div class="panel panel-default">
<div class="panel-heading"><h2 class="panel-title"><?=gettext('Captive portal Zones')?></h2></div>
<form action="services_captiveportal_zones.php" method="post">
<div class="panel panel-default">
<div class="panel-heading"><h2 class="panel-title"><?=gettext('Captive portal Zones')?></h2></div>
<div class="panel-body table-responsive">
<table class="table table-striped table-hover">
<thead>
@ -114,11 +111,11 @@ include("head.inc");
<th><?=gettext('Interfaces')?></th>
<th><?=gettext('Number of users'); ?></th>
<th><?=gettext('Description'); ?></th>
<th><!-- Action buttons --></th>
<th><?=gettext('Actions'); ?></th>
</tr>
</thead>
<tbody>
<?php
foreach ($a_cp as $cpzone => $cpitem):
if (!is_array($cpitem)) {
@ -148,14 +145,14 @@ include("head.inc");
</tbody>
</table>
</div>
</div>
</form>
<nav class="action-buttons">
<a href="services_captiveportal_zones_edit.php" class="btn btn-success"><?=gettext('Add')?></a>
</nav>
</div>
</form>
</body>
</html>
<nav class="action-buttons" style="margin-top: 10px;">
<a href="services_captiveportal_zones_edit.php" class="btn btn-success btn-sm">
<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
<?=gettext('Add')?>
</a>
</nav>
<?php include("foot.inc"); ?>