YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Change url for update/upgrade tab

Browse source
This commit is contained in:
Laurent Peuch 2015-10-01 23:19:32 +02:00
parent 338c6ae85e
commit 750fc7b19f
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/js/app.js
View file

@ -1714,7 +1714,7 @@ var app = Sammy('#main', function (sam) {
}); });
// System update & upgrade // System update & upgrade
sam.get('#/tools/update', function (c) { sam.get('#/update', function (c) {
c.api('/update', function(data) { c.api('/update', function(data) {
packagesLength = data.packages.length; packagesLength = data.packages.length;
for(var i = 0; i < packagesLength; i++) { for(var i = 0; i < packagesLength; i++) {
@ -1727,16 +1727,16 @@ var app = Sammy('#main', function (sam) {
data.packages[i].delayed = true; data.packages[i].delayed = true;
} }
} }
c.view('tools/tools_update', data); c.view('update/update', data);
}, 'PUT'); }, 'PUT');
}); });
// Upgrade apps or packages // Upgrade apps or packages
sam.get('#/tools/upgrade/:type', function (c) { sam.get('#/upgrade/:type', function (c) {
if (c.params['type'] !== 'apps' && c.params['type'] !== 'packages') { if (c.params['type'] !== 'apps' && c.params['type'] !== 'packages') {
c.flash('fail', y18n.t('unknown_argument', [c.params['type']])); c.flash('fail', y18n.t('unknown_argument', [c.params['type']]));
store.clear('slide'); store.clear('slide');
c.redirect('#/tools/update'); c.redirect('#/update');
} }
else { else {
c.confirm( c.confirm(
@ -1750,13 +1750,13 @@ var app = Sammy('#main', function (sam) {
c.api('/upgrade?'+endurl, function(data) { c.api('/upgrade?'+endurl, function(data) {
// 'log' is a reserved name, maybe in handlebars // 'log' is a reserved name, maybe in handlebars
data.logs = data.log; data.logs = data.log;
c.view('tools/tools_upgrade', data); c.view('upgrade/upgrade', data);
}, 'PUT'); }, 'PUT');
}, },
function(){ function(){
store.clear('slide'); store.clear('slide');
c.redirect('#/tools/update'); c.redirect('#/update');
} }
); );
} }

2
src/views/home.ms
View file

@ -11,7 +11,7 @@
<span class="pull-right fa-chevron-right"></span> <span class="pull-right fa-chevron-right"></span>
<h2 class="list-group-item-heading"><span class="fa-fw fa-rocket"></span> {{t 'applications'}}</h2> <h2 class="list-group-item-heading"><span class="fa-fw fa-rocket"></span> {{t 'applications'}}</h2>
</a> </a>
<a href="#/tools/update" class="list-group-item slide"> <a href="#/update" class="list-group-item slide">
<span class="fa-chevron-right pull-right"></span> <span class="fa-chevron-right pull-right"></span>
<h2 class="list-group-item-heading"><span class="fa-fw fa-refresh"></span> {{t 'system_update'}}</h2> <h2 class="list-group-item-heading"><span class="fa-fw fa-refresh"></span> {{t 'system_update'}}</h2>
</a> </a>

7
src/views/tools/tools_update.ms → src/views/update/update.ms
View file

@ -1,7 +1,6 @@
<div class="btn-breadcrumb"> <div class="btn-breadcrumb">
<a href="#/" ><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a> <a href="#/" ><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
<a href="#/tools">{{t 'tools'}}</a> <a href="#/update">{{t 'system_update'}}</a>
<a href="#/tools/update">{{t 'system_update'}}</a>
</div> </div>
<div class="separator"></div> <div class="separator"></div>
@ -27,7 +26,7 @@
{{/packages}} {{/packages}}
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<a href="#/tools/upgrade/packages" class="btn btn-success">{{t 'system_upgrade_btn'}}</a> <a href="#/upgrade/packages" class="btn btn-success">{{t 'system_upgrade_btn'}}</a>
</div> </div>
{{else}} {{else}}
<div class="panel-body"> <div class="panel-body">
@ -49,7 +48,7 @@
{{/apps}} {{/apps}}
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<a href="#/tools/upgrade/apps" class="btn btn-success">{{t 'system_upgrade_btn'}}</a> <a href="#/upgrade/apps" class="btn btn-success">{{t 'system_upgrade_btn'}}</a>
</div> </div>
{{else}} {{else}}
<div class="panel-body"> <div class="panel-body">

5
src/views/tools/tools_upgrade.ms → src/views/upgrade/upgrade.ms
View file

@ -1,8 +1,7 @@
<div class="btn-breadcrumb"> <div class="btn-breadcrumb">
<a href="#/" ><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a> <a href="#/" ><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
<a href="#/tools">{{t 'tools'}}</a> <a href="#/update">{{t 'system_update'}}</a>
<a href="#/tools/update">{{t 'system_update'}}</a> <a href="#/upgrade">{{t 'system_upgrade'}}</a>
<a href="#/tools/upgrade">{{t 'system_upgrade'}}</a>
</div> </div>
<div class="separator"></div> <div class="separator"></div>