http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97271
Revision: 97271 Author: reedy Date: 2011-09-16 14:12:52 +0000 (Fri, 16 Sep 2011) Log Message: ----------- REL1_18 MFT r96406 Modified Paths: -------------- branches/REL1_18/extensions/Collection/Collection.hooks.php branches/REL1_18/extensions/Collection/Collection.templates.php branches/REL1_18/extensions/Collection/js/bookcreator.css branches/REL1_18/phase3/includes/HistoryPage.php branches/REL1_18/phase3/includes/specials/SpecialFileDuplicateSearch.php branches/REL1_18/phase3/skins/common/shared.css Property Changed: ---------------- branches/REL1_18/phase3/includes/HistoryPage.php Modified: branches/REL1_18/extensions/Collection/Collection.hooks.php =================================================================== --- branches/REL1_18/extensions/Collection/Collection.hooks.php 2011-09-16 14:11:41 UTC (rev 97270) +++ branches/REL1_18/extensions/Collection/Collection.hooks.php 2011-09-16 14:12:52 UTC (rev 97271) @@ -245,7 +245,7 @@ 'alt' => '', 'width' => '80', 'height' => '45', - 'class' => 'mw-float-start collection-creatorbox-book', + 'class' => 'collection-creatorbox-book', ), '', true @@ -253,8 +253,7 @@ $html .= Xml::tags( 'div', array( 'class' => 'collection-creatorbox-row' ), - Xml::tags( 'div', - array( 'class' => 'mw-float-end' ), + Xml::tags( 'div', null, $skin->link( Title::newFromText( wfMsg( 'coll-helppage' ) ), Xml::element( 'img', @@ -263,7 +262,6 @@ 'alt' => '', 'width' => '16', 'height' => '16', - 'style' => 'vertical-align: text-bottom;', ) ) . ' ' . wfMsgHtml( 'coll-help' ), Modified: branches/REL1_18/extensions/Collection/Collection.templates.php =================================================================== --- branches/REL1_18/extensions/Collection/Collection.templates.php 2011-09-16 14:11:41 UTC (rev 97270) +++ branches/REL1_18/extensions/Collection/Collection.templates.php 2011-09-16 14:12:52 UTC (rev 97271) @@ -15,7 +15,7 @@ $mediapath = $GLOBALS['wgScriptPath'] . '/extensions/Collection/images/'; ?> -<div class="mw-float-start collection-column collection-column-left"> +<div class="collection-column collection-column-left"> <form action="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book' ) ) ?>" method="post" id="mw-collection-title-form"> <table id="mw-collection-title-table" style="width: 80%; background-color: transparent;" align="center"> @@ -51,7 +51,7 @@ </div> -<div class="mw-float-start collection-column collection-column-right"> +<div class="collection-column collection-column-right"> <div class="collection-column-right-box"> <h2><span class="mw-headline"><?php $this->msg( 'coll-book_title' ) ?></span></h2> @@ -60,7 +60,7 @@ $this->msgWiki( 'coll-book_text' ); ?> <div> - <div class="mw-float-end"> + <div id="collection-order-button"> <form action="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book' ) ) ?>" method="post"> <input type="hidden" name="bookcmd" value="post_zip" /> <input type="hidden" name="partner" value="pediapress" /> @@ -112,7 +112,7 @@ <?php } ?> </select> <?php } ?> - </td><td class="mw-align-end" style="vertical-align:bottom;"> + </td><td id="collection-download-button"> <input type="hidden" name="bookcmd" value="render" /> <input id="downloadButton" type="submit" value="<?php echo $buttonLabel ?>"<?php if ( count( $this->data['collection']['items'] ) == 0 ) { ?> disabled="disabled"<?php } ?> /> </td></tr></tbody></table> @@ -146,7 +146,7 @@ <?php } ?> <label for="personalCollTitle"><a href="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Prefixindex', 'prefix=' . wfUrlencode( $this->data['user-book-prefix'] ) ) ) ?>"><?php echo htmlspecialchars( $this->data['user-book-prefix'] ) ?></a></label> </td> - <td class="mw-align-end"> + <td id="collection-save-input"> <input id="personalCollTitle" type="text" name="pcollname" /> </td></tr> <?php } // if ($canSaveUserPage) ?> @@ -159,11 +159,11 @@ <?php } ?> <label for="communityCollTitle"><a href="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Prefixindex', 'prefix=' . wfUrlencode( $this->data['community-book-prefix'] ) ) ) ?>"><?php echo htmlspecialchars( $this->data['community-book-prefix'] ) ?></a></label> </td> - <td class="mw-align-end"> + <td id="collection-save-button"> <input id="communityCollTitle" type="text" name="ccollname" disabled="disabled" /> </td></tr> <?php } // if ($canSaveCommunityPage) ?> - <tr><td> </td><td class="mw-align-end"> + <tr><td> </td><td id="collection-save-button"> <input id="saveButton" type="submit" value="<?php $this->msg( 'coll-save_collection' ) ?>"<?php if ( count( $this->data['collection']['items'] ) == 0 ) { ?> disabled="disabled"<?php } ?> /> </tr></tbody></table> <input name="token" type="hidden" value="<?php echo htmlspecialchars( $GLOBALS['wgUser']->editToken() ) ?>" /> @@ -418,7 +418,7 @@ (<a href="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book', array( 'bookcmd' => 'suggest', 'resetbans' => '1' ) ) ) ?>" title="<?php $this->msg( 'coll-suggest_reset_bans_tooltip' ) ?>"><?php $this->msg( 'coll-suggest_reset_bans' ) ?></a>) <?php if ( count( $this->data['proposals'] ) > 0 ) { ?> <noscript> - <div class="mw-float-end"> + <div id="collection-suggest-add"> <input type="submit" value="<?php $this->msg( 'coll-suggest_add_selected' ) ?>" name="addselected" /> </div> </noscript> Modified: branches/REL1_18/extensions/Collection/js/bookcreator.css =================================================================== --- branches/REL1_18/extensions/Collection/js/bookcreator.css 2011-09-16 14:11:41 UTC (rev 97270) +++ branches/REL1_18/extensions/Collection/js/bookcreator.css 2011-09-16 14:12:52 UTC (rev 97271) @@ -13,6 +13,7 @@ */ .collection-column { + float: left; width: 47%; } @@ -116,6 +117,10 @@ margin-bottom: 0; } +.collection-creatorbox-book { + float: left; +} + /* Trivial but nicer for the browsers that support it */ .rtl .collection-creatorbox-book { --ms-transform: scaleX(-1); @@ -134,6 +139,18 @@ margin-left: 10px; } +.collection-creatorbox-row div { + float: right; +} + .collection-creatorbox-row img { vertical-align: text-bottom; -} \ No newline at end of file +} + +#collection-suggest-add, +#collection-order-button, +#collection-download-button, +#collection-save-button, +#collection-save-input { + float: right; +} Modified: branches/REL1_18/phase3/includes/HistoryPage.php =================================================================== --- branches/REL1_18/phase3/includes/HistoryPage.php 2011-09-16 14:11:41 UTC (rev 97270) +++ branches/REL1_18/phase3/includes/HistoryPage.php 2011-09-16 14:12:52 UTC (rev 97271) @@ -420,7 +420,7 @@ 'type' => 'submit', 'name' => $name, 'value' => '1', - 'class' => "mw-history-$name-button mw-float-end", + 'class' => "mw-history-$name-button", ), wfMsg( $msg ) ) . "\n"; Property changes on: branches/REL1_18/phase3/includes/HistoryPage.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/REL1_15/phase3/includes/PageHistory.php:51646 /branches/REL1_17/phase3/includes/HistoryPage.php:81448 /branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342 /trunk/phase3/includes/HistoryPage.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997 + /branches/REL1_15/phase3/includes/PageHistory.php:51646 /branches/REL1_17/phase3/includes/HistoryPage.php:81448 /branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342 /trunk/phase3/includes/HistoryPage.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997,96406 Modified: branches/REL1_18/phase3/includes/specials/SpecialFileDuplicateSearch.php =================================================================== --- branches/REL1_18/phase3/includes/specials/SpecialFileDuplicateSearch.php 2011-09-16 14:11:41 UTC (rev 97270) +++ branches/REL1_18/phase3/includes/specials/SpecialFileDuplicateSearch.php 2011-09-16 14:12:52 UTC (rev 97271) @@ -131,7 +131,7 @@ if ( $img ) { $thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) ); if( $thumb ) { - $wgOut->addHTML( '<div class="mw-float-end" id="mw-fileduplicatesearch-icon">' . + $wgOut->addHTML( '<div id="mw-fileduplicatesearch-icon">' . $thumb->toHtml( array( 'desc-link' => false ) ) . '<br />' . wfMsgExt( 'fileduplicatesearch-info', array( 'parse' ), $wgLang->formatNum( $img->getWidth() ), Modified: branches/REL1_18/phase3/skins/common/shared.css =================================================================== --- branches/REL1_18/phase3/skins/common/shared.css 2011-09-16 14:11:41 UTC (rev 97270) +++ branches/REL1_18/phase3/skins/common/shared.css 2011-09-16 14:12:52 UTC (rev 97271) @@ -18,11 +18,6 @@ /* @noflip */textarea[dir="ltr"], input[dir="ltr"] { direction: ltr; } /* @noflip */textarea[dir="rtl"], input[dir="rtl"] { direction: rtl; } -.mw-float-start { float: left; } -.mw-float-end { float: right; } -.mw-align-start { text-align: left; } -.mw-align-end { text-align: right; } - /* The scripts of these languages are very hard to read with underlines */ [lang="ar"] a, [lang="ckb"] a, [lang="fa"] a, [lang="kk-arab"] a, [lang="mzn"] a, [lang="ps"] a, [lang="ur"] a { @@ -296,6 +291,10 @@ border: 1px dashed #aaa; } +.mw-history-revisiondelete-button, #mw-fileduplicatesearch-icon { + float: right; +} + /** Generic minor/bot/newpage styling */ .newpage, .minor, .bot { font-weight: bold; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs