Changeset 1830:93aca6ba0163

Timestamp:

09/11/13 13:32:50 (12 years ago)

Author:

kevin@…

Branch:

Ticket #1539

Message:

Ticket #1539 : Supression des messages systèmes, type succes pour un contenu valide.

Location:

admin

Files:

• js/_post.js (modified) (5 diffs)
• post.php (modified) (1 diff)

admin/js/_post.js

@@ -92 +92 @@
                
                $('.format_control > *').addClass('hide');
-               if( $(this).val() == 'xhtml' ) {
-                    $('.control_xhtml > *').removeClass('hide');
-               } else if ( $(this).val() == 'wiki' ) {
-                    $('.control_wiki > *').removeClass('hide');
-               }
+               $('.format_control:not(.control_no_'+$(this).val()+') > *').removeClass('hide');
           });
 
@@ -126 +122 @@
 
           // Markup validator
-          var v = $('<div class="format_control control_xhtml control_wiki"><p><a id="a-validator"></a></p><div/>').get(0);
-          $('.control_wiki').before(v);
+          var v = $('<div class="format_control"><p><a id="a-validator"></a></p><div/>').get(0);
+          $('.format_control').before(v);
           var a = $('#a-validator').get(0);
           a.href = '#';
@@ -158 +154 @@
                               $('#markup-validator').remove();
                          }
-
-                         $(p).addClass('message');
+                         
+                         $('.message, .success, .error').remove();
+                         $(p).addClass('success');
                          $(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'});
-                         });
+                         $(p).backgroundFade({sColor:'#9BCA1C',eColor:'#bee74b',steps:20});
                     } else {
                          var div = document.createElement('div');
@@ -172 +167 @@
                               $('#markup-validator').remove();
                          }
-
+                         
+                         $('.message, .success, .error').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'});
-                         });
+                         $(div).backgroundFade({sColor:'#ffdec8',eColor:'#ffbaba',steps:20});
                     }
 
@@ -190 +184 @@
           
           $('.format_control > *').addClass('hide');
-          if ( last_post_format == 'xhtml' ) {
-               $('.control_xhtml > *').removeClass('hide');
-          } else if ( last_post_format == 'wiki' ) {
-               $('.control_wiki > *').removeClass('hide');
-          }
+          $('.format_control:not(.control_no_'+last_post_format+') > *').removeClass('hide');
 
           // Hide some fields

admin/post.php

@@ -455 +455 @@
                          '<p>'.form::combo('post_format',$formaters_combo,$post_format,'maximal').
                          '</p>'.
-                         '<p class="format_control control_wiki">'.
+                         '<p class="format_control control_no_xhtml">'.
                          '<a id="convert-xhtml" class="button'.($post_id && $post_format != 'wiki' ? ' hide' : '').'" href="post.php?id='.$post_id.'&amp;xconv=1">'.
                          __('Convert to XHTML').'</a></p></div>')),