From 8daaffc10a316cd43365f46c360c3bdbd526a1af Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 25 Aug 2018 20:34:46 +0800 Subject: [PATCH] modify style --- src/langs/zh_Hans.txt | 2 ++ src/langs/zh_Hant.txt | 2 ++ src/scripts/config/defaultLanguage.js | 2 ++ src/scripts/controllers/settings-ariang.js | 12 ++++++++++-- src/styles/core/core.css | 9 +++++++++ src/views/settings-ariang.html | 10 ++++++---- 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/langs/zh_Hans.txt b/src/langs/zh_Hans.txt index 6d9bb29..eb32486 100644 --- a/src/langs/zh_Hans.txt +++ b/src/langs/zh_Hans.txt @@ -163,9 +163,11 @@ RPC Alias=RPC 别名 Import / Export AriaNg Settings=导入 / 导出 AriaNg 设置 Import Settings=导入设置 Export Settings=导出设置 +AriaNg settings data=AriaNg 设置数据 Confirm Import=确认导入 Are you sure you want to import all settings?=您是否要导入所有设置? Invalid settings data format!=无效的设置数据格式! +Data has been copied to clipboard.=数据已经复制到剪贴板中. Supported Placeholder=支持的占位符 AriaNg Title=AriaNg 标题 Downloading Count=正在下载数量 diff --git a/src/langs/zh_Hant.txt b/src/langs/zh_Hant.txt index aff3fb4..7c5d41c 100644 --- a/src/langs/zh_Hant.txt +++ b/src/langs/zh_Hant.txt @@ -163,9 +163,11 @@ RPC Alias=RPC 別名 Import / Export AriaNg Settings=匯入 / 匯出 AriaNg 設定 Import Settings=匯入設定 Export Settings=匯出設定 +AriaNg settings data=AriaNg 設定資料 Confirm Import=確認匯入 Are you sure you want to import all settings?=您是否要匯入所有設定? Invalid settings data format!=無效的設定資料格式! +Data has been copied to clipboard.=資料已經複製到剪貼簿中. Supported Placeholder=支援的預留位置 AriaNg Title=AriaNg 標題 Downloading Count=正在下載數量 diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js index d4f32d2..989284b 100644 --- a/src/scripts/config/defaultLanguage.js +++ b/src/scripts/config/defaultLanguage.js @@ -167,9 +167,11 @@ 'Import / Export AriaNg Settings': 'Import / Export AriaNg Settings', 'Import Settings': 'Import Settings', 'Export Settings': 'Export Settings', + 'AriaNg settings data': 'AriaNg settings data', 'Confirm Import': 'Confirm Import', 'Are you sure you want to import all settings?': 'Are you sure you want to import all settings?', 'Invalid settings data format!': 'Invalid settings data format!', + 'Data has been copied to clipboard.': 'Data has been copied to clipboard.', 'Supported Placeholder': 'Supported Placeholder', 'AriaNg Title': 'AriaNg Title', 'Downloading Count': 'Downloading Count', diff --git a/src/scripts/controllers/settings-ariang.js b/src/scripts/controllers/settings-ariang.js index 7bcb58c..cbd8388 100644 --- a/src/scripts/controllers/settings-ariang.js +++ b/src/scripts/controllers/settings-ariang.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module('ariaNg').controller('AriaNgSettingsController', ['$rootScope', '$scope', '$routeParams', '$window', '$interval', '$timeout', '$filter', 'ariaNgLanguages', 'ariaNgCommonService', 'ariaNgNotificationService', 'ariaNgLocalizationService', 'ariaNgLogService', 'ariaNgFileService', 'ariaNgSettingService', 'ariaNgMonitorService', 'ariaNgTitleService', 'aria2SettingService', function ($rootScope, $scope, $routeParams, $window, $interval, $timeout, $filter, ariaNgLanguages, ariaNgCommonService, ariaNgNotificationService, ariaNgLocalizationService, ariaNgLogService, ariaNgFileService, ariaNgSettingService, ariaNgMonitorService, ariaNgTitleService, aria2SettingService) { + angular.module('ariaNg').controller('AriaNgSettingsController', ['$rootScope', '$scope', '$routeParams', '$window', '$interval', '$timeout', '$filter', 'clipboard', 'ariaNgLanguages', 'ariaNgCommonService', 'ariaNgNotificationService', 'ariaNgLocalizationService', 'ariaNgLogService', 'ariaNgFileService', 'ariaNgSettingService', 'ariaNgMonitorService', 'ariaNgTitleService', 'aria2SettingService', function ($rootScope, $scope, $routeParams, $window, $interval, $timeout, $filter, clipboard, ariaNgLanguages, ariaNgCommonService, ariaNgNotificationService, ariaNgLocalizationService, ariaNgLogService, ariaNgFileService, ariaNgSettingService, ariaNgMonitorService, ariaNgTitleService, aria2SettingService) { var extendType = $routeParams.extendType; var lastRefreshPageNotification = null; @@ -44,7 +44,8 @@ rpcSettings: ariaNgSettingService.getAllRpcSettings(), isSupportBlob: ariaNgFileService.isSupportBlob(), importSettings: null, - exportSettings: null + exportSettings: null, + exportSettingsCopied: false }; $scope.context.showDebugMode = $scope.context.sessionSettings.debugMode || extendType === 'debug'; @@ -211,12 +212,19 @@ $scope.showExportSettingsModal = function () { $scope.context.exportSettings = $filter('json')(ariaNgSettingService.exportAllOptions()); + $scope.context.exportSettingsCopied = false; angular.element('#export-settings-modal').modal(); }; $('#export-settings-modal').on('hide.bs.modal', function (e) { $scope.context.exportSettings = null; + $scope.context.exportSettingsCopied = false; }); + + $scope.copyExportSettings = function () { + clipboard.copyText($scope.context.exportSettings); + $scope.context.exportSettingsCopied = true; + }; $scope.addNewRpcSetting = function () { setNeedRefreshPage(); diff --git a/src/styles/core/core.css b/src/styles/core/core.css index ed2ca34..ebd7e13 100644 --- a/src/styles/core/core.css +++ b/src/styles/core/core.css @@ -248,3 +248,12 @@ td { width: 6px; } } + +/* animation */ +.fade-in.ng-enter { + transition:0.3s linear all; + opacity:0; +} +.fade-in.ng-enter.ng-enter-active { + opacity:1; +} diff --git a/src/views/settings-ariang.html b/src/views/settings-ariang.html index d43cf9b..fc10660 100644 --- a/src/views/settings-ariang.html +++ b/src/views/settings-ariang.html @@ -283,7 +283,8 @@
- +
@@ -302,13 +303,14 @@

Export Settings - - - + + + + Data has been copied to clipboard.