| Index: trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php |
| — | — | @@ -53,7 +53,6 @@ |
| 54 | 54 | * Creates the input form |
| 55 | 55 | * |
| 56 | 56 | * @global OutputPage $wgOut |
| 57 | | - * @global booolean $smwgQSortingSupport |
| 58 | 57 | * @return string |
| 59 | 58 | */ |
| 60 | 59 | protected function makeResults() { |
| — | — | @@ -62,32 +61,28 @@ |
| 63 | 62 | $spectitle = $this->getTitle(); |
| 64 | 63 | $result .= '<form name="ask" action="' . $spectitle->escapeLocalURL() . '" method="get">' . "\n" . |
| 65 | 64 | '<input type="hidden" name="title" value="' . $spectitle->getPrefixedText() . '"/>'; |
| 66 | | - |
| | 65 | + $result .= '<br>'; |
| 67 | 66 | $result .= wfMsg( 'smw_qc_query_help' ); |
| 68 | 67 | // Main query and printouts. |
| 69 | 68 | $result .= '<p><strong>' . wfMsg( 'smw_ask_queryhead' ) . "</strong></p>\n"; |
| 70 | | - $result .= '<p>' . $this->getQueryFormBox( $this->uiCore->getQueryString() ) . '</p>'; |
| | 69 | + $result .= '<p>' . $this->getQueryFormBox() . '</p>'; |
| | 70 | + //sorting and prinouts |
| | 71 | + $result .= $this->getPoSortFormBox(); |
| 71 | 72 | // show|hide additional options and querying help |
| 72 | | - $result .= '<span id="show_additional_options" style="display:inline"><a href="#addtional" rel="nofollow" onclick="' . |
| | 73 | + $result .= '<br><span id="show_additional_options" style="display:inline;"><a href="#addtional" rel="nofollow" onclick="' . |
| 73 | 74 | "document.getElementById('additional_options').style.display='block';" . |
| 74 | 75 | "document.getElementById('show_additional_options').style.display='none';" . |
| 75 | 76 | "document.getElementById('hide_additional_options').style.display='inline';" . '">' . |
| 76 | | - wfMsg( 'smw_show_addnal_opts' ) . '</a></span>'; |
| | 77 | + wfMsg( 'smw_qc_show_addnal_opts' ) . '</a></span>'; |
| 77 | 78 | $result .= '<span id="hide_additional_options" style="display:none"><a href="#" rel="nofollow" onclick="' . |
| 78 | 79 | "document.getElementById('additional_options').style.display='none';" . |
| 79 | 80 | "document.getElementById('hide_additional_options').style.display='none';" . |
| 80 | 81 | "document.getElementById('show_additional_options').style.display='inline';" . '">' . |
| 81 | | - wfMsg( 'smw_hide_addnal_opts' ) . '</a></span>'; |
| | 82 | + wfMsg( 'smw_qc_hide_addnal_opts' ) . '</a></span>'; |
| 82 | 83 | $result .= ' | <a href="' . htmlspecialchars( wfMsg( 'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>'; |
| 83 | 84 | // additional options |
| 84 | 85 | $result .= '<div id="additional_options" style="display:none">'; |
| 85 | | - $result .= '<p><strong>' . wfMsg( 'smw_ask_printhead' ) . "</strong></p>\n" . |
| 86 | | - '<span style="font-weight: normal;">' . wfMsg( 'smw_ask_printdesc' ) . '</span>' . "\n" . |
| 87 | | - '<p>' . $this->getPOFormBox( $this->getPOStrings(), SMWQueryUI::ENABLE_AUTO_SUGGEST ) . '</p>' . "\n"; |
| 88 | 86 | |
| 89 | | - // sorting inputs |
| 90 | | - $result .= $this->getSortingFormBox(); |
| 91 | | - |
| 92 | 87 | $result .= "<br><br>" . $this->getFormatSelectBox( 'broadtable' ); |
| 93 | 88 | |
| 94 | 89 | if ( $this->uiCore->getQueryString() != '' ) // hide #ask if there isnt any query defined |