diff --git a/syntaxhighlighter_insert.module b/syntaxhighlighter_insert.module index 1c9e679..3893205 100644 --- a/syntaxhighlighter_insert.module +++ b/syntaxhighlighter_insert.module @@ -88,6 +88,7 @@ function syntaxhighlighter_insert_base_form(&$form, $name = 'wysiwyg') { ), '#options' => $lang_options, '#description' => t('Select the code language to highlight'), + '#prefix' => '
', ); $form["syntaxhighlighter_insert_{$type}_auto_links"] = array( @@ -136,6 +137,7 @@ function syntaxhighlighter_insert_base_form(&$form, $name = 'wysiwyg') { 'id' => array("syntaxhighlighter-insert-{$type}-toolbar-$name"), 'checked' => array('checked'), ), + '#suffix' => '
', ); $form["syntaxhighlighter_insert_{$type}_class_name"] = array( @@ -145,6 +147,7 @@ function syntaxhighlighter_insert_base_form(&$form, $name = 'wysiwyg') { '#attributes' => array( 'id' => array("syntaxhighlighter-insert-{$type}-class-name-$name"), ), + '#prefix' => '
', ); $form["syntaxhighlighter_insert_{$type}_first_line"] = array( @@ -174,8 +177,17 @@ function syntaxhighlighter_insert_base_form(&$form, $name = 'wysiwyg') { 'id' => array("syntaxhighlighter-insert-{$type}-tab-size-$name"), 'value' => array('4'), ), + '#suffix' => '
', ); + $form["syntaxhighlighter_insert_{$type}_texte_code"] = array( + '#type' => 'textarea', + '#title' => t('Code to insert'), + '#description' => t('Enter here the code to insert in your node.'), + '#attributes' => array( + 'id' => array("syntaxhighlighter-insert-{$type}-texte-code-$name"), + ), + ); $form["syntaxhighlighter_insert_{$type}_tag"] = array( '#type' => 'hidden', diff --git a/syntaxhighlighter_insert_wysiwyg/plugins/syntaxhighlighter_insert_wysiwyg/syntaxhighlighter_insert_wysiwyg.js b/syntaxhighlighter_insert_wysiwyg/plugins/syntaxhighlighter_insert_wysiwyg/syntaxhighlighter_insert_wysiwyg.js index bfeca0c..f0f566d 100644 --- a/syntaxhighlighter_insert_wysiwyg/plugins/syntaxhighlighter_insert_wysiwyg/syntaxhighlighter_insert_wysiwyg.js +++ b/syntaxhighlighter_insert_wysiwyg/plugins/syntaxhighlighter_insert_wysiwyg/syntaxhighlighter_insert_wysiwyg.js @@ -65,6 +65,7 @@ Drupal.wysiwyg.plugins.syntaxhighlighter_insert_wysiwyg = { var smarttabs = dialogdiv.contents().find('#' + field_id.replace('*field*', 'smart-tabs')).is(':checked'); var tabsize = dialogdiv.contents().find('#' + field_id.replace('*field*', 'tab-size')).val(); var toolbar = dialogdiv.contents().find('#' + field_id.replace('*field*', 'toolbar')).is(':checked'); + var message = dialogdiv.contents().find('#' + field_id.replace('*field*', 'texte-code')).val(); var wrapper = dialogdiv.contents().find('#' + field_id.replace('*field*', 'form-wrapper')); var content = '<' + tag + ' class="'; content += 'brush: ' + brush + '; '; @@ -79,7 +80,7 @@ Drupal.wysiwyg.plugins.syntaxhighlighter_insert_wysiwyg = { content += 'toolbar: ' + new Boolean(toolbar).toString() + '; '; content += 'codetag" '; if (title.length) content += 'title="' + title + '" '; - var message = Drupal.t('Type your code in the box. To create a new line within the box use SHIFT + ENTER.'); + //var message = Drupal.t('Type your code in the box. To create a new line within the box use SHIFT + ENTER.'); content += ' id="shinsert-current-tag"> ' + message + ' '; Drupal.wysiwyg.plugins.syntaxhighlighter_insert_wysiwyg.insertIntoEditor(content, editor_id); jQuery(this).dialog("close"); @@ -187,4 +188,4 @@ Drupal.wysiwyg.plugins.syntaxhighlighter_insert_wysiwyg = { return '<--syntaxhighlighter_insert_wysiwyg->'; } }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/syntaxhighlighter_insert_wysiwyg/syntaxhighlighter_insert_wysiwyg.css b/syntaxhighlighter_insert_wysiwyg/syntaxhighlighter_insert_wysiwyg.css index 988c548..2f3edf4 100644 --- a/syntaxhighlighter_insert_wysiwyg/syntaxhighlighter_insert_wysiwyg.css +++ b/syntaxhighlighter_insert_wysiwyg/syntaxhighlighter_insert_wysiwyg.css @@ -1,3 +1,14 @@ .jquery_ui_dialog-dialog { top: 90px !important; -} \ No newline at end of file +} +.syntaxhighlighter-insert-left { + float: left; + width: 50%; +} +.syntaxhighlighter-insert-right { + float: left; + width: 40%; +} +.form-item-syntaxhighlighter-insert-wysiwyg-texte-code { + clear: both; +}