Skip to content

O
OpnSense
Commit 3a47f554 authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

html fixes

parent 4227d111
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
src/etc/inc/authgui.inc
View file @ 3a47f554
...@@ -320,7 +320,7 @@ function display_error_form($http_code, $desc) ...@@ -320,7 +320,7 @@ function display_error_form($http_code, $desc)
<title><?=$http_code?></title> <title><?=$http_code?></title>
<link href="/ui/themes/<?= $themename ?>/build/css/main.css" media="screen, projection" rel="stylesheet"> <link href="/ui/themes/<?= $themename ?>/build/css/main.css" rel="stylesheet">
<link href="/ui/themes/<?= $themename ?>/build/images/favicon.png" rel="shortcut icon"> <link href="/ui/themes/<?= $themename ?>/build/images/favicon.png" rel="shortcut icon">
<!--[if lt IE 9]><script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script><![endif]--> <!--[if lt IE 9]><script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script><![endif]-->
...@@ -388,7 +388,7 @@ function display_login_form($Login_Error = '') ...@@ -388,7 +388,7 @@ function display_login_form($Login_Error = '')
<title><?=gettext("Login"); ?></title> <title><?=gettext("Login"); ?></title>
<link href="/ui/themes/<?= $themename ?>/build/css/main.css" media="screen, projection" rel="stylesheet"> <link href="/ui/themes/<?= $themename ?>/build/css/main.css" rel="stylesheet">
<link href="/ui/themes/<?= $themename ?>/build/images/favicon.png" rel="shortcut icon"> <link href="/ui/themes/<?= $themename ?>/build/images/favicon.png" rel="shortcut icon">
<!--[if lt IE 9]><script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script><![endif]--> <!--[if lt IE 9]><script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script><![endif]-->
...@@ -408,7 +408,7 @@ function display_login_form($Login_Error = '') ...@@ -408,7 +408,7 @@ function display_login_form($Login_Error = '')
<main class="login-modal-container"> <main class="login-modal-container">
<header class="login-modal-head" style="height:55px;"> <header class="login-modal-head" style="height:55px;">
<div class="navbar-brand"> <div class="navbar-brand">
<img src="/ui/themes/<?= $themename ?>/build/images/default-logo.png" height="30"/> <img src="/ui/themes/<?= $themename ?>/build/images/default-logo.png" height="30" alt="logo"/>
</div> </div>
</header> </header>
......
src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
View file @ 3a47f554
...@@ -70,9 +70,9 @@ label : dialog label ...@@ -70,9 +70,9 @@ label : dialog label
<tbody> <tbody>
{% if advanced|default(false) or help|default(false) %} {% if advanced|default(false) or help|default(false) %}
<tr> <tr>
<td align="left"><a href="#">{% if advanced|default(false) %}<i class="fa fa-toggle-off text-danger" id="show_advanced_formDialogPipe" type="button"></i> </a><small>{{ lang._('advanced mode') }} </small>{% endif %}</td> <td>{% if advanced|default(false) %}<a href="#"><i class="fa fa-toggle-off text-danger" id="show_advanced_formDialog{{id}}"></i> </a><small>{{ lang._('advanced mode') }} </small>{% endif %}</td>
<td colspan="2" align="right"> <td colspan="2" style="text-align:right;">
{% if help|default(false) %}<small>{{ lang._('full help') }} </small><a href="#"><i class="fa fa-toggle-off text-danger" id="show_all_help_formDialogPipe" type="button"></i></a>{% endif %} {% if help|default(false) %}<small>{{ lang._('full help') }} </small><a href="#"><i class="fa fa-toggle-off text-danger" id="show_all_help_formDialog{{id}}"></i></a>{% endif %}
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
......
src/opnsense/mvc/app/views/layout_partials/base_menu_system.volt
View file @ 3a47f554
...@@ -17,17 +17,17 @@ ...@@ -17,17 +17,17 @@
</div> </div>
</div> </div>
</a> </a>
<div class="collapse {% if subMenuItem.Selected %} active-menu in {% endif %}" id="{{ topMenuItem.Id }}_{{ subMenuItem.Id }}" aria-expanded="{% if subMenuItem.Selected %}true{%else%}false{% endif %}"> <div class="collapse {% if subMenuItem.Selected %} active-menu in {% endif %}" id="{{ topMenuItem.Id }}_{{ subMenuItem.Id }}" >
{% for subsubMenuItem in subMenuItem.Children %} {% for subsubMenuItem in subMenuItem.Children %}
{% if subsubMenuItem.IsExternal == "Y" %} {% if subsubMenuItem.IsExternal == "Y" %}
<a href="{{ subsubMenuItem.Url }}" target="_new" class="list-group-item menu-level-3-item {% if subsubMenuItem.Selected %} active {% endif %}">{{ lang._(subsubMenuItem.VisibleName) }}</a> <a href="{{ subsubMenuItem.Url }}" target="_blank" class="list-group-item menu-level-3-item {% if subsubMenuItem.Selected %} active {% endif %}">{{ lang._(subsubMenuItem.VisibleName) }}</a>
{% elseif acl.isPageAccessible(session.get('Username'),subsubMenuItem.Url) %} {% elseif acl.isPageAccessible(session.get('Username'),subsubMenuItem.Url) %}
<a href="{{ subsubMenuItem.Url }}" class="list-group-item menu-level-3-item {% if subsubMenuItem.Selected %} active {% endif %}">{{ lang._(subsubMenuItem.VisibleName) }}</a> <a href="{{ subsubMenuItem.Url }}" class="list-group-item menu-level-3-item {% if subsubMenuItem.Selected %} active {% endif %}">{{ lang._(subsubMenuItem.VisibleName) }}</a>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% elseif subMenuItem.IsExternal == "Y" %} {% elseif subMenuItem.IsExternal == "Y" %}
<a href="{{ subMenuItem.Url }}" target="_new" class="list-group-item {% if subMenuItem.Selected %} active {% endif %}" aria-expanded="{% if subMenuItem.Selected %}true{%else%}false{% endif %}"> <a href="{{ subMenuItem.Url }}" target="_blank" class="list-group-item {% if subMenuItem.Selected %} active {% endif %}" aria-expanded="{% if subMenuItem.Selected %}true{%else%}false{% endif %}">
<div style="display: table;width: 100%;"> <div style="display: table;width: 100%;">
<div style="display: table-row"> <div style="display: table-row">
<div style="display: table-cell">{{ lang._(subMenuItem.VisibleName) }}</div> <div style="display: table-cell">{{ lang._(subMenuItem.VisibleName) }}</div>
......
src/opnsense/mvc/app/views/layouts/default.volt
View file @ 3a47f554
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<title>{{title|default("OPNsense") }}</title> <title>{{title|default("OPNsense") }}</title>
<!-- include (theme) style --> <!-- include (theme) style -->
<link href="/ui/themes/{{ui_theme|default('opnsense')}}/build/css/main.css" media="screen, projection" rel="stylesheet"> <link href="/ui/themes/{{ui_theme|default('opnsense')}}/build/css/main.css" rel="stylesheet">
<!-- TODO: move to theme style --> <!-- TODO: move to theme style -->
<style> <style>
...@@ -169,8 +169,8 @@ ...@@ -169,8 +169,8 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="/"> <a class="navbar-brand" href="/">
<img class="brand-logo" src="/ui/themes/{{ui_theme|default('opnsense')}}/build/images/default-logo.png" height="30"/> <img class="brand-logo" src="/ui/themes/{{ui_theme|default('opnsense')}}/build/images/default-logo.png" height="30" alt="logo"/>
<img class="brand-icon" src="/ui/themes/{{ui_theme|default('opnsense')}}/build/images/icon-logo.png" height="30"/> <img class="brand-icon" src="/ui/themes/{{ui_theme|default('opnsense')}}/build/images/icon-logo.png" height="30" alt="icon"/>
</a> </a>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navigation"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navigation">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
......
src/www/fbegin.inc
View file @ 3a47f554
...@@ -80,8 +80,8 @@ if($need_alert_display == true) { ...@@ -80,8 +80,8 @@ if($need_alert_display == true) {
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="/index.php"> <a class="navbar-brand" href="/index.php">
<img class="brand-logo" src="/ui/themes/<?= $themename ?>/build/images/default-logo.png" height="30"/> <img class="brand-logo" src="/ui/themes/<?= $themename ?>/build/images/default-logo.png" height="30" alt="logo" />
<img class="brand-icon" src="/ui/themes/<?= $themename ?>/build/images/icon-logo.png" height="30"/> <img class="brand-icon" src="/ui/themes/<?= $themename ?>/build/images/icon-logo.png" height="30" alt="icon" />
</a> </a>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navigation"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navigation">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
...@@ -134,7 +134,7 @@ if($need_alert_display == true) { ...@@ -134,7 +134,7 @@ if($need_alert_display == true) {
foreach ($subMenuItem->Children as $subsubMenuItem):?> foreach ($subMenuItem->Children as $subsubMenuItem):?>
<?php <?php
if ($subsubMenuItem->IsExternal == "Y"):?> if ($subsubMenuItem->IsExternal == "Y"):?>
<a href="<?=$subsubMenuItem->Url;?>" target="_new" class="list-group-item menu-level-3-item <?=$subsubMenuItem->Selected ? "active" :"";?>"><?=gettext($subsubMenuItem->VisibleName);?></a> <a href="<?=$subsubMenuItem->Url;?>" target="_blank" class="list-group-item menu-level-3-item <?=$subsubMenuItem->Selected ? "active" :"";?>"><?=gettext($subsubMenuItem->VisibleName);?></a>
<?php <?php
elseif ($aclObj->isPageAccessible($_SESSION['Username'],$subsubMenuItem->Url)):?> elseif ($aclObj->isPageAccessible($_SESSION['Username'],$subsubMenuItem->Url)):?>
<a href="<?=$subsubMenuItem->Url;?>" class="list-group-item menu-level-3-item <?=$subsubMenuItem->Selected ? "active" :"";?>"><?=gettext($subsubMenuItem->VisibleName);?></a> <a href="<?=$subsubMenuItem->Url;?>" class="list-group-item menu-level-3-item <?=$subsubMenuItem->Selected ? "active" :"";?>"><?=gettext($subsubMenuItem->VisibleName);?></a>
...@@ -144,7 +144,7 @@ if($need_alert_display == true) { ...@@ -144,7 +144,7 @@ if($need_alert_display == true) {
</div> </div>
<?php <?php
elseif ($subMenuItem->IsExternal == "Y" ):?> elseif ($subMenuItem->IsExternal == "Y" ):?>
<a href="<?=$subMenuItem->Url;?>" target="_new" class="list-group-item <?=$subMenuItem->Selected ? "active" : "";?>" aria-expanded="<?=$subMenuItem->Selected ? "true" : "false";?>"> <a href="<?=$subMenuItem->Url;?>" target="_blank" class="list-group-item <?=$subMenuItem->Selected ? "active" : "";?>" aria-expanded="<?=$subMenuItem->Selected ? "true" : "false";?>">
<div style="display: table;width: 100%;"> <div style="display: table;width: 100%;">
<div style="display: table-row"> <div style="display: table-row">
<div style="display: table-cell"><?=gettext($subMenuItem->VisibleName);?></div> <div style="display: table-cell"><?=gettext($subMenuItem->VisibleName);?></div>
......
src/www/head.inc
View file @ 3a47f554
...@@ -63,7 +63,7 @@ $pagetitle .= sprintf(' | %s.%s', $config['system']['hostname'], $config['system ...@@ -63,7 +63,7 @@ $pagetitle .= sprintf(' | %s.%s', $config['system']['hostname'], $config['system
<title><?= $pagetitle ?></title> <title><?= $pagetitle ?></title>
<!-- include (theme) style --> <!-- include (theme) style -->
<link href="/ui/themes/<?= $themename ?>/build/css/main.css" media="screen, projection" rel="stylesheet"> <link href="/ui/themes/<?= $themename ?>/build/css/main.css" rel="stylesheet">
<!-- TODO: move to theme style --> <!-- TODO: move to theme style -->
<style> <style>
......
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