diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js index b68a06aa..684ef3af 100644 --- a/src/js/yunohost/controllers/apps.js +++ b/src/js/yunohost/controllers/apps.js @@ -131,64 +131,6 @@ }); }); - // List available apps lists - app.get('#/apps/lists', function (c) { - c.api('/appslists', function(data) { - list = []; - var has_community_list = false; - $.each(data, function(listname, listinfo) { - list.push({ - 'name': listname, - 'url': listinfo['url'], - 'lastUpdate': listinfo['lastUpdate'] - }); - - // Check for community list - if (listname == 'community' || listinfo['url'] == 'https://app.yunohost.org/community.json') { - has_community_list = true; - } - }); - - c.view('app/app_appslists_list', { - appslists: list, - has_community_list: has_community_list - }); - }, 'GET'); - }); - - // Add a new apps list - app.post('#/apps/lists', function (c) { - list = { - 'name' : c.params['appslist_name'], - 'url' : c.params['appslist_url'] - } - - c.api('/appslists', function(data) { - store.clear('slide'); - c.redirect('#/apps/lists/' + list.name); - }, 'PUT', list); - }); - - // Show appslist info and operations - app.get('#/apps/lists/:appslist', function (c) { - c.api('/appslists', function(data) { - if (typeof data[c.params['appslist']] !== 'undefined') { - list = { - 'name' : c.params['appslist'], - 'url': data[c.params['appslist']]['url'], - 'lastUpdate': data[c.params['appslist']]['lastUpdate'], - 'removable' : (c.params['appslist'] !== 'yunohost') ? true : false // Do not remove default apps list - }; - c.view('app/app_appslists_info', {appslist: list}); - } - else { - c.flash('warning', y18n.t('appslists_unknown_list', [c.params['appslist']])); - store.clear('slide'); - c.redirect('#/apps/lists'); - } - }, 'GET'); - }); - // Refresh available apps list app.get('#/apps/lists/refresh', function (c) { c.api('/appslists', function(data) { @@ -197,30 +139,6 @@ }, 'PUT'); }); - // Refresh specific apps list - app.get('#/apps/lists/:appslist/refresh', function (c) { - c.api('/appslists', function(data) { - c.redirect('#/apps/lists'); - }, 'PUT', {'name' : c.params['appslist']}); - }); - - // Remove apps list - app.get('#/apps/lists/:appslist/remove', function (c) { - c.confirm( - y18n.t('appslist'), - y18n.t('appslists_confirm_remove', [c.params['app']]), - function() { - c.api('/appslists', function() { - c.redirect('#/apps/lists'); - }, 'DELETE', {'name' : c.params['appslist']}); - }, - function() { - store.clear('slide'); - c.redirect('#/apps/lists/'+ c.params['appslist']); - } - ); - }); - // Get app information app.get('#/apps/:app', function (c) { c.api('/apps/'+c.params['app']+'?raw', function(data) { // http://api.yunohost.org/#!/app/app_info_get_9 diff --git a/src/locales/en.json b/src/locales/en.json index b1acbd34..d46a9a5a 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -404,20 +404,7 @@ "regenerate_selfsigned_cert": "Regenerate self-signed certificate", "revert_to_selfsigned_cert_message": "If you really want to, you can reinstall a self-signed certificate. (Not recommended)", "revert_to_selfsigned_cert": "Revert to a self-signed certificate", - "appslists": "Applications lists", - "appslists_no_lists": "No applications lists", - "appslists_custom": "Custom applications list", - "appslists_manage": "Manage applications lists", - "appslists_confirm_remove": "Are you sure you want to remove this applications list?", - "appslists_info_refresh_desc": "Refresh applications status for this list.", - "appslists_info_remove_desc": "Applications from this list will not be available anymore.", - "appslists_last_update": "Last update", - "appslists_unknown_list": "Unknown apps list: %s", - "appslists_community_list": "Community applications list", "name": "Name", - "install_community_appslists_info": "Community applications list allows you to install community maintained applications.
See the full list on yunohost.org/apps.", - "install_community_appslists_warning": "Note that these applications packages are not official and not maintained by the YunoHost team.
Installing these applications is at your own risk and could break your system.", - "install_custom_app_appslists_info": "Note that you can use alternative applications lists to install some other apps maintained by the YunoHost community.", "purge_user_data_checkbox": "Purge %s's data? (This will remove the content of it's home and mail directories.)", "purge_user_data_warning": "Purging user's data is not reversible. Be sure you know what you're doing!" } diff --git a/src/views/app/app_appslists_info.ms b/src/views/app/app_appslists_info.ms deleted file mode 100644 index 4fa09040..00000000 --- a/src/views/app/app_appslists_info.ms +++ /dev/null @@ -1,49 +0,0 @@ -
- {{t 'home'}} - {{t 'applications'}} - {{t 'appslists'}} - {{appslist.name}} -
- -
- -
-
-

{{t 'infos'}}

-
-
-
-
{{t 'name'}}
-
{{appslist.name}}
-
{{t 'url'}}
-
{{appslist.url}}
-
{{t 'appslists_last_update'}}
-
{{formatTime appslist.lastUpdate day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}
-
-
-
- -
-
-

- {{t 'operations'}} -

-
-
-
-

{{t 'appslists_info_refresh_desc'}}

- - {{t 'refresh_app_list'}} - -
- {{#appslist.removable}} -
-
-

{{t 'appslists_info_remove_desc'}}

- - {{t 'remove'}} - -
- {{/appslist.removable}} -
-
diff --git a/src/views/app/app_appslists_list.ms b/src/views/app/app_appslists_list.ms deleted file mode 100644 index 3a677f9a..00000000 --- a/src/views/app/app_appslists_list.ms +++ /dev/null @@ -1,80 +0,0 @@ -
- {{t 'home'}} - {{t 'applications'}} - {{t 'appslists'}} -
- -
- -
-
-

{{t 'appslists'}}

-
- -
- {{#appslists}} - - -

- {{name}} -

- - {{/appslists}} - {{^appslists}} -

- - {{t 'appslists_no_lists'}} -

- {{/appslists}} -
-
- -{{^has_community_list}} -
-
-

{{t 'appslists_community_list'}}

-
-
-
- - -
-
-

{{t 'install_community_appslists_info'}}

-

- {{t 'install_community_appslists_warning'}} -

- -
-
-
-
-
-{{/has_community_list}} - -
-
-

{{t 'appslists_custom'}}

-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
-
-
diff --git a/src/views/app/app_list_install.ms b/src/views/app/app_list_install.ms index 72da8df6..1a616ac9 100644 --- a/src/views/app/app_list_install.ms +++ b/src/views/app/app_list_install.ms @@ -5,9 +5,6 @@
- - {{t 'appslists_manage'}} - {{t 'refresh_app_list'}} @@ -79,13 +76,6 @@ {{t 'confirm_install_custom_app'}}

-
-

- {{t 'install_custom_app_appslists_info'}}

-

- {{t 'appslists_manage'}} -

-