Changeset 1815:07b857f03655

Timestamp:

09/04/13 14:29:21 (11 years ago)

Author:

kevin@…

Branch:

Ticket #1539

Parents:

1814:53cc8fc5cad5 (diff), 1717:9df047961e9c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fusion avec default

Location:

admin

Files:

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

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/js/_post.js

@@ -198 +198 @@
           // Hide some fields
           $('#notes-area label').toggleWithLegend($('#notes-area').children().not('label'),{
-               cookie: 'dcx_post_notes',
+               user_pref: 'dcx_post_notes',
                legend_click:true,
                hide: $('#post_notes').val() == ''
@@ -207 +207 @@
           });
           $('#post_lang').parent().children('label').toggleWithLegend($('#post_lang'),{
-               cookie: 'dcx_post_lang',
+               user_pref: 'dcx_post_lang',
                legend_click: true
           });
           $('#post_password').parent().children('label').toggleWithLegend($('#post_password'),{
-               cookie: 'dcx_post_password',
+               user_pref: 'dcx_post_password',
                legend_click: true,
                hide: $('#post_password').val() == ''
           });
           $('#post_status').parent().children('label').toggleWithLegend($('#post_status'),{
-               cookie: 'dcx_post_status',
+               user_pref: 'dcx_post_status',
                legend_click: true
           });
           $('#post_dt').parent().children('label').toggleWithLegend($('#post_dt').parent().children().not('label'),{
-               cookie: 'dcx_post_dt',
+               user_pref: 'dcx_post_dt',
                legend_click: true
           });
           $('#label_format').toggleWithLegend($('#label_format').parent().children().not('#label_format'),{
-               cookie: 'dcx_post_format',
+               user_pref: 'dcx_post_format',
                legend_click: true
           });
           $('#cat_id').parent().children('label').toggleWithLegend($('#cat_id'),{
-               cookie: 'cat_id',
+               user_pref: 'cat_id',
+               legend_click: true
+          });
+          $('#label_comment_tb').toggleWithLegend($('#label_comment_tb').parent().children().not('#label_comment_tb'),{
+               user_pref: 'dcx_comment_tb',
                legend_click: true
           });
           $('#post_url').parent().children('label').toggleWithLegend($('#post_url').parent().children().not('label'),{
-               cookie: 'post_url',
+               user_pref: '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',
+               user_pref: 'dcx_post_excerpt',
                legend_click: true,
                hide: $('#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/post.php

@@ -472 +472 @@
                'title' => __('Options'),
                'items' => array(
-                    'post_open_comment' =>
+                    'post_open_comment_tb' =>
+                         '<div>'.
+                         '<h5 id="label_comment_tb">'.__('Commentaires et rétroliens').'</h5>'.
                          '<p><label for="post_open_comment" class="classic">'.
                          form::checkbox('post_open_comment',1,$post_open_comment).' '.
@@ -482 +484 @@
                                    __('Warning: Comments are not more accepted for this entry.').'</p>') : 
                               '<p class="form-note warn">'.
-                              __('Comments are not accepted on this blog so far.').'</p>'),
-                    'post_open_tb' =>
+                              __('Comments are not accepted on this blog so far.').'</p>').
                          '<p><label for="post_open_tb" class="classic">'.
                          form::checkbox('post_open_tb',1,$post_open_tb).' '.
@@ -492 +493 @@
                                    '<p class="form-note warn">'.
                                    __('Warning: Trackbacks are not more accepted for this entry.').'</p>') : 
-                              '<p class="form-note warn">'.__('Trackbacks are not accepted on this blog so far.').'</p>'),
+                              '<p class="form-note warn">'.__('Trackbacks are not accepted on this blog so far.').'</p>').
+                         '</div>',
                     'post_password' =>
                          '<p><label for="post_password" class="ib">'.__('Password').'</label>'.
@@ -516 +518 @@
           "post_excerpt" =>
                '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'<span class="form-note">'.
-               __('Add an introduction to the post.').'</span></label> '.
+               __('Introduction to the post.').'</span></label> '.
                form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
                '</p>',
@@ -528 +530 @@
           "post_notes" =>
                '<p class="area" id="notes-area"><label for="post_notes">'.__('Personal notes:').'<span class="form-note">'.
-               __('Add unpublished notes.').'</span></label>'.
+               __('Unpublished notes.').'</span></label>'.
                form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
                '</p>'

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 {

admin/style/default.css

@@ -800 +800 @@
      border: none;
 }
-.media-item {
+.media-item, .media-action-box {
      position: relative;
      border: 1px solid #ccc;
@@ -806 +806 @@
      padding: 1em;
      width: 300px;
-     height: 120px;
      display: inline-block;
      vertical-align: top;
-}
-div.media-list .media-item {
+     min-height: 120px
 }
 a.media-icon {
@@ -908 +906 @@
      margin-left: 0;
 }
+/* in blog_pref */
+.user-perm {
+     margin: 2em 0px;
+     background: transparent url(user.png) no-repeat left top;
+     width: 320px;
+     display: inline-block;
+     vertical-align: top;
+}
+.user-perm h4, .user-perm h5, .user-perm p, .user-perm ul, .user-perm li {
+     margin: .5em 0 .33em;
+     padding: 0;
+}
+.user-perm h4 {
+     padding-left: 28px;
+}
+.user-perm ul {
+     list-style-type: inside;
+}
+.user-perm li {
+     margin-left: 1em;
+     padding-left: 0;
+}
+.user-perm h5 {
+     margin:   1em 0 0 0;
+}
+li.user_super, li.user_admin {
+     margin-left: 0;
+     padding-left: 1em;
+     list-style: none;
+     background: transparent url(../images/superadmin.png) no-repeat -2px 2px;
+}
+li.user_admin {
+     background-image: url(../images/admin.png);
+}
+
 /* -------------------------------------------------------------------- Themes */
 #themes {
@@ -1165 +1198 @@
 .success a {
      color: #666;
+}
+.dc-update {
+     padding: 1em 48px 0.5em 48px;
+     margin-bottom: 1em;
+     border-radius: 8px;
+     background: #A2CBE9 url(msg-success.png) no-repeat .7em .7em;
+}
+.dc-update a {
+     color: #000;
+     border-color: #000;
+     margin-right: 1em;
+}
+a.info {
+     margin-left: 2em;
+     font-weight: bold;
 }
 /* ------------------------------------------------------------------ navigation */