From 878313d2ecd3daa526d0d8c99b52603eacf4c41d Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Fri, 3 Aug 2012 12:24:04 +0530
Subject: [PATCH] Rearranging Files

* Seperating standalone jQuery ULS plugin and extension related code
* lib/jquery.uls can be submodule, but not now.

Change-Id: I7d9cb47daa88dd1a27ceda602a08cab0073caf33
---
 UniversalLanguageSelector.php                 |  40 ++++++++----------
 lib/jquery.uls/README.md                      |   4 ++
 .../jquery.uls/css/jquery.uls.css             |   0
 .../jquery.uls/css/jquery.uls.grid.css        |   0
 .../jquery.uls/css/jquery.uls.lcd.css         |   0
 .../jquery.uls/data/jquery.uls.data.js        |   0
 .../jquery.uls/examples}/index.html           |  16 +++----
 .../jquery.uls/examples}/resources/demo.css   |   0
 .../jquery.uls/examples}/resources/jquery.js  |   0
 .../jquery.uls}/images/clear.png              | Bin
 .../jquery.uls}/images/close.png              | Bin
 .../jquery.uls}/images/icon-language.png      | Bin
 .../jquery.uls}/images/search.png             | Bin
 .../jquery.uls}/images/world_map.png          | Bin
 .../jquery.uls/src/jquery.uls.core.js         |   0
 .../jquery.uls/src/jquery.uls.data.utils.js   |   0
 .../src/jquery.uls.languagefilter.js          |   0
 .../jquery.uls/src/jquery.uls.lcd.js          |   0
 18 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 lib/jquery.uls/README.md
 rename resources/css/ext.uls.css => lib/jquery.uls/css/jquery.uls.css (100%)
 rename resources/css/ext.uls.grid.css => lib/jquery.uls/css/jquery.uls.grid.css (100%)
 rename resources/css/ext.uls.lcd.css => lib/jquery.uls/css/jquery.uls.lcd.css (100%)
 rename data/ext.uls.data.js => lib/jquery.uls/data/jquery.uls.data.js (100%)
 rename {examples => lib/jquery.uls/examples}/index.html (97%)
 rename {examples => lib/jquery.uls/examples}/resources/demo.css (100%)
 rename {examples => lib/jquery.uls/examples}/resources/jquery.js (100%)
 rename {resources => lib/jquery.uls}/images/clear.png (100%)
 rename {resources => lib/jquery.uls}/images/close.png (100%)
 rename {resources => lib/jquery.uls}/images/icon-language.png (100%)
 rename {resources => lib/jquery.uls}/images/search.png (100%)
 rename {resources => lib/jquery.uls}/images/world_map.png (100%)
 rename resources/ext.uls.core.js => lib/jquery.uls/src/jquery.uls.core.js (100%)
 rename resources/ext.uls.data.utils.js => lib/jquery.uls/src/jquery.uls.data.utils.js (100%)
 rename resources/ext.uls.languagefilter.js => lib/jquery.uls/src/jquery.uls.languagefilter.js (100%)
 rename resources/ext.uls.lcd.js => lib/jquery.uls/src/jquery.uls.lcd.js (100%)

diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index b0ee3b52..a9548c1d 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -69,39 +69,35 @@ $wgResourceModules['ext.uls.init'] = array(
 	'dependencies' => array(
 		'mediawiki.Uri',
 		'jquery.tipsy',
-		'ext.uls.core',
+		'jquery.uls',
 	),
 	'position' => 'top',
 );
 
