r97870 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r97869‎ | r97870 | r97871 >
Date:00:16, 23 September 2011
Author:preilly
Status:ok
Tags:
Comment:
mft 96528 to 95268
Modified paths:
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/android.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/blackberry.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/default.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/firefox.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/images/close-button.png (added) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/iphone.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/iphone2.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/kindle.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/nokia.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/operamini.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/palm_pre.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/psp.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/simple.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/webkit.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/webkit_old.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/wii.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/views/information/disable.html.php (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/views/layout/_search_webkit.html.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/wii.css
——@@ -259,3 +259,47 @@
260260 .section_anchors,
261261 button.section_heading.hide {
262262 display: none; }
 263+
 264+#search:focus {
 265+ outline: none;
 266+}
 267+
 268+#search {
 269+ -webkit-appearance: none;
 270+ border-top-width: 0px;
 271+ border-right-width: 0px;
 272+ border-bottom-width: 0px;
 273+ border-left-width: 0px;
 274+ outline-style: none;
 275+ outline-width: initial;
 276+ outline-color: initial;
 277+ height: 1.4em;
 278+}
 279+
 280+.divclearable {
 281+ border: 1px solid #888;
 282+ display: -moz-inline-stack;
 283+ display: inline-block;
 284+ zoom:1;
 285+ *display:inline;
 286+ vertical-align:middle;
 287+ height: 1.5em;
 288+ position: relative;
 289+}
 290+
 291+.clearlink {
 292+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 293+ background-position: center center;
 294+ cursor: pointer;
 295+ zoom:1;
 296+ position: absolute;
 297+ right: 0.25em;
 298+ top: 50%;
 299+ margin: 1px;
 300+ height: 12px;
 301+ width: 12px;
 302+ margin-top: -6px;
 303+ z-index: 2;
 304+ border: 0px solid;
 305+ display: none;
 306+}
\ No newline at end of file
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/simple.css
——@@ -299,3 +299,47 @@
300300 a.arrow {
301301 float: right;
302302 margin-right: 5px; }
 303+
 304+#search:focus {
 305+ outline: none;
 306+}
 307+
 308+#search {
 309+ -webkit-appearance: none;
 310+ border-top-width: 0px;
 311+ border-right-width: 0px;
 312+ border-bottom-width: 0px;
 313+ border-left-width: 0px;
 314+ outline-style: none;
 315+ outline-width: initial;
 316+ outline-color: initial;
 317+ height: 1.4em;
 318+}
 319+
 320+.divclearable {
 321+ border: 1px solid #888;
 322+ display: -moz-inline-stack;
 323+ display: inline-block;
 324+ zoom:1;
 325+ *display:inline;
 326+ vertical-align:middle;
 327+ height: 1.5em;
 328+ position: relative;
 329+}
 330+
 331+.clearlink {
 332+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 333+ background-position: center center;
 334+ cursor: pointer;
 335+ zoom:1;
 336+ position: absolute;
 337+ right: 0.25em;
 338+ top: 50%;
 339+ margin: 1px;
 340+ height: 12px;
 341+ width: 12px;
 342+ margin-top: -6px;
 343+ z-index: 2;
 344+ border: 0px solid;
 345+ display: none;
 346+}
