Changes in [1717:9df047961e9c:1815:07b857f03655]

Location:

admin

Files:

• js/_post.js (modified) (3 diffs)
• post.php (modified) (2 diffs)
• style/default.css (modified) (1 diff)

admin/js/_post.js

@@ -90 +90 @@
                     $(this).val(last_post_format);
                }
+               
+               $('.format_control > *').addClass('hide');
+               if( $(this).val() == 'xhtml' ) {
+                    $('.control_xhtml > *').removeClass('hide');
+               } else if ( $(this).val() == 'wiki' ) {
+                    $('.control_wiki > *').removeClass('hide');
+               }
           });
 
@@ -117 +124 @@
                return window.confirm(dotclear.msg.confirm_delete_post);
           });
+
+          // Markup validator
+          var v = $('<div class="format_control control_xhtml"><p><a id="a-validator"></a></p><div/>').get(0);
+          $('.control_wiki').before(v);
+          var a = $('#a-validator').get(0);
+          a.href = '#';
+          a.className = 'button ';
+          $(a).click(function() {
+               
+               excerpt_content = $('#post_excerpt').css('display') != 'none' ? $('#post_excerpt').val() : $('#excerpt-area iframe').contents().find('body').html();
+               post_content    = $('#post_content').css('display') != 'none' ? $('#post_content').val() : $('#content-area iframe').contents().find('body').html();
+               
+               var params = {
+                    xd_check: dotclear.nonce,
+                    f: 'validatePostMarkup',
+                    excerpt: excerpt_content,
+                    content: post_content,
+                    format: $('#post_format').get(0).value,
+                    lang: $('#post_lang').get(0).value
+               };
+
+               $.post('services.php',params,function(data) {
+                    if ($(data).find('rsp').attr('status') != 'ok') {
+                         alert($(data).find('rsp message').text());
+                         return false;
+                    }
+
+                    if ($(data).find('valid').text() == 1) {
+                         var p = document.createElement('p');
+                         p.id = 'markup-validator';
+
+                         if ($('#markup-validator').length > 0) {
+                              $('#markup-validator').remove();
+                         }
+
+                         $(p).addClass('message');
+                         $(p).text(dotclear.msg.xhtml_valid);
+                         $('#entry-content h3').after(p);
+                         $(p).backgroundFade({sColor:'#666666',eColor:'#ffcc00',steps:50},function() {
+                                   $(this).backgroundFade({sColor:'#ffcc00',eColor:'#666666'});
+                         });
+                    } else {
+                         var div = document.createElement('div');
+                         div.id = 'markup-validator';
+
+                         if ($('#markup-validator').length > 0) {
+                              $('#markup-validator').remove();
+                         }
+
+                         $(div).addClass('error');
+                         $(div).html('<p><strong>' + dotclear.msg.xhtml_not_valid + '</strong></p>' + $(data).find('errors').text());
+                         $('#entry-content h3').after(div);
+                         $(div).backgroundFade({sColor:'#ffffff',eColor:'#FFBABA',steps:50},function() {
+                                   $(this).backgroundFade({sColor:'#ffbaba',eColor:'#ffffff'});
+                         });
+                    }
+
+                    return false;
+               });
+
+               return false;
+          });
+
+          a.appendChild(document.createTextNode(dotclear.msg.xhtml_validator));
+          
+          $('.format_control > *').addClass('hide');
+          if ( last_post_format == 'xhtml' ) {
+               $('.control_xhtml > *').removeClass('hide');
+          } else if ( last_post_format == 'wiki' ) {
+               $('.control_wiki > *').removeClass('hide');
+          }
 
           // Hide some fields
@@ -184 +262 @@
           });
 
-          // Markup validator
-          var h = document.createElement('h4');
-          var a = document.createElement('a');
-          a.href = '#';
-          a.className = 'button';
-          $(a).click(function() {
-               var params = {
-                    xd_check: dotclear.nonce,
-                    f: 'validatePostMarkup',
-                    excerpt: $('#post_excerpt').text(),
-                    content: $('#post_content').text(),
-                    format: $('#post_format').get(0).value,
-                    lang: $('#post_lang').get(0).value
-               };
-
-               $.post('services.php',params,function(data) {
-                    if ($(data).find('rsp').attr('status') != 'ok') {
-                         alert($(data).find('rsp message').text());
-                         return false;
-                    }
-
-                    if ($(data).find('valid').text() == 1) {
-                         var p = document.createElement('p');
-                         p.id = 'markup-validator';
-
-                         if ($('#markup-validator').length > 0) {
-                              $('#markup-validator').remove();
-                         }
-
-                         $(p).addClass('message');
-                         $(p).text(dotclear.msg.xhtml_valid);
-                         $(p).insertAfter(h);
-                         $(p).backgroundFade({sColor:'#666666',eColor:'#ffcc00',steps:50},function() {
-                                   $(this).backgroundFade({sColor:'#ffcc00',eColor:'#666666'});
-                         });
-                    } else {
-                         var div = document.createElement('div');
-                         div.id = 'markup-validator';
-
-                         if ($('#markup-validator').length > 0) {
-                              $('#markup-validator').remove();
-                         }
-
-                         $(div).addClass('error');
-                         $(div).html('<p><strong>' + dotclear.msg.xhtml_not_valid + '</strong></p>' + $(data).find('errors').text());
-                         $(div).insertAfter(h);
-                         $(div).backgroundFade({sColor:'#ffffff',eColor:'#FFBABA',steps:50},function() {
-                                   $(this).backgroundFade({sColor:'#ffbaba',eColor:'#ffffff'});
-                         });
-                    }
-
-                    return false;
-               });
-
-               return false;
-          });
-
-          a.appendChild(document.createTextNode(dotclear.msg.xhtml_validator));
-          h.appendChild(a);
-          $(h).appendTo('#entry-content');
-
           // Check unsaved changes before XHTML conversion
           var excerpt = $('#post_excerpt').val();

admin/post.php

@@ -445 +445 @@
                          '<p>'.form::combo('post_format',$formaters_combo,$post_format,'maximal').
                          '</p>'.
-                         '<p>'.($post_id && $post_format != 'xhtml' ? 
-                         '<a id="convert-xhtml" class="button maximal" href="post.php?id='.$post_id.'&amp;xconv=1">'.
-                         __('Convert to XHTML').'</a>' : '').'</p></div>')),
+                         '<p class="format_control control_wiki">'.
+                         '<a id="convert-xhtml" class="button maximal '.($post_id && $post_format != 'wiki' ? 'hide' : '').'" href="post.php?id='.$post_id.'&amp;xconv=1">'.
+                         __('Convert to XHTML').'</a></p></div>')),
           'metas-box' => array(
                'title' => __('Ordering'),
@@ -523 +523 @@
           
           "post_content" =>
-               '<p class="area"><label class="required" '.
+               '<p class="area" id="content-area"><label class="required" '.
                'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
                form::textarea('post_content',50,$core->auth->getOption('edit_size'),html::escapeHTML($post_content)).

admin/style/default.css

@@ -34 +34 @@
 a:hover, a:active, a:focus {
      text-decoration: underline;
+}
+a.hide, a.button.hide, a.submit.hide {
+     display: none;
 }
 a img, a:link img, a:visited img {