| Index: trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php |
| — | — | @@ -1487,7 +1487,7 @@ |
| 1488 | 1488 | } |
| 1489 | 1489 | |
| 1490 | 1490 | $result[0] .= "</select>"; |
| 1491 | | - $result[0] .= "</p>\n"; |
| | 1491 | + $result[0] .= "\n"; |
| 1492 | 1492 | $result[] .= '<fieldset><legend>' . wfMsg( 'smw_ask_otheroptions' ) . "</legend>\n"; |
| 1493 | 1493 | $result[1] .= "<div id=\"other_options\">" . $this->showFormatOptions( $params['format'], $params ) . " </div>"; |
| 1494 | 1494 | $result[1] .= "</fieldset>\n"; |
| Index: trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php |
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 | ); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | | - $htmlOutput .= Html::rawElement( 'div', array( 'class' => 'smw-qc-result' ), $this->uiCore->getHTMLResult() ); |
| | 45 | + $htmlOutput .= Html::rawElement( 'div', array( 'class' => 'smwqcresult' ), $this->uiCore->getHTMLResult() ); |
| 46 | 46 | |
| 47 | 47 | if ( $this->usesNavigationBar() ) { |
| 48 | 48 | $htmlOutput .= Html::rawElement( 'div', array( 'class' => 'smwqcnavbar' ), |
| — | — | @@ -82,17 +82,16 @@ |
| 83 | 83 | $formatBox = $this->getFormatSelectBoxSep( 'broadtable' ); |
| 84 | 84 | $result .= '<form name="ask" action="' . $specTitle->escapeLocalURL() . '" method="get">' . "\n" . |
| 85 | 85 | '<input type="hidden" name="title" value="' . $specTitle->getPrefixedText() . '"/>'; |
| 86 | | - $result .= '<br>'; |
| | 86 | + $result .= '<br/>'; |
| 87 | 87 | $result .= wfMsg( 'smw_qc_query_help' ); |
| 88 | 88 | // Main query and format options |
| 89 | | - $result .= '<table style="width: 100%; ">' . |
| 90 | | - '<tr><th>' . wfMsg( 'smw_ask_queryhead' ) . "</th>\n<th>" . wfMsg( 'smw_ask_format_as' ) . "</th></tr>" . |
| 91 | | - '<tr>' . |
| 92 | | - '<td style="width: 70%; padding-right: 7px;">' . $this->getQueryFormBox() . "</td>\n" . |
| 93 | | - '<td style="padding-right: 7px; text-align:center;">' . $formatBox[0]; |
| 94 | | - |
| | 89 | + $result .= $this->getQueryFormBox(); |
| | 90 | + // sorting and prinouts |
| | 91 | + $result .= '<div class="smw-qc-sortbox" style="padding-left:10px;">' . $this->getPoSortFormBox() . '</div>'; |
| | 92 | + // additional options |
| 95 | 93 | //START: show|hide additional options |
| 96 | | - $result .= '<span id="show_additional_options" style="display:inline;"><a href="#addtional" rel="nofollow" onclick="' . |
| | 94 | + $result .= '<div class="smwqcformatas"><strong>'.wfMsg('smw_ask_format_as').'</strong>'; |
| | 95 | + $result .= $formatBox[0].'<span id="show_additional_options" style="display:inline;"><a href="#addtional" rel="nofollow" onclick="' . |
| 97 | 96 | "jQuery('#additional_options').show('blind');" . |
| 98 | 97 | "document.getElementById('show_additional_options').style.display='none';" . |
| 99 | 98 | "document.getElementById('hide_additional_options').style.display='inline';" . '">' . |
| — | — | @@ -102,14 +101,8 @@ |
| 103 | 102 | "document.getElementById('hide_additional_options').style.display='none';" . |
| 104 | 103 | "document.getElementById('show_additional_options').style.display='inline';" . '">' . |
| 105 | 104 | wfMsg( 'smw_qc_hide_addnal_opts' ) . '</a></span>'; |
| | 105 | + $result .= '</div>'; |
| 106 | 106 | //END: show|hide additional options |
| 107 | | - |
| 108 | | - $result .= '</td>' . |
| 109 | | - '</tr>' . |
| 110 | | - "</table>\n"; |
| 111 | | - // sorting and prinouts |
| 112 | | - $result .= '<div class="smw-qc-sortbox" style="padding-left:10px;">' . $this->getPoSortFormBox() . '</div>'; |
| 113 | | - // additional options |
| 114 | 107 | $result .= '<div id="additional_options" style="display:none">'; |
| 115 | 108 | |
| 116 | 109 | $result .= $formatBox[1]; // display the format options |
| — | — | @@ -119,7 +112,7 @@ |
| 120 | 113 | |
| 121 | 114 | $result .= '<a href="' . htmlspecialchars( wfMsg( 'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>'; |
| 122 | 115 | if ( $this->uiCore->getQueryString() != '' ) { // hide #ask if there isnt any query defined |
| 123 | | - $result .= ' | <a name="show-embed-code" id="show-embed-code" href="##">' . wfMsg( 'smw_ask_show_embed' ) . '</a>'; |
| | 116 | + $result .= ' | <a name="show-embed-code" id="show-embed-code" href="##" rel="nofollow">' . wfMsg( 'smw_ask_show_embed' ) . '</a>'; |
| 124 | 117 | $result .= '<div id="embed-code-dialog">' . |
| 125 | 118 | $this->getAskEmbedBox() . |
| 126 | 119 | '</div>'; |
| Index: trunk/extensions/SemanticMediaWiki/skins/SMW_custom.css |
| — | — | @@ -160,6 +160,11 @@ |
| 161 | 161 | padding-top: 5px; |
| 162 | 162 | } |
| 163 | 163 | |
| | 164 | +div.smwqcformatas{ |
| | 165 | + margin:10px; |
| | 166 | + margin-top: 15px; |
| | 167 | + margin-bottom: 0px; |
| | 168 | +} |
| 164 | 169 | /* search, browse, RDF icons */ |
| 165 | 170 | |
| 166 | 171 | span.smwsearchicon { /*FIXME: this was only used for Factbox docu, should be removed from code*/ |