From 12924135cebd289aa4bf3e12255ceb097f395067 Mon Sep 17 00:00:00 2001 From: azaozz Date: Tue, 5 May 2009 18:57:43 +0000 Subject: [PATCH] Add wpspin_light and wpspin_dark spinners git-svn-id: http://svn.automattic.com/wordpress/trunk@11203 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/press-this.css | 1 + wp-admin/edit-form-advanced.php | 2 +- wp-admin/images/wpspin.gif | Bin 2285 -> 0 bytes wp-admin/images/wpspin_dark.gif | Bin 0 -> 2547 bytes wp-admin/images/wpspin_light.gif | Bin 0 -> 2193 bytes wp-admin/import/livejournal.php | 4 +- wp-admin/includes/manifest.php | 647 ++++++++++++++++--------------- wp-admin/includes/media.php | 2 +- wp-admin/includes/template.php | 6 +- wp-admin/js/dashboard.dev.js | 2 +- wp-admin/js/dashboard.js | 2 +- wp-admin/press-this.php | 4 +- wp-admin/widgets.php | 4 +- 13 files changed, 338 insertions(+), 336 deletions(-) delete mode 100644 wp-admin/images/wpspin.gif create mode 100644 wp-admin/images/wpspin_dark.gif create mode 100644 wp-admin/images/wpspin_light.gif diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css index da7aaeca61..9c9a9d8d63 100644 --- a/wp-admin/css/press-this.css +++ b/wp-admin/css/press-this.css @@ -416,6 +416,7 @@ ul.categorychecklist li { #saving { display: inline; + vertical-align: middle; } .submit input, diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 4fddd09822..d1240b2d5d 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -472,7 +472,7 @@ function post_comment_meta_box($post) { -

+

