Show edit window and buttons below changes when using PageForms

resources/styles/_extensionfixes.scss

@@ -111,3 +111,9 @@
 .wikiEditor-ui * {
 	box-sizing: content-box;
 }
+
+/* Extension PageForm */
+form#pfForm  {
+	clear: both;
+	border-top: $hr-border-width solid $hr-border-color;
+}

src/ChameleonTemplate.php

@@ -53,7 +53,7 @@ public function execute() {
 		if ( !$bodyOnly ) {
 			$this->html( 'headelement' );
 		}
-		echo $this->getSkin()->getComponentFactory()->getRootComponent()->getHtml();
+		echo $this->getSkin()->getComponentFactory()->getRootComponent()->getHtml($this);
 		if ( !$bodyOnly ) {
 			$this->printTrail();
 			echo "</body>\n</html>";

src/Components/CategoryLinks.php

@@ -40,9 +40,13 @@ class CategoryLinks extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 */
-	public function getHtml() {
+	 public function getHtml($tpl = null) {
+	         if ( !is_null( $tpl ) ) {
+	             $this->setSkinTemplate( $tpl );
+	         }
 		return $this->indent() . '<!-- category links -->' .
 			$this->indent() . $this->getSkinTemplate()->get( 'catlinks' );
 	}

src/Components/Component.php

@@ -120,6 +120,14 @@ public function getSkinTemplate() {
 		return $this->mSkinTemplate;
 	}
 
+	/**
+   * @param ChameleonTemplate $tpl
+   * @return void
+   */
+     public function setSkinTemplate( $tpl ) {
+         $this->mSkinTemplate = $tpl;
+     }
+
 	/**
 	 * @since 1.1
 	 * @return \Skins\Chameleon\Chameleon
@@ -173,9 +181,10 @@ public function getDomElement() {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 */
-	abstract public function getHtml();
+	abstract public function getHtml( $tpl );
 
 	/**
 	 * @return string[] the resource loader modules needed by this component

src/Components/Container.php

@@ -46,10 +46,14 @@ class Container extends Structure {
 	/**
 	 * Builds the HTML code for the main container
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	 public function getHtml($tpl = null) {
+			 if ( !is_null( $tpl ) ) {
+					 $this->setSkinTemplate( $tpl );
+			 }
 		$attribs = [ 'class' => $this->getClassString() ];
 
 		$id = $this->getAttribute( 'id' );
@@ -60,7 +64,7 @@ public function getHtml() {
 		$ret = $this->indent() . \Html::openElement( 'div', $attribs );
 		$this->indent( 1 );
 
-		$ret .= parent::getHtml();
+		$ret .= parent::getHtml( $tpl );
 
 		$ret .= $this->indent( -1 ) . '</div>';
 

src/Components/ContentBody.php

@@ -39,9 +39,13 @@ class ContentBody extends Component {
 
 	/**
 	 * @inheritDoc
+   * @param ChameleonTemplate $tpl
 	 * @throws \MWException
 	 */
-	public function getHtml(): string {
+public function getHtml($tpl = null): string {
+  if ( !is_null( $tpl ) ) {
+  $this->setSkinTemplate( $tpl );
+  }
 		return $this->buildContentBody();
 	}
 

src/Components/ContentHeader.php

@@ -39,9 +39,13 @@ class ContentHeader extends Component {
 
 	/**
 	 * @inheritDoc
+   * @param ChameleonTemplate $tpl
 	 * @throws \MWException
 	 */
-	public function getHtml(): string {
+public function getHtml($tpl = null): string {
+  if ( !is_null( $tpl ) ) {
+  $this->setSkinTemplate( $tpl );
+  }
 		return $this->buildContentHeader();
 	}
 

src/Components/FooterIcons.php

@@ -42,10 +42,14 @@ class FooterIcons extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		return $this->indent() . '<!-- footer icons -->' .
 			IdRegistry::getRegistry()->element(
 				'div',

src/Components/FooterInfo.php

@@ -46,10 +46,14 @@ class FooterInfo extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		return $this->indent() . '<!-- footer links -->' .
 			IdRegistry::getRegistry()->element(
 				'div',

src/Components/FooterPlaces.php

@@ -42,10 +42,14 @@ class FooterPlaces extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		return $this->indent() . '<!-- places -->' .
 			IdRegistry::getRegistry()->element(
 				'div',

src/Components/Html.php

@@ -40,9 +40,13 @@ class Html extends Component {
 	/**
 	 * Builds the HTML code for the main container
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$ret = '';
 
 		if ( $this->getDomElement() !== null ) {

src/Components/Indicators.php

@@ -39,9 +39,13 @@ class Indicators extends Component {
 
 	/**
 	 * @inheritDoc
+	 * @param ChameleonTemplate $tpl
 	 * @throws \MWException
 	 */
-	public function getHtml(): string {
+	public function getHtml($tpl = null): string {
+		if ( !is_null( $tpl ) ) {
+		$this->setSkinTemplate( $tpl );
+    }
 		$idRegistry = IdRegistry::getRegistry();
 
 		return $idRegistry->element( 'div', [ 'id' => 'mw-indicators',

src/Components/Logo.php

@@ -43,10 +43,14 @@ class Logo extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$logo = $this->indent( 1 ) . $this->getLogo();
 
 		return $this->indent( -1 ) . '<!-- logo and main page link -->' .

src/Components/MainContent.php

@@ -44,10 +44,14 @@ class MainContent extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$idRegistry = IdRegistry::getRegistry();
 
 		$topAnchor = $idRegistry->element( 'a', [ 'id' => 'top' ] );

src/Components/Menu.php

@@ -41,10 +41,14 @@ class Menu extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		if ( $this->getDomElement() === null ) {
 			return '';
 		}

src/Components/Message.php

@@ -40,9 +40,13 @@ class Message extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$name = $this->getAttribute( 'name' );
 		if ( !empty( $name ) ) {
 			return $this->getSkinTemplate()->getMsg( $name )->parse();

src/Components/Modifications/Modification.php

@@ -163,9 +163,13 @@ public function getDomElement() {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$this->applyModification();
 		return $this->getComponent()->getHtml();
 	}

src/Components/NavMenu.php

@@ -45,10 +45,14 @@ class NavMenu extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return string the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$ret = '';
 
 		$sidebar = $this->getSkinTemplate()->getSidebar(

src/Components/NavbarHorizontal.php

@@ -51,10 +51,14 @@ class NavbarHorizontal extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		if ( $this->mHtml === null ) {
 			$this->buildHtml();
 		}

src/Components/NavbarHorizontal/LangLinks.php

@@ -43,10 +43,14 @@ class LangLinks extends Component {
 	/**
 	 * Builds the HTML code for this component
 	 *
+	 * @param ChameleonTemplate $tpl
 	 * @return String the HTML code
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		if ( !$this->hasLangLinks() ) {
 			return '';
 		}

src/Components/NavbarHorizontal/Logo.php

@@ -41,10 +41,14 @@
 class Logo extends Component {
 
 	/**
+	 * @param ChameleonTemplate $tpl
 	 * @return String
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$logo = new GenLogo( $this->getSkinTemplate(), $this->getDomElement(), $this->getIndent() );
 		$logo->addClasses( 'navbar-brand' );
 

src/Components/NavbarHorizontal/Menu.php

@@ -41,10 +41,14 @@
 class Menu extends Component {
 
 	/**
+	 * @param ChameleonTemplate $tpl
 	 * @return String
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$menu = new GenMenu( $this->getSkinTemplate(), $this->getDomElement(), $this->getIndent() );
 		return $menu->getHtml();
 	}

src/Components/NavbarHorizontal/NavMenu.php

@@ -41,10 +41,14 @@
 class NavMenu extends Component {
 
 	/**
+	 * @param ChameleonTemplate $tpl
 	 * @return String
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$navMenu = new GenNavMenu( $this->getSkinTemplate(), $this->getDomElement(),
 			$this->getIndent() + 1 );
 		return $navMenu->getHtml();

src/Components/NavbarHorizontal/PageTools.php

@@ -41,11 +41,15 @@
 class PageTools extends Component {
 
 	/**
+	 * @param ChameleonTemplate $tpl
 	 * @return string
 	 * @throws \ConfigException
 	 * @throws \MWException
 	 */
-	public function getHtml() {
+	public function getHtml($tpl = null) {
+      if ( !is_null( $tpl ) ) {
+          $this->setSkinTemplate( $tpl );
+      }
 		$pageTools = $this->createGenericPageTools();
 
 		$this->indent( 1 );