Skip to content

O
OpnSense
Commit eed12b6e authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

src: start removal of visual clutter in the form of markup "hints" et al 

This makes pages much easer on the eye, the messages are clear still.

(cherry picked from commit abcb4cce)
parent 0abc5dbf
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 111 deletions
src/www/firewall_nat_1to1.php
View file @ eed12b6e
...@@ -328,18 +328,10 @@ $main_buttons = array( ...@@ -328,18 +328,10 @@ $main_buttons = array(
</tr> </tr>
<tr> <tr>
<td colspan="9"> <td colspan="9">
<p> <?=gettext("If you add a 1:1 NAT entry for any of the interface IPs on this system, " .
<span class="text-danger"> "it will make this system inaccessible on that IP address. i.e. if " .
<strong><?=gettext("Note:"); ?><br /> "you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) " .
</strong> "using the WAN IP address will no longer function."); ?>
</span>
<?=gettext("Depending on the way your WAN connection is setup, you may also need a"); ?>
<a href="firewall_virtual_ip.php"><?=gettext("Virtual IP."); ?></a><br />
<?=gettext("If you add a 1:1 NAT entry for any of the interface IPs on this system, " .
"it will make this system inaccessible on that IP address. i.e. if " .
"you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) " .
"using the WAN IP address will no longer function."); ?>
</p>
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
......
src/www/firewall_rules.php
View file @ eed12b6e
...@@ -761,10 +761,6 @@ $( document ).ready(function() { ...@@ -761,10 +761,6 @@ $( document ).ready(function() {
</tr> </tr>
<tr class="hidden-xs hidden-sm"> <tr class="hidden-xs hidden-sm">
<td colspan="11"> <td colspan="11">
<strong>
<span class="text-danger"><?=gettext("Hint:");?></span>
</strong>
<br />
<?php if ("FloatingRules" != $selected_if): ?> <?php if ("FloatingRules" != $selected_if): ?>
<?=gettext("Rules are evaluated on a first-match basis (i.e. " . <?=gettext("Rules are evaluated on a first-match basis (i.e. " .
"the action of the first rule to match a packet will be executed). " . "the action of the first rule to match a packet will be executed). " .
......
src/www/interfaces_bridge.php
View file @ eed12b6e
...@@ -166,10 +166,6 @@ $main_buttons = array( ...@@ -166,10 +166,6 @@ $main_buttons = array(
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid">
<span class="text-danger"><strong><?=gettext("Note:"); ?><br /></strong></span>
<?=gettext("Here you can configure bridging of interfaces."); ?>
</div>
</form> </form>
</div> </div>
</section> </section>
......
src/www/interfaces_gif.php
View file @ eed12b6e
...@@ -142,25 +142,22 @@ $main_buttons = array( ...@@ -142,25 +142,22 @@ $main_buttons = array(
<?php <?php
$i++; $i++;
endforeach; ?> endforeach; ?>
<tr>
<td colspan="4">
<?=sprintf(
gettext(
'If you are using a GIF tunnel to connect to a Hurricane Electric (he.net) Tunnel Broker ' .
'on a WAN with a dynamic IP, you may want to add a %sHE.net Tunnelbroker dynamic DNS entry%s ' .
'to keep your tunnel functional when your IP changes.'
),
'<a href="services_dyndns.php">',
'</a>'
); ?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid">
<p>
<span class="text-danger"><strong><?=gettext("Note:"); ?><br /></strong></span>
<?=gettext("GIF tunnels are configured here."); ?>
<br /><br />
<?=sprintf(
gettext(
'If you are using a GIF tunnel to connect to a Hurricane Electric (he.net) Tunnel Broker ' .
'on a WAN with a dynamic IP, you may want to add a %sHE.net Tunnelbroker dynamic DNS entry%s ' .
'to keep your tunnel functional when your IP changes.'
),
'<a href="services_dyndns.php">',
'</a>'
); ?>
</p>
</div>
</form> </form>
</div> </div>
</section> </section>
......
src/www/interfaces_gre.php
View file @ eed12b6e
...@@ -147,12 +147,6 @@ $main_buttons = array( ...@@ -147,12 +147,6 @@ $main_buttons = array(
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid">
<p>
<span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
<?=gettext("Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.");?>
</p>
</div>
</form> </form>
</div> </div>
</section> </section>
......
src/www/interfaces_groups.php
View file @ eed12b6e
...@@ -142,14 +142,13 @@ $main_buttons = array( ...@@ -142,14 +142,13 @@ $main_buttons = array(
<?php <?php
$i++; $i++;
endforeach; ?> endforeach; ?>
<tr>
<td colspan="4">
<?=gettext("Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.");?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
<div class="container-fluid">
<p>
<span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
<?=gettext("Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.");?>
</p>
</div>
</form> </form>
</div> </div>
</section> </section>
......
src/www/interfaces_lagg.php
View file @ eed12b6e
...@@ -152,15 +152,14 @@ $main_buttons = array( ...@@ -152,15 +152,14 @@ $main_buttons = array(
<?php <?php
$i++; $i++;
endforeach; ?> endforeach; ?>
<tr>
<td colspan="4">
<?=gettext("LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG."); ?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid">
<p>
<span class="text-danger"><strong><?=gettext("Note:"); ?><br /></strong></span>
<?=gettext("LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG."); ?>
</p>
</div>
</form> </form>
</div> </div>
</section> </section>
......
src/www/interfaces_qinq.php
View file @ eed12b6e
...@@ -161,15 +161,14 @@ $main_buttons = array( ...@@ -161,15 +161,14 @@ $main_buttons = array(
<?php <?php
$i++; $i++;
endforeach; ?> endforeach; ?>
<tr>
<td colspan="4">
<?= gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems.");?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid">
<p>
<span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
<?= gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems.");?>
</p>
</div>
</form> </form>
</div> </div>
</section> </section>
......
src/www/interfaces_vlan.php
View file @ eed12b6e
...@@ -144,15 +144,14 @@ $main_buttons = array( ...@@ -144,15 +144,14 @@ $main_buttons = array(
<?php <?php
$i++; $i++;
endforeach; ?> endforeach; ?>
<tr>
<td colspan="4">
<?= gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems.");?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid">
<p>
<span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
<?= gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems.");?>
</p>
</div>
</form> </form>
</div> </div>
</section> </section>
......
src/www/interfaces_wireless.php
View file @ eed12b6e
...@@ -141,15 +141,14 @@ $main_buttons = array( ...@@ -141,15 +141,14 @@ $main_buttons = array(
<?php <?php
$i++; $i++;
endforeach;?> endforeach;?>
<tr>
<td colspan="4">
<?=gettext("Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.");?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid">
<p>
<span class="text-danger"><strong><?=gettext("Note");?>:<br /></strong></span>
<?=gettext("Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.");?>
</p>
</div>
</form> </form>
</div> </div>
</section> </section>
......
src/www/services_dnsmasq.php
View file @ eed12b6e
...@@ -367,27 +367,28 @@ $( document ).ready(function() { ...@@ -367,27 +367,28 @@ $( document ).ready(function() {
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td></td>
<td>
<input name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" /> <input name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
</td> </td>
</tr> </tr>
<tr>
<td colspan="2">
<?= sprintf(gettext("If the DNS forwarder is enabled, the DHCP".
" service (if enabled) will automatically serve the LAN IP".
" address as a DNS server to DHCP clients so they will use".
" the forwarder. The DNS forwarder will use the DNS servers".
" entered in %sSystem: General setup%s".
" or those obtained via DHCP or PPP on WAN if the &quot;Allow".
" DNS server list to be overridden by DHCP/PPP on WAN&quot;".
" is checked. If you don't use that option (or if you use".
" a static IP address on WAN), you must manually specify at".
" least one DNS server on the %sSystem: General setup%s page."),
'<a href="system_general.php">','</a>','<a href="system_general.php">','</a>');?>
</td>
</tr>
</table> </table>
</div> </div>
<div class="container-fluid">
<p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:");?><br />
</strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP".
" service (if enabled) will automatically serve the LAN IP".
" address as a DNS server to DHCP clients so they will use".
" the forwarder. The DNS forwarder will use the DNS servers".
" entered in %sSystem: General setup%s".
" or those obtained via DHCP or PPP on WAN if the &quot;Allow".
" DNS server list to be overridden by DHCP/PPP on WAN&quot;".
" is checked. If you don't use that option (or if you use".
" a static IP address on WAN), you must manually specify at".
" least one DNS server on the %sSystem: General setup%s page."),
'<a href="system_general.php">','</a>','<a href="system_general.php">','</a>');?><br />
</span></p>
</div>
</form> </form>
</div> </div>
</section> </section>
......
src/www/services_dyndns.php
View file @ eed12b6e
...@@ -175,16 +175,12 @@ $main_buttons = array( ...@@ -175,16 +175,12 @@ $main_buttons = array(
<?php <?php
$i++; $i++;
endforeach; ?> endforeach; ?>
</tbody>
<tfoot>
<tr> <tr>
<td colspan="6" class="list"> <td colspan="6" class="list">
<p><span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span> <?=gettext("You can force an update for an IP address on the edit page for that service.");?>
<?=gettext("IP addresses appearing in green are up to date with Dynamic DNS provider.");?><br />
<?=gettext("You can force an update for an IP address on the edit page for that service.");?></p>
</td> </td>
</tr> </tr>
</tfoot> </tbody>
</table> </table>
</div> </div>
</form> </form>
......
src/www/services_igmpproxy.php
View file @ eed12b6e
...@@ -138,11 +138,8 @@ $main_buttons = array( ...@@ -138,11 +138,8 @@ $main_buttons = array(
$i++; $i++;
endforeach; ?> endforeach; ?>
<tr> <tr>
<td class="tabcont" colspan="5"> <td colspan="5">
<p>
<span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span>
<?=gettext("Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. Only one 'upstream' interface can be configured.");?> <?=gettext("Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. Only one 'upstream' interface can be configured.");?>
</p>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
src/www/services_unbound.php
View file @ eed12b6e
...@@ -263,25 +263,26 @@ function show_advanced_dns() { ...@@ -263,25 +263,26 @@ function show_advanced_dns() {
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td></td>
<td>
<input name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" /> <input name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
</td> </td>
</tr> </tr>
<tr>
<td colspan="2">
<?= sprintf(gettext("If the DNS Resolver is enabled, the DHCP".
" service (if enabled) will automatically serve the LAN IP".
" address as a DNS server to DHCP clients so they will use".
" the DNS Resolver. If Forwarding, is enabled, the DNS Resolver will use the DNS servers".
" entered in %sSystem: General setup%s".
" or those obtained via DHCP or PPP on WAN if the &quot;Allow".
" DNS server list to be overridden by DHCP/PPP on WAN&quot;".
" is checked."),'<a href="system_general.php">','</a>');?>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid">
<span class="text-danger"><strong><?=gettext("Note:");?><br />
</strong></span><?php printf(gettext("If the DNS Resolver is enabled, the DHCP".
" service (if enabled) will automatically serve the LAN IP".
" address as a DNS server to DHCP clients so they will use".
" the DNS Resolver. If Forwarding, is enabled, the DNS Resolver will use the DNS servers".
" entered in %sSystem: General setup%s".
" or those obtained via DHCP or PPP on WAN if the &quot;Allow".
" DNS server list to be overridden by DHCP/PPP on WAN&quot;".
" is checked."),'<a href="system_general.php">','</a>');?>
<br /><br />
</div>
</div> </div>
</section> </section>
</form> </form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023