diff --git a/modules/backup/client/config/admin/backup-admin.client.menu.js b/modules/backup/client/config/admin/backup-admin.client.menu.js deleted file mode 100644 index 21d8e687..00000000 --- a/modules/backup/client/config/admin/backup-admin.client.menu.js +++ /dev/null @@ -1,20 +0,0 @@ -(function () { - 'use strict'; - - // Configuring the Articles Admin module - angular - .module('backup.admin') - .run(menuConfig); - - menuConfig.$inject = ['menuService']; - - function menuConfig(menuService) { - menuService.addSubMenuItem('topbar', 'admin', { - title: 'MENU_ADMIN_BACKUP', - state: 'admin.backup', - position: 50, - roles: ['admin'], - divider: true - }); - } -}()); diff --git a/modules/backup/client/config/admin/backup-admin.client.routes.js b/modules/backup/client/config/admin/backup-admin.client.routes.js deleted file mode 100644 index e6c956f9..00000000 --- a/modules/backup/client/config/admin/backup-admin.client.routes.js +++ /dev/null @@ -1,22 +0,0 @@ -(function () { - 'use strict'; - - // Setting up route - angular - .module('invitations.admin.routes') - .config(routeConfig); - - routeConfig.$inject = ['$stateProvider']; - - function routeConfig($stateProvider) { - $stateProvider - .state('admin.backup', { - url: '/backup', - templateUrl: '/modules/backup/client/views/backup.client.view.html', - data: { - pageTitle: 'PAGETITLE.ADMIN_BACKUP' - } - }); - } -}()); - diff --git a/modules/backup/client/less/backup.less b/modules/backup/client/less/backup.less new file mode 100644 index 00000000..21e39920 --- /dev/null +++ b/modules/backup/client/less/backup.less @@ -0,0 +1,20 @@ +@import (reference) "../../../core/client/less/mt-var.less"; + +.backup-list { + .pagination-div-bottom { + margin-top: 20px; + border-top: 2px solid lighten(@gray-base, 85%); + } + .pagination-div-top { + border-bottom: 2px solid lighten(@gray-base, 85%); + input { + @media (max-width: @screen-sm-max) { + margin-top: 0 !important; + } + } + } + .file-info { + color: #888; + font-size: 12px; + } +} diff --git a/modules/backup/client/views/backup.client.view.html b/modules/backup/client/views/backup.client.view.html index d8c4a15c..7c4602cf 100644 --- a/modules/backup/client/views/backup.client.view.html +++ b/modules/backup/client/views/backup.client.view.html @@ -1,67 +1,56 @@ -
-
-
- -

- {{'BACKUP.VIEW_CAPTION' | translate}} -

-
+
+ +

+ {{'BACKUP.VIEW_CAPTION' | translate}} +

+
-
-
-
    -
-
+
+
+
    +
+
-
- - - - - - - - - - - - - - - - - -
{{ 'BACKUP.FIELD_NAME' | translate}}{{ 'BACKUP.FIELD_SIZE' | translate}}{{ 'BACKUP.FIELD_TIME' | translate}}{{ 'MESSAGES_FIELD.LIST_SELECT' | translate}}
- {{f.name}} - - {{f.size | bytes}} - - {{f.ctime | date: 'yyyy-MM-dd HH:mm:ss'}} - - - -
-
- -
-
    -
-
- -
-
+
+ + + + + + + + + + + + + +
{{ 'BACKUP.FIELD_NAME' | translate}}{{ 'MESSAGES_FIELD.LIST_SELECT' | translate}}
+ {{f.name}} +
+ {{f.ctime | date: 'yyyy-MM-dd HH:mm:ss'}} - {{f.size | bytes}} +
+
+ + +
+
+
+
    +
+
+
-
\ No newline at end of file diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 0d357f27..50ebf617 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -31,7 +31,7 @@ MENU_UPLOADER_ADMIN: 'Manage Uploader', MENU_TORRENTS_ADMIN_EDAU: 'Announce Editor', MENU_ADMIN_OFFICIAL_INVITATION: 'Send official invitation', - MENU_ADMIN_BACKUP: 'System Backup Files Database', + MENU_ADMIN_DATABASE_BACKUP: 'Database Backup Files', MENU_ADMIN_MESSAGES: 'System Messages', MENU_ADMIN_TRACE: 'System Traces', MENU_ADMIN_FORUMS_CONFIGURE: 'Forums Configure', @@ -225,7 +225,7 @@ ADMIN_FORUMS_CONFIGURE: 'Forums Configure', ADMIN_FORUMS_MANAGEMENT: 'Forums Management', ADMIN_OFFICIAL_INVITATION: 'Official invitations', - ADMIN_BACKUP: 'System Backup Files Manager', + ADMIN_BACKUP: 'Database Backup Files', ADMIN_SYSTEMS: 'System Control Panel', PASSWORD_FORGOT: 'Password forgot', PASSWORD_RESET: 'Password reset', @@ -678,9 +678,7 @@ BACKUP: { VIEW_CAPTION: 'System Backup Database Files List', LIST_ERROR: 'Files list error', - FIELD_NAME: 'File name', - FIELD_SIZE: 'File size', - FIELD_TIME: 'Backup time', + FIELD_NAME: 'File info', DELETE_CONFIRM_BODY_TEXT: 'Are you sure want to delete these files?', DELETED_SUCCESSFULLY: 'File deleted successfully', DELETED_ERROR: 'File deleted failed', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 333f4aa2..924e0551 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -31,7 +31,7 @@ MENU_UPLOADER_ADMIN: '上传权限管理', MENU_TORRENTS_ADMIN_EDAU: '种子修改器', MENU_ADMIN_OFFICIAL_INVITATION: '发送官方邀请', - MENU_ADMIN_BACKUP: '系统备份文件管理', + MENU_ADMIN_DATABASE_BACKUP: '数据库备份文件', MENU_ADMIN_MESSAGES: '系统消息', MENU_ADMIN_TRACE: '系统日志', MENU_ADMIN_FORUMS_CONFIGURE: '论坛配置管理', @@ -225,7 +225,7 @@ ADMIN_FORUMS_CONFIGURE: '论坛配置', ADMIN_FORUMS_MANAGEMENT: '论坛管理', ADMIN_OFFICIAL_INVITATION: '官方邀请', - ADMIN_BACKUP: '系统备份文件管理', + ADMIN_BACKUP: '数据库备份文件', ADMIN_SYSTEMS: '系统控制面板', PASSWORD_FORGOT: '找回密码', PASSWORD_RESET: '重设密码', @@ -678,9 +678,7 @@ BACKUP: { VIEW_CAPTION: '系统备份数据文件列表', LIST_ERROR: '备份文件列表错误', - FIELD_NAME: '文件名', - FIELD_SIZE: '文件大小', - FIELD_TIME: '备份时间', + FIELD_NAME: '备份文件信息', DELETE_CONFIRM_BODY_TEXT: '您确定要删除这些备份文件吗?', DELETED_SUCCESSFULLY: '备份文件删除成功', DELETED_ERROR: '备份文件删除失败', diff --git a/modules/systems/client/config/systems-admin.client.routes.js b/modules/systems/client/config/systems-admin.client.routes.js index 85d8ba4f..dd651437 100644 --- a/modules/systems/client/config/systems-admin.client.routes.js +++ b/modules/systems/client/config/systems-admin.client.routes.js @@ -38,7 +38,15 @@ .state('admin.systems.commands', { url: '/commands', templateUrl: '/modules/systems/client/views/commands.client.view.html' + }) + .state('admin.systems.backup', { + url: '/backup', + templateUrl: '/modules/backup/client/views/backup.client.view.html', + data: { + pageTitle: 'PAGETITLE.ADMIN_BACKUP' + } }); + } }()); diff --git a/modules/systems/client/views/panel.client.view.html b/modules/systems/client/views/panel.client.view.html index 99c7c093..f30ae9d7 100644 --- a/modules/systems/client/views/panel.client.view.html +++ b/modules/systems/client/views/panel.client.view.html @@ -8,6 +8,9 @@ {{'SYSTEMS.TEMPLATES_EDIT' | translate}} {{'SYSTEMS.COMMANDS_EXECUTE' | translate}}
+
diff --git a/modules/torrents/client/config/admin/torrents-admin.client.menu.js b/modules/torrents/client/config/admin/torrents-admin.client.menu.js index 152dd894..49b63ef5 100644 --- a/modules/torrents/client/config/admin/torrents-admin.client.menu.js +++ b/modules/torrents/client/config/admin/torrents-admin.client.menu.js @@ -24,7 +24,8 @@ menuService.addSubMenuItem('topbar', 'admin', { title: 'MENU_TORRENTS_ADMIN_EDAU', state: 'admin.announce', - position: 60 + position: 60, + divider: true }); } }());