Merge pull request #12418 from Wikia/XW-2575

XW-2575 | Remove GlobalNavigation extension
Wikia · Feb 20, 2017 · f5731db · f5731db
2 parents 7fc4ab7 + 07a241d
commit f5731db
Show file tree

Hide file tree

Showing 62 changed files with 27 additions and 3,345 deletions.
diff --git a/extensions/wikia/AppPromoLanding/AppPromoLandingController.class.php b/extensions/wikia/AppPromoLanding/AppPromoLandingController.class.php
@@ -72,9 +72,7 @@ public function content( $params ){
 		$this->debug = "";
 
 		// render global and user navigation
-		$this->header = !empty( $this->wg->EnableDesignSystem ) ?
-			F::app()->renderView( 'DesignSystemGlobalNavigationService', 'index' ) :
-			F::app()->renderView( 'GlobalNavigation', 'index' );
+		$this->header = F::app()->renderView( 'DesignSystemGlobalNavigationService', 'index' );
 
 		// Get the config for this app, from the service.
 		$this->config = AppPromoLandingController::getConfigForWiki( $this->wg->CityId );

diff --git a/extensions/wikia/AssetsManager/config.php b/extensions/wikia/AssetsManager/config.php
@@ -2361,54 +2361,6 @@
 	],
 ];
 
-/** GlobalNavigation extension */
-$config['global_navigation_scss'] = [
-	'type' => AssetsManager::TYPE_SCSS,
-	'skin' => [ 'oasis' ],
-	'assets' => [
-		'//extensions/wikia/GlobalNavigation/styles/GlobalNavigation.scss',
-		'//extensions/wikia/GlobalNavigation/styles/GlobalNavigationSearch.scss',
-		'//extensions/wikia/GlobalNavigation/styles/GlobalNavigationAccountNavigation.scss',
-		'//extensions/wikia/GlobalNavigation/styles/GlobalNavigationUserLoginDropdown.scss',
-		'//extensions/wikia/GlobalNavigation/styles/GlobalNavigationNotifications.scss',
-		'//extensions/wikia/GlobalNavigation/styles/GlobalNavigationInverse.scss',
-		'//extensions/wikia/GlobalNavigation/styles/GoogleSearchAPI.scss',
-		'//skins/shared/styles/transparent-out.scss',
-	],
-];
-
-$config['global_navigation_js'] = [
-	'type' => AssetsManager::TYPE_JS,
-	'skin' => [ 'oasis' ],
-	'assets' => [
-		'#group_delayed_hover_js',
-		'//resources/wikia/modules/scrollToLink.js',
-		'//skins/shared/scripts/transparent-out.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationDropdownsHandler.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationiOSScrollFix.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationScrollToLink.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationTracking.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationLazyLoad.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationSearch.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GoogleSearchAPI.js',
-		'//extensions/wikia/GlobalNavigation/scripts/SearchSuggestions.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationInverseTransition.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationAccountNavigation.js',
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationExploreWikiaDropdown.js',
-		'//extensions/wikia/UserLogin/js/UserBaseAjaxForm.js',
-		'//extensions/wikia/UserLogin/js/UserLoginAjaxForm.js',
-		'//resources/wikia/libraries/bootstrap/tooltip.js',
-	],
-];
-
-$config['wall_notifications_global_navigation_js'] = [
-	'type' => AssetsManager::TYPE_JS,
-	'skin' => [ 'oasis' ],
-	'assets' => [
-		'//extensions/wikia/GlobalNavigation/scripts/GlobalNavigationNotifications.js',
-	],
-];
-
 $config['media_gallery_js'] = [
 	'type' => AssetsManager::TYPE_JS,
 	'skin' => [ 'oasis' ],
@@ -3078,8 +3030,7 @@
 	'type' => AssetsManager::TYPE_SCSS,
 	'skin' => [ 'oasis' ],
 	'assets' => [
-		'//resources/wikia/libraries/headroom/headroom.scss',
-		'//extensions/wikia/GlobalNavigation/styles/GlobalNavigationNotifications.scss'
+		'//resources/wikia/libraries/headroom/headroom.scss'
 	],
 ];
 

diff --git a/...a/GlobalNavigation/images/signin_icon.svg → ...ikia/CommunityPage/images/signin_icon.svg b/...a/GlobalNavigation/images/signin_icon.svg → ...ikia/CommunityPage/images/signin_icon.svg
diff --git a/extensions/wikia/CommunityPage/styles/components/_avatar.scss b/extensions/wikia/CommunityPage/styles/components/_avatar.scss
@@ -13,7 +13,7 @@
 	}
 
 	&.logged-avatar-placeholder {
-		background-image: url('/extensions/wikia/GlobalNavigation/images/signin_icon.svg'); /* inline */
+		background-image: url('/extensions/wikia/CommunityPage/images/signin_icon.svg'); /* inline */
 		background-position: center;
 		background-repeat: no-repeat;
 	}

