Changeset 411:7735865d1ac0

Timestamp:

06/23/11 14:34:44 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Improved editor popups/display/CSS

Files:

• admin/js/tiny_mce/plugins/dcControls/editor_plugin.js (modified) (2 diffs)
• admin/js/tiny_mce/plugins/dcControls/js/popup_web_media.js (modified) (4 diffs)
• admin/js/tiny_mce/themes/advanced/skins/dotclear/dialog.css (modified) (2 diffs)
• admin/media_item.php (modified) (1 diff)
• admin/popup_link.php (modified) (1 diff)
• admin/popup_web_media.php (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (3 diffs)

admin/js/tiny_mce/plugins/dcControls/editor_plugin.js

@@ -38 +38 @@
                          height: 500,
                          inline: 1,
-                         popup_css : false,
                          dc_popup: '',
                          alwaysRaised: 'yes',
@@ -57 +56 @@
                          height: 500,
                          inline: 1,
-                         popup_css : false,
                          dc_popup: '',
                          alwaysRaised: 'yes',

admin/js/tiny_mce/plugins/dcControls/js/popup_web_media.js

@@ -7 +7 @@
           onProviderNotFound: function(url) {
                $('#src').removeClass().addClass('error');
-               alert('Provider not supported');
+               alert(tinyMCEPopup.editor.getLang('dcControls_dlg.provider_not_supported'));
           },
           beforeEmbed: function(data) {
                if (data.type == 'error') {
                     $('#src').removeClass().addClass('error');
+                    $('a.insert').hide();
                } else {
                     $('#src').removeClass().addClass('success');
+                    $('a.insert').show();
                }
           },
@@ -42 +44 @@
           onError: function(xhr,status,error) {
                $('#src').removeClass().addClass('error');
+               alert(tinyMCEPopup.editor.getLang('dcControl_dlg.webmedia_no_information'));
           }
      },
      
      init: function() {
+          $('a.insert').hide();
+          
           $('#src').focusin(function(e) {
                $(this).removeClass();
@@ -59 +64 @@
                     return;
                }
+               
+               $('a.insert').hide();
                
                $('div.two-cols').slideUp();
@@ -126 +133 @@
                     tinyMCEPopup.close();
                } else {
-                    alert('Provide a valid media');
+                    alert(tinyMCEPopup.editor.getLang('dcControls_dlg.no_media_loaded'));
                }
           });

admin/js/tiny_mce/themes/advanced/skins/dotclear/dialog.css

@@ -7 +7 @@
 }
 
+/* Buttons */
+a.button { margin-right: 5px; }
+a.insert { font-weight: bold; }
 /* Web media */
 #src {
@@ -21 +24 @@
      background: #99ff99 url(img/tick.png) no-repeat 7px center;
 }
+
 
 /* Browse */

admin/media_item.php

@@ -306 +306 @@
      
      echo
-     '<p><a id="media-insert-cancel" class="button" href="#">'.__('Cancel').'</a> - '.
-     '<strong><a id="media-insert-ok" class="button" href="#">'.__('Insert').'</a></strong>'.
+     '<p><a id="media-insert-cancel" class="button cancel" href="#">'.__('cancel').'</a>'.
+     '<a id="media-insert-ok" class="button insert" href="#">'.__('insert').'</a>'.
      form::hidden(array('type'),html::escapeHTML($media_type)).
      form::hidden(array('title'),html::escapeHTML($file->media_title)).

admin/popup_link.php

@@ -64 +64 @@
 form::combo('hreflang',$lang_combo,$hreflang).
 '</label></p>'.
-'<p><a class="button reset" href="#" id="link-insert-cancel">'.__('cancel').'</a> - '.
-'<strong><a class="button" href="#" id="link-insert-ok">'.__('insert').'</a></strong></p>'."\n".
+'<p><a class="button cancel" href="#" id="link-insert-cancel">'.__('cancel').'</a>'.
+'<a class="button insert" href="#" id="link-insert-ok">'.__('insert').'</a></p>'."\n".
 
 '<div id="div-entries">'.

admin/popup_web_media.php

@@ -36 +36 @@
 '<h2>'.__('Add a web media').'</h2>'.
 
+'<p class="error" style="display: none;"></p>'.
 '<form id="video-insert-form" action="#" method="get">'.
 '<p><label class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Source URL:').'</label>'.
 form::field('src',65,512,'').'&nbsp;'.
-'<a class="button" href="#" id="webmedia-insert-search">'.__('search').'</a> - '.
-'<strong><a class="button" href="#" id="webmedia-insert-ok">'.__('insert').'</a></strong> - '.
-'<a class="button reset" href="#" id="webmedia-insert-cancel">'.__('cancel').'</a></p>'.
+'<a class="button" href="#" id="webmedia-insert-search">'.__('preview').'</a>'.
+'<a class="button insert" href="#" id="webmedia-insert-ok">'.__('insert').'</a>'.
+'<a class="button cancel" href="#" id="webmedia-insert-cancel">'.__('cancel').'</a></p>'.
 
 '<div class="two-cols" style="display:none;"><div class="col">'.

inc/admin/lib.dc.page.php

@@ -616 +616 @@
                     'link',
                     'unlink',
+                    'anchor',
                     'separator',
                     'media',
@@ -803 +804 @@
           $tb->addI18n('fullscreen',array('desc' => __('Toggle fullscreen mode')));
           $tb->addI18n('aria',array('rich_text_area' => __('Rich Text Area')));
-          
           $tb->addI18n('dcControls',array(
                'inlinecode_desc' => __('Code'),
@@ -810 +810 @@
                'media_desc' => __('Add media from media manager'),
                'webmedia_desc' => __('Add media from web')
+          ));
+          $tb->addI18n('dcControls_dlg',array(
+               'provider_not_supported' => __('Provider not supported.'),
+               'webmedia_no_information' => __('Impossible to get media information. Please, try again later.'),
+               'no_media_loaded' => __('No media loaded. Please, load one beore inserting.')
           ));