1.1.1

martec · Dec 28, 2020 · da74239 · da74239
1 parent e8cd0c7
commit da74239
Show file tree

Hide file tree

Showing 145 changed files with 7,117 additions and 1,065 deletions.
diff --git a/inc/plugins/rineditor.php b/inc/plugins/rineditor.php
@@ -20,7 +20,7 @@
 	die("Direct initialization of this file is not allowed.<br /><br />Please make sure IN_MYBB is defined.");
 }
 
-define('RE_PLUGIN_VER', '1.1.0');
+define('RE_PLUGIN_VER', '1.1.1');
 
 function rineditor_info()
 {
@@ -618,6 +618,8 @@ function rineditor_inserter_quick($smilies = true)
 		"rineditor_restore" => "Restore",
 		"rineditor_uploading" => "Uploading",
 		"rineditor_fail" => "Fail",
+		"wrote" => "Wrote",
+		"quote" => "Quote"
 	);
 	$editor_language = "RinEditor = {\n";
 

diff --git a/jscripts/rin/editor/ckeditor.js b/jscripts/rin/editor/ckeditor.js
diff --git a/jscripts/rin/editor/contents.css b/jscripts/rin/editor/contents.css
@@ -38,22 +38,47 @@ blockquote {
 	border-radius: 6px;
 }
 