diff --git a/wp-admin/images/wpspin.gif b/wp-admin/images/wpspin.gif deleted file mode 100644 index 80fc8088ffbde78ca2748696be5bb110ba2b3383..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2285 zcmcJQYfu&E8OL{F-LSZqvrBe;*y1{`A&JBEu~BQdDZ(PT2y+Gw22H2siCza;I4+C6+eU;Eo< zKfk~IKhN{7!)4FdT4KX&*nJFp^5n^nF~0xt`xU;8@xZDFR#|-U;ENcGi;MH~^Ai>y z#~2+Q9gMv(`eIMtpH>J2Is<`#&*FHD!&V(WT)x78@dWJufbnE?Zg#;=b9-L)rsvZW zaq9@<-^8k?FoJk)8*dd*cJ^L&xC7r4~pzi$qSy`%f~3}Uh-2%;$Y+h$B84Tl7koa-Gsghy+jgO=YvZ7pP9U)D>0H$a4kcpkrl<8t9;|1iO+hJVSZp*c7 zir&^eSG6^;S>~c;sW!XX{_}?AV)+?vq&t$AJQi7iGpSo{xf{wm&u>!5*`;-n+Mb~ETjQ!CeVjxqoQ-o-0sc<%O*eZeoLhL~|WcUA|5U`pz?URk(rTrg_d% zythO*`lIPyD!3uyoX<$06X8*eFvKdd>&i5C6HmO3cHNhBp1OJRyh#d|%iVE}J1pZ)aM~XwUr8DcWc1u3 z;0WO-?mAOOooW1MHHkAlzk1O8pN&TXTlRdH_pjlU#he!4DNYzwG zdtA&RsMUl_GUDDrX}KPnJ}5(Lm-Uv)0ZF2Ce2A=Rr>Ia!1o*h+Ns`y#njNwN@x&X` zXN$}hfxf}K6E6JHjO*EBc|Hd1nesPF-qgA+AmC4#v2~j{_g=ZU+xO+e^5}fkFNGGz zPoUafnz#P(c1K#2e2RE9-jpNqybH>h=yyYo6Le_ZIc*1nMx;Y8v9oNYW=$yI-73Ql zy%nWAwN?}INl4%X)mTSgbrVx0Nm2BtFeid2VrGu2??TK>HWcu`{4p0^jxQUVRHyoE zYt(CB_-ezpXmT;Iz15o=kRD%5-WI~jJLY#kA05QAl5DL#tuH+t#IT!8gE8k!+i%%m z)mcD$Q!Ky_I(gm;EB_D*Bbp#QS#2x&LhlJknmo%P2T71ai2Z29v7fw7QO6mERi$it zY@B9BRA)Xr&VkRDrK|CmDYDXccCFp`8lS1igzdHzkg!=vz`lNXaPqU{qn_qdFZBGZ z8tApYex`h~o4C|}E8Ta^>7a>1D^KxNM6@<$H`PN+q7ex~h#@-!m&OZ{*~`E_{~*sR zatC$!U8M5dMR+BPvSyiKS&oCiozHwSKFPoC>XW!}-<*pYuy@1{vdgk83s?CU%F5DQ zSc1IdECr;`pNUPaTH9hW+s9TFWW0Ub8GP18gMTEQ)3*8!eYzg?+<8IP5JQr(%i3me zu(7ZiwgE(SHB(TMI*xU_)<9A0kVJ}p!!`ICTn*_f?A{&Lg>QDy%$ViK^Mcj{i;gku z#0{Z#7Xti*a6mfgqWkXF$2aYrisbE1tx59_)GQ z2eT<@;DVcF*!Peoi4rgl6}Z z&Xyyl#UQf|cs0bfI@(n)QFn*_m1KfxZHU@#U;`I`YMQZ&}!PI%Q b2MS{oq9p4+BuxOXIG4r1MFawt>5KmZnZuPO diff --git a/wp-admin/images/wpspin_dark.gif b/wp-admin/images/wpspin_dark.gif new file mode 100644 index 0000000000000000000000000000000000000000..daebe0dbefc8ff3e9ed10f0eb2e0c671a0aabaef GIT binary patch literal 2547 zcmcJQ{Zkb89mn@}ZwAK3kNZ=b&FnzYtVh=YbvOKb=CJVcJ;F4jRfrcRZEFzTd4 ze28tQMLZ5gOau&qfD(&U6HIbyo0!H_gC=7&TBA9EBqo@SHf^WYeQ*N-r6|bsV zx^!ttNr~&a1qB7OXU|68$Nrx){XSO~TK1#h!dPg|tUSVp{x$tyekKcZuw3uI9wtT| zE!-s~N7w&w|0U{)wW|wur_Q|Iy*@v3VZ-dl0YxnOO?A#Q`HcVF&q>Z7TJ?1Minb@a z&;GvgvkJfnC8}D)_>V%?dM6V6d-2KA z;KHd0j!zKOFR&*F=7YufmF~6q5$?NJi%WA-E{;OO~OkhRG1PWI{>c^@^YYd_D%+q9DN9U>w7UKJmy)mC%Rb5GqHE7v1dyM#Hcq zDKNFo)>x`sgR&%p7v9zb3V@}{Wm&lj)PSa!xN#GV0jFj2fj6M8-qwsWkzi=?l5k{7 zj`U=Xt`>KEz~fl_bw#N{CvoCiD2D%tvmI*Dsi33AHO{I$h!Qa+OEH`3c#C ziYOY0LL~?m+EO1>D=h*i_sTgr`v!2FfDp)So$dolQ&$ufzL+v;%qN9kQ-HejEfyh% z9n%EBQ8i6wa9_C_k2MEA22x`G?$g?>sC_(wD6USe#;cPlv?W{b4%FvIcE~sD@>MqU zsHeu>_lL)S(y09Nk@TZm7C4DIVoNM{o}MEq%T+bXQRy9p;!*=T{HdI>l0ocq_TD$vz&on5EKB=~t9F?VnEfV#LQ>C&b#e|*Jz6`P* zLH;Sw;KWsGWR&nT<@=7AIqVoKpPayWh?QQSjIsAZ!aZNus|s1cmrB2#v+ZnMPRE56 zjQ^|W>gJvmYJWMpen4*dBK_&w8IEClv9?g@s2dfUH;ppARf0B&;TGy9$Z`B09K-r5 zAj@)_XrB*sAfa9np(*)rroH*6JQ6T$lK830DvqYvDyN?C5J(D17;-CBIx{lHYKKpl zGCRg8?f)y)liR5v%$@t{TK?mfKvnymnxV9&xv>Q3$o~4V_QHJgW(s>QF~9%$TKvmR zt*D&2pQ+0%l;;qneHbVY8ipXq&?a!7m2g$qCHC~<`<6qV7d9jRFDuizY$+z=1Z$#5 zSR%)%VUr^KY@kx(S(cC2sAL8q&`3u8S*Jo{$dNII-?ZPUSNJgjSRIjd4{fIhcj7-S zJ6HW9*?9%s3GV%+bbem<;f;@d62lv@(C}bvMlb*DRZ<&*e@T4yJ=c%ZCK96@1zI;D z)0iqVyy~?51d%{eh@D+zPp{iA?1zvg$pCVk2f0}u;3JReRO;Ma?S-P0bi&m)_ zIEx67a2&tm;AQSwW<<~johT48qGP=lY4|Sz`Hf3AITdrIMFWMS69lVhi0bA0+U*|@Li-7o8J0tbd@u|dt3uy0%$5(G;g(bS+XdFLM+YjdW|j#@BPXNBN03X;lt>VrSqd7^Sord z;`|kepGff&Uco-(Otcp6sxQtpzSFwJ@r`N=wPc}$_TTn=Ixp5VgbgQyivZ1Vb=5t^ zx!vP~u^9M)d9mirJnd%4QtMqhi;6k`tacch-o694sH&o-qU;2Fgb*rSMRzTZWd|H+ zDAHiu)x8yYK@`(vA>qxp-j@GRq)LLIXveo-cBZ^y-|$IiXyw2z?}}x0b_@Qd#)WHg zX7SDVxGDH&nm3D9=FL1|NjRphod;-|^ZK9h5vB=+CJkA^5=9-_EW>!QMVZ!m&~p1K zA$n!;u-@TDQwJM4PPBgAG6bBcW(nEo5g}|;PQy}DM~e%hgwCC!!M!Mq24^54Dqc(VWi literal 0 HcmV?d00001 diff --git a/wp-admin/images/wpspin_light.gif b/wp-admin/images/wpspin_light.gif new file mode 100644 index 0000000000000000000000000000000000000000..e10b97ff9d84d7ff8d7efe5c4c09783dd390e338 GIT binary patch literal 2193 zcmai#eNYtl8ON7(yJ6M6J=n0lMb_k8_Sd=PxP4*6q$V@fTkd$f1L8|!_`^Xw3?Nkk zC~rnNUV;$tr4l4p@CCR74h~C3V$$*262*vAVuOO9F=^{`jLEdlbka`yN0YrH{R4+i zKYO$L&)&@Qd4Au0p44>vi$C3^hxE`L2>MRrpJD#C#9u-@(0)tI%{|brFf(B$XJ#ff z!neubWH8KlFgU(MU_3BB9$3Qb4TP?MS0jA$c6+;*=;+X%9bwwSG`6)hhN%rx9zrV( z`hOU|Ta#tmwpHDnW0Ni7stE0U8AyT5q5p<7A@qYyo)eU5%q72Sl1mQe^)ydB z`SS9{o7alJO>^Lgb;EdZWTwCI-|IkR2DcbLR~R4Xo1bpfM@9-Z_5djw3Bo8~hYg%S z9p#NqBNqW-7U?J<>6|(Vf?!D^_2uVOT@nGE5ey`m(4iVdp5iSW7^kII2u23Llu=I2 z(B=VwodQXuV*iw881{Dcn@X+_N8f*NTPnzsc=mIUkhH^TwOP`B>rgj`RDSf7%7tYr z`F-gdqQ3f_rqcRCk=ci;YFH(8H?AWcno4r@%NtC0r&Cz{TEX@TL5aqLMgc!ea{^70 zAr%0_nhJF?tkQ)@-4u29d>`x;)(x693l4%j9H8lJ<{*O+&r&I$o#^b`3DC}rZepD^l?;g@|32TV~aZNyQ4R*PCVW$pR6*xek#2p z*6)7>ix2yhh<$SUE+A zJl3Gd%yTT8f;Zg12&+D=Wo@O?_OKlFLm$VxKvIE2x{Qamm{6^{srfOJ~YD>iv@x*qQU^lWMR*DmuX zE&U%?6pY@QdN{${*!bnzL~uWOy=!rh%>N9u+wUo{!TT5O`MsmlPcRHuKvR|C)_Pr~ zDJbS9z8z((6%5H$au|ZPT15qcA$SNG&e%yngMQ4kPc&dd4VlZj`rkq-wXTA`cDZw= zH2t0SjXi5WtAA5U{q)h~miHX5s^84Uyb~}#Xelj_qfSfHf0jy;n*YA~W`EfiML1qz zQp`u{+zL-tRGKiX*n&Wjf`d3=l~!qn2XOR+Xk{bdp;ZWijyeE3G!np%oW@6#IInfZ zyp=8G?KNN48~w7**>_St^~V>TIYrIIW6zG|{K zZbu^wLFIOWIHF)s#J(n?zyQN`k;HM``?RN%jhu2b@%myx*{&)`BK5&5RgB z=vj^w(2o=#ioCu#YDnP#g3fDaevjZwm0S~kcL668Tv=jpfn-~qsy2Z3|Br-)4wl;b z2M37RdtIT|5;4*A?oI@%vlYj-zkKD#5qtA$e#X#=tp53(j)lQlDS46e-5Q^&D@5Ei zD&3@@?(H=)^)_DLpgAzsY+a3HASqzQvK5m`dSe_Y=Ere@@Fvs{!vTV7uo}scOO6#o zwqL8|A2;Hm_VZi1dNC*`v%IKmHC)$x~ecdHdeT3e3rlgwcr^{9j zSJe;040k{8u4am``YjNoxURu&F$eBo@9H~6eKfbYciUHOjw{C|Zi)UJ(D_6<;`xsi zt3Ol^7sNilPG+n>l94Kf+|CaF+O#SYFRF?pxPGi!S4i=)hq2#6@klklFH%S%)2*P)EP^gW#~vR42A literal 0 HcmV?d00001 diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php index c5473adc1c..18a27bcc51 100644 --- a/wp-admin/import/livejournal.php +++ b/wp-admin/import/livejournal.php @@ -963,7 +963,7 @@ class LJ_API_Import { if ( next_counter <= 0 ) { if ( jQuery( '#' ).length ) { jQuery( "# input[type='submit']" ).hide(); - str = ' '; + str = ' '; jQuery( '#' ).html( str ); jQuery( '#' ).submit(); return; @@ -992,7 +992,7 @@ class LJ_API_Import { if ( jQuery( '#' ).length ) { jQuery( "# input[type='submit']" ).hide(); jQuery.ajaxSetup({'timeout':3600000}); - str = ' '; + str = ' '; jQuery( '#' ).html( str ); jQuery('#ljapi-status').load(ajaxurl, {'action':'lj-importer', 'step':jQuery('#step').val(), diff --git a/wp-admin/includes/manifest.php b/wp-admin/includes/manifest.php index 15ba7d6d1e..cb36adf256 100644 --- a/wp-admin/includes/manifest.php +++ b/wp-admin/includes/manifest.php @@ -1,323 +1,324 @@ -registered as $script ) { - if ( empty($script->src) ) continue; - $ver = empty($script->ver) ? $wp_version : $script->ver; - if ( 'editor' == $script->handle ) $mce_ver = $script->ver; - $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src ); - $files[] = array($src, $ver); - $man_ver .= $ver; - } - - foreach ( $wp_styles->registered as $style ) { - if ( empty($style->src) ) continue; - - $ver = empty($style->ver) ? $wp_version : $style->ver; - $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src ); - if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css'; - $files[] = array($src, $ver); - $man_ver .= $ver; - - if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) { - if ( is_bool( $style->extra['rtl'] ) ) - $rtl_href = str_replace( '.css', '-rtl.css', $src ); - else - $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] ); - - $files[] = array($rtl_href, $ver); - $man_ver .= $ver; - } - } - - $images = array( - array('images/align-center.png'), - array('images/align-left.png'), - array('images/align-none.png'), - array('images/align-right.png'), - array('images/archive-link.png'), - array('images/blue-grad.png'), - array('images/browse-happy.gif'), - array('images/bubble_bg.gif'), - array('images/bubble_bg-rtl.gif'), - array('images/button-grad.png'), - array('images/button-grad-active.png'), - array('images/comment-grey-bubble.png'), - array('images/date-button.gif'), - array('images/ed-bg.gif'), - array('images/fade-butt.png'), - array('images/fav.png'), - array('images/fav-arrow.gif'), - array('images/fav-arrow-rtl.gif'), - array('images/fav-top.png'), - array('images/generic.png'), - array('images/gray-grad.png'), - array('images/icons32.png'), - array('images/icons32-vs.png'), - array('images/list.png'), - array('images/list-vs.png'), - array('images/wpspin.gif'), - array('images/logo.gif'), - array('images/logo-ghost.png'), - array('images/logo-login.gif'), - array('images/media-button-image.gif'), - array('images/media-button-music.gif'), - array('images/media-button-other.gif'), - array('images/media-button-video.gif'), - array('images/menu.png'), - array('images/menu-vs.png'), - array('images/menu-arrows.gif'), - array('images/menu-bits.gif'), - array('images/menu-bits-rtl.gif'), - array('images/menu-dark.gif'), - array('images/menu-dark-rtl.gif'), - array('images/no.png'), - array('images/required.gif'), - array('images/resize.gif'), - array('images/screen-options-left.gif'), - array('images/screen-options-right.gif'), - array('images/screen-options-right-up.gif'), - array('images/se.png'), - array('images/star.gif'), - array('images/toggle-arrow.gif'), - array('images/toggle-arrow-rtl.gif'), - array('images/white-grad.png'), - array('images/white-grad-active.png'), - array('images/wordpress-logo.png'), - array('images/wp-logo.gif'), - array('images/xit.gif'), - array('images/yes.png'), - array('../wp-includes/images/crystal/archive.png'), - array('../wp-includes/images/crystal/audio.png'), - array('../wp-includes/images/crystal/code.png'), - array('../wp-includes/images/crystal/default.png'), - array('../wp-includes/images/crystal/document.png'), - array('../wp-includes/images/crystal/interactive.png'), - array('../wp-includes/images/crystal/text.png'), - array('../wp-includes/images/crystal/video.png'), - array('../wp-includes/images/crystal/spreadsheet.png'), - array('../wp-includes/images/rss.png'), - array('../wp-includes/js/thickbox/loadingAnimation.gif'), - array('../wp-includes/js/thickbox/tb-close.png'), - ); - - $files = array_merge($files, $images); - - if ( @is_file('../wp-includes/js/tinymce/tiny_mce.js') ) : - $mce = array( - array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver, true), - array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver, true), - array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver, true), - array('../wp-includes/js/tinymce/utils/mctabs.js', $mce_ver, true), - array('../wp-includes/js/tinymce/utils/validate.js', $mce_ver, true), - array('../wp-includes/js/tinymce/utils/form_utils.js', $mce_ver, true), - array('../wp-includes/js/tinymce/utils/editable_selects.js', $mce_ver, true), - array('../wp-includes/js/tinymce/tiny_mce_popup.js', $mce_ver, true), - - array('../wp-includes/js/tinymce/themes/advanced/editor_template.js', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/source_editor.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/anchor.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/image.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/link.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/color_picker.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/charmap.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/js/color_picker.js', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/js/charmap.js', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/js/image.js', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/js/link.js', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/js/source_editor.js', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/js/anchor.js', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css', $mce_ver, true), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/inlinepopups/template.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/media/editor_plugin.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/media/js/media.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/media/media.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/media/css/content.css', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/media/css/media.css', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/paste/editor_plugin.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/paste/js/pasteword.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/paste/js/pastetext.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/paste/pasteword.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/paste/blank.htm', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/paste/pastetext.htm', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/safari/editor_plugin.js', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/spellchecker/css/content.css', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/wordpress/css/content.css', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css', $mce_ver, true), - array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css', $mce_ver, true), - - array('../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js', $mce_ver, true), - - array('../wp-includes/js/tinymce/themes/advanced/img/icons.gif'), - array('../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg'), - array('../wp-includes/js/tinymce/themes/advanced/img/fm.gif'), - array('../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png'), - array('../wp-includes/js/tinymce/themes/advanced/img/sflogo.png'), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png'), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png'), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif'), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif'), - array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif'), - array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.gif'), - array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/flash.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/flv_player.swf'), - array('../wp-includes/js/tinymce/plugins/media/img/quicktime.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/realmedia.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/shockwave.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/trans.gif'), - array('../wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/more.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/page.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/help.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/image.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/media.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/video.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif'), - array('../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png'), - array('../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png'), - array('../wp-includes/js/tinymce/plugins/wpgallery/img/delete.png'), - array('../wp-includes/js/tinymce/plugins/wpgallery/img/edit.png'), - array('../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png') - ); - $files = array_merge($files, $mce); - endif; - - return $files; -} +registered as $script ) { + if ( empty($script->src) ) continue; + $ver = empty($script->ver) ? $wp_version : $script->ver; + if ( 'editor' == $script->handle ) $mce_ver = $script->ver; + $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src ); + $files[] = array($src, $ver); + $man_ver .= $ver; + } + + foreach ( $wp_styles->registered as $style ) { + if ( empty($style->src) ) continue; + + $ver = empty($style->ver) ? $wp_version : $style->ver; + $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src ); + if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css'; + $files[] = array($src, $ver); + $man_ver .= $ver; + + if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) { + if ( is_bool( $style->extra['rtl'] ) ) + $rtl_href = str_replace( '.css', '-rtl.css', $src ); + else + $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] ); + + $files[] = array($rtl_href, $ver); + $man_ver .= $ver; + } + } + + $images = array( + array('images/align-center.png'), + array('images/align-left.png'), + array('images/align-none.png'), + array('images/align-right.png'), + array('images/archive-link.png'), + array('images/blue-grad.png'), + array('images/browse-happy.gif'), + array('images/bubble_bg.gif'), + array('images/bubble_bg-rtl.gif'), + array('images/button-grad.png'), + array('images/button-grad-active.png'), + array('images/comment-grey-bubble.png'), + array('images/date-button.gif'), + array('images/ed-bg.gif'), + array('images/fade-butt.png'), + array('images/fav.png'), + array('images/fav-arrow.gif'), + array('images/fav-arrow-rtl.gif'), + array('images/fav-top.png'), + array('images/generic.png'), + array('images/gray-grad.png'), + array('images/icons32.png'), + array('images/icons32-vs.png'), + array('images/list.png'), + array('images/list-vs.png'), + array('images/wpspin_light.gif'), + array('images/wpspin_dark.gif'), + array('images/logo.gif'), + array('images/logo-ghost.png'), + array('images/logo-login.gif'), + array('images/media-button-image.gif'), + array('images/media-button-music.gif'), + array('images/media-button-other.gif'), + array('images/media-button-video.gif'), + array('images/menu.png'), + array('images/menu-vs.png'), + array('images/menu-arrows.gif'), + array('images/menu-bits.gif'), + array('images/menu-bits-rtl.gif'), + array('images/menu-dark.gif'), + array('images/menu-dark-rtl.gif'), + array('images/no.png'), + array('images/required.gif'), + array('images/resize.gif'), + array('images/screen-options-left.gif'), + array('images/screen-options-right.gif'), + array('images/screen-options-right-up.gif'), + array('images/se.png'), + array('images/star.gif'), + array('images/toggle-arrow.gif'), + array('images/toggle-arrow-rtl.gif'), + array('images/white-grad.png'), + array('images/white-grad-active.png'), + array('images/wordpress-logo.png'), + array('images/wp-logo.gif'), + array('images/xit.gif'), + array('images/yes.png'), + array('../wp-includes/images/crystal/archive.png'), + array('../wp-includes/images/crystal/audio.png'), + array('../wp-includes/images/crystal/code.png'), + array('../wp-includes/images/crystal/default.png'), + array('../wp-includes/images/crystal/document.png'), + array('../wp-includes/images/crystal/interactive.png'), + array('../wp-includes/images/crystal/text.png'), + array('../wp-includes/images/crystal/video.png'), + array('../wp-includes/images/crystal/spreadsheet.png'), + array('../wp-includes/images/rss.png'), + array('../wp-includes/js/thickbox/loadingAnimation.gif'), + array('../wp-includes/js/thickbox/tb-close.png'), + ); + + $files = array_merge($files, $images); + + if ( @is_file('../wp-includes/js/tinymce/tiny_mce.js') ) : + $mce = array( + array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver, true), + array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver, true), + array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver, true), + array('../wp-includes/js/tinymce/utils/mctabs.js', $mce_ver, true), + array('../wp-includes/js/tinymce/utils/validate.js', $mce_ver, true), + array('../wp-includes/js/tinymce/utils/form_utils.js', $mce_ver, true), + array('../wp-includes/js/tinymce/utils/editable_selects.js', $mce_ver, true), + array('../wp-includes/js/tinymce/tiny_mce_popup.js', $mce_ver, true), + + array('../wp-includes/js/tinymce/themes/advanced/editor_template.js', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/source_editor.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/anchor.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/image.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/link.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/color_picker.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/charmap.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/js/color_picker.js', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/js/charmap.js', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/js/image.js', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/js/link.js', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/js/source_editor.js', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/js/anchor.js', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css', $mce_ver, true), + array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/inlinepopups/template.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/media/editor_plugin.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/media/js/media.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/media/media.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/media/css/content.css', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/media/css/media.css', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/paste/editor_plugin.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/paste/js/pasteword.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/paste/js/pastetext.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/paste/pasteword.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/paste/blank.htm', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/paste/pastetext.htm', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/safari/editor_plugin.js', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/spellchecker/css/content.css', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/wordpress/css/content.css', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css', $mce_ver, true), + array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css', $mce_ver, true), + + array('../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js', $mce_ver, true), + + array('../wp-includes/js/tinymce/themes/advanced/img/icons.gif'), + array('../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg'), + array('../wp-includes/js/tinymce/themes/advanced/img/fm.gif'), + array('../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png'), + array('../wp-includes/js/tinymce/themes/advanced/img/sflogo.png'), + array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png'), + array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png'), + array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif'), + array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif'), + array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif'), + array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.gif'), + array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif'), + array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif'), + array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif'), + array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif'), + array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif'), + array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif'), + array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif'), + array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif'), + array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif'), + array('../wp-includes/js/tinymce/plugins/media/img/flash.gif'), + array('../wp-includes/js/tinymce/plugins/media/img/flv_player.swf'), + array('../wp-includes/js/tinymce/plugins/media/img/quicktime.gif'), + array('../wp-includes/js/tinymce/plugins/media/img/realmedia.gif'), + array('../wp-includes/js/tinymce/plugins/media/img/shockwave.gif'), + array('../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif'), + array('../wp-includes/js/tinymce/plugins/media/img/trans.gif'), + array('../wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/more.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/page.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/help.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/image.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/media.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/video.gif'), + array('../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif'), + array('../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png'), + array('../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png'), + array('../wp-includes/js/tinymce/plugins/wpgallery/img/delete.png'), + array('../wp-includes/js/tinymce/plugins/wpgallery/img/edit.png'), + array('../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png') + ); + $files = array_merge($files, $mce); + endif; + + return $files; +} diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 217970bb0d..3ff382a8d1 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1514,7 +1514,7 @@ var addExtImage = { t.resetImageData(); return false; } - document.getElementById('status_img').src = 'images/wpspin.gif'; + document.getElementById('status_img').src = 'images/wpspin_light.gif'; t.preloadImg = new Image(); t.preloadImg.onload = t.updateImageData; t.preloadImg.onerror = t.resetImageData; diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 972536cae0..dfccb6e661 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -265,7 +265,7 @@ function inline_edit_term_row($type) { - +
@@ -1258,7 +1258,7 @@ function inline_edit_row( $type ) { $update_text = ( $is_page ) ? __( 'Update Page' ) : __( 'Update Post' ); ?> - + @@ -2293,7 +2293,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', - +

diff --git a/wp-admin/js/dashboard.dev.js b/wp-admin/js/dashboard.dev.js index e8773c3e85..75d4521de4 100644 --- a/wp-admin/js/dashboard.dev.js +++ b/wp-admin/js/dashboard.dev.js @@ -23,7 +23,7 @@ jQuery(document).ready( function($) { quickPressLoad = function() { var act = $('#quickpost-action'), t; t = $('#quick-press').submit( function() { - $('#dashboard_quick_press h3').append( '' ); + $('#dashboard_quick_press h3').append( '' ); $('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr('disabled','disabled'); if ( 'post' == act.val() ) { diff --git a/wp-admin/js/dashboard.js b/wp-admin/js/dashboard.js index d40b9fb98b..8c20f1ecf2 100644 --- a/wp-admin/js/dashboard.js +++ b/wp-admin/js/dashboard.js @@ -1 +1 @@ -jQuery(document).ready(function(c){var a,b,d;a=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins"];b=function(){c.each(a,function(){var f=jQuery("#"+this+":visible div.inside").find(".widget-loading");if(f.size()){f.parent().load("index-extra.php?jax="+this)}})};b();postboxes.add_postbox_toggles("dashboard",{onShow:b});d=function(){var e=c("#quickpost-action"),f;f=c("#quick-press").submit(function(){c("#dashboard_quick_press h3").append('');c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==e.val()){e.val("post-quickpress-publish")}c("#dashboard_quick_press div.inside").load(f.attr("action"),f.serializeArray(),function(){c("#dashboard_quick_press h3 img").remove();c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");c("#dashboard_quick_press ul").find("li").each(function(){c("#dashboard_recent_drafts ul").prepend(this)}).end().remove();tb_init("a.thickbox");d()});return false});c("#publish").click(function(){e.val("post-quickpress-publish")})};d()}); \ No newline at end of file +jQuery(document).ready(function(c){var a,b,d;a=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins"];b=function(){c.each(a,function(){var f=jQuery("#"+this+":visible div.inside").find(".widget-loading");if(f.size()){f.parent().load("index-extra.php?jax="+this)}})};b();postboxes.add_postbox_toggles("dashboard",{onShow:b});d=function(){var e=c("#quickpost-action"),f;f=c("#quick-press").submit(function(){c("#dashboard_quick_press h3").append('');c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==e.val()){e.val("post-quickpress-publish")}c("#dashboard_quick_press div.inside").load(f.attr("action"),f.serializeArray(),function(){c("#dashboard_quick_press h3 img").remove();c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");c("#dashboard_quick_press ul").find("li").each(function(){c("#dashboard_recent_drafts ul").prepend(this)}).end().remove();tb_init("a.thickbox");d()});return false});c("#publish").click(function(){e.val("post-quickpress-publish")})};d()}); \ No newline at end of file diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index 9747fa78aa..be2795ba8e 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -402,7 +402,7 @@ var ajaxurl = ''; return false; break; case 'photo' : - jQuery('#extra_fields').before('

'); + jQuery('#extra_fields').before('

'); jQuery.ajax({ type: "GET", cache : false, @@ -463,7 +463,7 @@ var ajaxurl = '';

- +

diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 3b407da743..4166380da6 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -357,7 +357,7 @@ require_once( 'admin-header.php' ); ?>

-

+

@@ -379,7 +379,7 @@ foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {

-

+