| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -414,7 +414,7 @@ |
| 415 | 415 | |
| 416 | 416 | /** @todo document */ |
| 417 | 417 | function makeImageLinkObj( $nt, $label, $alt, $align = '', $params = array(), $framed = false, |
| 418 | | - $thumb = false, $manual_thumb = '', $valign = '', $upright = false, $upright_factor = 0, $border = false ) |
| | 418 | + $thumb = false, $manual_thumb = '', $valign = '', $upright = false, $upright_factor = 0, $border = false, $frameless = false ) |
| 419 | 419 | { |
| 420 | 420 | global $wgContLang, $wgUser, $wgThumbLimits, $wgThumbUpright; |
| 421 | 421 | |
| — | — | @@ -436,7 +436,7 @@ |
| 437 | 437 | |
| 438 | 438 | if ( !isset( $params['width'] ) ) { |
| 439 | 439 | $params['width'] = $img->getWidth( $page ); |
| 440 | | - if( $thumb || $framed ) { |
| | 440 | + if( $thumb || $framed || $frameless ) { |
| 441 | 441 | $wopt = $wgUser->getOption( 'thumbsize' ); |
| 442 | 442 | |
| 443 | 443 | if( !isset( $wgThumbLimits[$wopt] ) ) { |
| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -4412,6 +4412,7 @@ |
| 4413 | 4413 | # * ___px scale to ___ pixels width, no aligning. e.g. use in taxobox |
| 4414 | 4414 | # * center center the image |
| 4415 | 4415 | # * framed Keep original image size, no magnify-button. |
| | 4416 | + # * frameless like 'thumbnail' but without frame, enlarge-icon and caption. User preference thumb width is used |
| 4416 | 4417 | # * upright reduce width for upright images, rounded to full __0 px |
| 4417 | 4418 | # * border draw a 1px border around the image |
| 4418 | 4419 | # vertical-align values (no % or length right now): |
| — | — | @@ -4436,6 +4437,7 @@ |
| 4437 | 4438 | $mwManualThumb =& MagicWord::get( 'img_manualthumb' ); |
| 4438 | 4439 | $mwWidth =& MagicWord::get( 'img_width' ); |
| 4439 | 4440 | $mwFramed =& MagicWord::get( 'img_framed' ); |
| | 4441 | + $mwFrameless =& MagicWord::get( 'img_frameless' ); |
| 4440 | 4442 | $mwUpright =& MagicWord::get( 'img_upright' ); |
| 4441 | 4443 | $mwBorder =& MagicWord::get( 'img_border' ); |
| 4442 | 4444 | $mwPage =& MagicWord::get( 'img_page' ); |
| — | — | @@ -4443,6 +4445,7 @@ |
| 4444 | 4446 | |
| 4445 | 4447 | $params = array(); |
| 4446 | 4448 | $framed = $thumb = false; |
| | 4449 | + $frameless = false; |
| 4447 | 4450 | $upright = false; |
| 4448 | 4451 | $upright_factor = 0; |
| 4449 | 4452 | $border = false; |
| — | — | @@ -4458,6 +4461,8 @@ |
| 4459 | 4462 | $upright_factor = floatval( $match ); |
| 4460 | 4463 | } elseif ( !is_null( $mwBorder->matchVariableStartToEnd( $val ) ) ) { |
| 4461 | 4464 | $border = true; |
| | 4465 | + } elseif ( !is_null( $mwFrameless->matchVariableStartToEnd( $val ) ) ) { |
| | 4466 | + $frameless = true; |
| 4462 | 4467 | } elseif ( ! is_null( $match = $mwManualThumb->matchVariableStartToEnd($val) ) ) { |
| 4463 | 4468 | # use manually specified thumbnail |
| 4464 | 4469 | $thumb=true; |
| — | — | @@ -4504,7 +4509,7 @@ |
| 4505 | 4510 | $alt = Sanitizer::stripAllTags( $alt ); |
| 4506 | 4511 | |
| 4507 | 4512 | # Linker does the rest |
| 4508 | | - return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign, $upright, $upright_factor, $border ); |
| | 4513 | + return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign, $upright, $upright_factor, $border, $frameless ); |
| 4509 | 4514 | } |
| 4510 | 4515 | |
| 4511 | 4516 | /** |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -281,6 +281,7 @@ |
| 282 | 282 | 'img_width' => array( 1, '$1px' ), |
| 283 | 283 | 'img_center' => array( 1, 'center', 'centre' ), |
| 284 | 284 | 'img_framed' => array( 1, 'framed', 'enframed', 'frame' ), |
| | 285 | + 'img_frameless' => array( 1, 'frameless' ), |
| 285 | 286 | 'img_page' => array( 1, 'page=$1', 'page $1' ), |
| 286 | 287 | 'img_upright' => array( 1, 'upright', 'upright=$1', 'upright $1' ), |
| 287 | 288 | 'img_border' => array( 1, 'border' ), |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -34,13 +34,15 @@ |
| 35 | 35 | * (bug 9628) Show warnings about slave lag on Special:Contributions, |
| 36 | 36 | Special:Watchlist |
| 37 | 37 | * (bug 8818) Expose "wpDestFile" as parameter $1 to "uploaddisabledtext" |
| 38 | | -* Introducing new image parameter 'upright' and corresponding variable |
| | 38 | +* Introducing new image keyword 'upright' and corresponding variable |
| 39 | 39 | $wgThumbUpright. This allows better proportional view of upright images |
| 40 | 40 | related to landscape images on a page without nailing the width of upright |
| 41 | 41 | images to a fix value which makes views for anon unproportional and user |
| 42 | 42 | preferences useless |
| 43 | | -* (bug 6072) Add a 'border' keyword to the image syntax |
| 44 | | - |
| | 43 | +* (bug 6072) Introducing 'border' keyword to the [[Image:]] syntax |
| | 44 | +* Introducing 'frameless' keyword to [[Image:]] syntax which respects the |
| | 45 | + user preferences for image width like 'thumb' but without a frame. |
| | 46 | + |
| 45 | 47 | == Bugfixes since 1.10 == |
| 46 | 48 | |
| 47 | 49 | * (bug 9712) Use Arabic comma in date/time formats for Arabic and Farsi |