Changeset 1812:39cc57b045d6

Timestamp:

08/31/13 15:07:38 (11 years ago)

Author:

Lepeltier kévin

Branch:

Ticket #1539

Message:

Ticket #1539: Si wiki est choisi, affichage du bouton "Convertir en xhtml"
Si xhtml est choisi, affichage du bouton "Vérifier la validité xhtml"

Location:

admin

Files:

• js/_post.js (modified) (5 diffs)
• post.php (modified) (1 diff)
• 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');
+               }
           });
 
@@ -118 +125 @@
           });
 
-          // Hide some fields
-          $('#notes-area label').toggleWithLegend($('#notes-area').children().not('label'),{
-               cookie: 'dcx_post_notes',
-               legend_click:true,
-               hide: $('#post_notes').val() == ''
-          });
-          $('#create_cat').toggleWithLegend($('#create_cat').parent().children().not('#create_cat'),{
-               // no cookie on new category as we don't use this every day
-               legend_click: true
-          });
-          $('#post_lang').parent().children('label').toggleWithLegend($('#post_lang'),{
-               cookie: 'dcx_post_lang',
-               legend_click: true
-          });
-          $('#post_password').parent().children('label').toggleWithLegend($('#post_password'),{
-               cookie: 'dcx_post_password',
-               legend_click: true,
-               hide: $('#post_password').val() == ''
-          });
-          $('#post_status').parent().children('label').toggleWithLegend($('#post_status'),{
-               cookie: 'dcx_post_status',
-               legend_click: true
-          });
-          $('#post_dt').parent().children('label').toggleWithLegend($('#post_dt').parent().children().not('label'),{
-               cookie: 'dcx_post_dt',
-               legend_click: true
-          });
-          $('#label_format').toggleWithLegend($('#label_format').parent().children().not('#label_format'),{
-               cookie: 'dcx_post_format',
-               legend_click: true
-          });
-          $('#cat_id').parent().children('label').toggleWithLegend($('#cat_id'),{
-               cookie: 'cat_id',
-               legend_click: true
-          });
-          $('#post_url').parent().children('label').toggleWithLegend($('#post_url').parent().children().not('label'),{
-               cookie: 'post_url',
-               legend_click: true
-          });
-          // We load toolbar on excerpt only when it's ready
-          $('#excerpt-area label').toggleWithLegend($('#excerpt-area').children().not('label'),{
-               cookie: 'dcx_post_excerpt',
-               legend_click: true,
-               hide: $('#post_excerpt').val() == ''
-          });
-
-          // Load toolbars
-          contentTb.switchMode(formatField.value);
-          excerptTb.switchMode(formatField.value);
-
-          // Replace attachment remove links by a POST form submit
-          $('a.attachment-remove').click(function() {
-               this.href = '';
-               var m_name = $(this).parents('ul').find('li:first>a').attr('title');
-               if (window.confirm(dotclear.msg.confirm_remove_attachment.replace('%s',m_name))) {
-                    var f = $('#attachment-remove-hide').get(0);
-                    f.elements['media_id'].value = this.id.substring(11);
-                    f.submit();
-               }
-               return false;
-          });
-
           // Markup validator
-          var h = document.createElement('h4');
-          var a = document.createElement('a');
+          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.className = 'button ';
           $(a).click(function() {
                var params = {
@@ -211 +157 @@
                          $(p).addClass('message');
                          $(p).text(dotclear.msg.xhtml_valid);
-                         $(p).insertAfter(h);
+                         $(v).append(p);
                          $(p).backgroundFade({sColor:'#666666',eColor:'#ffcc00',steps:50},function() {
                                    $(this).backgroundFade({sColor:'#ffcc00',eColor:'#666666'});
@@ -225 +171 @@
                          $(div).addClass('error');
                          $(div).html('<p><strong>' + dotclear.msg.xhtml_not_valid + '</strong></p>' + $(data).find('errors').text());
-                         $(div).insertAfter(h);
+                         $(v).append(div);
                          $(div).backgroundFade({sColor:'#ffffff',eColor:'#FFBABA',steps:50},function() {
                                    $(this).backgroundFade({sColor:'#ffbaba',eColor:'#ffffff'});
@@ -238 +184 @@
 
           a.appendChild(document.createTextNode(dotclear.msg.xhtml_validator));
-          h.appendChild(a);
-          $(h).appendTo('#entry-content');
+          
+          $('.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
+          $('#notes-area label').toggleWithLegend($('#notes-area').children().not('label'),{
+               cookie: 'dcx_post_notes',
+               legend_click:true,
+               hide: $('#post_notes').val() == ''
+          });
+          $('#create_cat').toggleWithLegend($('#create_cat').parent().children().not('#create_cat'),{
+               // no cookie on new category as we don't use this every day
+               legend_click: true
+          });
+          $('#post_lang').parent().children('label').toggleWithLegend($('#post_lang'),{
+               cookie: 'dcx_post_lang',
+               legend_click: true
+          });
+          $('#post_password').parent().children('label').toggleWithLegend($('#post_password'),{
+               cookie: 'dcx_post_password',
+               legend_click: true,
+               hide: $('#post_password').val() == ''
+          });
+          $('#post_status').parent().children('label').toggleWithLegend($('#post_status'),{
+               cookie: 'dcx_post_status',
+               legend_click: true
+          });
+          $('#post_dt').parent().children('label').toggleWithLegend($('#post_dt').parent().children().not('label'),{
+               cookie: 'dcx_post_dt',
+               legend_click: true
+          });
+          $('#label_format').toggleWithLegend($('#label_format').parent().children().not('#label_format'),{
+               cookie: 'dcx_post_format',
+               legend_click: true
+          });
+          $('#cat_id').parent().children('label').toggleWithLegend($('#cat_id'),{
+               cookie: 'cat_id',
+               legend_click: true
+          });
+          $('#post_url').parent().children('label').toggleWithLegend($('#post_url').parent().children().not('label'),{
+               cookie: 'post_url',
+               legend_click: true
+          });
+          // We load toolbar on excerpt only when it's ready
+          $('#excerpt-area label').toggleWithLegend($('#excerpt-area').children().not('label'),{
+               cookie: 'dcx_post_excerpt',
+               legend_click: true,
+               hide: $('#post_excerpt').val() == ''
+          });
+
+          // Load toolbars
+          contentTb.switchMode(formatField.value);
+          excerptTb.switchMode(formatField.value);
+
+          // Replace attachment remove links by a POST form submit
+          $('a.attachment-remove').click(function() {
+               this.href = '';
+               var m_name = $(this).parents('ul').find('li:first>a').attr('title');
+               if (window.confirm(dotclear.msg.confirm_remove_attachment.replace('%s',m_name))) {
+                    var f = $('#attachment-remove-hide').get(0);
+                    f.elements['media_id'].value = this.id.substring(11);
+                    f.submit();
+               }
+               return false;
+          });
 
           // Check unsaved changes before XHTML conversion

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'),

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 {