From 6e5df29053494070a281c91c4980afb3d462b992 Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 29 Aug 2019 09:49:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/user/form.html | 29 ++-- application/admin/view/user/pass.html | 18 +-- public/static/plugs/ckeditor/styles.js | 194 ++++++++++++------------- 3 files changed, 119 insertions(+), 122 deletions(-) diff --git a/application/admin/view/user/form.html b/application/admin/view/user/form.html index c769683d1..08d4bb926 100644 --- a/application/admin/view/user/form.html +++ b/application/admin/view/user/form.html @@ -1,33 +1,30 @@
-
-

用户账号创建后，不允许再次修改。

+

登录用户账号创建后，不允许再次修改。

-

可选，用户联系手机号码，需要填写正确的格式

-

可选，用户联系电子邮箱，需要填写正确的格式

@@ -35,7 +32,7 @@ {notempty name='authorizes'}
- 访问授权 + 角色访问授权 Authorization
{if isset($vo.username) and $vo.username eq 'admin'} @@ -59,9 +56,9 @@
diff --git a/application/admin/view/user/pass.html b/application/admin/view/user/pass.html index 08f89db14..edd470210 100644 --- a/application/admin/view/user/pass.html +++ b/application/admin/view/user/pass.html @@ -4,23 +4,23 @@
-

用户账号创建后，不允许再次修改。

+

登录用户账号创建后，不允许再次修改。

请输入旧密码来验证修改权限，旧密码不限制格式。

@@ -28,18 +28,18 @@

密码必需包含大小写字母、数字、符号的任意两者组合。

密码必需包含大小写字母、数字、符号的任意两者组合。

