tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11409-poner-un-poco-mas-arreglado-la-vista-del-update-manager' into 'develop' 

Ent 11409 poner un poco mas arreglado la vista del update manager

See merge request artica/pandorafms!5994
This commit is contained in:
Matias Didier 2023-05-31 11:10:29 +00:00
parent 9c593b062f 71d196778b
commit dfaea703ee
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/update_manager_client/lib/UpdateManager/UI/Manager.php
View File

@ -481,7 +481,7 @@ class Manager
if (count($updates) > 0) { if (count($updates) > 0) {
$next = $updates[0]; $next = $updates[0];
$return = '<p><b>'.\__('Next update').':</b><span id="next-version">'; $return = '<p><b>'.\__('Next update').': </b><span id="next-version" onclick="changelog()" style="cursor:pointer">';
$return .= $next['version'].'</span>'; $return .= $next['version'].'</span>';
$return .= ' - <a id="um-package-details-next" '; $return .= ' - <a id="um-package-details-next" ';
$return .= ' class="um-package-details" '; $return .= ' class="um-package-details" ';

4
pandora_console/update_manager_client/resources/javascript/umc.js
View File

@ -480,6 +480,10 @@ function umShowUpdateDetails(update) {
} }
} }
function changelog() {
window.open("https://pandorafms.com/en/changelog/", "_blank").focus();
}
function umToggleUpdateList() { function umToggleUpdateList() {
if (typeof toggleUpdateList == "function") { if (typeof toggleUpdateList == "function") {
toggleUpdateList(); toggleUpdateList();

23
pandora_console/update_manager_client/resources/styles/um.css
View File

@ -108,7 +108,7 @@ a.update_manager_button:after {
color: #82b92e; color: #82b92e;
font-size: 6em; font-size: 6em;
font-weight: bold; font-weight: bold;
margin: 30px 0 !important; margin: 50px 0 !important;
} }
.update_manager_warning p { .update_manager_warning p {
@ -315,19 +315,10 @@ a.update_manager_button:after {
} }
#um-buttons button { #um-buttons button {
margin: 0 1em 1em 1em;
border: none;
padding: 10px; padding: 10px;
cursor: pointer; cursor: pointer;
background: #efefef; width: 285px;
} margin: 20px;
#um-buttons button:hover {
background: #ddd;
}
#um-buttons button:active {
background: #ccc;
} }
.ui-widget.ui-widget-content { .ui-widget.ui-widget-content {
@ -578,3 +569,11 @@ a.update_manager_button_open {
color: #82b92e; color: #82b92e;
border-radius: 2px; border-radius: 2px;
} }
#um-updates {
width: 300px;
}
#next-version:hover {
font-weight: bolder;
}

10
pandora_console/update_manager_client/views/online.php
View File

@ -61,8 +61,10 @@ global $config;
<div id="um-updates"> <div id="um-updates">
</div> </div>
<div id="um-buttons" style="display:none;"> <div id="um-buttons" style="display:none;">
<button id="um-next"><?php echo __('Update to next version'); ?></button> <?php
<button id="um-last"><?php echo __('Update to latest version'); ?></button> html_print_button(__('Update to next version'), 'um-next', false, '', ['icon' => 'next', 'class' => 'sub ok']);
html_print_button(__('Update to latest version'), 'um-last', false, '', ['icon' => 'next', 'class' => 'sub ok']);
?>
</div> </div>
<div id="um-result"></div> <div id="um-result"></div>
@ -99,8 +101,8 @@ global $config;
window.onload = function() { window.onload = function() {
var bsearch = document.getElementById('um-search'); var bsearch = document.getElementById('um-search');
var bnext = document.getElementById('um-next'); var bnext = document.getElementById('button-um-next');
var blast = document.getElementById('um-last'); var blast = document.getElementById('button-um-last');
var result = document.getElementById('um-result'); var result = document.getElementById('um-result');
<?php <?php