\ No newline at end of file
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/palm_pre.css
——@@ -287,3 +287,47 @@
288288
289289 body {
290290 font-size: 14px; }
 291+
 292+#search:focus {
 293+ outline: none;
 294+}
 295+
 296+#search {
 297+ -webkit-appearance: none;
 298+ border-top-width: 0px;
 299+ border-right-width: 0px;
 300+ border-bottom-width: 0px;
 301+ border-left-width: 0px;
 302+ outline-style: none;
 303+ outline-width: initial;
 304+ outline-color: initial;
 305+ height: 1.4em;
 306+}
 307+
 308+.divclearable {
 309+ border: 1px solid #888;
 310+ display: -moz-inline-stack;
 311+ display: inline-block;
 312+ zoom:1;
 313+ *display:inline;
 314+ vertical-align:middle;
 315+ height: 1.5em;
 316+ position: relative;
 317+}
 318+
 319+.clearlink {
 320+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 321+ background-position: center center;
 322+ cursor: pointer;
 323+ zoom:1;
 324+ position: absolute;
 325+ right: 0.25em;
 326+ top: 50%;
 327+ margin: 1px;
 328+ height: 12px;
 329+ width: 12px;
 330+ margin-top: -6px;
 331+ z-index: 2;
 332+ border: 0px solid;
 333+ display: none;
 334+}
\ No newline at end of file
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/nokia.css
——@@ -276,3 +276,47 @@
277277 margin: -1px 0 0 0;
278278 background: white;
279279 padding: 0 5px 5px 5px; }
 280+
 281+#search:focus {
 282+ outline: none;
 283+}
 284+
 285+#search {
 286+ -webkit-appearance: none;
 287+ border-top-width: 0px;
 288+ border-right-width: 0px;
 289+ border-bottom-width: 0px;
 290+ border-left-width: 0px;
 291+ outline-style: none;
 292+ outline-width: initial;
 293+ outline-color: initial;
 294+ height: 1.4em;
 295+}
 296+
 297+.divclearable {
 298+ border: 1px solid #888;
 299+ display: -moz-inline-stack;
 300+ display: inline-block;
 301+ zoom:1;
 302+ *display:inline;
 303+ vertical-align:middle;
 304+ height: 1.5em;
 305+ position: relative;
 306+}
 307+
 308+.clearlink {
 309+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 310+ background-position: center center;
 311+ cursor: pointer;
 312+ zoom:1;
 313+ position: absolute;
 314+ right: 0.25em;
 315+ top: 50%;
 316+ margin: 1px;
 317+ height: 12px;
 318+ width: 12px;
 319+ margin-top: -6px;
 320+ z-index: 2;
 321+ border: 0px solid;
 322+ display: none;
 323+}
