Skip to content

S
solo-1
Commit 714f52ba authored by Liang's avatar Liang
Browse files
Options

✨ fixed #12276

parent 67f29f9d
Show whitespace changes
Inline Side-by-side
Showing with 274 additions and 71 deletions
src/main/resources/lang_en_US.properties
View file @ 714f52ba
...@@ -16,12 +16,24 @@ ...@@ -16,12 +16,24 @@
# #
# Description: Solo language configurations(en_US). # Description: Solo language configurations(en_US).
# Version: 2.11.4.20, Apr 17, 2017 # Version: 2.12.4.20, Apr 25, 2017
# Author: Liang Ding # Author: Liang Ding
# Author: Liyuan Li # Author: Liyuan Li
# Author: Dongxu Wang # Author: Dongxu Wang
# #
addBoldLabel=Add bold text
addItalicLabel=Add italic text
insertQuoteLabel=Insert a quote
addBulletedLabel=Add a bulleted list
addNumberedListLabel=Add a numbered list
addLinkLabel=Add a link
undoLabel=Undo
redoLabel=Redo
fullscreenLabel=Fullscreen
helpLabel=Help
previewLabel=Preview
uploadFilesLabel=Upload File
howConfigLabel=How? howConfigLabel=How?
duplicatedCategoryURILabel=Duplicated category URI! duplicatedCategoryURILabel=Duplicated category URI!
duplicatedCategoryLabel=Duplicated category! duplicatedCategoryLabel=Duplicated category!
......
src/main/resources/lang_zh_CN.properties
View file @ 714f52ba
...@@ -16,12 +16,24 @@ ...@@ -16,12 +16,24 @@
# #
# Description: Solo default language configurations(zh_CN). # Description: Solo default language configurations(zh_CN).
# Version: 2.11.4.20, Apr 17, 2017 # Version: 2.12.4.20, Apr 25, 2017
# Author: Liang Ding # Author: Liang Ding
# Author: Liyuan Li # Author: Liyuan Li
# Author: Dongxu Wang # Author: Dongxu Wang
# #
addBoldLabel=\u6DFB\u52A0\u7C97\u4F53
addItalicLabel=\u6DFB\u52A0\u659C\u4F53
insertQuoteLabel=\u63D2\u5165\u5F15\u7528
addBulletedLabel=\u6DFB\u52A0\u65E0\u5E8F\u5217\u8868
addNumberedListLabel=\u6DFB\u52A0\u6709\u5E8F\u5217\u8868
addLink1Label=\u6DFB\u52A0\u94FE\u63A5
undoLabel=\u64A4\u9500
redoLabel=\u6062\u590D
helpLabel=\u5E2E\u52A9
fullscreenLabel=\u5168\u5C4F
previewLabel=\u9884\u89C8
uploadFilesLabel=\u4E0A\u4F20\u6587\u4EF6
howConfigLabel=\u5982\u4F55\u914D\u7F6E\uFF1F howConfigLabel=\u5982\u4F55\u914D\u7F6E\uFF1F
duplicatedCategoryURILabel=\u5206\u7C7B URI \u91CD\u590D\uFF01 duplicatedCategoryURILabel=\u5206\u7C7B URI \u91CD\u590D\uFF01
duplicatedCategoryLabel=\u5206\u7C7B\u91CD\u590D\uFF01 duplicatedCategoryLabel=\u5206\u7C7B\u91CD\u590D\uFF01
......
src/main/webapp/admin-label.ftl
View file @ 714f52ba
...@@ -123,7 +123,19 @@ ...@@ -123,7 +123,19 @@
"visitorUserLabel": "${visitorUserLabel}", "visitorUserLabel": "${visitorUserLabel}",
"categoryTooLongLabel": "${categoryTooLongLabel}", "categoryTooLongLabel": "${categoryTooLongLabel}",
"descriptionLabel": "${descriptionLabel}", "descriptionLabel": "${descriptionLabel}",
"autoSaveLabel": "${autoSaveLabel}" "autoSaveLabel": "${autoSaveLabel}",
"addBoldLabel": '${addBoldLabel}',
"addItalicLabel": '${addItalicLabel}',
"insertQuoteLabel": '${insertQuoteLabel}',
"addBulletedLabel": '${addBulletedLabel}',
"addNumberedListLabel": '${addNumberedListLabel}',
"addLinkLabel": '${addLinkLabel}',
"undoLabel": '${undoLabel}',
"redoLabel": '${redoLabel}',
"previewLabel": '${previewLabel}',
"helpLabel": '${helpLabel}',
"fullscreenLabel": '${fullscreenLabel}',
"uploadFilesLabel": '${uploadFilesLabel}'
}; };
admin.init(); admin.init();
......
src/main/webapp/css/default-admin.css
View file @ 714f52ba
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* admin style * admin style
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 2.1.7.4, Apr 8, 2017 * @version 2.2.7.4, Apr 25, 2017
*/ */
/* start resset */ /* start resset */
...@@ -163,6 +163,174 @@ a:hover { ...@@ -163,6 +163,174 @@ a:hover {
box-shadow: inset 0 -1px 0 #bbb; box-shadow: inset 0 -1px 0 #bbb;
} }
.tooltipped {
position: relative;
cursor: pointer;
}
.tooltipped::after {
position: absolute;
z-index: 1000000;
display: none;
padding: 5px 8px;
font-size: 11px;
font-weight: normal;
-webkit-font-smoothing: subpixel-antialiased;
color: #fff;
text-align: center;
text-decoration: none;
text-shadow: none;
text-transform: none;
letter-spacing: normal;
word-wrap: break-word;
white-space: pre;
pointer-events: none;
content: attr(aria-label);
background: rgba(0,0,0,0.8);
border-radius: 3px;
line-height: 16px;
opacity: 0
}
.tooltipped::before {
position: absolute;
z-index: 1000001;
display: none;
width: 0;
height: 0;
color: rgba(0,0,0,0.8);
pointer-events: none;
content: "";
border: 5px solid transparent;
opacity: 0
}
@-webkit-keyframes tooltip-appear {
from {
opacity: 0
}
to {
opacity: 1
}
}
@keyframes tooltip-appear {
from {
opacity: 0
}
to {
opacity: 1
}
}
.tooltipped-hover::before,
.tooltipped-hover::after,
.tooltipped:hover::before,
.tooltipped:hover::after,
.tooltipped:active::before,
.tooltipped:active::after,
.tooltipped:focus::before,
.tooltipped:focus::after {
display: inline-block;
text-decoration: none;
-webkit-animation-name: tooltip-appear;
animation-name: tooltip-appear;
-webkit-animation-duration: 0.1s;
animation-duration: 0.1s;
-webkit-animation-fill-mode: forwards;
animation-fill-mode: forwards;
-webkit-animation-timing-function: ease-in;
animation-timing-function: ease-in;
-webkit-animation-delay: 0.4s;
animation-delay: 0.4s
}
.tooltipped-s::after,.tooltipped-se::after,.tooltipped-sw::after {
top: 100%;
right: 50%;
margin-top: 5px
}
.tooltipped-s::before,.tooltipped-se::before,.tooltipped-sw::before {
top: auto;
right: 50%;
bottom: -5px;
margin-right: -5px;
border-bottom-color: rgba(0,0,0,0.8)
}
.tooltipped-se::after {
right: auto;
left: 50%;
margin-left: -15px
}
.tooltipped-sw::after {
margin-right: -15px
}
.tooltipped-n::after,.tooltipped-ne::after,.tooltipped-nw::after {
right: 50%;
bottom: 100%;
margin-bottom: 5px
}
.tooltipped-n::before,.tooltipped-ne::before,.tooltipped-nw::before {
top: -5px;
right: 50%;
bottom: auto;
margin-right: -5px;
border-top-color: rgba(0,0,0,0.8)
}
.tooltipped-ne::after {
right: auto;
left: 50%;
margin-left: -15px
}
.tooltipped-nw::after {
margin-right: -15px
}
.tooltipped-s::after,.tooltipped-n::after {
-webkit-transform: translateX(50%);
transform: translateX(50%)
}
.tooltipped-w::after {
right: 100%;
bottom: 50%;
margin-right: 5px;
-webkit-transform: translateY(50%);
transform: translateY(50%);
}
.tooltipped-w::before {
top: 50%;
bottom: 50%;
left: -5px;
margin-top: -5px;
border-left-color: rgba(0,0,0,0.8);
}
.tooltipped-e::after {
bottom: 50%;
left: 100%;
margin-left: 5px;
-webkit-transform: translateY(50%);
transform: translateY(50%)
}
.tooltipped-e::before {
top: 50%;
right: -5px;
bottom: 50%;
margin-top: -5px;
border-right-color: rgba(0,0,0,0.8)
}
button, button,
.completed-ck span { .completed-ck span {
......
src/main/webapp/js/admin/editorCodeMirror.js
View file @ 714f52ba
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.4.1.4, Jan 21, 2017 * @version 1.4.2.4, Apr 25, 2017
*/ */
Util.processClipBoard = function (text, cm) { Util.processClipBoard = function (text, cm) {
...@@ -224,17 +224,13 @@ admin.editors.CodeMirror = { ...@@ -224,17 +224,13 @@ admin.editors.CodeMirror = {
toolbar: [ toolbar: [
{name: 'bold'}, {name: 'bold'},
{name: 'italic'}, {name: 'italic'},
'|',
{name: 'quote'}, {name: 'quote'},
{name: 'link'},
{name: 'unordered-list'}, {name: 'unordered-list'},
{name: 'ordered-list'}, {name: 'ordered-list'},
'|', {name: 'image', html: '<span style="display: inline-block;top:1px" class="tooltipped tooltipped-n" aria-label="' + Label.uploadFilesLabel + '" ><form id="' + conf.id + 'fileUpload" method="POST" enctype="multipart/form-data"><label class="icon-upload"><input type="file"/></label></form></span>'},
{name: 'link'},
{name: 'image', html: '<form id="' + conf.id + 'fileUpload" method="POST" enctype="multipart/form-data"><label class="icon-upload"><input type="file"/></label></form>'},
'|',
{name: 'redo'}, {name: 'redo'},
{name: 'undo'}, {name: 'undo'},
'|',
{name: 'preview'}, {name: 'preview'},
{name: 'fullscreen'}], {name: 'fullscreen'}],
extraKeys: { extraKeys: {
......
src/main/webapp/js/lib/CodeMirrorEditor/codemirror.css
View file @ 714f52ba
...@@ -516,32 +516,26 @@ span.CodeMirror-selectedtext { background: none; } ...@@ -516,32 +516,26 @@ span.CodeMirror-selectedtext { background: none; }
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset;
border-bottom-width: 0; border-bottom-width: 0;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
height: 34px;
} }
.editor-toolbar a, .editor-toolbar a,
.editor-toolbar label { .editor-toolbar label {
display: inline-block; text-decoration: none!important;
text-align: center;
text-decoration: none !important;
font-size: 16px; font-size: 16px;
color: #666; color: #666;
width: 23px; padding: 5px 10px;
height: 23px;
margin: 2px;
border: 1px solid transparent;
border-radius: 3px;
cursor: pointer; cursor: pointer;
line-height: 24px;
display: inline-block;
top: -1px;
} }
.editor-toolbar a:hover, .editor-toolbar a.active, .editor-toolbar a:hover,
.editor-toolbar a.active,
.editor-toolbar a.focus,
.editor-toolbar label:hover, .editor-toolbar label:hover,
.editor-toolbar label.active { .editor-toolbar label.active {
background: #fcfcfc; background: #666;
border-color: #95a5a6; color: #fff;
color: #777;
}
.editor-toolbar a.active {
color: #911;
border-color: #911;
} }
.editor-toolbar a:before, .editor-toolbar a:before,
...@@ -550,19 +544,19 @@ span.CodeMirror-selectedtext { background: none; } ...@@ -550,19 +544,19 @@ span.CodeMirror-selectedtext { background: none; }
} }
.editor-toolbar label.icon-upload { .editor-toolbar label.icon-upload {
padding: 0 1px; margin: 0;
height: 23px; position: relative;
width: 21px;
vertical-align: bottom;
float: none;
} }
.editor-toolbar input { .editor-toolbar input {
height: 1px; height: 1px;
margin-top: 8px; position: absolute;
left: 0;
top: 0;
opacity: 0.001;
} }
.editor-toolbar form { .editor-toolbar form {
display: inline; overflow: hidden;
display: initial;
} }
.editor-toolbar i.separator { .editor-toolbar i.separator {
display: inline-block; display: inline-block;
......
src/main/webapp/js/lib/CodeMirrorEditor/codemirror.min.css
View file @ 714f52ba
.CodeMirror{font-family:monospace;height:300px;color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror-lines pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta{color:#555}.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-s-default .cm-error{color:red}.cm-invalidchar{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper{-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror-lines pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-focused div.CodeMirror-cursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}.CodeMirror-hints{position:absolute;z-index:100;overflow:hidden;list-style:none;margin:0;padding:2px;-webkit-box-shadow:2px 3px 5px rgba(0,0,0,.2);-moz-box-shadow:2px 3px 5px rgba(0,0,0,.2);box-shadow:2px 3px 5px rgba(0,0,0,.2);border-radius:3px;border:1px solid silver;background:#fff;font-size:90%;font-family:monospace;max-height:20em;overflow-y:auto}.CodeMirror-hint{margin:0;padding:0 4px;border-radius:2px;max-width:19em;overflow:hidden;white-space:pre;color:#000;cursor:pointer}li.CodeMirror-hint-active{background:#08f;color:#fff}.CodeMirror-fullscreen{position:fixed;top:0;left:0;right:0;bottom:0;height:auto;z-index:9}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.CodeMirror-merge-2pane .CodeMirror-merge-pane{width:49%;border:1px solid #ccc;border-radius:3px}.CodeMirror-merge-2pane .CodeMirror-merge-gap{width:0;display:none}.CodeMirror-merge-3pane .CodeMirror-merge-pane{width:31%}.CodeMirror-merge-3pane .CodeMirror-merge-gap{width:3.5%}.CodeMirror-merge-pane{display:inline-block;white-space:normal;vertical-align:top}.CodeMirror-merge-pane-rightmost{float:right}.CodeMirror-merge-gap{z-index:2;display:inline-block;height:100%;-moz-box-sizing:border-box;box-sizing:border-box;overflow:hidden;border-left:1px solid #ddd;border-right:1px solid #ddd;position:relative;background:#f8f8f8}.CodeMirror-merge-scrolllock-wrap{position:absolute;bottom:0;left:50%}.CodeMirror-merge-scrolllock{position:relative;left:-50%;cursor:pointer;color:#555;line-height:1;display:none}.CodeMirror-merge-copybuttons-left,.CodeMirror-merge-copybuttons-right{position:absolute;left:0;top:0;right:0;bottom:0;line-height:1}.CodeMirror-merge-copy{position:absolute;cursor:pointer;color:#44c;z-index:3}.CodeMirror-merge-copy-reverse{position:absolute;cursor:pointer;color:#44c}.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy{left:2px}.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy{right:2px}.CodeMirror-merge-l-inserted,.CodeMirror-merge-r-inserted{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);background-position:bottom left;background-repeat:repeat-x}.CodeMirror-merge-l-deleted,.CodeMirror-merge-r-deleted{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);background-position:bottom left;background-repeat:repeat-x}.CodeMirror-merge-r-chunk{background:#ffffe0}.CodeMirror-merge-r-chunk-start{border-top:1px solid #ee8}.CodeMirror-merge-r-chunk-end{border-bottom:1px solid #ee8}.CodeMirror-merge-r-connect{fill:#ffffe0;stroke:#ee8;stroke-width:1px}.CodeMirror-merge-l-chunk{background:#eef}.CodeMirror-merge-l-chunk-start{border-top:1px solid #88e}.CodeMirror-merge-l-chunk-end{border-bottom:1px solid #88e}.CodeMirror-merge-l-connect{fill:#eef;stroke:#88e;stroke-width:1px}.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk{background:#dfd}.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start{border-top:1px solid #4e4}.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end{border-bottom:1px solid #4e4}.CodeMirror-merge-collapsed-widget:before{content:"(...)"}.CodeMirror-merge-collapsed-widget{cursor:pointer;color:#88b;background:#eef;border:1px solid #ddf;font-size:90%;padding:0 3px;border-radius:4px}.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt{display:none}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}:-webkit-full-screen{background:#f9f9f5;padding:.5em 1em;width:100%;height:100%}:-moz-full-screen{padding:.5em 1em;background:#f9f9f5;width:100%;height:100%}.editor-wrapper{font:16px/1.62 "Helvetica Neue","Xin Gothic","Hiragino Sans GB","WenQuanYi Micro Hei","Microsoft YaHei",sans-serif;color:#2c3e50}.editor-toolbar{position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;border:1px solid #ccc;background-color:#fafafa;box-shadow:0 1px 2px rgba(0,0,0,.075) inset;border-bottom-width:0;border-radius:3px 3px 0 0}.editor-toolbar a,.editor-toolbar label{display:inline-block;text-align:center;text-decoration:none!important;font-size:16px;color:#666;width:23px;height:23px;margin:2px;border:1px solid transparent;border-radius:3px;cursor:pointer}.editor-toolbar a.active,.editor-toolbar a:hover,.editor-toolbar label.active,.editor-toolbar label:hover{background:#fcfcfc;border-color:#95a5a6;color:#777}.editor-toolbar a.active{color:#911;border-color:#911}.editor-toolbar a:before,.editor-toolbar label:before{line-height:24px}.editor-toolbar label.icon-upload{padding:0 1px;height:23px;width:21px;vertical-align:bottom;float:none}.editor-toolbar input{height:1px;margin-top:8px}.editor-toolbar form{display:inline}.editor-toolbar i.separator{display:inline-block;width:0;border-left:1px solid #d9d9d9;border-right:1px solid #fff;color:transparent;text-indent:-10px;margin:0 5px}.editor-toolbar a.icon-contract,.editor-toolbar a.icon-fullscreen{position:absolute;right:0}.editor-statusbar{border-top:1px solid #ece9e9;padding:8px 10px;font-size:12px;color:#959694;text-align:right}.editor-statusbar span{display:inline-block;min-width:4em;margin-left:1em}.editor-statusbar .lines:before{content:'lines: '}.editor-statusbar .words:before{content:'words: '}.editor-preview{position:absolute;width:100%;height:100%;top:1px;padding:0 4px;left:100%;background:#fdfdfd;z-index:10;overflow:auto;-webkit-transition:left .2s ease;-moz-transition:left .2s ease;-ms-transition:left .2s ease;transition:left .2s ease;box-sizing:border-box}.editor-preview-active{left:0}.editor-preview>p{margin-top:0}.CodeMirror-preview{background-color:#fff;width:50%;top:30px;border-left:1px solid #ccc;border-radius:0 0 3px;border-top:0;overflow:hidden;right:0;position:absolute;box-shadow:0 1px 2px rgba(0,0,0,.075) inset;padding:4px;box-sizing:border-box;overflow:auto} .CodeMirror{font-family:monospace;height:300px;color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror-lines pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror-lines pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}.CodeMirror-hints{position:absolute;z-index:100;overflow:hidden;list-style:none;margin:0;padding:2px;-webkit-box-shadow:2px 3px 5px rgba(0,0,0,.2);-moz-box-shadow:2px 3px 5px rgba(0,0,0,.2);box-shadow:2px 3px 5px rgba(0,0,0,.2);border-radius:3px;border:1px solid silver;background:#fff;font-size:90%;font-family:monospace;max-height:20em;overflow-y:auto}.CodeMirror-preview,.editor-toolbar{box-shadow:0 1px 2px rgba(0,0,0,.075) inset}.CodeMirror-hint{margin:0;padding:0 4px;border-radius:2px;max-width:19em;overflow:hidden;white-space:pre;color:#000;cursor:pointer}li.CodeMirror-hint-active{background:#08f;color:#fff}.CodeMirror-fullscreen{position:fixed;top:0;left:0;right:0;bottom:0;height:auto;z-index:9}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.CodeMirror-merge-2pane .CodeMirror-merge-pane{width:49%;border:1px solid #CCC;border-radius:3px}.CodeMirror-merge-2pane .CodeMirror-merge-gap{width:0;display:none}.CodeMirror-merge-3pane .CodeMirror-merge-pane{width:31%}.CodeMirror-merge-3pane .CodeMirror-merge-gap{width:3.5%}.CodeMirror-merge-pane{display:inline-block;white-space:normal;vertical-align:top}.CodeMirror-merge-pane-rightmost{float:right}.CodeMirror-merge-gap{z-index:2;display:inline-block;height:100%;-moz-box-sizing:border-box;box-sizing:border-box;overflow:hidden;border-left:1px solid #ddd;border-right:1px solid #ddd;position:relative;background:#f8f8f8}.CodeMirror-merge-scrolllock-wrap{position:absolute;bottom:0;left:50%}.CodeMirror-merge-scrolllock{position:relative;left:-50%;cursor:pointer;color:#555;line-height:1;display:none}.CodeMirror-merge-copy,.CodeMirror-merge-copy-reverse{position:absolute;color:#44c;cursor:pointer}.CodeMirror-merge-copybuttons-left,.CodeMirror-merge-copybuttons-right{position:absolute;left:0;top:0;right:0;bottom:0;line-height:1}.CodeMirror-merge-copy{z-index:3}.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy{left:2px}.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy{right:2px}.CodeMirror-merge-l-inserted,.CodeMirror-merge-r-inserted{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);background-position:bottom left;background-repeat:repeat-x}.CodeMirror-merge-l-deleted,.CodeMirror-merge-r-deleted{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);background-position:bottom left;background-repeat:repeat-x}.CodeMirror-merge-r-chunk{background:#ffffe0}.CodeMirror-merge-r-chunk-start{border-top:1px solid #ee8}.CodeMirror-merge-r-chunk-end{border-bottom:1px solid #ee8}.CodeMirror-merge-r-connect{fill:#ffffe0;stroke:#ee8;stroke-width:1px}.CodeMirror-merge-l-chunk{background:#eef}.CodeMirror-merge-l-chunk-start{border-top:1px solid #88e}.CodeMirror-merge-l-chunk-end{border-bottom:1px solid #88e}.CodeMirror-merge-l-connect{fill:#eef;stroke:#88e;stroke-width:1px}.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk{background:#dfd}.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start{border-top:1px solid #4e4}.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end{border-bottom:1px solid #4e4}.CodeMirror-merge-collapsed-widget:before{content:"(...)"}.CodeMirror-merge-collapsed-widget{cursor:pointer;color:#88b;background:#eef;border:1px solid #ddf;font-size:90%;padding:0 3px;border-radius:4px}.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt{display:none}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}:-webkit-full-screen{background:#f9f9f5;padding:.5em 1em;width:100%;height:100%}:-moz-full-screen{padding:.5em 1em;background:#f9f9f5;width:100%;height:100%}.editor-wrapper{font:16px/1.62 "Helvetica Neue","Xin Gothic","Hiragino Sans GB","WenQuanYi Micro Hei","Microsoft YaHei",sans-serif;color:#2c3e50}.editor-toolbar{position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;border:1px solid #CCC;background-color:#FAFAFA;border-bottom-width:0;border-radius:3px 3px 0 0;height:34px}.editor-toolbar a,.editor-toolbar label{text-decoration:none!important;font-size:16px;color:#666;padding:5px 10px;cursor:pointer;line-height:24px;display:inline-block;top:-1px}.editor-toolbar a.active,.editor-toolbar a.focus,.editor-toolbar a:hover,.editor-toolbar label.active,.editor-toolbar label:hover{background:#666;color:#fff}.editor-toolbar a:before,.editor-toolbar label:before{line-height:24px}.editor-toolbar label.icon-upload{margin:0;position:relative}.editor-toolbar input{height:1px;position:absolute;left:0;top:0;opacity:.001}.editor-toolbar form{overflow:hidden;display:initial}.CodeMirror-preview,.editor-preview{position:absolute;box-sizing:border-box;overflow:auto}.editor-toolbar i.separator{display:inline-block;width:0;border-left:1px solid #d9d9d9;border-right:1px solid #fff;color:transparent;text-indent:-10px;margin:0 5px}.editor-toolbar a.icon-contract,.editor-toolbar a.icon-fullscreen{position:absolute;right:0}.editor-statusbar{border-top:1px solid #ece9e9;padding:8px 10px;font-size:12px;color:#959694;text-align:right}.editor-statusbar span{display:inline-block;min-width:4em;margin-left:1em}.editor-statusbar .lines:before{content:'lines: '}.editor-statusbar .words:before{content:'words: '}.editor-preview{width:100%;height:100%;top:1px;padding:0 4px;left:100%;background:#FDFDFD;z-index:10;-webkit-transition:left .2s ease;-moz-transition:left .2s ease;-ms-transition:left .2s ease;transition:left .2s ease}.editor-preview-active{left:0}.editor-preview>p{margin-top:0}.CodeMirror-preview{background-color:#FFF;width:50%;top:30px;border-left:1px solid #ccc;border-radius:0 0 3px;border-top:0;right:0;padding:4px}
\ No newline at end of file \ No newline at end of file
src/main/webapp/js/lib/CodeMirrorEditor/editor.js
View file @ 714f52ba
...@@ -1042,24 +1042,35 @@ ...@@ -1042,24 +1042,35 @@
/** /**
* Create icon element for toolbar. * Create icon element for toolbar.
*/ */
function createIcon(name, options) { function createIcon(options) {
options = options || {}; if (options.name === 'image') {
if (name === 'image') {
return $(options.html)[0]; return $(options.html)[0];
} }
var ariaLabels = {
bold: Label.addBoldLabel + ' <ctrl+b>',
italic: Label.addItalicLabel + ' <ctrl+i>',
quote: Label.insertQuoteLabel + ' <ctrl+e>',
'unordered-list': Label.addBulletedLabel + ' <ctrl+l>',
'ordered-list': Label.addNumberedListLabel + ' <shift+ctrl+l>',
'link': Label.addLinkLabel + ' <ctrl+k>',
redo: Label.redoLabel + ' <shift+ctrl+z>',
undo: Label.undoLabel + ' <ctrl+z>',
preview: Label.previewLabel + ' <ctrl+d>',
question: Label.helpLabel,
fullscreen: Label.fullscreenLabel + ' <shift+ctrl+a>'
}
var el = document.createElement('a'); var el = document.createElement('a');
var shortcut = options.shortcut || shortcuts[name]; var label = ariaLabels[options.name]
if (shortcut) {
shortcut = fixShortcut(shortcut);
el.title = shortcut;
el.title = el.title.replace('Cmd', '⌘');
if (isMac) { if (isMac) {
el.title = el.title.replace('Alt', '⌥'); label = label.replace('cmd', '⌘').replace('shift', '⇧');
}
} }
el.className = options.className || 'icon-' + name; el.className = 'tooltipped tooltipped-n';
el.setAttribute('aria-label', label)
el.innerHTML = "<span class='icon-" + options.name + "'></span>"
return el; return el;
} }
...@@ -1111,8 +1122,8 @@ ...@@ -1111,8 +1122,8 @@
var cm = editor.codemirror, var cm = editor.codemirror,
wrap = editor.codemirror.getWrapperElement(); wrap = editor.codemirror.getWrapperElement();
if ('icon-fullscreen' === editor.toolbar.fullscreen.className) { if ('icon-fullscreen' === editor.toolbar.fullscreen.children[0].className) {
editor.toolbar.fullscreen.className = 'icon-contract'; editor.toolbar.fullscreen.children[0].className = 'icon-contract';
editor.toolbar.preview.style.display = 'none'; editor.toolbar.preview.style.display = 'none';
if (editor.toolbar.preview.className.indexOf('active') > -1) { if (editor.toolbar.preview.className.indexOf('active') > -1) {
editor.toolbar.preview.click(); editor.toolbar.preview.click();
...@@ -1150,7 +1161,7 @@ ...@@ -1150,7 +1161,7 @@
return false; return false;
} }
editor.toolbar.fullscreen.className = 'icon-fullscreen'; editor.toolbar.fullscreen.children[0].className = 'icon-fullscreen';
editor.toolbar.preview.style.display = 'inline'; editor.toolbar.preview.style.display = 'inline';
$(editor.element.parentElement).css({ $(editor.element.parentElement).css({
'position': 'inherit' 'position': 'inherit'
...@@ -1543,9 +1554,7 @@ ...@@ -1543,9 +1554,7 @@
for (var i = 0; i < items.length; i++) { for (var i = 0; i < items.length; i++) {
(function (item) { (function (item) {
var el; var el;
if (item.name) { if (item === '|') {
el = createIcon(item.name, item);
} else if (item === '|') {
el = createSep(); el = createSep();
} else { } else {
el = createIcon(item); el = createIcon(item);
......
src/main/webapp/js/lib/compress/admin-lib.min.js
View file @ 714f52ba
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment