Merge pull request #241 from Hutchy68/release/1.2rc

Merging

CHANGELOG.md

@@ -1,3 +1,18 @@
+## Version 1.2
+
+* [compatibility] Update skin for skin registration on MW 1.25 and higher
+* [compatibility] Backwards compatibility with MediaWiki Versions prior to 1.25
+* [bug] Fixed Echo extension compatibility with recent release
+* [documentation] Update Readme.md
+* [language] Update Fr-fr translation string
+* [development] Addition of Travis and Scrutinizer
+* [code] Resource module position explicitly set
+* [code] Fixes for execution paths
+* [feature] Support for Visual Editor
+* [icons] Font Awesome update to 4.2, better icons for ULS and page history
+* [code] CSS fix for invasive ULS CSS, removed style for SiteNotice now user controlled
+* [language] Update to language files, now uses .json files to load translations
+
 ## Version 1.1
 
 * [feature] Addition of Social Media Follow Icons using AddThis horizontal follow bar

README.md

@@ -21,9 +21,11 @@ After that, you can issue `git pull` to update the code at anytime.
 
 ## Setup
 
-Once the skin is in place add the following line to your `LocalSettings.php` file.
+Once the skin is in place add one the following lines to your `LocalSettings.php` file depending on the version of MediaWiki you are using.
 
-    require_once "$IP/skins/foreground/foreground.php";
+    require_once "$IP/skins/foreground/foreground.php"; //MW versions < 1.25.x
+	
+	wfLoadSkin( 'foreground' ); //MW versions 1.25 and higher
 
 This will activate Foreground in your installation. At this point you can select it as a user skin in your user preferences.
 

assets/scripts/foreground.js

@@ -12,6 +12,7 @@ jQuery(document).ready(function() {
   // The Echo extension puts an item in personal tools that Foreground really should have in the top menu
   // to make this easier, we move it here and loaded earlier to speed up transform
   jQuery("#pt-notifications").prependTo("#echo-notifications");
+  jQuery("#pt-notifications-alert").prependTo("#echo-notifications");
   
   // Append font-awesome icons
   jQuery('[id^=ca-nstab] a').prepend('<div class="drop-icon"><i class="fa fa-file fa-fw"></i></div>')

assets/stylesheets/foreground.css

@@ -730,7 +730,8 @@ body.mw-special-Userlogin h2.title {
   margin: .5em 1em;
 }
 
-#echo-notifications #pt-notifications {
+#echo-notifications #pt-notifications,
+#echo-notifications #pt-notifications-alert {
   position: relative;
   list-style: none;
 }
@@ -745,13 +746,25 @@ body.mw-special-Userlogin h2.title {
   padding:6px;
 }
 
-#echo-notifications #pt-notifications a.mw-echo-short-link .mw-badge
+#echo-notifications #pt-notifications-alert .mw-echo-notifications-badge
+{
+  width: 50px;
+  height: 30px;
+  text-align: center;
+  border-radius: 6px;
+  margin: 0;
+}
+
+#echo-notifications #pt-notifications a.mw-echo-short-link .mw-badge,
+#echo-notifications #pt-notifications-alert a.mw-echo-short-link .mw-badge
 {
   margin:0;
   padding:6px;
 }
 
-#echo-notifications #pt-notifications .mw-badge-content {
+#echo-notifications #pt-notifications .mw-badge-content,
+#echo-notifications #pt-notifications-alert .mw-badge-content
+{
   font-size: 1.3em;
   line-height: 1.1;
 }

skin.json

@@ -1,6 +1,6 @@
 {
 	"name": "Foreground",
-	"version": "1.2-alpha",
+	"version": "1.2-rc",
 	"author": [
 		"Garrick Van Buren",
 		"Jamie Thingelstad",