\ No newline at end of file
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/firefox.css
——@@ -276,3 +276,47 @@
277277
278278 #nav {
279279 margin-top: 8px; }
 280+
 281+#search:focus {
 282+ outline: none;
 283+}
 284+
 285+#search {
 286+ -webkit-appearance: none;
 287+ border-top-width: 0px;
 288+ border-right-width: 0px;
 289+ border-bottom-width: 0px;
 290+ border-left-width: 0px;
 291+ outline-style: none;
 292+ outline-width: initial;
 293+ outline-color: initial;
 294+ height: 1.4em;
 295+}
 296+
 297+.divclearable {
 298+ border: 1px solid #888;
 299+ display: -moz-inline-stack;
 300+ display: inline-block;
 301+ zoom:1;
 302+ *display:inline;
 303+ vertical-align:middle;
 304+ height: 1.5em;
 305+ position: relative;
 306+}
 307+
 308+.clearlink {
 309+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 310+ background-position: center center;
 311+ cursor: pointer;
 312+ zoom:1;
 313+ position: absolute;
 314+ right: 0.25em;
 315+ top: 50%;
 316+ margin: 1px;
 317+ height: 12px;
 318+ width: 12px;
 319+ margin-top: -6px;
 320+ z-index: 2;
 321+ border: 0px solid;
 322+ display: none;
 323+}
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/psp.css
——@@ -329,3 +329,47 @@
330330
331331 span.idx {
332332 display: none; }
 333+
 334+#search:focus {
 335+ outline: none;
 336+}
 337+
 338+#search {
 339+ -webkit-appearance: none;
 340+ border-top-width: 0px;
 341+ border-right-width: 0px;
 342+ border-bottom-width: 0px;
 343+ border-left-width: 0px;
 344+ outline-style: none;
 345+ outline-width: initial;
 346+ outline-color: initial;
 347+ height: 1.4em;
 348+}
 349+
 350+.divclearable {
 351+ border: 1px solid #888;
 352+ display: -moz-inline-stack;
 353+ display: inline-block;
 354+ zoom:1;
 355+ *display:inline;
 356+ vertical-align:middle;
 357+ height: 1.5em;
 358+ position: relative;
 359+}
 360+
 361+.clearlink {
 362+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 363+ background-position: center center;
 364+ cursor: pointer;
 365+ zoom:1;
 366+ position: absolute;
 367+ right: 0.25em;
 368+ top: 50%;
 369+ margin: 1px;
 370+ height: 12px;
 371+ width: 12px;
 372+ margin-top: -6px;
 373+ z-index: 2;
 374+ border: 0px solid;
 375+ display: none;
 376+}
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/iphone2.css
——@@ -276,3 +276,47 @@
277277
278278 #header {
279279 max-width: 290px; }
 280+
 281+#search:focus {
 282+ outline: none;
 283+}
 284+
 285+#search {
 286+ -webkit-appearance: none;
 287+ border-top-width: 0px;
 288+ border-right-width: 0px;
 289+ border-bottom-width: 0px;
 290+ border-left-width: 0px;
 291+ outline-style: none;
 292+ outline-width: initial;
 293+ outline-color: initial;
 294+ height: 1.4em;
 295+}
 296+
 297+.divclearable {
 298+ border: 1px solid #888;
 299+ display: -moz-inline-stack;
 300+ display: inline-block;
 301+ zoom:1;
 302+ *display:inline;
 303+ vertical-align:middle;
 304+ height: 1.5em;
 305+ position: relative;
 306+}
 307+
 308+.clearlink {
 309+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 310+ background-position: center center;
 311+ cursor: pointer;
 312+ zoom:1;
 313+ position: absolute;
 314+ right: 0.25em;
 315+ top: 50%;
 316+ margin: 1px;
 317+ height: 12px;
 318+ width: 12px;
 319+ margin-top: -6px;
 320+ z-index: 2;
 321+ border: 0px solid;
 322+ display: none;
 323+}
\ No newline at end of file
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/kindle.css
——@@ -92,3 +92,47 @@
9393
9494 body {
9595 line-height: 120%; }
 96+
 97+#search:focus {
 98+ outline: none;
 99+}
 100+
 101+#search {
 102+ -webkit-appearance: none;
 103+ border-top-width: 0px;
 104+ border-right-width: 0px;
 105+ border-bottom-width: 0px;
 106+ border-left-width: 0px;
 107+ outline-style: none;
 108+ outline-width: initial;
 109+ outline-color: initial;
 110+ height: 1.4em;
 111+}
 112+
 113+.divclearable {
 114+ border: 1px solid #888;
 115+ display: -moz-inline-stack;
 116+ display: inline-block;
 117+ zoom:1;
 118+ *display:inline;
 119+ vertical-align:middle;
 120+ height: 1.5em;
 121+ position: relative;
 122+}
 123+
 124+.clearlink {
 125+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 126+ background-position: center center;
 127+ cursor: pointer;
 128+ zoom:1;
 129+ position: absolute;
 130+ right: 0.25em;
 131+ top: 50%;
 132+ margin: 1px;
 133+ height: 12px;
 134+ width: 12px;
 135+ margin-top: -6px;
 136+ z-index: 2;
 137+ border: 0px solid;
 138+ display: none;
 139+}
