Changeset 2614:db6f6a1f4f25 for admin
- Timestamp:
- 12/11/13 11:35:57 (12 years ago)
- Branch:
- default
- Location:
- admin
- Files:
-
- 25 deleted
- 12 edited
-
category.php (modified) (1 diff)
-
comment.php (modified) (1 diff)
-
index.php (modified) (1 diff)
-
js/_category.js (modified) (1 diff)
-
js/_comment.js (modified) (1 diff)
-
js/_index.js (modified) (3 diffs)
-
js/_post.js (modified) (4 diffs)
-
js/jsToolBar/jsToolBar.dotclear.js (deleted)
-
js/jsToolBar/jsToolBar.js (deleted)
-
js/jsToolBar/jsToolBar.wysiwyg.js (deleted)
-
js/jsToolBar/popup_link.js (deleted)
-
js/jsToolBar/popup_media.js (deleted)
-
js/jsToolBar/popup_posts.js (deleted)
-
media.php (modified) (2 diffs)
-
media_item.php (modified) (1 diff)
-
popup_link.php (modified) (1 diff)
-
popup_posts.php (modified) (1 diff)
-
post.php (modified) (1 diff)
-
style/jsToolBar/bt_bquote.png (deleted)
-
style/jsToolBar/bt_br.png (deleted)
-
style/jsToolBar/bt_clean.png (deleted)
-
style/jsToolBar/bt_code.png (deleted)
-
style/jsToolBar/bt_del.png (deleted)
-
style/jsToolBar/bt_em.png (deleted)
-
style/jsToolBar/bt_img.png (deleted)
-
style/jsToolBar/bt_img_select.png (deleted)
-
style/jsToolBar/bt_ins.png (deleted)
-
style/jsToolBar/bt_link.png (deleted)
-
style/jsToolBar/bt_ol.png (deleted)
-
style/jsToolBar/bt_paragraph.png (deleted)
-
style/jsToolBar/bt_post.png (deleted)
-
style/jsToolBar/bt_pre.png (deleted)
-
style/jsToolBar/bt_quote.png (deleted)
-
style/jsToolBar/bt_strong.png (deleted)
-
style/jsToolBar/bt_ul.png (deleted)
-
style/jsToolBar/jsToolBar.css (deleted)
-
style/jsToolBar/resize.png (deleted)
Legend:
- Unmodified
- Added
- Removed
-
admin/category.php
r2566 r2614 176 176 dcPage::open($title, 177 177 dcPage::jsConfirmClose('category-form'). 178 dcPage::jsToolBar().179 178 dcPage::jsLoad('js/_category.js'), 179 $core->callBehavior('adminPostEditor'). 180 180 dcPage::breadcrumb($elements) 181 181 ); -
admin/comment.php
r2566 r2614 181 181 dcPage::open(__('Edit comment'), 182 182 dcPage::jsConfirmClose('comment-form'). 183 dcPage::jsToolBar().184 183 dcPage::jsLoad('js/_comment.js'). 184 $core->callBehavior('adminPostEditor'). 185 185 # --BEHAVIOR-- adminCommentHeaders 186 186 $core->callBehavior('adminCommentHeaders'), -
admin/index.php
r2566 r2614 171 171 -------------------------------------------------------- */ 172 172 dcPage::open(__('Dashboard'), 173 dcPage::jsToolBar().174 173 dcPage::jsLoad('js/_index.js'). 174 $core->callBehavior('adminPostEditor'). 175 175 # --BEHAVIOR-- adminDashboardHeaders 176 176 $core->callBehavior('adminDashboardHeaders'), -
admin/js/_category.js
r2566 r2614 2 2 dotclear.hideLockable(); 3 3 4 var tbCategory = new jsToolBar(document.getElementById('cat_desc')); 5 tbCategory.draw('xhtml'); 4 if ($.isFunction('jsToolBar')) { 5 var tbCategory = new jsToolBar(document.getElementById('cat_desc')); 6 tbCategory.draw('xhtml'); 7 } 6 8 }); -
admin/js/_comment.js
r2566 r2614 1 1 $(function() { 2 if ( !document.getElementById) { return; }3 4 var tbComment = new jsToolBar(document.getElementById('comment_content'));5 tbComment.draw('xhtml');2 if ($.isFunction('jsToolBar')) { 3 var tbComment = new jsToolBar(document.getElementById('comment_content')); 4 tbComment.draw('xhtml'); 5 } 6 6 7 7 $('#comment-form input[name="delete"]').click(function() { -
admin/js/_index.js
r1699 r2614 2 2 var f = $('#quick-entry'); 3 3 if (f.length > 0) { 4 var contentTb = new jsToolBar($('#post_content',f)[0]); 5 contentTb.switchMode($('#post_format',f).val()); 4 if ($.isFunction('jsToolBar')) { 5 var contentTb = new jsToolBar($('#post_content',f)[0]); 6 contentTb.switchMode($('#post_format',f).val()); 7 } 6 8 7 9 $('input[name=save]',f).click(function() { … … 21 23 22 24 function quickPost(f,status) { 23 if ( contentTb.getMode() == 'wysiwyg') {25 if ($.isFunction('jsToolBar') && (contentTb.getMode() == 'wysiwyg')) { 24 26 contentTb.syncContents('iframe'); 25 27 } … … 55 57 $('#post_title',f).val(''); 56 58 $('#post_content',f).val(''); 57 if ( contentTb.getMode() == 'wysiwyg') {59 if ($.isFunction('jsToolBar') && (contentTb.getMode() == 'wysiwyg')) { 58 60 contentTb.syncContents('textarea'); 59 61 } -
admin/js/_post.js
r2556 r2614 51 51 52 52 $(function() { 53 if (!document.getElementById) { return; }54 55 if (document.getElementById('edit-entry'))56 {57 // Get document format and prepare toolbars58 var formatField = $('#post_format').get(0);59 var last_post_format = $(formatField).val();60 $(formatField).change(function() {61 // Confirm post format change62 if(window.confirm(dotclear.msg.confirm_change_post_format_noconvert)){63 excerptTb.switchMode(this.value);64 contentTb.switchMode(this.value);65 last_post_format = $(this).val();66 }else{67 // Restore last format if change cancelled68 $(this).val(last_post_format);69 }70 71 $('.format_control > *').addClass('hide');72 $('.format_control:not(.control_no_'+$(this).val()+') > *').removeClass('hide');73 });74 75 var excerptTb = new jsToolBar(document.getElementById('post_excerpt'));76 var contentTb = new jsToolBar(document.getElementById('post_content'));77 excerptTb.context = contentTb.context = 'post';78 }79 80 if (document.getElementById('comment_content')) {81 var commentTb = new jsToolBar(document.getElementById('comment_content'));82 commentTb.draw('xhtml');83 }84 85 53 // Post preview 86 54 $('#post-preview').modalWeb($(window).width()-40,$(window).height()-40); … … 99 67 return window.confirm(dotclear.msg.confirm_delete_post); 100 68 }); 101 102 // Markup validator103 var v = $('<div class="format_control"><p><a id="a-validator"></a></p><div/>').get(0);104 $('.format_control').before(v);105 var a = $('#a-validator').get(0);106 a.href = '#';107 a.className = 'button ';108 $(a).click(function() {109 110 excerpt_content = $('#post_excerpt').css('display') != 'none' ? $('#post_excerpt').val() : $('#excerpt-area iframe').contents().find('body').html();111 post_content = $('#post_content').css('display') != 'none' ? $('#post_content').val() : $('#content-area iframe').contents().find('body').html();112 113 var params = {114 xd_check: dotclear.nonce,115 f: 'validatePostMarkup',116 excerpt: excerpt_content,117 content: post_content,118 format: $('#post_format').get(0).value,119 lang: $('#post_lang').get(0).value120 };121 122 $.post('services.php',params,function(data) {123 if ($(data).find('rsp').attr('status') != 'ok') {124 alert($(data).find('rsp message').text());125 return false;126 }127 128 $('.message, .success, .error, .warning-msg').remove();129 130 if ($(data).find('valid').text() == 1) {131 var p = document.createElement('p');132 p.id = 'markup-validator';133 134 $(p).addClass('success');135 $(p).text(dotclear.msg.xhtml_valid);136 $('#entry-content h3').after(p);137 $(p).backgroundFade({sColor: dotclear.fadeColor.beginValidatorMsg, eColor: dotclear.fadeColor.endValidatorMsg, steps: 50},function() {138 $(this).backgroundFade({sColor: dotclear.fadeColor.endValidatorMsg, eColor: dotclear.fadeColor.beginValidatorMsg});139 });140 } else {141 var div = document.createElement('div');142 div.id = 'markup-validator';143 144 $(div).addClass('error');145 $(div).html('<p><strong>' + dotclear.msg.xhtml_not_valid + '</strong></p>' + $(data).find('errors').text());146 $('#entry-content h3').after(div);147 $(div).backgroundFade({sColor: dotclear.fadeColor.beginValidatorErr,eColor: dotclear.fadeColor.endValidatorErr, steps: 50},function() {148 $(this).backgroundFade({sColor: dotclear.fadeColor.endValidatorErr, eColor: dotclear.fadeColor.beginValidatorErr});149 });150 }151 152 if ( $('#post_excerpt').text() != excerpt_content || $('#post_content').text() != post_content ) {153 var pn = document.createElement('p');154 $(pn).addClass('warning-msg');155 $(pn).text(dotclear.msg.warning_validate_no_save_content);156 $('#entry-content h3').after(pn);157 }158 159 return false;160 });161 162 return false;163 });164 165 a.appendChild(document.createTextNode(dotclear.msg.xhtml_validator));166 167 $('.format_control > *').addClass('hide');168 $('.format_control:not(.control_no_'+last_post_format+') > *').removeClass('hide');169 69 170 70 // Hide some fields … … 218 118 }); 219 119 220 // Load toolbars221 contentTb.switchMode(formatField.value);222 excerptTb.switchMode(formatField.value);223 224 120 // Replace attachment remove links by a POST form submit 225 121 $('a.attachment-remove').click(function() { … … 232 128 } 233 129 return false; 234 });235 236 // Check unsaved changes before XHTML conversion237 var excerpt = $('#post_excerpt').val();238 var content = $('#post_content').val();239 $('#convert-xhtml').click(function() {240 if (excerpt != $('#post_excerpt').val() || content != $('#post_content').val()) {241 return window.confirm(dotclear.msg.confirm_change_post_format);242 }243 130 }); 244 131 }); -
admin/media.php
r2582 r2614 75 75 76 76 $page_url = 'media.php?popup='.$popup.'&post_id='.$post_id; 77 $page_url = $core->callBehavior('adminMediaURL',$page_url); 77 78 78 79 if ($popup) { … … 575 576 } 576 577 } else { 577 $link = 578 'media_item.php?id='.$f->media_id.'&popup='.$popup.'&post_id='.$post_id;578 $link = 'media_item.php?id='.$f->media_id.'&popup='.$popup.'&post_id='.$post_id; 579 $link = $core->callBehavior('adminMediaURL',$link); 579 580 } 580 581 -
admin/media_item.php
r2566 r2614 209 209 if ($popup) { 210 210 $starting_scripts .= 211 dcPage::jsLoad('js/jsToolBar/popup_media.js');211 $core->callBehavior('adminPopupMedia'); 212 212 } 213 213 call_user_func($open_f,__('Media manager'), -
admin/popup_link.php
r2566 r2614 19 19 $title = !empty($_GET['title']) ? $_GET['title'] : ''; 20 20 21 dcPage::openPopup(__('Add a link'), dcPage::jsLoad('js/jsToolBar/popup_link.js'));21 dcPage::openPopup(__('Add a link'),$core->callBehavior('adminPopupLink')); 22 22 23 23 echo '<h2 class="page-title">'.__('Add a link').'</h2>'; -
admin/popup_posts.php
r2566 r2614 48 48 dcPage::openPopup(__('Add a link to an entry'), 49 49 dcPage::jsLoad('js/_posts_list.js'). 50 dcPage::jsLoad('js/jsToolBar/popup_posts.js'));50 $core->callBehavior('adminPopupPosts')); 51 51 52 52 echo '<h2 class="page-title">'.__('Add a link to an entry').'</h2>'; -
admin/post.php
r2566 r2614 375 375 dcPage::open($page_title.' - '.__('Entries'), 376 376 dcPage::jsDatePicker(). 377 dcPage::jsToolBar().378 377 dcPage::jsModal(). 379 378 dcPage::jsMetaEditor(). 380 379 dcPage::jsLoad('js/_post.js'). 380 $core->callBehavior('adminPostEditor'). 381 381 dcPage::jsConfirmClose('entry-form','comment-form'). 382 382 # --BEHAVIOR-- adminPostHeaders
Note: See TracChangeset
for help on using the changeset viewer.