| Index: trunk/WikiWord/WikiWord/src/main/php/search/wikipics.php |
| — | — | @@ -255,23 +255,21 @@ |
| 256 | 256 | if (is_array($definition)) $definition = $utils->pickLocal($definition, $langs); |
| 257 | 257 | |
| 258 | 258 | ?> |
| 259 | | - <tr class="row_top"> |
| 260 | | - <td colspan="3"> </td> |
| 261 | | - </tr> |
| 262 | | - |
| 263 | 259 | <tr class="row_head"> |
| 264 | | - <td colspan="1" class="cell_name"> |
| 265 | | - <h3 class="<?php print "weight_$wclass"; ?>"> |
| 266 | | - <?php print getConceptDetailsLink($langs, $concept); ?> |
| 267 | | - </h3> |
| | 260 | + <td colspan="3"> |
| | 261 | + <h1 class="name <?php print "weight_$wclass"; ?>"><?php print getConceptDetailsLink($langs, $concept); ?>:</h1> |
| | 262 | + <p class="definition"><?php print htmlspecialchars($definition); ?></p> |
| | 263 | + <div class="wikipages">Pages: <?php printConceptPageList($langs, $concept, $lclass) ?></div> |
| 268 | 264 | </td> |
| 269 | | - <td colspan="2" class="cell_pages"> |
| 270 | | - <?php printConceptPageList($langs, $concept, $lclass) ?> |
| 271 | | - </td> |
| 272 | 265 | </tr> |
| 273 | 266 | |
| 274 | | - <tr class="row_def"> |
| 275 | | - <td colspan="3"><?php print htmlspecialchars($definition); ?></td> |
| | 267 | + <tr class="row_images"> |
| | 268 | + <td class="cell_images" colspan="3"> |
| | 269 | + <?php |
| | 270 | + printConceptImageList( $gallery, $terse ? "tersegallery" : "gallery" ); |
| | 271 | + ?> |
| | 272 | + <p>more...<!-- TODO --></p> |
| | 273 | + </td> |
| 276 | 274 | </tr> |
| 277 | 275 | |
| 278 | 276 | <tr class="row_related"> |
| — | — | @@ -280,14 +278,6 @@ |
| 281 | 279 | <?php |
| 282 | 280 | printRelatedConceptList( $langs, $concept, $lclass ); |
| 283 | 281 | ?> |
| 284 | | - </td> |
| 285 | | - </tr> |
| 286 | | - |
| 287 | | - <tr class="row_images"> |
| 288 | | - <td class="cell_images" colspan="3"> |
| 289 | | - <?php |
| 290 | | - printConceptImageList( $gallery, $terse ? "tersegallery" : "gallery" ); |
| 291 | | - ?> |
| 292 | 282 | <p>more...<!-- TODO --></p> |
| 293 | 283 | </td> |
| 294 | 284 | </tr> |
| — | — | @@ -298,17 +288,10 @@ |
| 299 | 289 | <?php |
| 300 | 290 | printConceptCategoryList( $langs, $concept, $lclass ); |
| 301 | 291 | ?> |
| | 292 | + <p>more...<!-- TODO --></p> |
| 302 | 293 | </td> |
| 303 | 294 | </tr> |
| 304 | 295 | |
| 305 | | - <tr class="row_bottom"> |
| 306 | | - <td colspan="3"> </td> |
| 307 | | - </tr> |
| 308 | | - |
| 309 | | - <tr class="row_blank"> |
| 310 | | - <td colspan="3"> </td> |
| 311 | | - </tr> |
| 312 | | - |
| 313 | 296 | <?php |
| 314 | 297 | if (isset($score) && $score && $score<2 && $pos>=3) return false; |
| 315 | 298 | else return true; |
| — | — | @@ -375,13 +358,19 @@ |
| 376 | 359 | |
| 377 | 360 | <style type="text/css"> |
| 378 | 361 | body { font-family: verdana, helvetica, arial, sans-serif; } |
| 379 | | - td { text-align: left; vertical-align: top; } |
| 380 | | - th { text-align: left; vertical-align: top; font-weight:bold; } |
| 381 | 362 | |
| 382 | | - a:link, a:visited, a:active { |
| | 363 | + a, a:link, a:visited, a:active, a:hover { |
| 383 | 364 | color:#2200CC; |
| 384 | 365 | } |
| 385 | 366 | |
| | 367 | + a, a:link, a:visited { |
| | 368 | + text-decoration: none; |
| | 369 | + } |
| | 370 | + |
| | 371 | + a:active, a:hover { |
| | 372 | + text-decoration: underline; |
| | 373 | + } |
| | 374 | + |
| 386 | 375 | .error { color: red; font-weight: bold; } |
| 387 | 376 | .weight_huge { font-size: 140%; font-weight:bold; } |
| 388 | 377 | .weight_big { font-size: 120%; font-weight:bold; } |
| — | — | @@ -389,14 +378,34 @@ |
| 390 | 379 | .weight_some { font-size: 100%; font-weight:bold; } |
| 391 | 380 | .weight_little { font-size: 90%; font-weight:bold; } |
| 392 | 381 | .weight_unknown { font-size: 100%; font-weight:bold; } |
| | 382 | + |
| | 383 | + /* |
| 393 | 384 | .row_def td { font-size: small; font-style:italic; } |
| 394 | 385 | .row_details td { font-size: small; } |
| | 386 | + */ |
| | 387 | + |
| | 388 | + .row_head td { font-size: small; } |
| | 389 | + |
| | 390 | + .row_head td { border-top: 1px solid #6B90DA; background-color: #F0F7F9; padding: 0.5ex; } |
| | 391 | + .row_head h1, .row_head h2, .row_head h3 { padding: 0; margin: 0; font-size: inherit; font-weight: inherit; } |
| | 392 | + .row_head p { padding: 0; margin: 0; font-size: inherit; } |
| | 393 | + .row_head .name { font-weight: bold; display:inline; font-size: large; } |
| | 394 | + .row_head .definition { font-style: italic; display:inline; } |
| | 395 | + .row_head .wikipages { font-style: inherit; display:inline; } |
| | 396 | + |
| 395 | 397 | .row_related td { font-size: small; } |
| 396 | | - .row_category td { font-size: small; font-weight: bold; } |
| | 398 | + .row_category td { font-size: small; } |
| 397 | 399 | .cell_weight { text-align: right; } |
| 398 | 400 | .cell_label { text-align: right; } |
| 399 | | - .header { text-align: left; } |
| 400 | | - .inputform { text-align: center; margin:1ex auto; padding:1ex; width:80%; border:1px solid #666666; background-color:#DDDDDD; } |
| | 401 | + |
| | 402 | + .header { text-align: left; margin:0; padding: 0; border-bottom: 1px solid #C9D7F1; } |
| | 403 | + |
| | 404 | + .inputform { text-align: left; margin:0 1ex; } |
| | 405 | + .inputform td { text-align: left; vertical-align: bottom; padding: 0.5ex; } |
| | 406 | + .inputform td.note { font-size:small; } |
| | 407 | + .inputform th { text-align: left; vertical-align: bottom; } |
| | 408 | + |
| | 409 | + |
| 401 | 410 | .footer { font-size:80%; text-align: center; border-top: 1px solid #666666; } |
| 402 | 411 | .note { font-size:80%; } |
| 403 | 412 | |
| — | — | @@ -405,7 +414,10 @@ |
| 406 | 415 | .terselist li:first-child:before { content:"" } |
| 407 | 416 | |
| 408 | 417 | .gallery li { display: inline; padding:0.5ex; margin:0.5ex; } |
| | 418 | + |
| 409 | 419 | .results { margin: 1em; } |
| | 420 | + .results td { text-align: left; vertical-align: top; } |
| | 421 | + .results th { text-align: left; vertical-align: top; font-weight:bold; } |
| 410 | 422 | |
| 411 | 423 | .imageCell { |
| 412 | 424 | vertical-align: bottom; |
| — | — | @@ -421,10 +433,10 @@ |
| 422 | 434 | </head> |
| 423 | 435 | <body> |
| 424 | 436 | <div class="header"> |
| 425 | | - <h1>WikiWord Navigator</h1> |
| | 437 | + <!-- <h1>WikiWord Navigator</h1> |
| 426 | 438 | <p>Experimental semantic navigator and thesaurus interface for Wikipedia.</p> |
| 427 | 439 | <p>The WikiWord Navigator was created as part of the WikiWord project run by <a href="http://wikimedia.de">Wikimedia Deutschland e.V.</a>. |
| 428 | | - It is based on a <a href="http://brightbyte.de/page/WikiWord">diploma thesis</a> by Daniel Kinzler, and runs on the <a href="http://toolserver.org/">Wikimedia Toolserver</a>. WikiWord is an ongoing research project. Please contact <a href="http://brightbyte.de/page/Special:Contact">Daniel Kinzler</a> for more information.</p> |
| | 440 | + It is based on a <a href="http://brightbyte.de/page/WikiWord">diploma thesis</a> by Daniel Kinzler, and runs on the <a href="http://toolserver.org/">Wikimedia Toolserver</a>. WikiWord is an ongoing research project. Please contact <a href="http://brightbyte.de/page/Special:Contact">Daniel Kinzler</a> for more information.</p> --> |
| 429 | 441 | </div> |
| 430 | 442 | |
| 431 | 443 | <div class="inputform" > |
| — | — | @@ -432,18 +444,27 @@ |
| 433 | 445 | <table border="0" class="inputgrid"> |
| 434 | 446 | <tr> |
| 435 | 447 | <td> |
| 436 | | - <label for="term">Term: </label><input type="text" name="term" id="term" size="24" value="<?php print htmlspecialchars($term); ?>"/> |
| | 448 | + <?php |
| | 449 | + $u = $utils->getThumbnailURL("Commons_logo_optimized.svg", 60); |
| | 450 | + print "<img class=\"logo\" src=\"".htmlspecialchars($u)."\" title=\"Search Wikimedia Commons\" valign=\"bottom\"/>"; |
| | 451 | + ?> |
| 437 | 452 | </td> |
| 438 | 453 | <td> |
| | 454 | + <label for="term" style="display:none">Term: </label><input type="text" name="term" id="term" size="24" value="<?php print htmlspecialchars($term); ?>"/> |
| | 455 | + </td> |
| | 456 | + <td> |
| 439 | 457 | <label for="term" style="display:none">Language: </label> |
| 440 | 458 | <?php WWUtils::printSelector("lang", $wwLanguages, $lang) ?> |
| 441 | 459 | </td> |
| 442 | 460 | <td> |
| 443 | 461 | <input type="submit" name="go" value="go"/> |
| 444 | 462 | </td> |
| | 463 | + <td class="note"> |
| | 464 | + Note: this is a thesaurus lookup, not a full text search. Multiple words are handeled as a single phrase. Only exact matches of complete phrases will be found. |
| | 465 | + </td> |
| 445 | 466 | </tr> |
| 446 | 467 | </table> |
| 447 | | - <p class="note">Note: this is a thesaurus lookup, not a full text search. Only exact matches are considered.</p> |
| | 468 | + |
| 448 | 469 | <?php |
| 449 | 470 | if ($utils->debug) { |
| 450 | 471 | print '<input type="hidden" name="debug" value="true"/>'; |