\ No newline at end of file
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/images/close-button.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes on: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/images/close-button.png
___________________________________________________________________
Added: svn:mime-type
96140 + image/png
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/android.css
——@@ -273,3 +273,47 @@
274274 margin: -1px 0 0 0;
275275 background: white;
276276 padding: 0 5px 5px 5px; }
 277+
 278+#search:focus {
 279+ outline: none;
 280+}
 281+
 282+#search {
 283+ -webkit-appearance: none;
 284+ border-top-width: 0px;
 285+ border-right-width: 0px;
 286+ border-bottom-width: 0px;
 287+ border-left-width: 0px;
 288+ outline-style: none;
 289+ outline-width: initial;
 290+ outline-color: initial;
 291+ height: 1.4em;
 292+}
 293+
 294+.divclearable {
 295+ border: 1px solid #888;
 296+ display: -moz-inline-stack;
 297+ display: inline-block;
 298+ zoom:1;
 299+ *display:inline;
 300+ vertical-align:middle;
 301+ height: 1.5em;
 302+ position: relative;
 303+}
 304+
 305+.clearlink {
 306+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 307+ background-position: center center;
 308+ cursor: pointer;
 309+ zoom:1;
 310+ position: absolute;
 311+ right: 0.25em;
 312+ top: 50%;
 313+ margin: 1px;
 314+ height: 12px;
 315+ width: 12px;
 316+ margin-top: -6px;
 317+ z-index: 2;
 318+ border: 0px solid;
 319+ display: none;
 320+}
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/blackberry.css
——@@ -276,3 +276,47 @@
277277 margin: -1px 0 0 0;
278278 background: white;
279279 padding: 0 5px 5px 5px; }
 280+
 281+#search:focus {
 282+ outline: none;
 283+}
 284+
 285+#search {
 286+ -webkit-appearance: none;
 287+ border-top-width: 0px;
 288+ border-right-width: 0px;
 289+ border-bottom-width: 0px;
 290+ border-left-width: 0px;
 291+ outline-style: none;
 292+ outline-width: initial;
 293+ outline-color: initial;
 294+ height: 1.4em;
 295+}
 296+
 297+.divclearable {
 298+ border: 1px solid #888;
 299+ display: -moz-inline-stack;
 300+ display: inline-block;
 301+ zoom:1;
 302+ *display:inline;
 303+ vertical-align:middle;
 304+ height: 1.5em;
 305+ position: relative;
 306+}
 307+
 308+.clearlink {
 309+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 310+ background-position: center center;
 311+ cursor: pointer;
 312+ zoom:1;
 313+ position: absolute;
 314+ right: 0.25em;
 315+ top: 50%;
 316+ margin: 1px;
 317+ height: 12px;
 318+ width: 12px;
 319+ margin-top: -6px;
 320+ z-index: 2;
 321+ border: 0px solid;
 322+ display: none;
 323+}
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/iphone.css
——@@ -302,3 +302,47 @@
303303
304304 #header {
305305 max-width: 290px; }
 306+
 307+#search:focus {
 308+ outline: none;
 309+}
 310+
 311+#search {
 312+ -webkit-appearance: none;
 313+ border-top-width: 0px;
 314+ border-right-width: 0px;
 315+ border-bottom-width: 0px;
 316+ border-left-width: 0px;
 317+ outline-style: none;
 318+ outline-width: initial;
 319+ outline-color: initial;
 320+ height: 1.4em;
 321+}
 322+
 323+.divclearable {
 324+ border: 1px solid #888;
 325+ display: -moz-inline-stack;
 326+ display: inline-block;
 327+ zoom:1;
 328+ *display:inline;
 329+ vertical-align:middle;
 330+ height: 1.5em;
 331+ position: relative;
 332+}
 333+
 334+.clearlink {
 335+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 336+ background-position: center center;
 337+ cursor: pointer;
 338+ zoom:1;
 339+ position: absolute;
 340+ right: 0.25em;
 341+ top: 50%;
 342+ margin: 1px;
 343+ height: 12px;
 344+ width: 12px;
 345+ margin-top: -6px;
 346+ z-index: 2;
 347+ border: 0px solid;
 348+ display: none;
 349+}
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/operamini.css
——@@ -302,3 +302,47 @@
303303
304304 span.idx {
305305 display: none; }
 306+
 307+#search:focus {
 308+ outline: none;
 309+}
 310+
 311+#search {
 312+ -webkit-appearance: none;
 313+ border-top-width: 0px;
 314+ border-right-width: 0px;
 315+ border-bottom-width: 0px;
 316+ border-left-width: 0px;
 317+ outline-style: none;
 318+ outline-width: initial;
 319+ outline-color: initial;
 320+ height: 1.4em;
 321+}
 322+
 323+.divclearable {
 324+ border: 1px solid #888;
 325+ display: -moz-inline-stack;
 326+ display: inline-block;
 327+ zoom:1;
 328+ *display:inline;
 329+ vertical-align:middle;
 330+ height: 1.5em;
 331+ position: relative;
 332+}
 333+
 334+.clearlink {
 335+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 336+ background-position: center center;
 337+ cursor: pointer;
 338+ zoom:1;
 339+ position: absolute;
 340+ right: 0.25em;
 341+ top: 50%;
 342+ margin: 1px;
 343+ height: 12px;
 344+ width: 12px;
 345+ margin-top: -6px;
 346+ z-index: 2;
 347+ border: 0px solid;
 348+ display: none;
 349+}
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/webkit_old.css
——@@ -284,3 +284,47 @@
285285 margin: -1px 0 0 0;
286286 background: white;
287287 padding: 0 5px 5px 5px; }
 288+
 289+#search:focus {
 290+ outline: none;
 291+}
 292+
 293+#search {
 294+ -webkit-appearance: none;
 295+ border-top-width: 0px;
 296+ border-right-width: 0px;
 297+ border-bottom-width: 0px;
 298+ border-left-width: 0px;
 299+ outline-style: none;
 300+ outline-width: initial;
 301+ outline-color: initial;
 302+ height: 1.4em;
 303+}
 304+
 305+.divclearable {
 306+ border: 1px solid #888;
 307+ display: -moz-inline-stack;
 308+ display: inline-block;
 309+ zoom:1;
 310+ *display:inline;
 311+ vertical-align:middle;
 312+ height: 1.5em;
 313+ position: relative;
 314+}
 315+
 316+.clearlink {
 317+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 318+ background-position: center center;
 319+ cursor: pointer;
 320+ zoom:1;
 321+ position: absolute;
 322+ right: 0.25em;
 323+ top: 50%;
 324+ margin: 1px;
 325+ height: 12px;
 326+ width: 12px;
 327+ margin-top: -6px;
 328+ z-index: 2;
 329+ border: 0px solid;
 330+ display: none;
 331+}
