32 files changed, 68 insertions, 59 deletions
diff --git a/skins/ArchLinux b/skins/ArchLinux
new file mode 120000
index 00000000..d450cbb4
--- /dev/null
+++ b/skins/ArchLinux
@@ -0,0 +1 @@
+Parabola
+\ No newline at end of file
diff --git a/skins/ArchLinux/archnavbar.css b/skins/ArchLinux/archnavbar.css
deleted file mode 100644
index 574d8b2b..00000000
--- a/skins/ArchLinux/archnavbar.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * ARCH GLOBAL NAVBAR
- * We're forcing all generic selectors with !important
- * to help prevent other stylesheets from interfering.
- */
-
-/* container for the entire bar */
-#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #000 !important; border-bottom: 5px #787DAB solid !important; }
-#archnavbarlogo { float: left !important; margin: -5px 0 0 0 !important; padding: 0 !important; height: 50px !important; width: 324px !important; background: url('archlogo.png') no-repeat !important; }
-
-/* move the heading/paragraph text offscreen */
-#archnavbarlogo p { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
-#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; border-bottom: 0px !important; }
-
-/* make the link the same size as the logo */
-#archnavbarlogo a { display: block !important; height: 50px !important; width: 324px !important; }
-
-/* display the list inline, float it to the right and style it */
-#archnavbar ul { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; }
-#archnavbar ul li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; }
-
-/* style the links */
-#archnavbar ul#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
-#archnavbar ul li a:hover { color: white !important; text-decoration: underline !important; }
diff --git a/skins/Parabola/ArchLinux.php b/skins/Parabola/ArchLinux.php
new file mode 120000
index 00000000..b99dddef
--- /dev/null
+++ b/skins/Parabola/ArchLinux.php
@@ -0,0 +1 @@
+Parabola.php
+\ No newline at end of file
diff --git a/skins/Parabola/ArchLinuxTemplate.php b/skins/Parabola/ArchLinuxTemplate.php
new file mode 120000
index 00000000..4f4e1d4f
--- /dev/null
+++ b/skins/Parabola/ArchLinuxTemplate.php
@@ -0,0 +1 @@
+Template.php
+\ No newline at end of file
diff --git a/skins/ArchLinux/COPYING b/skins/Parabola/COPYING
index d159169d..d159169d 100644
--- a/skins/ArchLinux/COPYING
+++ b/skins/Parabola/COPYING
diff --git a/skins/ArchLinux/Gruntfile.js b/skins/Parabola/Gruntfile.js
index 9c56558a..9c56558a 100644
--- a/skins/ArchLinux/Gruntfile.js
+++ b/skins/Parabola/Gruntfile.js
diff --git a/skins/ArchLinux/IE60Fixes.css b/skins/Parabola/IE60Fixes.css
index a5beed5d..a5beed5d 100644
--- a/skins/ArchLinux/IE60Fixes.css
+++ b/skins/Parabola/IE60Fixes.css
diff --git a/skins/ArchLinux/IE70Fixes.css b/skins/Parabola/IE70Fixes.css
index e82d57a3..e82d57a3 100644
--- a/skins/ArchLinux/IE70Fixes.css
+++ b/skins/Parabola/IE70Fixes.css
diff --git a/skins/ArchLinux/ArchLinux.php b/skins/Parabola/Parabola.php
index fce0e822..abc6c7c6 100644
--- a/skins/ArchLinux/ArchLinux.php
+++ b/skins/Parabola/Parabola.php
@@ -1,7 +1,7 @@
 <?php
 
 if ( function_exists( 'wfLoadSkin' ) ) {
-	wfLoadSkin( 'ArchLinux' );
+	wfLoadSkin( 'Parabola' );
 	// Keep i18n globals so mergeMessageFileList.php doesn't break
 	$wgMessagesDirs['MonoBook'] = __DIR__ . '/i18n';
 	/* wfWarn(
@@ -10,5 +10,5 @@ if ( function_exists( 'wfLoadSkin' ) ) {
 	); */
 	return true;
 } else {
-	die( 'This version of the ArchLinux skin requires MediaWiki 1.25+' );
+	die( 'This version of the Parabola skin requires MediaWiki 1.25+' );
 }