+pre {
+	background: white;
+	margin: .25em .05em 0 0;
+	border: 1px solid #ccc;
+	padding: 10px;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
 blockquote:before {
 	font-weight: bold;
 	font-style: normal;
-	content: attr(data-cite);
+	content: attr(data-show);
 	display: block;
 	font-size: 1em;
 	border-bottom: 1px solid #ccc;
 	margin-bottom: 10px;
 	padding-bottom: 3px;
 }
 
+pre:before {
+	font-weight: bold;
+	content: 'Code:';
+	display: block;
+	border-bottom: 1px solid #ccc;
+	padding: 4px 0 3px 0;
+	margin-bottom: 10px;
+}
+
 blockquote:before:-moz-only-whitespace {
 	display: none;
 }
 
-blockquote[data-cite='codeblock']:before, blockquote[data-cite='phpcodeblock']:before {
+pre:before:-moz-only-whitespace {
+	display: none;
+}
+
+pre[data-cite='codeblock']:before, pre[data-cite='phpcodeblock']:before {
 	font-weight: bold;
 	content: 'Code:';
 	display: block;
@@ -62,12 +87,12 @@ blockquote[data-cite='codeblock']:before, blockquote[data-cite='phpcodeblock']:b
 	margin-bottom: 10px;
 }
 
-blockquote[data-cite='phpcodeblock']:before {
+pre[data-cite='phpcodeblock']:before {
 	content: 'PHP Code:' !important;
 	color: #333 !important;
 }
 
-blockquote[data-cite='codeblock'], blockquote[data-cite='phpcodeblock'] {
+pre[data-cite='codeblock'], pre[data-cite='phpcodeblock'] {
 	font-family: Monaco, Consolas, Courier, monospace;
 	font-size: 13px !important;
 	padding: 10px;
@@ -85,6 +110,10 @@ blockquote[data-cite='phpcodeblock'] {
 	color: #0000BB;
 }
 
+pre[data-cite='phpcodeblock'] {
+	color: #0000BB;
+}
+
 a
 {
 	color: #0782C1;
@@ -126,14 +155,6 @@ img.left
 	padding: 5px;
 }
 
-pre
-{
-	white-space: pre-wrap; /* CSS 2.1 */
-	word-wrap: break-word; /* IE7 */
-	-moz-tab-size: 4;
-	tab-size: 4;
-}
-
 .marker
 {
 	background-color: Yellow;

diff --git a/jscripts/rin/editor/contents_black.css b/jscripts/rin/editor/contents_black.css
@@ -45,22 +45,49 @@ blockquote {
 	border-radius: 6px;
 }
 
+pre {
+	background: white;
+	margin: .25em .05em 0 0;
+	border: 1px solid #ccc;
+	padding: 10px;
+	background-color: #171717;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
 blockquote:before {
 	font-weight: bold;
 	font-style: normal;
-	content: attr(data-cite);
+	content: attr(data-show);
 	display: block;
 	font-size: 1em;
 	border-bottom: 1px solid #ccc;
 	margin-bottom: 10px;
 	padding-bottom: 3px;
 }
 
+pre:before {
+	font-weight: bold;
+	content: 'Code:';
+	display: block;
+	border-bottom: 1px solid #ccc;
+	padding: 4px 0 3px 0;
+	color: #eeeeee !important;
+	margin-bottom: 10px;
+}
+
 blockquote:before:-moz-only-whitespace {
 	display: none;
 }
 
-blockquote[data-cite='codeblock']:before, blockquote[data-cite='phpcodeblock']:before {
+pre:before:-moz-only-whitespace {
+	display: none;
+}
+
+pre[data-cite='codeblock']:before, pre[data-cite='phpcodeblock']:before {
 	font-weight: bold;
 	content: 'Code:';
 	display: block;
@@ -70,11 +97,11 @@ blockquote[data-cite='codeblock']:before, blockquote[data-cite='phpcodeblock']:b
 	margin-bottom: 10px;
 }
 
-blockquote[data-cite='phpcodeblock']:before {
+pre[data-cite='phpcodeblock']:before {
 	content: 'PHP Code:' !important;
 }
 
-blockquote[data-cite='codeblock'], blockquote[data-cite='phpcodeblock'] {
+pre[data-cite='codeblock'], pre[data-cite='phpcodeblock'] {
 	font-family: Monaco, Consolas, Courier, monospace;
 	font-size: 13px !important;
 	padding: 10px;

diff --git a/jscripts/rin/editor/lang/af.js b/jscripts/rin/editor/lang/af.js
diff --git a/jscripts/rin/editor/lang/ar.js b/jscripts/rin/editor/lang/ar.js
diff --git a/jscripts/rin/editor/lang/az.js b/jscripts/rin/editor/lang/az.js
diff --git a/jscripts/rin/editor/lang/bg.js b/jscripts/rin/editor/lang/bg.js
diff --git a/jscripts/rin/editor/lang/bn.js b/jscripts/rin/editor/lang/bn.js
diff --git a/jscripts/rin/editor/lang/bs.js b/jscripts/rin/editor/lang/bs.js
diff --git a/jscripts/rin/editor/lang/ca.js b/jscripts/rin/editor/lang/ca.js
diff --git a/jscripts/rin/editor/lang/cs.js b/jscripts/rin/editor/lang/cs.js
diff --git a/jscripts/rin/editor/lang/cy.js b/jscripts/rin/editor/lang/cy.js
diff --git a/jscripts/rin/editor/lang/da.js b/jscripts/rin/editor/lang/da.js
diff --git a/jscripts/rin/editor/lang/de-ch.js b/jscripts/rin/editor/lang/de-ch.js
diff --git a/jscripts/rin/editor/lang/de.js b/jscripts/rin/editor/lang/de.js
diff --git a/jscripts/rin/editor/lang/el.js b/jscripts/rin/editor/lang/el.js
diff --git a/jscripts/rin/editor/lang/en-au.js b/jscripts/rin/editor/lang/en-au.js
diff --git a/jscripts/rin/editor/lang/en-ca.js b/jscripts/rin/editor/lang/en-ca.js
diff --git a/jscripts/rin/editor/lang/en-gb.js b/jscripts/rin/editor/lang/en-gb.js
diff --git a/jscripts/rin/editor/lang/en.js b/jscripts/rin/editor/lang/en.js
diff --git a/jscripts/rin/editor/lang/eo.js b/jscripts/rin/editor/lang/eo.js
diff --git a/jscripts/rin/editor/lang/es-mx.js b/jscripts/rin/editor/lang/es-mx.js
diff --git a/jscripts/rin/editor/lang/es.js b/jscripts/rin/editor/lang/es.js
diff --git a/jscripts/rin/editor/lang/et.js b/jscripts/rin/editor/lang/et.js
diff --git a/jscripts/rin/editor/lang/eu.js b/jscripts/rin/editor/lang/eu.js
diff --git a/jscripts/rin/editor/lang/fa.js b/jscripts/rin/editor/lang/fa.js
diff --git a/jscripts/rin/editor/lang/fi.js b/jscripts/rin/editor/lang/fi.js
diff --git a/jscripts/rin/editor/lang/fo.js b/jscripts/rin/editor/lang/fo.js
diff --git a/jscripts/rin/editor/lang/fr-ca.js b/jscripts/rin/editor/lang/fr-ca.js
diff --git a/jscripts/rin/editor/lang/fr.js b/jscripts/rin/editor/lang/fr.js
diff --git a/jscripts/rin/editor/lang/gl.js b/jscripts/rin/editor/lang/gl.js
diff --git a/jscripts/rin/editor/lang/gu.js b/jscripts/rin/editor/lang/gu.js
diff --git a/jscripts/rin/editor/lang/he.js b/jscripts/rin/editor/lang/he.js
diff --git a/jscripts/rin/editor/lang/hi.js b/jscripts/rin/editor/lang/hi.js
diff --git a/jscripts/rin/editor/lang/hr.js b/jscripts/rin/editor/lang/hr.js
diff --git a/jscripts/rin/editor/lang/hu.js b/jscripts/rin/editor/lang/hu.js
diff --git a/jscripts/rin/editor/lang/id.js b/jscripts/rin/editor/lang/id.js
diff --git a/jscripts/rin/editor/lang/is.js b/jscripts/rin/editor/lang/is.js
diff --git a/jscripts/rin/editor/lang/it.js b/jscripts/rin/editor/lang/it.js
diff --git a/jscripts/rin/editor/lang/ja.js b/jscripts/rin/editor/lang/ja.js
diff --git a/jscripts/rin/editor/lang/ka.js b/jscripts/rin/editor/lang/ka.js
diff --git a/jscripts/rin/editor/lang/km.js b/jscripts/rin/editor/lang/km.js
diff --git a/jscripts/rin/editor/lang/ko.js b/jscripts/rin/editor/lang/ko.js
diff --git a/jscripts/rin/editor/lang/ku.js b/jscripts/rin/editor/lang/ku.js
diff --git a/jscripts/rin/editor/lang/lt.js b/jscripts/rin/editor/lang/lt.js
diff --git a/jscripts/rin/editor/lang/lv.js b/jscripts/rin/editor/lang/lv.js
diff --git a/jscripts/rin/editor/lang/mk.js b/jscripts/rin/editor/lang/mk.js
diff --git a/jscripts/rin/editor/lang/mn.js b/jscripts/rin/editor/lang/mn.js
diff --git a/jscripts/rin/editor/lang/ms.js b/jscripts/rin/editor/lang/ms.js
diff --git a/jscripts/rin/editor/lang/nb.js b/jscripts/rin/editor/lang/nb.js
diff --git a/jscripts/rin/editor/lang/nl.js b/jscripts/rin/editor/lang/nl.js
diff --git a/jscripts/rin/editor/lang/no.js b/jscripts/rin/editor/lang/no.js
diff --git a/jscripts/rin/editor/lang/oc.js b/jscripts/rin/editor/lang/oc.js
diff --git a/jscripts/rin/editor/lang/pl.js b/jscripts/rin/editor/lang/pl.js
diff --git a/jscripts/rin/editor/lang/pt-br.js b/jscripts/rin/editor/lang/pt-br.js
diff --git a/jscripts/rin/editor/lang/pt.js b/jscripts/rin/editor/lang/pt.js
diff --git a/jscripts/rin/editor/lang/ro.js b/jscripts/rin/editor/lang/ro.js
diff --git a/jscripts/rin/editor/lang/ru.js b/jscripts/rin/editor/lang/ru.js
diff --git a/jscripts/rin/editor/lang/si.js b/jscripts/rin/editor/lang/si.js
diff --git a/jscripts/rin/editor/lang/sk.js b/jscripts/rin/editor/lang/sk.js
diff --git a/jscripts/rin/editor/lang/sl.js b/jscripts/rin/editor/lang/sl.js
diff --git a/jscripts/rin/editor/lang/sq.js b/jscripts/rin/editor/lang/sq.js
diff --git a/jscripts/rin/editor/lang/sr-latn.js b/jscripts/rin/editor/lang/sr-latn.js
diff --git a/jscripts/rin/editor/lang/sr.js b/jscripts/rin/editor/lang/sr.js
diff --git a/jscripts/rin/editor/lang/sv.js b/jscripts/rin/editor/lang/sv.js
diff --git a/jscripts/rin/editor/lang/th.js b/jscripts/rin/editor/lang/th.js
diff --git a/jscripts/rin/editor/lang/tr.js b/jscripts/rin/editor/lang/tr.js
diff --git a/jscripts/rin/editor/lang/tt.js b/jscripts/rin/editor/lang/tt.js
diff --git a/jscripts/rin/editor/lang/ug.js b/jscripts/rin/editor/lang/ug.js
diff --git a/jscripts/rin/editor/lang/uk.js b/jscripts/rin/editor/lang/uk.js
diff --git a/jscripts/rin/editor/lang/vi.js b/jscripts/rin/editor/lang/vi.js
diff --git a/jscripts/rin/editor/lang/zh-cn.js b/jscripts/rin/editor/lang/zh-cn.js
diff --git a/jscripts/rin/editor/lang/zh.js b/jscripts/rin/editor/lang/zh.js
diff --git a/jscripts/rin/editor/plugins/codesnippet/dialogs/codesnippet.js b/jscripts/rin/editor/plugins/codesnippet/dialogs/codesnippet.js