lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 01:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: UX and display tweaks

Browse Source
This commit is contained in:
Franco Fichtner 2021-02-16 10:31:04 +01:00
parent 31cefec61b
commit 9a01e5399d
7 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
View File

@ -400,7 +400,8 @@
var local_count = 0;
var plugin_count = 0;
var broken_plugins = 0;
var misconfigured_plugins = 0;
var missing_plugins = 0;
var changelog_count = 0;
var changelog_max = 15;
if ($.changelog_keep_full != undefined) {
@ -421,7 +422,7 @@
'<td>' + row['repository'] + '</td>' +
'<td>' + row['license'] + '</td>' +
'<td>' + row['comment'] + '</td>' +
'<td>' +
'<td style="white-space:nowrap;vertical-align:middle;"><div class="input-group">' +
'<button class="btn btn-default btn-xs act_license" data-package="' + row['name'] + '" ' +
' data-toggle="tooltip" title="{{ lang._('License') }}">' +
'<i class="fa fa-balance-scale fa-fw"></i></button> ' +
@ -434,7 +435,7 @@
'<button class="btn btn-default btn-xs act_lock" data-package="' + row['name'] + '" ' +
' data-toggle="tooltip" title="{{ lang._('Lock') }}" >' +
'<i class="fa fa-unlock fa-fw"></i></button>'
) + '</td>' +
) + '</div></td>' +
'</tr>'
);
});
@ -456,12 +457,12 @@
status_text = ' ({{ lang._('misconfigured') }})';
bold_on = '<b>';
bold_off = '</b>';
broken_plugins = 1;
misconfigured_plugins = 1;
} else if (row['installed'] == "0" && row['configured'] == "1") {
status_text = ' ({{ lang._('missing') }})';
bold_on = '<span class="text-danger plugin_missing"><b>';
bold_off = '</b></span>';
broken_plugins = 1;
missing_plugins = 1;
} else if (row['installed'] == "1") {
status_text = ' ({{ lang._('installed') }})';
bold_on = '<b>';
@ -477,7 +478,8 @@
'<td>' + bold_on + row['flatsize'] + bold_off + '</td>' +
'<td>' + bold_on + row['repository'] + bold_off + '</td>' +
'<td>' + bold_on + row['comment'] + bold_off + '</td>' +
'<td><button class="btn btn-default btn-xs act_details" data-package="' + row['name'] + '" ' +
'<td style="white-space:nowrap;vertical-align:middle;"><div class="input-group">' +
'<button class="btn btn-default btn-xs act_details" data-package="' + row['name'] + '" ' +
' data-toggle="tooltip" title="{{ lang._('Info') }}">' +
'<i class="fa fa-info-circle fa-fw"></i></button>' +
(row['installed'] == "1" ?
@ -489,7 +491,7 @@
'data-repository="'+row['repository']+'" data-toggle="tooltip" title="{{ lang._('Install') }}">' +
'<i class="fa fa-plus fa-fw">' +
'</i></button>'
) + '</td>' + '</tr>'
) + '</div></td>' + '</tr>'
);
});
@ -503,7 +505,12 @@
$("#plugin_search").keyup();
$("#package_search").keyup();
if (broken_plugins) {
if (misconfigured_plugins || missing_plugins) {
if (!missing_plugins) {
$("#plugin_get").parent().hide();
} else {
$("#plugin_get").parent().show();
}
$('#plugin_actions').show();
} else {
$('#plugin_actions').hide();
@ -907,7 +914,7 @@
<ul class="dropdown-menu" role="menu">
<li><a id="plugin_see" href="#">{{ lang._('View and edit local conflicts') }}</a></li>
<li><a id="plugin_get" href="#">{{ lang._('Run the automatic resolver') }}</a></li>
<li><a id="plugin_set" href="#">{{ lang._('Reset the local conflicts') }}</a></li>
<li><a id="plugin_set" href="#">{{ lang._('Reset all local conflicts') }}</a></li>
</ul>
</div>
</td>
@ -920,7 +927,7 @@
<table class="table table-striped table-condensed table-responsive" id="pluginlist">
<thead>
<tr>
<th style="vertical-align:middle"><input type="text" style="width: 250px;" class="input-sm" autocomplete="off" id="plugin_search" placeholder="{{ lang._('Name') }}"></th>
<th style="vertical-align:middle"><input type="text" class="input-sm" autocomplete="off" id="plugin_search" placeholder="{{ lang._('Name') }}"></th>
<th style="vertical-align:middle">{{ lang._('Version') }}</th>
<th style="vertical-align:middle">{{ lang._('Size') }}</th>
<th style="vertical-align:middle">{{ lang._('Repository') }}</th>
@ -935,7 +942,7 @@
<table class="table table-striped table-condensed table-responsive" id="packageslist">
<thead>
<tr>
<th style="vertical-align:middle"><input type="text" style="width: 250px;" class="input-sm" autocomplete="off" id="package_search" placeholder="{{ lang._('Name') }}"></th>
<th style="vertical-align:middle"><input type="text" class="input-sm" autocomplete="off" id="package_search" placeholder="{{ lang._('Name') }}"></th>
<th style="vertical-align:middle">{{ lang._('Version') }}</th>
<th style="vertical-align:middle">{{ lang._('Size') }}</th>
<th style="vertical-align:middle">{{ lang._('Repository') }}</th>

2
src/opnsense/scripts/firmware/install.sh
View File

@ -31,7 +31,7 @@ PACKAGE=$1
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO INSTALL: ${PACKAGE}***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO INSTALL***" >> ${PKG_PROGRESS_FILE}
if [ "${PACKAGE#os-}" != "${PACKAGE}" ]; then
COREPKG=$(opnsense-version -n)
COREVER=$(opnsense-version -v)

2
src/opnsense/scripts/firmware/lock.sh
View File

@ -31,7 +31,7 @@ PACKAGE=${1}
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO LOCK: ${PACKAGE}***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO LOCK***" >> ${PKG_PROGRESS_FILE}
if [ "${PACKAGE}" = "base" ]; then
echo "Locking base set" >> ${PKG_PROGRESS_FILE}
opnsense-update -bL >> ${PKG_PROGRESS_FILE} 2>&1

2
src/opnsense/scripts/firmware/reinstall.sh
View File

@ -32,7 +32,7 @@ REBOOT=
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO REINSTALL: ${PACKAGE}***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO REINSTALL***" >> ${PKG_PROGRESS_FILE}
if [ "${PACKAGE}" = "base" ]; then
if opnsense-update -Tb; then

2
src/opnsense/scripts/firmware/remove.sh
View File

@ -31,7 +31,7 @@ PACKAGE=$1
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO REMOVE: ${PACKAGE}***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO REMOVE***" >> ${PKG_PROGRESS_FILE}
pkg remove -y ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php remove ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
pkg autoremove -y >> ${PKG_PROGRESS_FILE} 2>&1

2
src/opnsense/scripts/firmware/sync.sh
View File

@ -31,7 +31,7 @@ PACKAGES=$(/usr/local/sbin/pluginctl -g system.firmware.plugins | /usr/bin/sed '
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO SYNC: ${PACKAGES}***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO SYNC***" >> ${PKG_PROGRESS_FILE}
for PACKAGE in ${PACKAGES}; do
if ! pkg query %n ${PACKAGE} > /dev/null; then
pkg install -y ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1

2
src/opnsense/scripts/firmware/unlock.sh
View File

@ -31,7 +31,7 @@ PACKAGE=${1}
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO UNLOCK: ${PACKAGE}***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO UNLOCK***" >> ${PKG_PROGRESS_FILE}
if [ "${PACKAGE}" = "base" ]; then
echo "Unlocking base set" >> ${PKG_PROGRESS_FILE}
opnsense-update -bU >> ${PKG_PROGRESS_FILE} 2>&1