Changeset 329:0ff0593a8882 for inc

Timestamp:

06/03/11 11:48:02 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Popup media now works for images, mp3 and other extensions except flv

Location:

inc/admin

Files:

• class.dc.toolbar.php (modified) (1 diff)
• lib.dc.page.php (modified) (4 diffs)

inc/admin/class.dc.toolbar.php

@@ -76 +76 @@
           $res = "dcToolBar = new dcToolBar();\n";
           
+          $this->core->callBehavior('adminToolbar',$this);
+          
           foreach ($this->toolbars as $formatter => $options) {
                $s = $options['settings'];

inc/admin/lib.dc.page.php

@@ -565 +565 @@
                'convert_newlines_to_brs' => 'true',
                'paste_auto_cleanup_on_paste' => 'true',
-               'formats' => '{underline: {inline: "ins"},strikethrough: {inline: "del"},inlinecode: {inline: "code"},quote: {inline: "q"}}',
-               'post_url_pattern' => $GLOBALS['core']->blog->getQMarkURL().$GLOBALS['core']->url->getBase('post')
+               'formats' => '{underline: {inline: "ins"},strikethrough: {inline: "del"},inlinecode: {inline: "code"},quote: {inline: "q"}}'
           ));
           $tb->addPlugins('xhtml',array(
@@ -572 +571 @@
                'paste' => true,
                'searchreplace' => true,
-               'dcControls' => true,
-               'dcTags' => false
+               'dcControls' => true
           ));
           $tb->addButtons('xhtml',array(
@@ -618 +616 @@
                3 => array(
                     'link',
-                    'postlink',
-                    'medialink',
-                    'separator',
                     'unlink',
+                    'separator',
+                    'media',
                     'separator',
                     'hr',
@@ -656 +653 @@
                'paste' => true,
                'searchreplace' => true,
-               'dcControls' => true,
-               'dcTags' => false
+               'dcControls' => true
           ));
           $tb->addButtons('wiki',array(