\ No newline at end of file
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/default.css
——@@ -261,3 +261,47 @@
262262 .section_anchors,
263263 button.section_heading.hide {
264264 display: none; }
 265+
 266+#search:focus {
 267+ outline: none;
 268+}
 269+
 270+#search {
 271+ -webkit-appearance: none;
 272+ border-top-width: 0px;
 273+ border-right-width: 0px;
 274+ border-bottom-width: 0px;
 275+ border-left-width: 0px;
 276+ outline-style: none;
 277+ outline-width: initial;
 278+ outline-color: initial;
 279+ height: 1.4em;
 280+}
 281+
 282+.divclearable {
 283+ border: 1px solid #888;
 284+ display: -moz-inline-stack;
 285+ display: inline-block;
 286+ zoom:1;
 287+ *display:inline;
 288+ vertical-align:middle;
 289+ height: 1.5em;
 290+ position: relative;
 291+}
 292+
 293+.clearlink {
 294+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 295+ background-position: center center;
 296+ cursor: pointer;
 297+ zoom:1;
 298+ position: absolute;
 299+ right: 0.25em;
 300+ top: 50%;
 301+ margin: 1px;
 302+ height: 12px;
 303+ width: 12px;
 304+ margin-top: -6px;
 305+ z-index: 2;
 306+ border: 0px solid;
 307+ display: none;
 308+}
