From 24bddb862300c537f7c3c3227644273427a522bb Mon Sep 17 00:00:00 2001 From: Yaco Date: Mon, 12 Aug 2019 11:46:39 -0300 Subject: corrige ubicacion de barra de botones de historial de pagina --- .../skins/chameleon/src/Components/ContentBody.php | 21 +++++++++++++++++++++ .../chameleon/src/Components/ContentHeader.php | 15 --------------- .../skins/chameleon/src/Components/MainContent.php | 18 ++++++++++++++++++ 3 files changed, 39 insertions(+), 15 deletions(-) (limited to 'www/wiki') diff --git a/www/wiki/skins/chameleon/src/Components/ContentBody.php b/www/wiki/skins/chameleon/src/Components/ContentBody.php index ceabed74..336b8172 100644 --- a/www/wiki/skins/chameleon/src/Components/ContentBody.php +++ b/www/wiki/skins/chameleon/src/Components/ContentBody.php @@ -64,6 +64,27 @@ class ContentBody extends Component { ) . $skintemplate->get( 'userlangattributes' ) . '>'; // $ret .= $this->buildContentHeader(); + + if ( $skintemplate->get( 'subtitle' ) ) { + + // TODO: should not use class 'small', better use class 'contentSub' and do styling in a less file + $ret .= + $this->indent() . '' . + $this->indent() . $idRegistry->element( 'div', array( 'id' => 'contentSub', 'class' => 'small' ), $skintemplate->get( 'subtitle' ) ); + $ret .= '
'; + + } + + if ( $skintemplate->get( 'undelete' ) ) { + // TODO: should not use class 'small', better use class 'contentSub2' and do styling in a less file + $ret .= + $this->indent() . '' . + $this->indent() . $idRegistry->element( 'div', array( 'id' => 'contentSub2', 'class' => 'small' ), $skintemplate->get( 'undelete' ) ); + $ret .= '
'; + + } + + $ret .= $this->buildContentBody(); $ret .= $this->buildCategoryLinks(); diff --git a/www/wiki/skins/chameleon/src/Components/ContentHeader.php b/www/wiki/skins/chameleon/src/Components/ContentHeader.php index 1bb08ac1..724f60da 100644 --- a/www/wiki/skins/chameleon/src/Components/ContentHeader.php +++ b/www/wiki/skins/chameleon/src/Components/ContentHeader.php @@ -60,21 +60,6 @@ class ContentHeader extends Component { $this->indent() . '' . $this->indent() . $idRegistry->element( 'div', array( 'id'=> 'siteSub' ), $skintemplate->getMsg( 'tagline' )->escaped() ); - if ( $skintemplate->get( 'subtitle' ) ) { - - // TODO: should not use class 'small', better use class 'contentSub' and do styling in a less file - $ret .= - $this->indent() . '' . - $this->indent() . $idRegistry->element( 'div', array( 'id' => 'contentSub', 'class' => 'small' ), $skintemplate->get( 'subtitle' ) ); - - } - - if ( $skintemplate->get( 'undelete' ) ) { - // TODO: should not use class 'small', better use class 'contentSub2' and do styling in a less file - $ret .= - $this->indent() . '' . - $this->indent() . $idRegistry->element( 'div', array( 'id' => 'contentSub2', 'class' => 'small' ), $skintemplate->get( 'undelete' ) ); - } // TODO: Do we need this? Seems to be an accessibility thing. It's used // in vector to jump to the nav which is at the bottom of the document, diff --git a/www/wiki/skins/chameleon/src/Components/MainContent.php b/www/wiki/skins/chameleon/src/Components/MainContent.php index ddacf65a..c732bd24 100644 --- a/www/wiki/skins/chameleon/src/Components/MainContent.php +++ b/www/wiki/skins/chameleon/src/Components/MainContent.php @@ -64,6 +64,24 @@ class MainContent extends Component { ) . $skintemplate->get( 'userlangattributes' ) . '>'; $ret .= $this->buildContentHeader(); + + // if ( $skintemplate->get( 'subtitle' ) ) { + + // TODO: should not use class 'small', better use class 'contentSub' and do styling in a less file + $ret .= + $this->indent() . '' . + $this->indent() . $idRegistry->element( 'div', array( 'id' => 'contentSub', 'class' => 'small' ), $skintemplate->get( 'subtitle' ) ); + + // } + + if ( $skintemplate->get( 'undelete' ) ) { + // TODO: should not use class 'small', better use class 'contentSub2' and do styling in a less file + $ret .= + $this->indent() . '' . + $this->indent() . $idRegistry->element( 'div', array( 'id' => 'contentSub2', 'class' => 'small' ), $skintemplate->get( 'undelete' ) ); + } + + $ret .= $this->buildContentBody(); $ret .= $this->buildCategoryLinks(); -- cgit v1.2.1