| Index: trunk/phase3/CREDITS |
| — | — | @@ -117,7 +117,6 @@ |
| 118 | 118 | * Stefano Codari |
| 119 | 119 | * Str4nd |
| 120 | 120 | * svip |
| 121 | | -* Zachary Hauri |
| 122 | 121 | |
| 123 | 122 | == Translators == |
| 124 | 123 | * Anders Wegge Jakobsen |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3040,31 +3040,6 @@ |
| 3041 | 3041 | $wgThumbUpright = 0.75; |
| 3042 | 3042 | |
| 3043 | 3043 | /** |
| 3044 | | - * Adjust the default number of images per-row in the gallery. |
| 3045 | | - */ |
| 3046 | | -$wgGalleryImagesPerRow = 3; |
| 3047 | | - |
| 3048 | | -/** |
| 3049 | | - * Adjust the width of the cells containing images in galleries (in "px") |
| 3050 | | - */ |
| 3051 | | -$wgGalleryImageWidth = 200; |
| 3052 | | - |
| 3053 | | -/** |
| 3054 | | - * Adjust the height of the cells containing images in galleries (in "px") |
| 3055 | | - */ |
| 3056 | | -$wgGalleryImageHeight = 200; |
| 3057 | | - |
| 3058 | | -/** |
| 3059 | | - * The length of caption to truncate to by default (in characters) |
| 3060 | | - */ |
| 3061 | | -$wgGalleryCaptionLength = 10; |
| 3062 | | - |
| 3063 | | -/** |
| 3064 | | - * Should the gallerys in categoryes show the filesize in bytes? |
| 3065 | | - */ |
| 3066 | | -$wgGalleryShowBytes = true; |
| 3067 | | - |
| 3068 | | -/** |
| 3069 | 3044 | * On category pages, show thumbnail gallery for images belonging to that |
| 3070 | 3045 | * category instead of listing them as articles. |
| 3071 | 3046 | */ |
| Index: trunk/phase3/includes/ImageGallery.php |
| — | — | @@ -32,22 +32,20 @@ |
| 33 | 33 | */ |
| 34 | 34 | private $contextTitle = false; |
| 35 | 35 | |
| | 36 | + private $mPerRow = 4; // How many images wide should the gallery be? |
| | 37 | + private $mWidths = 120, $mHeights = 120; // How wide/tall each thumbnail should be |
| | 38 | + |
| 36 | 39 | private $mAttribs = array(); |
| 37 | 40 | |
| 38 | 41 | /** |
| 39 | 42 | * Create a new image gallery object. |
| 40 | 43 | */ |
| 41 | 44 | function __construct( ) { |
| 42 | | - global $wgGalleryImagesPerRow, $wgGalleryImageWidth, $wgGalleryImageHeight, $wgGalleryShowBytes, $wgGalleryCaptionLength; |
| 43 | 45 | $this->mImages = array(); |
| 44 | | - $this->mShowBytes = $wgGalleryShowBytes; |
| | 46 | + $this->mShowBytes = true; |
| 45 | 47 | $this->mShowFilename = true; |
| 46 | 48 | $this->mParser = false; |
| 47 | 49 | $this->mHideBadImages = false; |
| 48 | | - $this->mPerRow = $wgGalleryImagesPerRow; |
| 49 | | - $this->mWidths = $wgGalleryImageWidth; |
| 50 | | - $this->mHeights = $wgGalleryImageHeight; |
| 51 | | - $this->mCaptionLength = $wgGalleryCaptionLength; |
| 52 | 50 | } |
| 53 | 51 | |
| 54 | 52 | /** |
| — | — | @@ -310,7 +308,7 @@ |
| 311 | 309 | $textlink = $this->mShowFilename ? |
| 312 | 310 | $sk->link( |
| 313 | 311 | $nt, |
| 314 | | - htmlspecialchars( $wgLang->truncate( $nt->getText(), $this->mCaptionLength ) ), |
| | 312 | + htmlspecialchars( $wgLang->truncate( $nt->getText(), 20 ) ), |
| 315 | 313 | array(), |
| 316 | 314 | array(), |
| 317 | 315 | array( 'known', 'noclasses' ) |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -19,9 +19,6 @@ |
| 20 | 20 | it from source control: http://www.mediawiki.org/wiki/Download_from_SVN |
| 21 | 21 | |
| 22 | 22 | === Configuration changes in 1.17 === |
| 23 | | -* (bug 12797) Allow adjusting of default gallery display options: |
| 24 | | - $wgGalleryImagesPerRow, $wgGalleryImageWidth, $wgGalleryImageHeight |
| 25 | | - $wgGalleryCaptionLength, $wgGalleryShowBytes |
| 26 | 23 | * DatabaseFunctions.php that was needed for compatibility with pre-1.3 extensions |
| 27 | 24 | has been removed. |
| 28 | 25 | |