fix #383

PHPfox-Official · Aug 21, 2015 · 051b4f4 · 051b4f4
1 parent 5fed876
commit 051b4f4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/PF.Base/module/admincp/include/component/controller/apps/index.class.php b/PF.Base/module/admincp/include/component/controller/apps/index.class.php
@@ -18,19 +18,20 @@ public function process() {
 			}
 		}
 
+		$menu = [];
 		if (defined('PHPFOX_IS_TECHIE') && PHPFOX_IS_TECHIE) {
-			$this->template()->setActionMenu([
-				'New App' => [
-					'url' => $this->url()->makeUrl('admincp/app/add'),
-					'class' => 'popup light'
-				],
-				'Find More Apps' => [
-					'url' => $this->url()->makeUrl('admincp.store', ['load' => 'apps']),
-					'class' => ''
-				]
-			]);
+			$menu['New App'] = [
+				'url' => $this->url()->makeUrl('admincp/app/add'),
+				'class' => 'popup light'
+			];
 		}
 
+		$menu['Find More Apps'] = [
+			'url' => $this->url()->makeUrl('admincp.store', ['load' => 'apps']),
+			'class' => ''
+		];
+		$this->template()->setActionMenu($menu);
+
 		$allApps = $Apps->all('__remove_core');
 		$Home = new Core\Home(PHPFOX_LICENSE_ID, PHPFOX_LICENSE_KEY);
 		$products = $Home->downloads(['type' => 0]);

diff --git a/PF.Base/module/admincp/template/default/controller/apps/index.html.php b/PF.Base/module/admincp/template/default/controller/apps/index.html.php
@@ -66,10 +66,9 @@
 			</div>
 			*}
 			<h1>Featured Apps</h1>
-			<div class="phpfox_store_featured" data-type="apps">
+			<div class="phpfox_store_featured" data-type="apps" data-parent="{url link='admincp.store' load='apps'}">
 
 			</div>
-			{*<a href="{url link='admincp.store' load='apps'}" class="phpfox_store_view_more">Find More Apps</a>*}
 		</section>
 	</div>
 

diff --git a/PF.Base/module/language/template/default/controller/admincp/index.html.php b/PF.Base/module/language/template/default/controller/admincp/index.html.php
@@ -41,7 +41,6 @@
 	</section>
 	<section class="preview">
 		<h1>Featured Language Packs</h1>
-		<div class="phpfox_store_featured" data-type="language"></div>
-		{* <a href="{url link='admincp.store' load='language'}" class="phpfox_store_view_more">Find More Language Packs</a> *}
+		<div class="phpfox_store_featured" data-type="language" data-parent="{url link='admincp.store' load='language'}"></div>
 	</section>
 </div>
diff --git a/PF.Base/module/theme/template/default/controller/admincp/index.html.php b/PF.Base/module/theme/template/default/controller/admincp/index.html.php
@@ -38,7 +38,6 @@
 
 	<section class="preview">
 		<h1>Featured Themes</h1>
-		<div class="phpfox_store_featured" data-type="themes"><i class="fa fa-spin fa-circle-o-notch"></i></div>
-		{*<a href="{url link='admincp.store' load='themes'}" class="phpfox_store_view_more">Find More Themes</a>*}
+		<div class="phpfox_store_featured" data-type="themes" data-parent="{url link='admincp.store' load='themes'}"><i class="fa fa-spin fa-circle-o-notch"></i></div>
 	</section>
 </div>
diff --git a/PF.Base/theme/adminpanel/default/style/default/jscript/menu.js b/PF.Base/theme/adminpanel/default/style/default/jscript/menu.js
@@ -46,7 +46,7 @@ $Behavior.adminMenuClick = function()
 
 	var storeFeatured = $('.phpfox_store_featured');
 	if (storeFeatured.length && !storeFeatured.hasClass('is_built')) {
-		var parentUrl = $('.phpfox_store_view_more').attr('href');
+		var parentUrl = storeFeatured.data('parent');
 		var url = 'https://store.phpfox.us/featured';
 
 		storeFeatured.addClass('is_built');