Skip to content

Commit

Permalink
Update Bootstrap Framework
Browse files Browse the repository at this point in the history
  • Loading branch information
toafez committed Sep 23, 2023
1 parent 74c307e commit bb3546a
Show file tree
Hide file tree
Showing 52 changed files with 502 additions and 189 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@ Basic Backup Release Notes
Version 0.8-100 vom 23.09.2023

- Deutsch
- Update Bootstrap Framework auf 5.3.2
- Update Bootsrap Icons auf 1.11.1
- Um die Benutzerfreundlichkeit zu verbessern, wurden die meisten Buttons mit zusätzlichen, nach unten zeigenden Pfeilen versehen, wenn sich dahinter ein Dropdown Menü mit weiteren Informationen befindet.
- Unterhalb des Befehls zur Auftragsausführung wird nun explizit darauf hingewiesen, dass sich das Kaufmännische & stets am Ende des Befehls befinden muss. Durch das Kaufmännische & am Ende des Befehls wird der Auftrag als eigenständiger Hintergrundprozess ausgeführt und damit von dem Prozess der GUI ausgekoppelt. Das wiederum verbessert die Stabilität der GUI.
- Allgemeine Codeoptimierungen und kleinere Systemanpassungen vorgenommen.

- English
- Update Bootstrap Framework to 5.3.2
- Update Bootsrap Icons to 1.11.1
- To improve usability, most buttons have additional downward-pointing arrows when there is a drop-down menu with further information behind them.
- Below the command to execute the order, it is now explicitly stated that the ampersand must always be at the end of the command. The ampersand & at the end of the command executes the order as an independent background process and is therefore decoupled from the GUI process. This in turn improves the stability of the GUI.
- General code optimizations and minor system adjustments made.
Expand Down
16 changes: 5 additions & 11 deletions ui/index.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@ if [ $(synogetkeyvalue /etc.defaults/VERSION majorversion) -ge 7 ]; then
<!-- Einbinden eigener CSS Formatierungen -->
<link rel="stylesheet" href="template/css/stylesheet.css" />
<!-- Einbinden von bootstrap Framework 5.3.1 -->
<!-- Einbinden von bootstrap Framework 5.3.2 -->
<link rel="stylesheet" href="template/bootstrap/css/bootstrap.min.css" />
<!-- Einbinden von bootstrap Icons 1.10.5 -->
<!-- Einbinden von bootstrap Icons 1.11.1 -->
<link rel="stylesheet" href="template/bootstrap/font/bootstrap-icons.css" />
<!-- Einbinden von jQuery 3.7.1 -->
Expand All @@ -239,9 +239,7 @@ if [ $(synogetkeyvalue /etc.defaults/VERSION majorversion) -ge 7 ]; then
{
echo '
<nav class="navbar fixed-top navbar-expand-sm navbar-light bg-light">
<div class="container-fluid">'
#<span class="navbar-brand" style="color: #FF8C00;">'${app_title}'</span>
echo '
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand All @@ -250,11 +248,7 @@ if [ $(synogetkeyvalue /etc.defaults/VERSION majorversion) -ge 7 ]; then
<li class="nav-item">
<a class="btn btn-sm text-dark text-decoration-none py-0" role="button" style="background-color: #e6e6e6;" href="index.cgi?page=main&section=reset" title="'${txt_button_refresh}'"><i class="bi bi-house-door text-dark" style="font-size: 1.2rem;"></i></a>'
echo -n '<a class="btn btn-sm text-dark text-decoration-none'; [[ "${get[page]}" == "jobedit" ]] && echo -n ' active disabled" aria-current="page" ' || echo -n '" '
echo -n 'style="background-color: #e6e6e6;" href="index.cgi?page=jobedit&section=1&edit=false&jobname=">'${txt_link_new_job}'</a>'
#if [[ "${get[page]}" != "jobedit" ]]; then
# echo '<a class="btn btn-sm text-dark text-decoration-none disabled" style="background-color: #e6e6e6;" href="index.cgi?page=jobedit&section=1&edit=false&jobname=">'${txt_link_new_job}'</a>&nbsp;'
#fi
echo '
echo -n 'style="background-color: #e6e6e6;" href="index.cgi?page=jobedit&section=1&edit=false&jobname=">'${txt_link_new_job}'</a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -426,7 +420,7 @@ if [ $(synogetkeyvalue /etc.defaults/VERSION majorversion) -ge 7 ]; then
<!-- container -->
</article>
<!-- Einbinden von bootstrap JavaScript 5.3.1 -->
<!-- Einbinden von bootstrap JavaScript 5.3.2 -->
<script src="template/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Einbinden von JavaScript bzw. jQuery Funktionen im HTML body -->
Expand Down
26 changes: 13 additions & 13 deletions ui/template/bootstrap/css/bootstrap-grid.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/template/bootstrap/css/bootstrap-grid.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ui/template/bootstrap/css/bootstrap-grid.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/template/bootstrap/css/bootstrap-grid.min.css.map

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions ui/template/bootstrap/css/bootstrap-grid.rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/template/bootstrap/css/bootstrap-grid.rtl.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ui/template/bootstrap/css/bootstrap-grid.rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/template/bootstrap/css/bootstrap-grid.rtl.min.css.map

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion ui/template/bootstrap/css/bootstrap-reboot.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/template/bootstrap/css/bootstrap-reboot.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ui/template/bootstrap/css/bootstrap-reboot.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/template/bootstrap/css/bootstrap-reboot.min.css.map

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion ui/template/bootstrap/css/bootstrap-reboot.rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/template/bootstrap/css/bootstrap-reboot.rtl.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit bb3546a

Please sign in to comment.