| Index: trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php |
| — | — | @@ -1515,9 +1515,7 @@ |
| 1516 | 1516 | |
| 1517 | 1517 | $result[0] .= "</select>"; |
| 1518 | 1518 | $result[0] .= "\n"; |
| 1519 | | - $result[] .= '<fieldset><legend>' . wfMsg( 'smw_ask_otheroptions' ) . "</legend>\n"; |
| 1520 | | - $result[1] .= "<div id=\"other_options\">" . $this->showFormatOptions( $params['format'], $params ) . " </div>"; |
| 1521 | | - $result[1] .= "</fieldset>\n"; |
| | 1519 | + $result[] .= '<div id="other_options"> ' . $this->showFormatOptions( $params['format'], $params ) . ' </div>'; |
| 1522 | 1520 | |
| 1523 | 1521 | // BEGIN: add javascript for updating formating options by ajax |
| 1524 | 1522 | $javascript = <<<END |
| Index: trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php |
| — | — | @@ -177,7 +177,9 @@ |
| 178 | 178 | * Overridden from parent to ignore GUI parameters 'format' 'limit' and 'offset' |
| 179 | 179 | */ |
| 180 | 180 | protected function showFormatOptions( $format, array $paramValues, array $ignoredAttribs = array() ) { |
| 181 | | - return parent::showFormatOptions( $format, $paramValues, array( 'format', 'limit', 'offset', 'mainlabel' ) ); |
| | 181 | + return parent::showFormatOptions( $format, $paramValues, array( |
| | 182 | + 'format', 'limit', 'offset', 'mainlabel', 'intro', 'outro', 'default' |
| | 183 | + ) ); |
| 182 | 184 | } |
| 183 | 185 | /** |
| 184 | 186 | * Creates the input form |
| — | — | @@ -218,7 +220,20 @@ |
| 219 | 221 | // END: show|hide additional options |
| 220 | 222 | $result .= '<div id="additional_options" style="display:none">'; |
| 221 | 223 | |
| 222 | | - $result .= $formatBox[1]; // display the format options |
| | 224 | + $result .= '<fieldset><legend>' . wfMsg( 'smw_ask_otheroptions' ) . "</legend>\n" . |
| | 225 | + Html::rawElement( 'div', array( 'style' => 'width: 30%; padding: 5px; float: left;' ), |
| | 226 | + 'Intro: <input name="p[intro]" size="32"/> <br/>' . wfMsg( 'smw_paramdesc_intro' ) |
| | 227 | + ) . |
| | 228 | + Html::rawElement( 'div', array( 'style' => 'width: 30%; padding: 5px; float: left;' ), |
| | 229 | + 'Outro: <input name="p[outro]" size="32"/> <br/>' . wfMsg( 'smw_paramdesc_outro' ) |
| | 230 | + ) . |
| | 231 | + Html::rawElement( 'div', array( 'style' => 'width: 30%; padding: 5px; float: left;' ), |
| | 232 | + 'Default: <input name="p[default]" size="32"/> <br/>' . wfMsg( 'smw_paramdesc_default' ) |
| | 233 | + ) . |
| | 234 | + '</fieldset>'; |
| | 235 | + $result .= '<fieldset><legend>' . wfMsg( 'smw_qc_formatopt' ) . "</legend>\n" . |
| | 236 | + $formatBox[1] . // display the format options |
| | 237 | + "</fieldset>\n"; |
| 223 | 238 | |
| 224 | 239 | $result .= '</div>'; // end of hidden additional options |
| 225 | 240 | $result .= '<br /><input type="submit" value="' . wfMsg( 'smw_ask_submit' ) . '"/><br/>'; |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php |
| — | — | @@ -227,7 +227,7 @@ |
| 228 | 228 | 'smw_ask_queryhead' => 'Query', |
| 229 | 229 | 'smw_ask_printhead' => 'Additional data to display', |
| 230 | 230 | 'smw_ask_printdesc' => '(add one property name per line)', |
| 231 | | - 'smw_ask_format_as' => 'Format as:', |
| | 231 | + 'smw_ask_format_as' => 'Format as:', |
| 232 | 232 | 'smw_ask_defaultformat' => 'default', |
| 233 | 233 | 'smw_ask_otheroptions' => 'Other options', |
| 234 | 234 | 'smw_ask_show_embed' => 'Show embed code', |
| — | — | @@ -240,6 +240,8 @@ |
| 241 | 241 | 'smw_qc_addmainlabel' => 'Add main label', |
| 242 | 242 | 'smw_qc_show_addnal_opts' => 'Show more options', |
| 243 | 243 | 'smw_qc_hide_addnal_opts' => 'Show less options', |
| | 244 | + 'smw_qc_otheropt' => 'Other options', |
| | 245 | + 'smw_qc_formatopt' => 'Format options', |
| 244 | 246 | 'smw_qc_query_help' => 'Enter a query using the form below. Select wiki pages based on |
| 245 | 247 | Categories (<strong>[[{{ns:category}}:Actor]]</strong>), |
| 246 | 248 | Properties (<strong>[[Located in::Germany]]</strong>), |