diff --git a/public/static/plugs/ckeditor/styles.js b/public/static/plugs/ckeditor/styles.js index 69b040ab2..3fd41daec 100644 --- a/public/static/plugs/ckeditor/styles.js +++ b/public/static/plugs/ckeditor/styles.js @@ -15,123 +15,123 @@ // // For more information refer to: https://ckeditor.com/docs/ckeditor4/latest/guide/dev_styles.html#style-rules -CKEDITOR.stylesSet.add( 'default', [ - /* Block styles */ +CKEDITOR.stylesSet.add('default', [ + /* Block styles */ - // These styles are already available in the "Format" drop-down list ("format" plugin), - // so they are not needed here by default. You may enable them to avoid - // placing the "Format" combo in the toolbar, maintaining the same features. - /* - { name: 'Paragraph', element: 'p' }, - { name: 'Heading 1', element: 'h1' }, - { name: 'Heading 2', element: 'h2' }, - { name: 'Heading 3', element: 'h3' }, - { name: 'Heading 4', element: 'h4' }, - { name: 'Heading 5', element: 'h5' }, - { name: 'Heading 6', element: 'h6' }, - { name: 'Preformatted Text',element: 'pre' }, - { name: 'Address', element: 'address' }, - */ + // These styles are already available in the "Format" drop-down list ("format" plugin), + // so they are not needed here by default. You may enable them to avoid + // placing the "Format" combo in the toolbar, maintaining the same features. + /* + { name: 'Paragraph', element: 'p' }, + { name: 'Heading 1', element: 'h1' }, + { name: 'Heading 2', element: 'h2' }, + { name: 'Heading 3', element: 'h3' }, + { name: 'Heading 4', element: 'h4' }, + { name: 'Heading 5', element: 'h5' }, + { name: 'Heading 6', element: 'h6' }, + { name: 'Preformatted Text',element: 'pre' }, + { name: 'Address', element: 'address' }, + */ - { name: 'Italic Title', element: 'h2', styles: { 'font-style': 'italic' } }, - { name: 'Subtitle', element: 'h3', styles: { 'color': '#aaa', 'font-style': 'italic' } }, - { - name: 'Special Container', - element: 'div', - styles: { - padding: '5px 10px', - background: '#eee', - border: '1px solid #ccc' - } - }, + {name: 'Italic Title', element: 'h2', styles: {'font-style': 'italic'}}, + {name: 'Subtitle', element: 'h3', styles: {'color': '#aaa', 'font-style': 'italic'}}, + { + name: 'Special Container', + element: 'div', + styles: { + padding: '5px 10px', + background: '#eee', + border: '1px solid #ccc' + } + }, - /* Inline styles */ + /* Inline styles */ - // These are core styles available as toolbar buttons. You may opt enabling - // some of them in the Styles drop-down list, removing them from the toolbar. - // (This requires the "stylescombo" plugin.) - /* - { name: 'Strong', element: 'strong', overrides: 'b' }, - { name: 'Emphasis', element: 'em' , overrides: 'i' }, - { name: 'Underline', element: 'u' }, - { name: 'Strikethrough', element: 'strike' }, - { name: 'Subscript', element: 'sub' }, - { name: 'Superscript', element: 'sup' }, - */ + // These are core styles available as toolbar buttons. You may opt enabling + // some of them in the Styles drop-down list, removing them from the toolbar. + // (This requires the "stylescombo" plugin.) + /* + { name: 'Strong', element: 'strong', overrides: 'b' }, + { name: 'Emphasis', element: 'em' , overrides: 'i' }, + { name: 'Underline', element: 'u' }, + { name: 'Strikethrough', element: 'strike' }, + { name: 'Subscript', element: 'sub' }, + { name: 'Superscript', element: 'sup' }, + */ - { name: 'Marker', element: 'span', attributes: { 'class': 'marker' } }, + {name: 'Marker', element: 'span', attributes: {'class': 'marker'}}, - { name: 'Big', element: 'big' }, - { name: 'Small', element: 'small' }, - { name: 'Typewriter', element: 'tt' }, + {name: 'Big', element: 'big'}, + {name: 'Small', element: 'small'}, + {name: 'Typewriter', element: 'tt'}, - { name: 'Computer Code', element: 'code' }, - { name: 'Keyboard Phrase', element: 'kbd' }, - { name: 'Sample Text', element: 'samp' }, - { name: 'Variable', element: 'var' }, + {name: 'Computer Code', element: 'code'}, + {name: 'Keyboard Phrase', element: 'kbd'}, + {name: 'Sample Text', element: 'samp'}, + {name: 'Variable', element: 'var'}, - { name: 'Deleted Text', element: 'del' }, - { name: 'Inserted Text', element: 'ins' }, + {name: 'Deleted Text', element: 'del'}, + {name: 'Inserted Text', element: 'ins'}, - { name: 'Cited Work', element: 'cite' }, - { name: 'Inline Quotation', element: 'q' }, + {name: 'Cited Work', element: 'cite'}, + {name: 'Inline Quotation', element: 'q'}, - { name: 'Language: RTL', element: 'span', attributes: { 'dir': 'rtl' } }, - { name: 'Language: LTR', element: 'span', attributes: { 'dir': 'ltr' } }, + {name: 'Language: RTL', element: 'span', attributes: {'dir': 'rtl'}}, + {name: 'Language: LTR', element: 'span', attributes: {'dir': 'ltr'}}, - /* Object styles */ + /* Object styles */ - { - name: 'Styled Image (left)', - element: 'img', - attributes: { 'class': 'left' } - }, + { + name: 'Styled Image (left)', + element: 'img', + attributes: {'class': 'left'} + }, - { - name: 'Styled Image (right)', - element: 'img', - attributes: { 'class': 'right' } - }, + { + name: 'Styled Image (right)', + element: 'img', + attributes: {'class': 'right'} + }, - { - name: 'Compact Table', - element: 'table', - attributes: { - cellpadding: '5', - cellspacing: '0', - border: '1', - bordercolor: '#ccc' - }, - styles: { - 'border-collapse': 'collapse' - } - }, + { + name: 'Compact Table', + element: 'table', + attributes: { + cellpadding: '5', + cellspacing: '0', + border: '1', + bordercolor: '#ccc' + }, + styles: { + 'border-collapse': 'collapse' + } + }, - { name: 'Borderless Table', element: 'table', styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } }, - { name: 'Square Bulleted List', element: 'ul', styles: { 'list-style-type': 'square' } }, + {name: 'Borderless Table', element: 'table', styles: {'border-style': 'hidden', 'background-color': '#E6E6FA'}}, + {name: 'Square Bulleted List', element: 'ul', styles: {'list-style-type': 'square'}}, - /* Widget styles */ + /* Widget styles */ - { name: 'Clean Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-clean' } }, - { name: 'Grayscale Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-grayscale' } }, + {name: 'Clean Image', type: 'widget', widget: 'image', attributes: {'class': 'image-clean'}}, + {name: 'Grayscale Image', type: 'widget', widget: 'image', attributes: {'class': 'image-grayscale'}}, - { name: 'Featured Snippet', type: 'widget', widget: 'codeSnippet', attributes: { 'class': 'code-featured' } }, + {name: 'Featured Snippet', type: 'widget', widget: 'codeSnippet', attributes: {'class': 'code-featured'}}, - { name: 'Featured Formula', type: 'widget', widget: 'mathjax', attributes: { 'class': 'math-featured' } }, + {name: 'Featured Formula', type: 'widget', widget: 'mathjax', attributes: {'class': 'math-featured'}}, - { name: '240p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-240p' }, group: 'size' }, - { name: '360p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-360p' }, group: 'size' }, - { name: '480p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-480p' }, group: 'size' }, - { name: '720p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-720p' }, group: 'size' }, - { name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-1080p' }, group: 'size' }, + {name: '240p', type: 'widget', widget: 'embedSemantic', attributes: {'class': 'embed-240p'}, group: 'size'}, + {name: '360p', type: 'widget', widget: 'embedSemantic', attributes: {'class': 'embed-360p'}, group: 'size'}, + {name: '480p', type: 'widget', widget: 'embedSemantic', attributes: {'class': 'embed-480p'}, group: 'size'}, + {name: '720p', type: 'widget', widget: 'embedSemantic', attributes: {'class': 'embed-720p'}, group: 'size'}, + {name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: {'class': 'embed-1080p'}, group: 'size'}, - // Adding space after the style name is an intended workaround. For now, there - // is no option to create two styles with the same name for different widget types. See https://dev.ckeditor.com/ticket/16664. - { name: '240p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-240p' }, group: 'size' }, - { name: '360p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-360p' }, group: 'size' }, - { name: '480p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-480p' }, group: 'size' }, - { name: '720p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-720p' }, group: 'size' }, - { name: '1080p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-1080p' }, group: 'size' } + // Adding space after the style name is an intended workaround. For now, there + // is no option to create two styles with the same name for different widget types. See https://dev.ckeditor.com/ticket/16664. + {name: '240p ', type: 'widget', widget: 'embed', attributes: {'class': 'embed-240p'}, group: 'size'}, + {name: '360p ', type: 'widget', widget: 'embed', attributes: {'class': 'embed-360p'}, group: 'size'}, + {name: '480p ', type: 'widget', widget: 'embed', attributes: {'class': 'embed-480p'}, group: 'size'}, + {name: '720p ', type: 'widget', widget: 'embed', attributes: {'class': 'embed-720p'}, group: 'size'}, + {name: '1080p ', type: 'widget', widget: 'embed', attributes: {'class': 'embed-1080p'}, group: 'size'} -] ); +]);