| Index: trunk/extensions/MobileFrontend/javascripts/application.js |
| — | — | @@ -3,14 +3,6 @@ |
| 4 | 4 | |
| 5 | 5 | initClearSearchLink(); |
| 6 | 6 | |
| 7 | | -function goToLanguageSelection() { |
| 8 | | - var languageSelection = document.getElementById( 'languageselection' ); |
| 9 | | - var newlocation = languageSelection.options[languageSelection.selectedIndex].value; |
| 10 | | - if ( newlocation ) { |
| 11 | | - window.location = newlocation; |
| 12 | | - } |
| 13 | | -} |
| 14 | | - |
| 15 | 7 | function initClearSearchLink() { |
| 16 | 8 | clearSearch.setAttribute( 'title','Clear' ); |
| 17 | 9 | clearSearch.addEventListener( 'mousedown', clearSearchBox, true ); |
| Index: trunk/extensions/MobileFrontend/MobileFrontend.i18n.php |
| — | — | @@ -68,7 +68,6 @@ |
| 69 | 69 | 'mobile-frontend-leave-feedback' => 'Mobile site feedback', |
| 70 | 70 | 'mobile-frontend-feedback-page' => 'Project:Mobile Extension Feedback', |
| 71 | 71 | 'mobile-frontend-leave-feedback-thanks' => 'Thanks, for your feedback!', |
| 72 | | - 'mobile-frontend-language-selection' => 'Languages', |
| 73 | 72 | ); |
| 74 | 73 | |
| 75 | 74 | /** Message documentation (Message documentation) |
| Index: trunk/extensions/MobileFrontend/MobileFrontend.php |
| — | — | @@ -1018,7 +1018,7 @@ |
| 1019 | 1019 | } elseif ( $this->contentFormat == 'WML' ) { |
| 1020 | 1020 | $homeButton = self::$messages['mobile-frontend-home-button']; |
| 1021 | 1021 | $randomButton = self::$messages['mobile-frontend-random-button']; |
| 1022 | | - //header( 'Content-Type: text/vnd.wap.wml' ); |
| | 1022 | + header( 'Content-Type: text/vnd.wap.wml' ); |
| 1023 | 1023 | |
| 1024 | 1024 | // TODO: Content transformations required |
| 1025 | 1025 | // WML Validator: |
| Index: trunk/extensions/MobileFrontend/views/layout/_search_webkit.html.php |
| — | — | @@ -6,12 +6,9 @@ |
| 7 | 7 | $randomPageUrl = self::$randomPageUrl; |
| 8 | 8 | $homeButton = self::$messages['mobile-frontend-home-button']; |
| 9 | 9 | $randomButton = self::$messages['mobile-frontend-random-button']; |
| 10 | | -$languageSelectionText = self::$messages['mobile-frontend-language-selection']; |
| 11 | 10 | |
| 12 | 11 | $scriptUrl = wfScript(); |
| 13 | 12 | |
| 14 | | -$languageSelection = self::buildLanguageSelection(); |
| 15 | | - |
| 16 | 13 | $searchWebkitHtml = <<<EOD |
| 17 | 14 | <div id='header'> |
| 18 | 15 | <div id='searchbox'> |
| — | — | @@ -24,14 +21,10 @@ |
| 25 | 22 | </div> |
| 26 | 23 | <button id='goButton' type='submit'></button> |
| 27 | 24 | </form> |
| 28 | | - <div id='results'></div> |
| 29 | 25 | </div> |
| 30 | 26 | <div class='nav' id='nav'> |
| 31 | 27 | <form method="get" action="{$mainPageUrl}"><button type="submit" id="homeButton">{$homeButton}</button></form> |
| 32 | 28 | <form method="get" action="{$randomPageUrl}"><button type="submit" id="randomButton">{$randomButton}</button></form> |
| 33 | | - <br/> |
| 34 | | - <b>{$languageSelectionText}:</b> |
| 35 | | - {$languageSelection} |
| 36 | 29 | </div> |
| 37 | 30 | </div> |
| 38 | 31 | EOD; |
| Index: trunk/extensions/MobileFrontend/views/layout/application.html.php |
| — | — | @@ -43,8 +43,7 @@ |
| 44 | 44 | {$contentHtml} |
| 45 | 45 | </div> |
| 46 | 46 | {$footerHtml} |
| 47 | | - <script type="text/javascript" language="javascript" src="{$wgExtensionAssetsPath}/MobileFrontend/javascripts/application.js?version=20110920T172820Z"></script> |
| 48 | | - <script type="text/javascript" language="javascript" src="{$wgExtensionAssetsPath}/MobileFrontend/javascripts/opensearchresults.js?version=20110921T172820Z"></script> |
| | 47 | + <script type="text/javascript" language="javascript" src="{$wgExtensionAssetsPath}/MobileFrontend/javascripts/application.js?version=20110920T172820Z"></script> |
| 49 | 48 | </body> |
| 50 | 49 | </html> |
| 51 | 50 | EOT; |
| Property changes on: trunk/extensions/MobileFrontend |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 52 | 51 | Merged /trunk/extensions/MobileFrontend:r99727 |