http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90777
Revision: 90777
Author: kipcool
Date: 2011-06-25 18:00:57 +0000 (Sat, 25 Jun 2011)
Log Message:
-----------
Replaced the h2, h3, h4 (h5) headers with div class.
Modified Paths:
--------------
trunk/extensions/Wikidata/OmegaWiki/Editor.php
trunk/extensions/Wikidata/OmegaWiki/tables.css
Modified: trunk/extensions/Wikidata/OmegaWiki/Editor.php
===================================================================
--- trunk/extensions/Wikidata/OmegaWiki/Editor.php 2011-06-25 17:59:42 UTC
(rev 90776)
+++ trunk/extensions/Wikidata/OmegaWiki/Editor.php 2011-06-25 18:00:57 UTC
(rev 90777)
@@ -1030,8 +1030,7 @@
}
public function getInputValue( $id ) {
- global
- $wgRequest;
+ global $wgRequest;
return $wgRequest->getInt( $id );
}
@@ -1108,7 +1107,6 @@
$definition = getDefinedMeaningDefinition( $value );
$definedMeaningAsLink = definedMeaningAsLink( $value );
$escapedDefinition = htmlspecialchars( $definition );
-
if ( $this->truncate && strlen( $definition ) >
$this->truncateAt )
$escapedDefinition = '<span title="' .
$escapedDefinition . '">' . htmlspecialchars( mb_substr( $definition, 0,
$this->truncateAt ) ) . wfMsg( 'ellipsis' ) . '</span>' . EOL;
@@ -1677,11 +1675,11 @@
public function add( IdStack $idPath ) {
return $this->addEditors( $idPath, $this->getEditors(),
$this->htmlTag );
}
-
+
protected function childHeader( Editor $editor, Attribute $attribute,
$class, $attributeId ) {
$expansionPrefix = $this->getExpansionPrefix( $class,
$attributeId );
$this->setExpansionByEditor( $editor, $class );
- return '<h' . $this->headerLevel . '><span id="collapse-' .
$attributeId . '" class="toggle ' . addCollapsablePrefixToClass( $class ) . '"
onclick="toggle(this, event);">' . $expansionPrefix . ' ' .
$attribute->name . '</span></h' . $this->headerLevel . '>' . EOL;
+ return '<div class="level' . $this->headerLevel . '"><span
id="collapse-' . $attributeId . '" class="toggle ' .
addCollapsablePrefixToClass( $class ) . '" onclick="toggle(this, event);">' .
$expansionPrefix . ' ' . $attribute->name . '</span></div>' . EOL;
}
protected function viewChild( Editor $editor, IdStack $idPath, $value,
Attribute $attribute, $class, $attributeId ) {
@@ -1908,8 +1906,7 @@
$this->setExpansion( $this->childrenExpanded,
$valueClass );
$idPath->pushAttribute( $captionAttribute );
- $result .= '<li>' .
- '<h' .
$this->headerLevel . '><span id="collapse-' . $recordId . '" class="toggle ' .
addCollapsablePrefixToClass( $captionClass ) . '" onclick="toggle(this,
event);">' . $captionExpansionPrefix . ' ' . $this->captionEditor->view(
$idPath, $record->getAttributeValue( $captionAttribute ) ) . '</span></h' .
$this->headerLevel . '>';
+ $result .= '<li><div class="level' .
$this->headerLevel . '"><span id="collapse-' . $recordId . '" class="toggle ' .
addCollapsablePrefixToClass( $captionClass ) . '" onclick="toggle(this,
event);">' . $captionExpansionPrefix . ' ' . $this->captionEditor->view(
$idPath, $record->getAttributeValue( $captionAttribute ) ) . '</span></div>';
$idPath->popAttribute();
$idPath->pushAttribute( $valueAttribute );
@@ -1952,8 +1949,7 @@
$this->setExpansion( $this->childrenExpanded,
$valueClass );
$idPath->pushAttribute( $captionAttribute );
- $result .= '<li>' .
- '<h' .
$this->headerLevel . '><span id="collapse-' . $recordId . '" class="toggle ' .
addCollapsablePrefixToClass( $captionClass ) . '" onclick="toggle(this,
event);">' . $captionExpansionPrefix . ' ' . $this->captionEditor->edit(
$idPath, $record->getAttributeValue( $captionAttribute ) ) . '</span></h' .
$this->headerLevel . '>' . EOL;
+ $result .= '<li><div class=level"' .
$this->headerLevel . '"><span id="collapse-' . $recordId . '" class="toggle ' .
addCollapsablePrefixToClass( $captionClass ) . '" onclick="toggle(this,
event);">' . $captionExpansionPrefix . ' ' . $this->captionEditor->edit(
$idPath, $record->getAttributeValue( $captionAttribute ) ) . '</span></div>' .
EOL;
$idPath->popAttribute();
$idPath->pushAttribute( $valueAttribute );
@@ -1970,10 +1966,8 @@
$class = $idPath->getClass();
$this->setExpansion( true, $class );
-
- # For which class is this add?
- $result .= '<li>' .
- '<h' .
$this->headerLevel . '><span id="collapse-' . $recordId . '" class="toggle ' .
addCollapsablePrefixToClass( $class ) . '" onclick="toggle(this, event);">' .
$this->getExpansionPrefix( $idPath->getClass(), $idPath->getId() ) . ' <img
src="' . $wgScriptPath . '/extensions/Wikidata/Images/Add.png" title="Enter new
list item to add" alt="Add"
onclick="addEmptyRow(this.parentNode.parentNode.id);"/>' .
$this->captionEditor->add( $idPath ) . '</span></h' . $this->headerLevel . '>'
. EOL;
+
+ $result .= '<li><div class="level' .
$this->headerLevel . '">' . '<span id="collapse-' . $recordId . '"
class="toggle ' . addCollapsablePrefixToClass( $class ) . '"
onclick="toggle(this, event);">' . $this->getExpansionPrefix(
$idPath->getClass(), $idPath->getId() ) . $this->captionEditor->add( $idPath )
. '</div></span>' . EOL;
$idPath->popAttribute();
$idPath->pushAttribute( $valueAttribute );
@@ -2002,8 +1996,7 @@
$this->setExpansion( true, $class );
- $result .= '<li>' .
- '<h' . $this->headerLevel . '><span
id="collapse-' . $recordId . '" class="toggle ' . addCollapsablePrefixToClass(
$class ) . '" onclick="toggle(this, event);">' . $this->getExpansionPrefix(
$idPath->getClass(), $idPath->getId() ) . ' ' . $this->captionEditor->add(
$idPath ) . '</span></h' . $this->headerLevel . '>' . EOL;
+ $result .= '<li><div class="level' . $this->headerLevel .
'"><span id="collapse-' . $recordId . '" class="toggle ' .
addCollapsablePrefixToClass( $class ) . '" onclick="toggle(this, event);">' .
$this->getExpansionPrefix( $idPath->getClass(), $idPath->getId() ) . ' ' .
$this->captionEditor->add( $idPath ) . '</span></div>' . EOL;
$idPath->popAttribute();
$idPath->pushAttribute( $valueAttribute );
Modified: trunk/extensions/Wikidata/OmegaWiki/tables.css
===================================================================
--- trunk/extensions/Wikidata/OmegaWiki/tables.css 2011-06-25 17:59:42 UTC
(rev 90776)
+++ trunk/extensions/Wikidata/OmegaWiki/tables.css 2011-06-25 18:00:57 UTC
(rev 90777)
@@ -102,6 +102,36 @@
width: auto;
}
+
+.level2 {
+ font-size:150% ;
+ background-color: #ffe0eb;
+ border-style:solid;
+ border-width:1px;
+ border-color:grey;
+ margin-top:10px;
+ padding:5px;
+}
+
+.level3 {
+ font-size:120% ;
+ font-weight: bold;
+ background-color: #e0ffff;
+ margin-top:10px;
+ padding:5px;
+}
+
+.level4 {
+ font-size:110% ;
+ font-weight: bold;
+ padding:5px;
+}
+
+.level5 {
+ font-weight: bold;
+ padding:5px;
+}
+
td.add {
text-align: center;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
