From 17f67c0f0110e2eec499c824893a5617a9b56fad Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 1 Sep 2021 19:50:43 +0800
Subject: [PATCH] fix some error

---
 .../site_menu_widgets_controller.rb           | 24 +++++++------------
 .../_site_menu_widget1.html.erb               |  2 +-
 .../_site_menu_widget2.html.erb               |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/controllers/site_menu_widgets_controller.rb b/app/controllers/site_menu_widgets_controller.rb
index 207dbc6..ca9a3a6 100644
--- a/app/controllers/site_menu_widgets_controller.rb
+++ b/app/controllers/site_menu_widgets_controller.rb
@@ -7,24 +7,18 @@ class SiteMenuWidgetsController < ApplicationController
 			if page.child_page.size > 0
 				item["page_name"] = page.name
 				item["children"] = create_json(page.sorted_published_child_pages)
-				if page.page_type == "page" or page.page_type == "link"
-					item["url"] = (page.page_type == "link") ? "/#{locale.to_s}" + page.external_url : "/#{locale.to_s}" + page.url
-					item["target"] = "_self"
-				else
-					item["url"] = "/#{locale.to_s}" + page.url
-					item["target"] = "_blank"
-				end
 			else
 				item["page_name"] = page.name
 				item["children"] = []
-				if page.page_type == "page"
-					item["url"] = "/#{locale.to_s}" + page.url
-					item["target"] = "_self"
-				else
-					item["url"] = page.external_url
-					item["target"] = (is_internal_url?(page.external_url) ? "_self" : "_blank") rescue "_blank"
-				end
 			end
+			if page.page_type == "link"
+				item["url"] = page.external_url
+				item["target"] = (is_internal_url?(page.external_url) ? "_self" : "_blank") rescue "_blank"
+			else
+				item["url"] = "/#{locale.to_s}" + page.url
+				item["target"] = "_self"
+			end
+			item['active_class'] = (@page_id==page.id ? 'active' : '')
 			items << item
 		end
 		items
@@ -55,7 +49,7 @@ class SiteMenuWidgetsController < ApplicationController
 		subpart = OrbitHelper.get_current_widget
 		params = OrbitHelper.params
 		page = Page.where(:page_id => params[:page_id]).first
-		@page_id = page.id
+		@page_id = page.id rescie nil
 		@expand_layer = false
 		@expand_next_layer = false
 		@expand_current_layer = false
diff --git a/widgets/site_menu_widget/_site_menu_widget1.html.erb b/widgets/site_menu_widget/_site_menu_widget1.html.erb
index 99b9454..149b3a0 100644
--- a/widgets/site_menu_widget/_site_menu_widget1.html.erb
+++ b/widgets/site_menu_widget/_site_menu_widget1.html.erb
@@ -3,7 +3,7 @@
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
 	<h3 class="sitemenu-title">{{widget_title}}</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
-		<li class="sitemenu-item level-1">
+		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
 			<ul class="sitemenu-list level-2" data-list="children" data-level="1">
 				<li class="sitemenu-item level-2" style="position: relative;">
diff --git a/widgets/site_menu_widget/_site_menu_widget2.html.erb b/widgets/site_menu_widget/_site_menu_widget2.html.erb
index 8462dc4..9b5f716 100644
--- a/widgets/site_menu_widget/_site_menu_widget2.html.erb
+++ b/widgets/site_menu_widget/_site_menu_widget2.html.erb
@@ -3,7 +3,7 @@
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
 	<h3 class="sitemenu-title">{{widget_title}}</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
-		<li class="sitemenu-item level-1">
+		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
 			<ul class="sitemenu-list level-2" data-list="children" data-level="1">
 				<li class="sitemenu-item level-2" style="position: relative;">