-$wgResourceModules['ext.uls.data'] = array(
-	'scripts' => 'data/ext.uls.data.js',
-	'localBasePath' => $dir,
-	'remoteExtPath' => 'UniversalLanguageSelector',
-);
-
-$wgResourceModules['ext.uls.lcd'] = array(
-	'scripts' => 'resources/ext.uls.lcd.js',
-	'localBasePath' => $dir,
-	'remoteExtPath' => 'UniversalLanguageSelector',
-	'styles' => 'resources/css/ext.uls.lcd.css',
-);
-
-$wgResourceModules['ext.uls.core'] = array(
+$wgResourceModules['jquery.uls'] = array(
 	'scripts' => array(
-		'resources/ext.uls.core.js',
-		'resources/ext.uls.languagefilter.js',
-		'resources/ext.uls.data.utils.js',
+		'lib/jquery.uls/src/jquery.uls.core.js',
+		'lib/jquery.uls/src/jquery.uls.languagefilter.js',
+		'lib/jquery.uls/src/jquery.uls.lcd.js',
 	),
 	'styles' => array(
-		'resources/css/ext.uls.css',
-		'resources/css/ext.uls.grid.css',
+		'lib/jquery.uls/css/jquery.uls.css',
+		'lib/jquery.uls/css/jquery.uls.grid.css',
+		'lib/jquery.uls/css/jquery.uls.lcd.css',
 	),
 	'localBasePath' => $dir,
 	'remoteExtPath' => 'UniversalLanguageSelector',
 	'dependencies' => array(
-		'ext.uls.data',
-		'ext.uls.lcd',
+		'jquery.uls.data',
 	),
 	'position' => 'top',
 );
+
+$wgResourceModules['jquery.uls.data'] = array(
+	'scripts' => array(
+		'lib/jquery.uls/data/jquery.uls.data.js',
+		'lib/jquery.uls/src/jquery.uls.data.utils.js',
+	),
+	'localBasePath' => $dir,
+	'remoteExtPath' => 'UniversalLanguageSelector',
+);
\ No newline at end of file
diff --git a/lib/jquery.uls/README.md b/lib/jquery.uls/README.md
new file mode 100644
index 00000000..acd9f063
--- /dev/null
+++ b/lib/jquery.uls/README.md
@@ -0,0 +1,4 @@
+jQuery Universal Language Selector
+=================================
+Universal  Language Selector
+
diff --git a/resources/css/ext.uls.css b/lib/jquery.uls/css/jquery.uls.css
similarity index 100%
rename from resources/css/ext.uls.css
rename to lib/jquery.uls/css/jquery.uls.css
diff --git a/resources/css/ext.uls.grid.css b/lib/jquery.uls/css/jquery.uls.grid.css
similarity index 100%
rename from resources/css/ext.uls.grid.css
rename to lib/jquery.uls/css/jquery.uls.grid.css
diff --git a/resources/css/ext.uls.lcd.css b/lib/jquery.uls/css/jquery.uls.lcd.css
similarity index 100%
rename from resources/css/ext.uls.lcd.css
rename to lib/jquery.uls/css/jquery.uls.lcd.css
diff --git a/data/ext.uls.data.js b/lib/jquery.uls/data/jquery.uls.data.js
similarity index 100%
rename from data/ext.uls.data.js
rename to lib/jquery.uls/data/jquery.uls.data.js
diff --git a/examples/index.html b/lib/jquery.uls/examples/index.html
similarity index 97%
rename from examples/index.html
rename to lib/jquery.uls/examples/index.html
index 4c44526d..7cb42700 100644
--- a/examples/index.html
+++ b/lib/jquery.uls/examples/index.html
@@ -14,19 +14,19 @@
 		<!-- <link rel="apple-touch-icon" href="/apple-touch-icon.png"/> -->
 		<!-- <meta name="description" content=""/> -->
 		<meta name="author" content="Santhosh Thottingal"/>
-		<link href="../resources/css/ext.uls.css" rel="stylesheet"/>
-		<link href="../resources/css/ext.uls.grid.css" rel="stylesheet"/>
-		<link href="../resources/css/ext.uls.lcd.css" rel="stylesheet"/>
+		<link href="../css/jquery.uls.css" rel="stylesheet"/>
+		<link href="../css/jquery.uls.grid.css" rel="stylesheet"/>
+		<link href="../css/jquery.uls.lcd.css" rel="stylesheet"/>
 		<!-- demo -->
 		<link href="resources/demo.css" rel="stylesheet"/>
 		<!-- Libs -->
 		<script src="resources/jquery.js"></script>
 		<!-- Source -->
-		<script src="../data/ext.uls.data.js"></script>
-		<script src="../resources/ext.uls.data.utils.js"></script>
-		<script src="../resources/ext.uls.lcd.js"></script>
-		<script src="../resources/ext.uls.languagefilter.js"></script>
-		<script src="../resources/ext.uls.core.js"></script>
+		<script src="../data/jquery.uls.data.js"></script>
+		<script src="../src/jquery.uls.data.utils.js"></script>
+		<script src="../src/jquery.uls.lcd.js"></script>
+		<script src="../src/jquery.uls.languagefilter.js"></script>
+		<script src="../src/jquery.uls.core.js"></script>
 		<script>
 			$( document ).ready( function() {
 				$( '.uls-trigger' ).uls( {
diff --git a/examples/resources/demo.css b/lib/jquery.uls/examples/resources/demo.css
similarity index 100%
rename from examples/resources/demo.css
rename to lib/jquery.uls/examples/resources/demo.css
diff --git a/examples/resources/jquery.js b/lib/jquery.uls/examples/resources/jquery.js
similarity index 100%
rename from examples/resources/jquery.js
rename to lib/jquery.uls/examples/resources/jquery.js
diff --git a/resources/images/clear.png b/lib/jquery.uls/images/clear.png
similarity index 100%
rename from resources/images/clear.png
rename to lib/jquery.uls/images/clear.png
diff --git a/resources/images/close.png b/lib/jquery.uls/images/close.png
similarity index 100%
rename from resources/images/close.png
rename to lib/jquery.uls/images/close.png
diff --git a/resources/images/icon-language.png b/lib/jquery.uls/images/icon-language.png
similarity index 100%
rename from resources/images/icon-language.png
rename to lib/jquery.uls/images/icon-language.png
diff --git a/resources/images/search.png b/lib/jquery.uls/images/search.png
similarity index 100%
rename from resources/images/search.png
rename to lib/jquery.uls/images/search.png
diff --git a/resources/images/world_map.png b/lib/jquery.uls/images/world_map.png
similarity index 100%
rename from resources/images/world_map.png
rename to lib/jquery.uls/images/world_map.png
diff --git a/resources/ext.uls.core.js b/lib/jquery.uls/src/jquery.uls.core.js
similarity index 100%
rename from resources/ext.uls.core.js
rename to lib/jquery.uls/src/jquery.uls.core.js
diff --git a/resources/ext.uls.data.utils.js b/lib/jquery.uls/src/jquery.uls.data.utils.js
similarity index 100%
rename from resources/ext.uls.data.utils.js
rename to lib/jquery.uls/src/jquery.uls.data.utils.js
diff --git a/resources/ext.uls.languagefilter.js b/lib/jquery.uls/src/jquery.uls.languagefilter.js
similarity index 100%
rename from resources/ext.uls.languagefilter.js
rename to lib/jquery.uls/src/jquery.uls.languagefilter.js
diff --git a/resources/ext.uls.lcd.js b/lib/jquery.uls/src/jquery.uls.lcd.js
similarity index 100%
rename from resources/ext.uls.lcd.js
rename to lib/jquery.uls/src/jquery.uls.lcd.js