Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix favicon and opt nav #2316

Merged
merged 4 commits into from
Oct 10, 2023
Merged

Fix favicon and opt nav #2316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e036601
fix:favicon 500
Oct 8, 2023
003b086
fix: nav always show up
Oct 8, 2023
812f9a9
Merge branch 'dev'
Oct 8, 2023
13f5391
Merge branch 'master' into master
LeoQuote Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ env
sonar-project.properties
.scannerwork
.env
local_settings.py
local_settings.py
src/docker-compose-dev
Empty file added common/static/img/favicon.ico
View file
Open in desktop
Empty file.
14 changes: 7 additions & 7 deletions common/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
{% if perms.sql.menu_sqlcheck %}
<li>
<a href="#"><i class="fa fa-check fa-fw"></i> SQL审核<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<ul class="nav nav-second-level collapse">
{% if perms.sql.menu_sqlworkflow %}
<li>
<a href="/sqlworkflow/">SQL上线</a>
Expand All @@ -118,7 +118,7 @@
{% if perms.sql.menu_query %}
<li>
<a href="#"><i class="fa fa-search fa-fw"></i> SQL查询<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<ul class="nav nav-second-level collapse">
{% if perms.sql.menu_sqlquery %}
<li>
<a href="/sqlquery/">在线查询</a>
Expand All @@ -142,7 +142,7 @@
{% if perms.sql.menu_sqloptimize %}
<li>
<a href="#"><i class="fa fa-wrench fa-fw"></i> SQL优化<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<ul class="nav nav-second-level collapse">
{% if perms.sql.menu_sqladvisor %}
<li>
<a href="/sqladvisor/">优化工具</a>
Expand All @@ -160,7 +160,7 @@
{% if perms.sql.menu_instance %}
<li>
<a href="#"><i class="fa fa-database fa-fw"></i> 实例管理<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<ul class="nav nav-second-level collapse">
{% if perms.sql.menu_instance_list %}
<li>
<a href="/instance/">实例列表</a>
Expand Down Expand Up @@ -194,7 +194,7 @@
{% if perms.sql.menu_tools %}
<li>
<a href="#"><i class="fa fa-plug fa-fw"></i> 工具插件<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<ul class="nav nav-second-level collapse">
{% if perms.sql.menu_archive %}
<li>
<a href="/archive/">PTArchiver</a>
Expand All @@ -217,7 +217,7 @@
{% if perms.sql.menu_system %}
<li>
<a href="#"><i class="fa fa-cogs fa-fw"></i> 系统管理<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<ul class="nav nav-second-level collapse">
<li>
<a href="/config/">配置项管理</a>
</li>
Expand Down Expand Up @@ -246,7 +246,7 @@
{% if perms.sql.audit_user %}
<li>
<a href="#"><i class="fa fa-eye fa-fw"></i> 系统审计<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<ul class="nav nav-second-level collapse">
<li>
<a href="/audit/">通用审计</a>
</li>
Expand Down
Loading