http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96684
Revision: 96684
Author: maxsem
Date: 2011-09-09 19:05:53 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
rv r96593
Modified Paths:
--------------
trunk/extensions/wikihiero/SpecialHieroglyphs.php
trunk/extensions/wikihiero/modules/ext.wikihiero.Special.css
trunk/extensions/wikihiero/modules/ext.wikihiero.css
trunk/extensions/wikihiero/tests.txt
trunk/extensions/wikihiero/wikihiero.body.php
Modified: trunk/extensions/wikihiero/SpecialHieroglyphs.php
===================================================================
--- trunk/extensions/wikihiero/SpecialHieroglyphs.php 2011-09-09 19:02:47 UTC
(rev 96683)
+++ trunk/extensions/wikihiero/SpecialHieroglyphs.php 2011-09-09 19:05:53 UTC
(rev 96684)
@@ -79,7 +79,7 @@
$this->hiero = new WikiHiero();
$out->addHTML( '<table><tr><td>' );
- $out->addHTML( '<div class="hiero-list">' );
+ $out->addHTML( '<div class="mw-hiero-list">' );
$out->addHTML( $this->listHieroglyphs() );
$out->addHTML( '</div></td><td>' );
$out->addHTML( $this->getToc() );
@@ -154,7 +154,7 @@
}
private function getToc() {
- $html = '<table class="toc hiero-toc">';
+ $html = '<table class="toc mw-hiero-toc">';
$syntax = wfMessage( 'wikihiero-syntax' )->text();
$html .= '<tr><td colspan="5">'
Modified: trunk/extensions/wikihiero/modules/ext.wikihiero.Special.css
===================================================================
--- trunk/extensions/wikihiero/modules/ext.wikihiero.Special.css
2011-09-09 19:02:47 UTC (rev 96683)
+++ trunk/extensions/wikihiero/modules/ext.wikihiero.Special.css
2011-09-09 19:05:53 UTC (rev 96684)
@@ -1,10 +1,10 @@
-.hiero-list {
+.mw-hiero-list {
overflow: auto;
height: 400px;
margin-top: 1em;
border: 1px solid silver;
}
-.hiero-toc {
+.mw-hiero-toc {
text-align: center;
}
Modified: trunk/extensions/wikihiero/modules/ext.wikihiero.css
===================================================================
--- trunk/extensions/wikihiero/modules/ext.wikihiero.css 2011-09-09
19:02:47 UTC (rev 96683)
+++ trunk/extensions/wikihiero/modules/ext.wikihiero.css 2011-09-09
19:05:53 UTC (rev 96684)
@@ -1,13 +1,13 @@
-.hiero-table {
+.mw-hiero-table {
border: 0 !important;
border-spacing: 0 !important;
}
-.hiero-outer {
+.mw-hiero-outer {
display: inline;
}
-.hiero-table td {
+.mw-hiero-table td {
border: 0 !important;
padding: 0 !important;
text-align: center !important;
Modified: trunk/extensions/wikihiero/tests.txt
===================================================================
--- trunk/extensions/wikihiero/tests.txt 2011-09-09 19:02:47 UTC (rev
96683)
+++ trunk/extensions/wikihiero/tests.txt 2011-09-09 19:05:53 UTC (rev
96684)
@@ -3,7 +3,7 @@
!! input
<hiero>A1 - B2 D3</hiero>
!! result
-<table class='hiero-table hiero-outer' dir='ltr'><tr><td> <table
class="hiero-table"><tr> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_A1.png' title='A1' alt='A1'
/></td><td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_B2.png' title='B2' alt='B2'
/></td><td><img style='margin:1px;' height='20'
src='/extensions/wikihiero/img/hiero_D3.png' title='D3' alt='D3'
/></td></tr></table> </td></tr></table>
+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table
class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_A1.png' title='A1' alt='A1'
/></td><td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_B2.png' title='B2' alt='B2'
/></td><td><img style='margin:1px;' height='20'
src='/extensions/wikihiero/img/hiero_D3.png' title='D3' alt='D3'
/></td></tr></table> </td></tr></table>
!! end
@@ -12,7 +12,7 @@
!! input
<hiero><script>alert("FAIL")</script></hiero>
!! result
-<table class='hiero-table hiero-outer' dir='ltr'><tr><td> <table
class="hiero-table"><tr> <td><script>alert(FAIL)<script></td>
</tr></table> </td></tr></table>
+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table
class="mw-hiero-table"><tr> <td><script>alert(FAIL)<script></td>
</tr></table> </td></tr></table>
!! end
@@ -21,7 +21,7 @@
!! input
<hiero>a:A1</hiero>
!! result
-<table class='hiero-table hiero-outer' dir='ltr'><tr><td> <table
class="hiero-table"><tr> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_a&A1.png' title='a&A1'
alt='a&A1' /></td> </tr></table> </td></tr></table>
+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table
class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_a&A1.png' title='a&A1'
alt='a&A1' /></td> </tr></table> </td></tr></table>
!! end
@@ -30,7 +30,7 @@
!! input
<hiero>N28:Aa13-R19-t:N24</hiero>
!! result
-<table class='hiero-table hiero-outer' dir='ltr'><tr><td> <table
class="hiero-table"><tr> <td><img style='margin:1px;' height='15'
src='/extensions/wikihiero/img/hiero_N28.png' title='N28' alt='N28' /><br
/><img style='margin:1px;' height='8'
src='/extensions/wikihiero/img/hiero_Aa13.png' title='Aa13' alt='Aa13' /></td>
<td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_R19.png' title='R19' alt='R19'
/></td><td><img style='margin:1px;' height='11'
src='/extensions/wikihiero/img/hiero_X1.png' title='X1 [t]' alt='t' /><br
/><img style='margin:1px;' height='14'
src='/extensions/wikihiero/img/hiero_N24.png' title='N24' alt='N24' /></td>
</tr></table> </td></tr></table>
+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table
class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='15'
src='/extensions/wikihiero/img/hiero_N28.png' title='N28' alt='N28' /><br
/><img style='margin:1px;' height='8'
src='/extensions/wikihiero/img/hiero_Aa13.png' title='Aa13' alt='Aa13' /></td>
<td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_R19.png' title='R19' alt='R19'
/></td><td><img style='margin:1px;' height='11'
src='/extensions/wikihiero/img/hiero_X1.png' title='X1 [t]' alt='t' /><br
/><img style='margin:1px;' height='14'
src='/extensions/wikihiero/img/hiero_N24.png' title='N24' alt='N24' /></td>
</tr></table> </td></tr></table>
!! end
@@ -39,7 +39,7 @@
!! input
<hiero>N5-O34:N29-N35:N35</hiero>
!! result
-<table class='hiero-table hiero-outer' dir='ltr'><tr><td> <table
class="hiero-table"><tr> <td><img style='margin:1px;' height='18'
src='/extensions/wikihiero/img/hiero_N5.png' title='N5' alt='N5'
/></td><td><img style='margin:1px;' height='6'
src='/extensions/wikihiero/img/hiero_O34.png' title='O34' alt='O34' /><br
/><img style='margin:1px;' height='17'
src='/extensions/wikihiero/img/hiero_N29.png' title='N29' alt='N29' /></td>
<td><img style='margin:1px;' height='5'
src='/extensions/wikihiero/img/hiero_N35.png' title='N35' alt='N35' /><br
/><img style='margin:1px;' height='5'
src='/extensions/wikihiero/img/hiero_N35.png' title='N35' alt='N35' /></td>
</tr></table> </td></tr></table>
+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table
class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='18'
src='/extensions/wikihiero/img/hiero_N5.png' title='N5' alt='N5'
/></td><td><img style='margin:1px;' height='6'
src='/extensions/wikihiero/img/hiero_O34.png' title='O34' alt='O34' /><br
/><img style='margin:1px;' height='17'
src='/extensions/wikihiero/img/hiero_N29.png' title='N29' alt='N29' /></td>
<td><img style='margin:1px;' height='5'
src='/extensions/wikihiero/img/hiero_N35.png' title='N35' alt='N35' /><br
/><img style='margin:1px;' height='5'
src='/extensions/wikihiero/img/hiero_N35.png' title='N35' alt='N35' /></td>
</tr></table> </td></tr></table>
!! end
@@ -49,6 +49,6 @@
<hiero>M23-X1:R4-X8-Q2:D4-W17-R14-G4-R8-O29:V30-U23 !
N26-D58-O49:Z1-F13:N31-V30:N16:N21*Z1-D45:N25</hiero>
!! result
-<table class='hiero-table hiero-outer' dir='ltr'><tr><td> <table
class="hiero-table"><tr> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_M23.png' title='M23' alt='M23'
/></td><td><img style='margin:1px;' height='11'
src='/extensions/wikihiero/img/hiero_X1.png' title='X1' alt='X1' /><br /><img
style='margin:1px;' height='15' src='/extensions/wikihiero/img/hiero_R4.png'
title='R4' alt='R4' /></td> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_X8.png' title='X8' alt='X8'
/></td><td><img style='margin:1px;' height='24'
src='/extensions/wikihiero/img/hiero_Q2.png' title='Q2' alt='Q2' /><br /><img
style='margin:1px;' height='12' src='/extensions/wikihiero/img/hiero_D4.png'
title='D4' alt='D4' /></td> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_W17.png' title='W17' alt='W17'
/></td><td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_R14.png' title='R14' alt='R14'
/></td><td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_G4.png' title='G4' alt='G4'
/></td><td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_R8.png' title='R8' alt='R8'
/></td><td><img style='margin:1px;' height='7'
src='/extensions/wikihiero/img/hiero_O29.png' title='O29' alt='O29' /><br
/><img style='margin:1px;' height='12'
src='/extensions/wikihiero/img/hiero_V30.png' title='V30' alt='V30' /></td>
<td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_U23.png' title='U23' alt='U23'
/></td></tr></table><table class="hiero-table"><tr> <td><img
style='margin:1px;' height='15' src='/extensions/wikihiero/img/hiero_N26.png'
title='N26' alt='N26' /></td><td><img style='margin:1px;' height='35'
src='/extensions/wikihiero/img/hiero_D58.png' title='D58' alt='D58'
/></td><td><img style='margin:1px;' height='18'
src='/extensions/wikihiero/img/hiero_O49.png' title='O49' alt='O49' /><br
/><img style='margin:1px;' height='16'
src='/extensions/wikihiero/img/hiero_Z1.png' title='Z1' alt='Z1' /></td>
<td><img style='margin:1px;' height='22'
src='/extensions/wikihiero/img/hiero_F13.png' title='F13' alt='F13' /><br
/><img style='margin:1px;' height='17'
src='/extensions/wikihiero/img/hiero_N31.png' title='N31' alt='N31' /></td>
<td><img style='margin:1px;' height='12'
src='/extensions/wikihiero/img/hiero_V30.png' title='V30' alt='V30' /><br
/><img style='margin:1px;' height='9'
src='/extensions/wikihiero/img/hiero_N16.png' title='N16' alt='N16' /><br
/><img style='margin:1px;' height='11'
src='/extensions/wikihiero/img/hiero_N21.png' title='N21' alt='N21' /> <img
style='margin:1px;' height='16' src='/extensions/wikihiero/img/hiero_Z1.png'
title='Z1' alt='Z1' /></td> <td><img style='margin:1px;' height='24'
src='/extensions/wikihiero/img/hiero_D45.png' title='D45' alt='D45' /><br
/><img style='margin:1px;' height='16'
src='/extensions/wikihiero/img/hiero_N25.png' title='N25' alt='N25' /></td>
</tr></table> </td></tr></table>
+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table
class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_M23.png' title='M23' alt='M23'
/></td><td><img style='margin:1px;' height='11'
src='/extensions/wikihiero/img/hiero_X1.png' title='X1' alt='X1' /><br /><img
style='margin:1px;' height='15' src='/extensions/wikihiero/img/hiero_R4.png'
title='R4' alt='R4' /></td> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_X8.png' title='X8' alt='X8'
/></td><td><img style='margin:1px;' height='24'
src='/extensions/wikihiero/img/hiero_Q2.png' title='Q2' alt='Q2' /><br /><img
style='margin:1px;' height='12' src='/extensions/wikihiero/img/hiero_D4.png'
title='D4' alt='D4' /></td> <td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_W17.png' title='W17' alt='W17'
/></td><td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_R14.png' title='R14' alt='R14'
/></td><td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_G4.png' title='G4' alt='G4'
/></td><td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_R8.png' title='R8' alt='R8'
/></td><td><img style='margin:1px;' height='7'
src='/extensions/wikihiero/img/hiero_O29.png' title='O29' alt='O29' /><br
/><img style='margin:1px;' height='12'
src='/extensions/wikihiero/img/hiero_V30.png' title='V30' alt='V30' /></td>
<td><img style='margin:1px;' height='38'
src='/extensions/wikihiero/img/hiero_U23.png' title='U23' alt='U23'
/></td></tr></table><table class="mw-hiero-table"><tr> <td><img
style='margin:1px;' height='15' src='/extensions/wikihiero/img/hiero_N26.png'
title='N26' alt='N26' /></td><td><img style='margin:1px;' height='35'
src='/extensions/wikihiero/img/hiero_D58.png' title='D58' alt='D58'
/></td><td><img style='margin:1px;' height='18'
src='/extensions/wikihiero/img/hiero_O49.png' title='O49' alt='O49' /><br
/><img style='margin:1px;' height='16'
src='/extensions/wikihiero/img/hiero_Z1.png' title='Z1' alt='Z1' /></td>
<td><img style='margin:1px;' height='22'
src='/extensions/wikihiero/img/hiero_F13.png' title='F13' alt='F13' /><br
/><img style='margin:1px;' height='17'
src='/extensions/wikihiero/img/hiero_N31.png' title='N31' alt='N31' /></td>
<td><img style='margin:1px;' height='12'
src='/extensions/wikihiero/img/hiero_V30.png' title='V30' alt='V30' /><br
/><img style='margin:1px;' height='9'
src='/extensions/wikihiero/img/hiero_N16.png' title='N16' alt='N16' /><br
/><img style='margin:1px;' height='11'
src='/extensions/wikihiero/img/hiero_N21.png' title='N21' alt='N21' /> <img
style='margin:1px;' height='16' src='/extensions/wikihiero/img/hiero_Z1.png'
title='Z1' alt='Z1' /></td> <td><img style='margin:1px;' height='24'
src='/extensions/wikihiero/img/hiero_D45.png' title='D45' alt='D45' /><br
/><img style='margin:1px;' height='16'
src='/extensions/wikihiero/img/hiero_N25.png' title='N25' alt='N25' /></td>
</tr></table> </td></tr></table>
!! end
Modified: trunk/extensions/wikihiero/wikihiero.body.php
===================================================================
--- trunk/extensions/wikihiero/wikihiero.body.php 2011-09-09 19:02:47 UTC
(rev 96683)
+++ trunk/extensions/wikihiero/wikihiero.body.php 2011-09-09 19:05:53 UTC
(rev 96684)
@@ -28,7 +28,7 @@
}
// D E F I N E S
-define( "WH_TABLE_S", '<table class="hiero-table">' );
+define( "WH_TABLE_S", '<table class="mw-hiero-table">' );
define( "WH_TABLE_E", '</table>' );
define( "WH_TD_S", '<td>' );
define( "WH_TD_E", '</td>' );
@@ -146,12 +146,12 @@
private function renderGlyph( $glyph, $option = '' ) {
if ( $glyph == ".." ) { // Render void block
$width = WH_HEIGHT;
- return "<table class=\"hiero-table\" style=\"width:
{$width}px;\"><tr><td> </td></tr></table>";
+ return "<table class=\"mw-hiero-table\" style=\"width:
{$width}px;\"><tr><td> </td></tr></table>";
}
elseif ( $glyph == "." ) // Render half-width void block
{
$width = WH_HEIGHT / 2;
- return "<table class=\"hiero-table\" style=\"width:
{$width}px;\"><tr><td> </td></tr></table>";
+ return "<table class=\"mw-hiero-table\" style=\"width:
{$width}px;\"><tr><td> </td></tr></table>";
}
elseif ( $glyph == '<' ) // Render open cartouche
{
@@ -469,7 +469,7 @@
$html .= WH_TABLE_S . "<tr>\n" . $tableContentHtml .
"</tr>" . WH_TABLE_E;
}
- return "<table class='hiero-table hiero-outer'
dir='ltr'><tr><td>\n$html\n</td></tr></table>";
+ return "<table class='mw-hiero-table mw-hiero-outer'
dir='ltr'><tr><td>\n$html\n</td></tr></table>";
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