\ No newline at end of file
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/webkit.css
——@@ -273,3 +273,47 @@
274274 margin: -1px 0 0 0;
275275 background: white;
276276 padding: 0 5px 5px 5px; }
 277+
 278+#search:focus {
 279+ outline: none;
 280+}
 281+
 282+#search {
 283+ -webkit-appearance: none;
 284+ border-top-width: 0px;
 285+ border-right-width: 0px;
 286+ border-bottom-width: 0px;
 287+ border-left-width: 0px;
 288+ outline-style: none;
 289+ outline-width: initial;
 290+ outline-color: initial;
 291+ height: 1.4em;
 292+}
 293+
 294+.divclearable {
 295+ border: 1px solid #888;
 296+ display: -moz-inline-stack;
 297+ display: inline-block;
 298+ zoom:1;
 299+ *display:inline;
 300+ vertical-align:middle;
 301+ height: 1.5em;
 302+ position: relative;
 303+}
 304+
 305+.clearlink {
 306+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
 307+ background-position: center center;
 308+ cursor: pointer;
 309+ zoom:1;
 310+ position: absolute;
 311+ right: 0.25em;
 312+ top: 50%;
 313+ margin: 1px;
 314+ height: 12px;
 315+ width: 12px;
 316+ margin-top: -6px;
 317+ z-index: 2;
 318+ border: 0px solid;
 319+ display: none;
 320+}
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
——@@ -49,7 +49,16 @@
5050 */
5151 $wgMobileFrontendLogo = false;
5252
 53+$wgMobileDomain = '.m.';
5354
 55+/**
 56+ * URL for script used to disable mobile site
 57+ * (protocol, host, optional port; path portion)
 58+ *
 59+ * e.g., http://en.wikipedia.org/w/mobileRedirect.php
 60+ */
 61+$wgMobileRedirectFormAction = false;
 62+
5463 $wgExtMobileFrontend = new ExtMobileFrontend();
5564
5665 $wgHooks['BeforePageDisplay'][] = array( &$wgExtMobileFrontend, 'beforePageDisplayHTML' );
——@@ -57,6 +66,8 @@
5867 $wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( &$wgExtMobileFrontend, 'addMobileFooter' );
5968 $wgExtensionFunctions[] = array( &$wgExtMobileFrontend, 'setDefaultLogo' );
6069
 70+$wgHooks['TestCanonicalRedirect'][] = array( &$wgExtMobileFrontend, 'testCanonicalRedirect' );
 71+
