Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions frontend/src/assets/iconfont/iconfont.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@font-face {
font-family: "iconfont"; /* Project id 4776196 */
src: url('iconfont.woff2?t=1740392092454') format('woff2'),
url('iconfont.woff?t=1740392092454') format('woff'),
url('iconfont.ttf?t=1740392092454') format('truetype'),
url('iconfont.svg?t=1740392092454#iconfont') format('svg');
src: url('iconfont.woff2?t=1740474796282') format('woff2'),
url('iconfont.woff?t=1740474796282') format('woff'),
url('iconfont.ttf?t=1740474796282') format('truetype'),
url('iconfont.svg?t=1740474796282#iconfont') format('svg');
}

.iconfont {
Expand Down Expand Up @@ -258,14 +258,6 @@
content: "\e666";
}

.p-gpu-1:before {
content: "\e623";
}

.p-gpu-2:before {
content: "\e6d8";
}

.p-xpack:before {
content: "\e60b";
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/assets/iconfont/iconfont.js

Large diffs are not rendered by default.

14 changes: 0 additions & 14 deletions frontend/src/assets/iconfont/iconfont.json
Original file line number Diff line number Diff line change
Expand Up @@ -432,20 +432,6 @@
"unicode": "e666",
"unicode_decimal": 58982
},
{
"icon_id": "6176565",
"name": "监控",
"font_class": "gpu-1",
"unicode": "e623",
"unicode_decimal": 58915
},
{
"icon_id": "640495",
"name": "详细信息",
"font_class": "gpu-2",
"unicode": "e6d8",
"unicode_decimal": 59096
},
{
"icon_id": "3722144",
"name": "钻石",
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/assets/iconfont/iconfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/src/assets/iconfont/iconfont.ttf
Binary file not shown.
Binary file modified frontend/src/assets/iconfont/iconfont.woff
Binary file not shown.
Binary file modified frontend/src/assets/iconfont/iconfont.woff2
Binary file not shown.
1 change: 1 addition & 0 deletions frontend/src/components/task-log/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const openWithResourceID = (taskType: string, taskOperate: string, resourceID: n

const handleClose = () => {
open.value = false;
bus.emit('close', true);
bus.emit('refreshTask', true);
};

Expand Down
120 changes: 78 additions & 42 deletions frontend/src/lang/modules/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2717,29 +2717,6 @@ const message = {
manage: 'Management',
},
},
customApp: {
name: 'Custom App Repository',
appStoreType: 'App Store Package Source',
appStoreUrl: 'Repository URL',
local: 'Local Path',
remote: 'Remote Link',
imagePrefix: 'Image Prefix',
imagePrefixHelper:
'Function: Customize the image prefix and modify the image field in the compose file. For example, when the image prefix is set to 1panel/custom, the image field for MaxKB will change to 1panel/custom/maxkb:v1.10.0',
closeHelper: 'Cancel using custom app repository',
appStoreUrlHelper: 'Only .tar.gz format is supported',
postNode: 'Sync to sub-node',
postNodeHelper: 'Sub-nodes will inherit and use the above configuration by default',
nodes: 'Nodes',
},
alert: {
isAlert: 'Alert',
alertCount: 'Alert Count',
clamHelper: 'Trigger SMS alert when scanning infected files',
cronJobHelper: 'Trigger SMS alert when scheduled task execution fails',
licenseHelper: 'Professional version supports SMS alert',
alertCountHelper: 'Maximum daily alarm frequency',
},
xpack: {
expiresTrialAlert:
'Friendly reminder: Your Pro trial will expire in {0} days, and all Pro features will no longer be accessible. Please renew or upgrade to the full version in a timely manner.',
Expand Down Expand Up @@ -3030,32 +3007,36 @@ const message = {
excludeUa: 'Exclude User-Agent',
},
tamper: {
tamper: 'Site Integrity',
tamper: 'Website Tamper Protection',
ignoreTemplate: 'Exclude Directory Template',
protectTemplate: 'Protect File Template',
templateContent: 'Template Content',
template: 'Template',
tamperHelper1:
'For one-click deployment type websites, it is recommended to enable the application directory anti-tampering feature. If the website malfunctions or backup/restore fails, please disable the anti-tampering feature first.',
'For one-click deployment type websites, it is recommended to enable the application directory tamper protection feature; if the website is not functioning properly or there are backup and recovery failures, please first disable the tamper protection feature;',
tamperHelper2:
'It will restrict the read, write, delete, permission, and owner modification operations of protected files under non-excluded directories',
op: 'Operation',
create: 'Create',
file: 'File',
'Operations for reading, writing, deleting, changing permissions, and modifying owners of protected files outside the excluded directories will be restricted',
tamperPath: 'Protected Directory',
tamperPathEdit: 'Modify Path',
log: 'Intercept Logs',
totalProtect: 'Total Protections',
todayProtect: 'Today’s Protections',
tamperPathEdit: 'Edit Path',
log: 'Intercept Log',
totalProtect: 'Total Protection',
todayProtect: 'Today’s Protection',
addRule: 'Add Rule',
ignore: 'Exclude Directory',
ignoreHelper: 'One entry per line, e.g., \ntmp\n./tmp',
ignoreHelper1: 'Add folder names or specific paths to exclude from protection.',
ignoreHelper2: 'Use relative paths starting with ./ to exclude specific folders.',
protect: 'Protected file',
protectHelper: 'One entry per line, e.g., \npng\n./test.css',
protectHelper1: 'Specify file names, extensions, or specific files to protect.',
protectHelper2: 'Use relative paths starting with ./ to protect specific files.',
ignoreHelper: 'One per line, e.g.: \ntmp\n./tmp',
ignoreTemplateHelper: 'Add folder names to ignore, separated by commas, e.g.: tmp,cache',
templateRule: 'Length 1-512, name cannot contain symbols like {0}',
ignoreHelper1: 'Add folder names or specific paths to ignore',
ignoreHelper2: 'To ignore a specific folder, use a relative path starting with ./',
protect: 'Protect File',
protectHelper: 'One per line, e.g.: \npng\n./test.css',
protectTemplateHelper: 'Add file names or extensions to ignore, separated by commas, e.g.: conf,.css',
protectHelper1: 'You can specify file names, extensions, or specific files to protect',
protectHelper2: 'To protect a specific file, use a relative path starting with ./',
enableHelper:
'The anti-tampering function of website {0} is about to be enabled to enhance website security. Do you want to continue?',
'The tamper protection feature for the following websites will be enabled to enhance website security. Do you want to continue?',
disableHelper:
'The anti-tampering function of website {0} is about to be disabled. Do you want to continue?',
'The tamper protection feature for the following websites will be disabled. Do you want to continue?',
},
setting: {
setting: 'Panel Settings',
Expand Down Expand Up @@ -3129,7 +3110,62 @@ const message = {
alertContent3:
'Provide users with custom phone numbers, daily push frequency, and daily push time configurations, making it easier for users to set up more reasonable push alerts.',
},
node: {
node: 'Node',
addr: 'Address',
memTotal: 'Total Memory',
nodeManagement: 'Node Management',
addNode: 'Add Node',
connInfo: 'Connection Information',
nodeInfo: 'Node Information',
panelExist:
'Detected that there is already 1panel service on this node. Adding this node will use the original service port and installation directory of 1panel. Do you want to continue?',
coreExist:
'Detected that there is already 1panel-core service on this node. Unable to add this node, please check and try again!',
agentExist: 'Detected that there is already 1panel-agent service on this node',
forceAdd: 'Force Add',
forceAddHelper: 'Force add will forcibly replace the 1panel-agent service on this node',
reinstallHelper: 'Reinstall node {0}, do you want to continue?',
unhealthyCheck: 'Abnormal Check',
fixOperation: 'Fix Operation',
checkName: 'Check Item',
checkSSHConn: 'Check SSH Connection Availability',
fixSSHConn: 'Manually edit the node to confirm connection information',
checkConnInfo: 'Check Agent Connection Information',
checkStatus: 'Check Node Service Availability',
fixStatus: 'Investigate Node Logs',
checkAPI: 'Check Node API Availability',
fixAPI: 'Check if the request address in the information is correct; if incorrect, modify the main node information',
forceDelete: 'Force Delete',
operateHelper: 'The following nodes will undergo {0} operation, do you want to continue?',
forceDeleteHelper: 'Force delete will ignore node deletion errors and delete database metadata',
baseDir: 'Installation Directory',
baseDirHelper:
'When the installation directory is empty, it will be installed in the /opt directory by default',
nodePort: 'Node Port',
},
customApp: {
name: 'Custom App Repository',
appStoreType: 'App Store Package Source',
appStoreUrl: 'Repository URL',
local: 'Local Path',
remote: 'Remote Link',
imagePrefix: 'Image Prefix',
imagePrefixHelper:
'Function: Customize the image prefix and modify the image field in the compose file. For example, when the image prefix is set to 1panel/custom, the image field for MaxKB will change to 1panel/custom/maxkb:v1.10.0',
closeHelper: 'Cancel using custom app repository',
appStoreUrlHelper: 'Only .tar.gz format is supported',
postNode: 'Sync to sub-node',
postNodeHelper: 'Sub-nodes will inherit and use the above configuration by default',
nodes: 'Nodes',
},
alert: {
isAlert: 'Alert',
alertCount: 'Alert Count',
clamHelper: 'Trigger SMS alert when scanning infected files',
cronJobHelper: 'Trigger SMS alert when scheduled task execution fails',
licenseHelper: 'Professional version supports SMS alert',
alertCountHelper: 'Maximum daily alarm frequency',
alert: 'SMS Alert',
logs: 'Alert Logs',
list: 'Alert List',
Expand Down
Loading
Loading