commit 9f2d24ec8bade6e64a23af4a6e84475af4dc9eed
parent 12957b71748f30441f662989ce962abbd2744664
Author: Jan Dankert <devnull@localhost>
Date: Tue, 7 Nov 2017 00:52:38 +0100
Tlw. etwas BEM eingeführt.
Diffstat:
3 files changed, 6 insertions(+), 43 deletions(-)
diff --git a/themes/default/css/openrat.css.php b/themes/default/css/openrat.css.php
@@ -381,20 +381,6 @@ a:hover
}
-a.editorlink:active,
-a.editorlink:hover
-{
- font-weight:normal;
- text-decoration:none;
-}
-
-a.editorlink:link,
-a.editorlink:visited
-{
- font-weight:normal;
- text-decoration:none;
-}
-
/* Submenu-Entrys */
body.menu tr.menu td table tr td,
@@ -612,10 +598,6 @@ table.calendar td
border: 1px dotted;
}
-textarea.editor
-{
- width:100%;
-}
label,
.clickable
@@ -1939,16 +1921,3 @@ div.line.filedropzone > div.input
border:1px dotted <?php echo $_GET['text_color']; ?>;
}
-/* ACE-Editor */
-textarea.code-editor {
- display:none; /* Textarea nicht anzeigen, da durch Editor ersetzt */
-}
-div.code-editor
-{
- position: absolute;
- height: 500px;
- width: 100%;
- //background: red!important;
- font-size:14px;
- z-index: 256;
-}-
\ No newline at end of file
diff --git a/themes/default/include/html/editor/editor-begin.inc.php b/themes/default/include/html/editor/editor-begin.inc.php
@@ -56,32 +56,27 @@ switch( $attr_type )
{
case 'fckeditor':
case 'html':
- echo '<textarea name="'.$attr_name.'" class="editor htmleditor" id="pageelement_edit_editor">'.$$attr_name.'</textarea>';
+ echo '<textarea name="'.$attr_name.'" class="editor__html-editor" id="pageelement_edit_editor">'.$$attr_name.'</textarea>';
break;
case 'wiki':
$conf_tags = $conf['editor']['text-markup'];
- ?><textarea name="<?php echo $attr_name ?>" class="editor wikieditor"><?php echo $$attr_name ?></textarea><?php
+ ?><textarea name="<?php echo $attr_name ?>" class="editor__wiki-editor"><?php echo $$attr_name ?></textarea><?php
break;
case 'text':
case 'raw':
if ( $this->isEditMode() )
- echo '<textarea name="'.$attr_name.'" class="editor" style="width:100%;height:300px;">'.$$attr_name.'</textarea>';
+ echo '<textarea name="'.$attr_name.'" class="editor__text-editor">'.$$attr_name.'</textarea>';
else
echo nl2br($$attr_name);
break;
case 'ace':
case 'code':
-// echo '<div class="ace-editor editor">';
-// echo '<textarea style="display:none" name="'.$attr_name.'" class="editor" style="width:100%;height:300px;">'.$$attr_name.'</textarea>';
-// echo '<div class="ace-editor"textarea name="'.$attr_name.'_ace"></div>';
-// echo '<textarea name="'.$attr_name.'" class="editor ace-editor" style="width:100%;height:300px;">'.$$attr_name.'</textarea>';
- echo '<textarea name="'.$attr_name.'" data-mode="'.$attr_mode.'" class="code-editor">'.$$attr_name.'</textarea>';
-// echo '</div>';
+ echo '<textarea name="'.$attr_name.'" data-mode="'.$attr_mode.'" class="editor__code-editor">'.$$attr_name.'</textarea>';
break;
diff --git a/themes/default/include/html/editor/editor.js b/themes/default/include/html/editor/editor.js
@@ -58,9 +58,9 @@ $(document).on('orViewLoaded',function(event, data) {
// ACE-Editor anzeigen
- $(event.target).find("textarea.code-editor").each( function() {
+ $(event.target).find("textarea.editor__code-editor").each( function() {
var textareaEl = $(this);
- var aceEl = $("<div class=\"code-editor\" />").insertAfter(textareaEl);
+ var aceEl = $("<div class=\"editor__code-editor\" />").insertAfter(textareaEl);
var editor = ace.edit( aceEl.get(0) );
var mode = textareaEl.data('mode');