Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 61 insertions, 0 deletions

diff --git a/vendor/oojs/oojs-ui/php/layouts/PanelLayout.php b/vendor/oojs/oojs-ui/php/layouts/PanelLayout.php
new file mode 100644
index 00000000..64931374
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/layouts/PanelLayout.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Layout that expands to cover the entire area of its parent, with optional scrolling and padding.
+ */
+class PanelLayout extends Layout {
+	/**
+	 * @param array $config Configuration options
+	 * @param boolean $config['scrollable'] Allow vertical scrolling (default: false)
+	 * @param boolean $config['padded'] Pad the content from the edges (default: false)
+	 * @param boolean $config['expanded'] Expand size to fill the entire parent element
+	 *   (default: true)
+	 * @param boolean $config['framed'] Wrap in a frame to visually separate from outside content
+	 *   (default: false)
+	 */
+	public function __construct( array $config = array() ) {
+		// Config initialization
+		$config = array_merge( array(
+			'scrollable' => false,
+			'padded' => false,
+			'expanded' => true,
+			'framed' => false,
+		), $config );
+
+		// Parent constructor
+		parent::__construct( $config );
+
+		// Initialization
+		$this->addClasses( array( 'oo-ui-panelLayout' ) );
+		if ( $config['scrollable'] ) {
+			$this->addClasses( array( 'oo-ui-panelLayout-scrollable' ) );
+		}
+		if ( $config['padded'] ) {
+			$this->addClasses( array( 'oo-ui-panelLayout-padded' ) );
+		}
+		if ( $config['expanded'] ) {
+			$this->addClasses( array( 'oo-ui-panelLayout-expanded' ) );
+		}
+		if ( $config['framed'] ) {
+			$this->addClasses( array( 'oo-ui-panelLayout-framed' ) );
+		}
+	}
+	public function getConfig( &$config ) {
+		if ( $this->hasClass( 'oo-ui-panelLayout-scrollable' ) ) {
+			$config['scrollable'] = true;
+		}
+		if ( $this->hasClass( 'oo-ui-panelLayout-padded' ) ) {
+			$config['padded'] = true;
+		}
+		if ( !$this->hasClass( 'oo-ui-panelLayout-expanded' ) ) {
+			$config['expanded'] = false;
+		}
+		if ( $this->hasClass( 'oo-ui-panelLayout-framed' ) ) {
+			$config['framed'] = true;
+		}
+		$config['content'] = $this->content;
+		return parent::getConfig( $config );
+	}
+}