diff --git a/skins/ArchLinux/SkinArchLinux.php b/skins/Parabola/Skin.php
index 4be24176..92edc05d 100644
--- a/skins/ArchLinux/SkinArchLinux.php
+++ b/skins/Parabola/Skin.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * ArchLinux skin (based on MonoBook)
+ * Parabola skin, based on Arch (the GNU/Linux distribution) and MonoBook skins
  *
- * Translated from gwicke's previous TAL template version to remove
- * dependency on PHPTAL.
+ * Arch (the GNU/Linux distribution) skin:
+ * * Translated from gwicke's previous TAL template version to remove
+ *   dependency on PHPTAL.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,11 +29,11 @@
  * Inherit main code from SkinTemplate, set the CSS and template filter.
  * @ingroup Skins
  */
-class SkinArchLinux extends SkinTemplate {
-	/** Using ArchLinux. */
-	public $skinname = 'archlinux';
-	public $stylename = 'ArchLinux';
-	public $template = 'ArchLinuxTemplate';
+class Skin extends SkinTemplate {
+	/** Using Parabola. */
+	public $skinname = 'parabola';
+	public $stylename = 'Parabola';
+	public $template = 'Template';
 
 	/**
 	 * @param OutputPage $out
diff --git a/skins/Parabola/SkinArchLinux.php b/skins/Parabola/SkinArchLinux.php
new file mode 120000
index 00000000..23d725a4
--- /dev/null
+++ b/skins/Parabola/SkinArchLinux.php
@@ -0,0 +1 @@
+Skin.php
+\ No newline at end of file
diff --git a/skins/ArchLinux/ArchLinuxTemplate.php b/skins/Parabola/Template.php
index 3e10befc..55ff43aa 100644
--- a/skins/ArchLinux/ArchLinuxTemplate.php
+++ b/skins/Parabola/Template.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * ArchLinux skin (based on MonoBook)
+ * Parabola skin, based on Arch (the GNU/Linux distribution) and MonoBook skins
  *
- * Translated from gwicke's previous TAL template version to remove
- * dependency on PHPTAL.
+ * Arch (the GNU/Linux distribution) skin:
+ * * Translated from gwicke's previous TAL template version to remove
+ *   dependency on PHPTAL.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,10 +28,10 @@
 /**
  * @ingroup Skins
  */
-class ArchLinuxTemplate extends BaseTemplate {
+class Template extends BaseTemplate {
 
 	/**
-	 * Template filter callback for ArchLinux skin.
+	 * Template filter callback for Parabola skin.
 	 * Takes an associative array of data set from a SkinTemplate-based
 	 * class, and a wrapper for MediaWiki's localization database, and
 	 * outputs a formatted page.
@@ -38,17 +39,17 @@ class ArchLinuxTemplate extends BaseTemplate {
 	 * @access private
 	 */
 	function execute() {
-		global $wgArchNavBar, $wgArchHome, $wgArchNavBarSelected, $wgArchNavBarSelectedDefault;
+		global $wgNavBar, $wgHome, $wgNavBarSelected, $wgNavBarSelectedDefault;
 		// Suppress warnings to prevent notices about missing indexes in $this->data
 		wfSuppressWarnings();
 
 		$this->html( 'headelement' );
 		?>
 
-		<div id="archnavbar"><!-- Arch Linux global navigation bar -->
-		        <div id="archnavbarlogo"><h1><a href="https://www.parabola.nu/">Parabola GNU/Linux-libre</a></h1></div>
-		        <div id="archnavbarmenu">
-		            <ul id="archnavbarlist">
+		<div id="navbar"><!-- Parabola global navigation bar -->
+		        <div id="navbarlogo"><h1><a href="https://www.parabola.nu/">Parabola GNU/Linux-libre</a></h1></div>
+		        <div id="navbarmenu">
+		            <ul id="navbarlist">
 		                <li id="anb-home"><a href="https://www.parabola.nu/" title="Parabola news, packages, projects and more">Home</a></li>
 		                <li id="anb-packages"><a href="https://www.parabola.nu/packages/" title="Package Database">Packages</a></li>
 		                <li id="anb-wiki" class="anb-selected"><a href="https://wiki.parabola.nu/" title="Community documentation">Wiki</a></li>
@@ -57,7 +58,7 @@ class ArchLinuxTemplate extends BaseTemplate {
 		                <li id="anb-download"><a href="https://wiki.parabola.nu/Get_Parabola" title="Get Parabola">Download</a></li>
 		            </ul>
 		        </div>
-		</div><!-- #archnavbar -->
+		</div><!-- #navbar -->
 
 		<div id="globalWrapper">
 		<div id="column-content">
@@ -324,7 +325,7 @@ class ArchLinuxTemplate extends BaseTemplate {
 
 					<?php
 					}
-					Hooks::run( 'ArchLinuxTemplateToolboxEnd', array( &$this ) );
+					Hooks::run( 'TemplateToolboxEnd', array( &$this ) );
 					Hooks::run( 'SkinTemplateToolboxEnd', array( &$this, true ) );
 					?>
 				</ul>
diff --git a/skins/Parabola/arch.css b/skins/Parabola/arch.css
new file mode 120000
index 00000000..ac1a9154
--- /dev/null
+++ b/skins/Parabola/arch.css
@@ -0,0 +1 @@
+parabola.css
+\ No newline at end of file
diff --git a/skins/Parabola/archlogo.png b/skins/Parabola/archlogo.png
new file mode 120000
index 00000000..bd36e718
--- /dev/null
+++ b/skins/Parabola/archlogo.png
@@ -0,0 +1 @@
+logo.png
+\ No newline at end of file
diff --git a/skins/Parabola/archnavbar.css b/skins/Parabola/archnavbar.css
new file mode 120000
index 00000000..b1808e79
--- /dev/null
+++ b/skins/Parabola/archnavbar.css
@@ -0,0 +1 @@
+navbar.css
+\ No newline at end of file
diff --git a/skins/ArchLinux/bullet.gif b/skins/Parabola/bullet.gif
index b43de48a..b43de48a 100644
--- a/skins/ArchLinux/bullet.gif
+++ b/skins/Parabola/bullet.gif
diff --git a/skins/ArchLinux/composer.json b/skins/Parabola/composer.json
index fd380fb7..fd380fb7 100644
--- a/skins/ArchLinux/composer.json
+++ b/skins/Parabola/composer.json
diff --git a/skins/ArchLinux/favicon.ico b/skins/Parabola/favicon.ico
index c67bbd61..c67bbd61 100644
--- a/skins/ArchLinux/favicon.ico
+++ b/skins/Parabola/favicon.ico
diff --git a/skins/ArchLinux/headbg.jpg b/skins/Parabola/headbg.jpg
index 5491c6e4..5491c6e4 100644
--- a/skins/ArchLinux/headbg.jpg
+++ b/skins/Parabola/headbg.jpg
diff --git a/skins/ArchLinux/hooks.txt b/skins/Parabola/hooks.txt
index b456a669..b456a669 100644
--- a/skins/ArchLinux/hooks.txt
+++ b/skins/Parabola/hooks.txt
diff --git a/skins/ArchLinux/link_icon.gif b/skins/Parabola/link_icon.gif
index 168c1a2f..168c1a2f 100644
--- a/skins/ArchLinux/link_icon.gif
+++ b/skins/Parabola/link_icon.gif
diff --git a/skins/ArchLinux/archlogo.png b/skins/Parabola/logo.png
index 8726397a..8726397a 100644
--- a/skins/ArchLinux/archlogo.png
+++ b/skins/Parabola/logo.png
diff --git a/skins/ArchLinux/magnify-clip.png b/skins/Parabola/magnify-clip.png
index ffd7637f..ffd7637f 100644
--- a/skins/ArchLinux/magnify-clip.png
+++ b/skins/Parabola/magnify-clip.png
diff --git a/skins/ArchLinux/main.css b/skins/Parabola/main.css
index 0abc7b31..0abc7b31 100644
--- a/skins/ArchLinux/main.css
+++ b/skins/Parabola/main.css
diff --git a/skins/Parabola/navbar.css b/skins/Parabola/navbar.css
new file mode 100644
index 00000000..95e7575d
--- /dev/null
+++ b/skins/Parabola/navbar.css
@@ -0,0 +1,24 @@
+/*
+ * GLOBAL NAVBAR
+ * We're forcing all generic selectors with !important
+ * to help prevent other stylesheets from interfering.
+ */
+
+/* container for the entire bar */
+#navbar { height: 40px !important; padding: 10px 15px !important; background: #000 !important; border-bottom: 5px #787DAB solid !important; }
+#navbarlogo { float: left !important; margin: -5px 0 0 0 !important; padding: 0 !important; height: 50px !important; width: 324px !important; background: url('logo.png') no-repeat !important; }
+
+/* move the heading/paragraph text offscreen */
+#navbarlogo p { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
+#navbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; border-bottom: 0px !important; }
+
+/* make the link the same size as the logo */
+#navbarlogo a { display: block !important; height: 50px !important; width: 324px !important; }
+
+/* display the list inline, float it to the right and style it */
+#navbar ul { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; }
+#navbar ul li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; }
+
+/* style the links */
+#navbar ul#navbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
+#navbar ul li a:hover { color: white !important; text-decoration: underline !important; }
diff --git a/skins/ArchLinux/arch.css b/skins/Parabola/parabola.css
index c8abb749..9d15dd6a 100644
--- a/skins/ArchLinux/arch.css
+++ b/skins/Parabola/parabola.css
@@ -173,6 +173,6 @@ div#footer {
 }
 
 /* highlight current website in the navbar */
-#archnavbar ul li.anb-selected a {
+#navbar ul li.anb-selected a {
     color: white !important;
 }
diff --git a/skins/ArchLinux/print.css b/skins/Parabola/print.css
index a2780f7a..2c0e2093 100644
--- a/skins/ArchLinux/print.css
+++ b/skins/Parabola/print.css
@@ -1,3 +1,3 @@
-#archnavbar {
+#navbar {
 	display: none;
 }
diff --git a/skins/ArchLinux/required.gif b/skins/Parabola/required.gif
index bd719769..bd719769 100644
--- a/skins/ArchLinux/required.gif
+++ b/skins/Parabola/required.gif
diff --git a/skins/ArchLinux/skin.json b/skins/Parabola/skin.json
index e45a8341..dc04491e 100644
--- a/skins/ArchLinux/skin.json
+++ b/skins/Parabola/skin.json
@@ -1,27 +1,27 @@
 {
-	"name": "ArchLinux",
-	"author": [ "Pierre Schmitz" ],
+	"name": "Parabola",
+	"author": [ "Parabola Hackers, based on Pierre Schmitz (derivative work)" ],
 	"url": "https://www.parabola.nu",
-	"description": "MediaWiki skin based on MonoBook, customized for Parabola",
+	"description": "MediaWiki skin based on Arch (the GNU/Linux distribution) and MonoBook",
 	"license-name": "GPL-2.0+",
 	"type": "skin",
 	"ValidSkinNames": {
-		"archlinux": "ArchLinux"
+		"parabola": "Parabola"
 	},
 	"SkinOOUIThemes": {
-		"archlinux": "Apex"
+		"parabola": "Apex"
 	},
 	"ResourceModules": {
-		"skins.archlinux.styles": {
+		"skins.parabola.styles": {
 			"position": "top",
 			"styles": {
 				"main.css": {
 					"media": "screen"
 				},
-				"archnavbar.css": {
+				"navbar.css": {
 					"media": "screen"
 				},
-				"arch.css": {
+				"parabola.css": {
 					"media": "screen"
 				},
 				"print.css": {
@@ -32,11 +32,11 @@
 	},
 	"ResourceFileModulePaths": {
 		"localBasePath": "",
-		"remoteSkinPath": "ArchLinux"
+		"remoteSkinPath": "Parabola"
 	},
 	"AutoloadClasses": {
-		"SkinArchLinux": "SkinArchLinux.php",
-		"ArchLinuxTemplate": "ArchLinuxTemplate.php"
+		"Skin": "Skin.php",
+		"Template": "Template.php"
 	},
 	"manifest_version": 1
 }
diff --git a/skins/ArchLinux/user.gif b/skins/Parabola/user.gif
index 34b4839d..34b4839d 100644
--- a/skins/ArchLinux/user.gif
+++ b/skins/Parabola/user.gif
diff --git a/skins/ArchLinux/wiki-indexed.png b/skins/Parabola/wiki-indexed.png
index 799ebac8..799ebac8 100644
--- a/skins/ArchLinux/wiki-indexed.png
+++ b/skins/Parabola/wiki-indexed.png
diff --git a/skins/ArchLinux/wiki.png b/skins/Parabola/wiki.png
index 8c421183..8c421183 100644
--- a/skins/ArchLinux/wiki.png
+++ b/skins/Parabola/wiki.png