http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97869
Revision: 97869
Author: preilly
Date: 2011-09-23 00:13:43 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
mft 96528 to 95268
Modified Paths:
--------------
branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/android.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/blackberry.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/default.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/firefox.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/iphone.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/iphone2.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/kindle.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/nokia.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/operamini.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/palm_pre.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/psp.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/simple.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/webkit.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/webkit_old.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/wii.css
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/disable.html.php
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/layout/_search_webkit.html.php
Added Paths:
-----------
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/images/close-button.png
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-09-23 00:13:43 UTC (rev 97869)
@@ -49,7 +49,16 @@
*/
$wgMobileFrontendLogo = false;
+$wgMobileDomain = '.m.';
+/**
+ * URL for script used to disable mobile site
+ * (protocol, host, optional port; path portion)
+ *
+ * e.g., http://en.wikipedia.org/w/mobileRedirect.php
+ */
+$wgMobileRedirectFormAction = false;
+
$wgExtMobileFrontend = new ExtMobileFrontend();
$wgHooks['BeforePageDisplay'][] = array( &$wgExtMobileFrontend,
'beforePageDisplayHTML' );
@@ -57,6 +66,8 @@
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( &$wgExtMobileFrontend,
'addMobileFooter' );
$wgExtensionFunctions[] = array( &$wgExtMobileFrontend, 'setDefaultLogo' );
+$wgHooks['TestCanonicalRedirect'][] = array( &$wgExtMobileFrontend,
'testCanonicalRedirect' );
+
/**
* Make the classes stripped from page content configurable. Each item will
* be stripped from the page. See $itemsToRemove for more info
@@ -73,7 +84,7 @@
}
class ExtMobileFrontend {
- const VERSION = '0.5.63';
+ const VERSION = '0.5.68';
/**
* @var DOMDocument
@@ -113,6 +124,7 @@
public static $currentURL;
public static $displayNoticeId;
public static $leaveFeedbackURL;
+ public static $mobileRedirectFormAction;
public static $messageKeys = array(
'mobile-frontend-show-button',
@@ -186,22 +198,34 @@
'#ogg_player_1',
'.nomobile',
);
+
+ public function testCanonicalRedirect( $request, $title, $output ) {
+ global $wgMobileDomain;
+ $host = $request->getHeader( 'HOST' );
+ return !( stristr( $host, $wgMobileDomain ) !== false );
+ }
public function addMobileFooter( &$obj, &$tpl ) {
global $wgRequest;
wfProfileIn( __METHOD__ );
- $footerlinks = $tpl->data['footerlinks'];
- $mobileViewUrl = $wgRequest->escapeAppendQuery(
'useformat=mobile' );
- $tpl->set('mobileview', "<a href='{$mobileViewUrl}'>".wfMsg(
'mobile-frontend-view')."</a>");
- $footerlinks['places'][] = 'mobileview';
- $tpl->set('footerlinks', $footerlinks);
+ $title = $obj->getTitle();
+ $isSpecial = $title->isSpecialPage();
+
+ if ( ! $isSpecial ) {
+ $footerlinks = $tpl->data['footerlinks'];
+ $mobileViewUrl = $wgRequest->escapeAppendQuery(
'useformat=mobile' );
+
+ $tpl->set('mobileview', "<a
href='{$mobileViewUrl}'>".wfMsg( 'mobile-frontend-view')."</a>");
+ $footerlinks['places'][] = 'mobileview';
+ $tpl->set('footerlinks', $footerlinks);
+ }
wfProfileOut( __METHOD__ );
return true;
}
public function getMsg() {
- global $wgUser, $wgContLang, $wgRequest;
+ global $wgUser, $wgContLang, $wgRequest, $wgServer,
$wgMobileRedirectFormAction, $wgMobileDomain;
wfProfileIn( __METHOD__ );
self::$disableImagesURL = $wgRequest->escapeAppendQuery(
'disableImages=1' );
@@ -233,6 +257,9 @@
self::$dir = $wgContLang->getDir();
self::$code = $wgContLang->getCode();
+
+ $nonMobileServerBaseURL = str_replace( $wgMobileDomain, '.',
$wgServer );
+ self::$mobileRedirectFormAction = ( $wgMobileRedirectFormAction
!== false ) ? $wgMobileRedirectFormAction :
"{$nonMobileServerBaseURL}/w/mobileRedirect.php";
self::$mainPageUrl = Title::newMainPage()->getLocalUrl();
self::$randomPageUrl = $this->getRelativeURL(
SpecialPage::getTitleFor( 'Randompage' )->getLocalUrl() );
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/android.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/android.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/android.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -273,3 +273,47 @@
margin: -1px 0 0 0;
background: white;
padding: 0 5px 5px 5px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/blackberry.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/blackberry.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/blackberry.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -276,3 +276,47 @@
margin: -1px 0 0 0;
background: white;
padding: 0 5px 5px 5px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/default.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/default.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/default.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -261,3 +261,47 @@
.section_anchors,
button.section_heading.hide {
display: none; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
\ No newline at end of file
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/firefox.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/firefox.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/firefox.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -276,3 +276,47 @@
#nav {
margin-top: 8px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
Added:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/images/close-button.png
===================================================================
(Binary files differ)
Property changes on:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/images/close-button.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/iphone.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/iphone.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/iphone.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -302,3 +302,47 @@
#header {
max-width: 290px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/iphone2.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/iphone2.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/iphone2.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -276,3 +276,47 @@
#header {
max-width: 290px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
\ No newline at end of file
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/kindle.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/kindle.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/kindle.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -92,3 +92,47 @@
body {
line-height: 120%; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
\ No newline at end of file
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/nokia.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/nokia.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/nokia.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -276,3 +276,47 @@
margin: -1px 0 0 0;
background: white;
padding: 0 5px 5px 5px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
\ No newline at end of file
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/operamini.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/operamini.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/operamini.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -302,3 +302,47 @@
span.idx {
display: none; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/palm_pre.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/palm_pre.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/palm_pre.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -287,3 +287,47 @@
body {
font-size: 14px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
\ No newline at end of file
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/psp.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/psp.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/psp.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -329,3 +329,47 @@
span.idx {
display: none; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/simple.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/simple.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/simple.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -299,3 +299,47 @@
a.arrow {
float: right;
margin-right: 5px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
\ No newline at end of file
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/webkit.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/webkit.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/webkit.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -273,3 +273,47 @@
margin: -1px 0 0 0;
background: white;
padding: 0 5px 5px 5px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/webkit_old.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/webkit_old.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/webkit_old.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -284,3 +284,47 @@
margin: -1px 0 0 0;
background: white;
padding: 0 5px 5px 5px; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
\ No newline at end of file
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/wii.css
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/wii.css
2011-09-22 23:53:37 UTC (rev 97868)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/stylesheets/wii.css
2011-09-23 00:13:43 UTC (rev 97869)
@@ -259,3 +259,47 @@
.section_anchors,
button.section_heading.hide {
display: none; }
+
+#search:focus {
+ outline: none;
+}
+
+#search {
+ -webkit-appearance: none;
+ border-top-width: 0px;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ border-left-width: 0px;
+ outline-style: none;
+ outline-width: initial;
+ outline-color: initial;
+ height: 1.4em;
+}
+
+.divclearable {
+ border: 1px solid #888;
+ display: -moz-inline-stack;
+ display: inline-block;
+ zoom:1;
+ *display:inline;
+ vertical-align:middle;
+ height: 1.5em;
+ position: relative;
+}
+
+.clearlink {
+ background: url(images/close-button.png) no-repeat scroll 0 0 transparent;
+ background-position: center center;
+ cursor: pointer;
+ zoom:1;
+ position: absolute;
+ right: 0.25em;
+ top: 50%;
+ margin: 1px;
+ height: 12px;
+ width: 12px;
+ margin-top: -6px;
+ z-index: 2;
+ border: 0px solid;
+ display: none;
+}
\ No newline at end of file
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/disable.html.php
===================================================================
---
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/disable.html.php
2011-09-22 23:53:37 UTC (rev 97868)
+++
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/disable.html.php
2011-09-23 00:13:43 UTC (rev 97869)
@@ -1,8 +1,8 @@
<?php
-$lang = self::$code;
$currentURL = self::$currentURL;
$currentURL = str_replace('&mobileaction=disable_mobile_site', '',
$currentURL);
+$mobileRedirectFormAction = self::$mobileRedirectFormAction;
$disableHtml = <<<EOT
<h1>
@@ -12,7 +12,7 @@
{$explainDisable}
</p>
<div id='disableButtons'>
- <form
action='http://{$lang}.wikipedia.org/w/mobileRedirect.php' method='get'>
+ <form action='{$mobileRedirectFormAction}' method='get'>
<input name='to' type='hidden' value='{$currentURL}' />
<input name='expires_in_days' type='hidden'
value='3650' />
<button id='disableButton'
type='submit'>{$disableButton}</button>
Modified:
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/layout/_search_webkit.html.php
===================================================================
---
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/layout/_search_webkit.html.php
2011-09-22 23:53:37 UTC (rev 97868)
+++
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/layout/_search_webkit.html.php
2011-09-23 00:13:43 UTC (rev 97869)
@@ -15,7 +15,10 @@
<img width="35" height="22" alt='Logo' id='logo'
src='{$wgMobileFrontendLogo}' />
<form action='{$scriptUrl}' class='search_bar' method='get'>
<input type="hidden" value="Special:Search" name="title" />
- <input id='searchField' name='search' size='28' type='search'
value='{$searchField}' />
+ <div id="sq" class="divclearable">
+ <input type="text" name="search" id="search" size="28"
value="{$searchField}" />
+ <div class="clearlink" id="clearsearch"></div>
+ </div>
<button id='goButton' type='submit'></button>
</form>
</div>
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