6172 /**
6273 * Make the classes stripped from page content configurable. Each item will
6374 * be stripped from the page. See $itemsToRemove for more info
——@@ -73,7 +84,7 @@
7485 }
7586
7687 class ExtMobileFrontend {
77 - const VERSION = '0.5.63';
 88+ const VERSION = '0.5.68';
7889
7990 /**
8091 * @var DOMDocument
——@@ -113,6 +124,7 @@
114125 public static $currentURL;
115126 public static $displayNoticeId;
116127 public static $leaveFeedbackURL;
 128+ public static $mobileRedirectFormAction;
117129
118130 public static $messageKeys = array(
119131 'mobile-frontend-show-button',
——@@ -186,22 +198,34 @@
187199 '#ogg_player_1',
188200 '.nomobile',
189201 );
 202+
 203+ public function testCanonicalRedirect( $request, $title, $output ) {
 204+ global $wgMobileDomain;
 205+ $host = $request->getHeader( 'HOST' );
 206+ return !( stristr( $host, $wgMobileDomain ) !== false );
 207+ }
190208
191209 public function addMobileFooter( &$obj, &$tpl ) {
192210 global $wgRequest;
193211 wfProfileIn( __METHOD__ );
194 - $footerlinks = $tpl->data['footerlinks'];
195 - $mobileViewUrl = $wgRequest->escapeAppendQuery( 'useformat=mobile' );
196212
197 - $tpl->set('mobileview', "<a href='{$mobileViewUrl}'>".wfMsg( 'mobile-frontend-view')."</a>");
198 - $footerlinks['places'][] = 'mobileview';
199 - $tpl->set('footerlinks', $footerlinks);
 213+ $title = $obj->getTitle();
 214+ $isSpecial = $title->isSpecialPage();
 215+
 216+ if ( ! $isSpecial ) {
 217+ $footerlinks = $tpl->data['footerlinks'];
 218+ $mobileViewUrl = $wgRequest->escapeAppendQuery( 'useformat=mobile' );
 219+
 220+ $tpl->set('mobileview', "<a href='{$mobileViewUrl}'>".wfMsg( 'mobile-frontend-view')."</a>");
 221+ $footerlinks['places'][] = 'mobileview';
 222+ $tpl->set('footerlinks', $footerlinks);
 223+ }
200224 wfProfileOut( __METHOD__ );
201225 return true;
202226 }
203227
204228 public function getMsg() {
205 - global $wgUser, $wgContLang, $wgRequest;
 229+ global $wgUser, $wgContLang, $wgRequest, $wgServer, $wgMobileRedirectFormAction, $wgMobileDomain;
206230 wfProfileIn( __METHOD__ );
207231
208232 self::$disableImagesURL = $wgRequest->escapeAppendQuery( 'disableImages=1' );
——@@ -233,6 +257,9 @@
234258
235259 self::$dir = $wgContLang->getDir();
236260 self::$code = $wgContLang->getCode();
 261+
 262+ $nonMobileServerBaseURL = str_replace( $wgMobileDomain, '.', $wgServer );
 263+ self::$mobileRedirectFormAction = ( $wgMobileRedirectFormAction !== false ) ? $wgMobileRedirectFormAction : "{$nonMobileServerBaseURL}/w/mobileRedirect.php";
237264
238265 self::$mainPageUrl = Title::newMainPage()->getLocalUrl();
239266 self::$randomPageUrl = $this->getRelativeURL( SpecialPage::getTitleFor( 'Randompage' )->getLocalUrl() );
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/views/information/disable.html.php
——@@ -1,8 +1,8 @@
22 <?php
33
4 -$lang = self::$code;
54 $currentURL = self::$currentURL;
65 $currentURL = str_replace('&mobileaction=disable_mobile_site', '', $currentURL);
 6+$mobileRedirectFormAction = self::$mobileRedirectFormAction;
77
88 $disableHtml = <<<EOT
99 <h1>
——@@ -12,7 +12,7 @@
1313 {$explainDisable}
1414 </p>
1515 <div id='disableButtons'>
16 - <form action='http://{$lang}.wikipedia.org/w/mobileRedirect.php' method='get'>
 16+ <form action='{$mobileRedirectFormAction}' method='get'>
1717 <input name='to' type='hidden' value='{$currentURL}' />
1818 <input name='expires_in_days' type='hidden' value='3650' />
1919 <button id='disableButton' type='submit'>{$disableButton}</button>
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/views/layout/_search_webkit.html.php
——@@ -15,7 +15,10 @@
1616 <img width="35" height="22" alt='Logo' id='logo' src='{$wgMobileFrontendLogo}' />
1717 <form action='{$scriptUrl}' class='search_bar' method='get'>
1818 <input type="hidden" value="Special:Search" name="title" />
19 - <input id='searchField' name='search' size='28' type='search' value='{$searchField}' />
 19+ <div id="sq" class="divclearable">
 20+ <input type="text" name="search" id="search" size="28" value="{$searchField}" />
 21+ <div class="clearlink" id="clearsearch"></div>
 22+ </div>
2023 <button id='goButton' type='submit'></button>
2124 </form>
2225 </div>

Status & tagging log