diff --git a/...lNavigation/images/notifications_icon.svg → ...esignSystem/images/notifications_icon.svg b/...lNavigation/images/notifications_icon.svg → ...esignSystem/images/notifications_icon.svg
diff --git a/...ikia/DesignSystem/services/DesignSystemGlobalNavigationWallNotificationsService.class.php b/...ikia/DesignSystem/services/DesignSystemGlobalNavigationWallNotificationsService.class.php
@@ -1,7 +1,5 @@
 <?php
 
 class DesignSystemGlobalNavigationWallNotificationsService extends GlobalNavigationWallNotificationsController {
-	protected function addAssets() {
-		// We need to disable import from parent class
-	}
+	protected function addAssets() {}
 }
diff --git a/...gation/styles/GlobalNavigationMixins.scss → ...System/styles/GlobalNavigationMixins.scss b/...gation/styles/GlobalNavigationMixins.scss → ...System/styles/GlobalNavigationMixins.scss
@@ -1,8 +1,6 @@
-@import "GlobalNavigationColors";
-
 @mixin global-nav-chevron {
 	border: 4px solid transparent;
-	border-top-color: $global-navigation-text-color;
+	border-top-color: rgb(101, 110, 120);
 	content: ' ';
 	display: inline-block;
 }
diff --git a/...styles/GlobalNavigationNotifications.scss → ...styles/GlobalNavigationNotifications.scss b/...styles/GlobalNavigationNotifications.scss → ...styles/GlobalNavigationNotifications.scss
@@ -2,13 +2,12 @@
 @import 'skins/shared/mixins/calc';
 @import 'skins/shared/mixins/clearfix';
 @import 'skins/shared/mixins/box-shadow';
-@import 'GlobalNavigationColors';
 @import 'GlobalNavigationMixins';
-@import 'GlobalNavigationVariables';
 
 $black-half-transparent: rgba(0, 0, 0, .6);
 $black-transparent: rgba(0, 0, 0, 0);
 $border-color: #c7d1d8;
+$global-navigation-height: 46px;
 $header-bg-color: #092140;
 $markasread-bg-color: rgb(9, 35, 68);
 $markasread-color: #fff;
@@ -20,14 +19,12 @@ $time-color: rgba($notifications-header-color, .5);
 $notification-bubble-color: rgb(101, 110, 120);
 $white-transparent: rgba(255, 255, 255, 0);
 $white: #fff;
-$wiki-header-bg-color: rgba(113, 133, 148, .2);
-$wiki-header-color: #2b54b5;
 
 .notifications-container {
 	position: relative;
 
 	.notifications-entry-point {
-		background-image: url('/extensions/wikia/GlobalNavigation/images/notifications_icon.svg'); /** inline */
+		background-image: url('/extensions/wikia/DesignSystem/images/notifications_icon.svg'); /** inline */
 		background-position: center;
 		background-size: 19px;
 		background-repeat: no-repeat;
@@ -83,7 +80,7 @@ $wiki-header-color: #2b54b5;
 	}
 
 	&.active {
-		background-color: $global-navigation-background-color;
+		background-color: rgb(230, 235, 242);;
 
 		.notifications-container {
 			display: block;

diff --git a/extensions/wikia/DesignSystem/styles/design-system.scss b/extensions/wikia/DesignSystem/styles/design-system.scss
@@ -3,6 +3,9 @@
 @import '../bower_components/design-system/dist/scss/wds-variables/index';
 @import 'skins/oasis/css/core/breakpoints-variables';
 
+// Legacy notification styles - copied here from original GlobalNavigation extension
+@import 'GlobalNavigationNotifications';
+
 // Platform-specific styles for DesignSystem integration
 $global-navigation-z-index: 5000101;
 

diff --git a/extensions/wikia/EditPageLayout/EditPageLayoutController.class.php b/extensions/wikia/EditPageLayout/EditPageLayoutController.class.php
@@ -126,9 +126,7 @@ public function executeEditPage() {
 		$this->wordmark = $response->getData();
 
 		// render global and user navigation
-		$this->header = !empty( $this->wg->EnableDesignSystem ) ?
-			F::app()->renderView( 'DesignSystemGlobalNavigationService', 'index' ) :
-			F::app()->renderView( 'GlobalNavigation', 'index' );
+		$this->header = F::app()->renderView( 'DesignSystemGlobalNavigationService', 'index' );
 
 		// Editing [foo]
 		$this->title = $editPage->getEditedTitle();

diff --git a/extensions/wikia/EmbeddableDiscussions/styles/avatar.scss b/extensions/wikia/EmbeddableDiscussions/styles/avatar.scss
@@ -15,7 +15,7 @@ $avatar-size: 42px;
 		}
 
 		&.logged-avatar-placeholder {
-			background-image: url('/extensions/wikia/GlobalNavigation/images/signin_icon.svg'); /* inline */
+			background-image: url('/extensions/wikia/CommunityPage/images/signin_icon.svg'); /* inline */
 			background-position: center;
 			background-repeat: no-repeat;
 		}