From b39deb5f8501f91248290f675f6aab1884d92aa3 Mon Sep 17 00:00:00 2001
From: rulingcom <orbit@rulingcom.com>
Date: Mon, 4 Oct 2021 10:03:29 +0800
Subject: [PATCH] Update

---
 assets/stylesheets/template/RWD.scss          |  6 ++--
 .../stylesheets/template/layout/header.scss   |  8 ++---
 assets/stylesheets/template/template.scss     |  1 -
 modules/ad_banner/_ad_banner_widget1.html.erb | 29 ++++++++++++-----
 .../_ad_banner_widget2_video.html.erb         | 31 +++++++++++++------
 modules/announcement/_annc_widget15.html.erb  | 13 ++------
 modules/announcement/annc_index11.html.erb    |  2 +-
 modules/announcement/annc_index12.html.erb    |  2 +-
 modules/announcement/annc_index15.html.erb    |  2 +-
 modules/announcement/annc_index16.html.erb    |  2 +-
 modules/member/member_index2.html.erb         |  6 ++--
 modules/member/show.html.erb                  |  2 +-
 modules/personal_activity/index.html.erb      |  2 +-
 modules/personal_course/index.html.erb        |  2 +-
 modules/personal_honor/index.html.erb         |  2 +-
 modules/personal_lab/index.html.erb           |  2 +-
 modules/personal_research/index.html.erb      |  2 +-
 .../web_resource/_web_res_widget1.html.erb    |  3 ++
 .../web_resource/_web_res_widget2.html.erb    |  3 ++
 modules/web_resource/web_res_index1.html.erb  | 19 +++++++-----
 modules/web_resource/web_res_index2.html.erb  | 21 ++++++++-----
 .../_site_menu_widget1.html.erb               |  2 +-
 .../_site_menu_widget2.html.erb               |  2 +-
 23 files changed, 99 insertions(+), 65 deletions(-)

diff --git a/assets/stylesheets/template/RWD.scss b/assets/stylesheets/template/RWD.scss
index 30fa888..092398e 100644
--- a/assets/stylesheets/template/RWD.scss
+++ b/assets/stylesheets/template/RWD.scss
@@ -102,12 +102,12 @@
       padding: 2.5em 0;
     }
     .default_site_h1{
-      display: grid;
-          padding: 0 0 0 0.5em!important;
+      display: flex;
+      align-items: center;
+      padding: 0 0 0 0.5em!important;
     }
     .layout-header .navbar-header .navbar-brand .site-logo{
           margin-left: -0.8em;
-          width: 100%!important;
           margin-top: 0;
     }
 }
diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss
index 6252704..19600d3 100644
--- a/assets/stylesheets/template/layout/header.scss
+++ b/assets/stylesheets/template/layout/header.scss
@@ -50,7 +50,6 @@
 
   .navbar-header {
     padding: 0em;
-
     .navbar-brand {
       height: unset;
       margin:0;
@@ -64,7 +63,7 @@
       @media (min-width: $screen-sm) {
         height: unset;
         margin: 0.5rem 0 0;
-        padding-left: 0;
+        padding-left: 2em;
         line-height: 3.75em;
         font-size: 1.5em;
       }
@@ -79,10 +78,9 @@
       }
 
       .site-logo {
-        width: 180px;
-        height: 100%;
+        height: 60px;
         margin-top: 0.6em;
-        margin-right: 0.5em;
+        margin-right: 0.5em!important;
         float: left;
       }
     }
diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss
index a635ab4..fa7ad2a 100644
--- a/assets/stylesheets/template/template.scss
+++ b/assets/stylesheets/template/template.scss
@@ -35,7 +35,6 @@
 
   @media (min-width: $screen-xs) {
     width: 100%;
-    padding: 0;
   }
 
   @media (min-width: $screen-sm) {
diff --git a/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb
index 405ffb8..8c32071 100644
--- a/modules/ad_banner/_ad_banner_widget1.html.erb
+++ b/modules/ad_banner/_ad_banner_widget1.html.erb
@@ -1,5 +1,5 @@
-<div class="w-ba-banner ad-banner-widget-1 ba-banner-widget-1">
-  <div class="w-ba-banner__wrap  cycle-slideshow"
+<div class="w-ad-banner w-ba-banner ad-banner-widget-1 ba-banner-widget-1">
+  <div class="w-ad-banner__wrap  w-ba-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
       data-cycle-slides=".w-ba-banner__slide"
@@ -15,7 +15,7 @@
       data-cycle-swipe=true
       data-cycle-swipe-fx="scrollHorz"
     >
-    <div class="w-ba-banner__slide {{class}}"
+    <div class="w-ad-banner__slide w-ba-banner__slide {{class}}"
         data-link="{{link}}"
         data-cycle-title="{{title}}"
         data-cycle-desc="{{context}}"
@@ -23,13 +23,13 @@
         data-target="{{target}}"
       >
        <a href="{{link}}" target="{{target}}" title="{{alt_title}}">
-           <img class="w-ba-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
+           <img class="w-ad-banner__image w-ba-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
        </a>
 
     </div>
   </div>
-  <div class="ad-overlay w-ba-banner__caption w-ad-banner__caption w-ad-banner__overlay_{{subpart-id}}"></div>
-    <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
+  <div class="w-ad-banner__caption ad-overlay w-ba-banner__caption w-ad-banner__caption w-ad-banner__overlay_{{subpart-id}}"></div>
+    <div class="w-ad-banner__pager-1 w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
       <li><button title="Slide {{slide_number}}"><span style="display: none;">Slide {{slide_number}}</span></button></li>
     </div>
     <ul class="controlplay"><a class="resume-slide active" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
@@ -60,10 +60,23 @@
   
 </script>
 <style type="text/css">
-  .controlplay .resume-slide.active i{
+  .w-ba-banner .controlplay .resume-slide.active i{
     color: #32D9C3;
   }
-  .controlplay .pause-slide.active i{
+  .w-ba-banner .controlplay .pause-slide.active i{
     color: #ff4500;
   }
+  .w-ba-banner .controlplay{
+    width: auto;
+  }
+  .w-ba-banner .button-mid{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+  }
+  .next-button,.prev-button{
+    cursor: pointer;
+  }
 </style>
\ No newline at end of file
diff --git a/modules/ad_banner/_ad_banner_widget2_video.html.erb b/modules/ad_banner/_ad_banner_widget2_video.html.erb
index c80bb92..949e906 100644
--- a/modules/ad_banner/_ad_banner_widget2_video.html.erb
+++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb
@@ -1,5 +1,5 @@
-<div class="w-ba-banner ba-banner-widget-1 ba-banner-widget-youtube">
-  <div class="w-ba-banner__wrap  cycle-slideshow"
+<div class="w-ad-banner ad-banner-widget-2 w-ba-banner ba-banner-widget-1 ba-banner-widget-youtube">
+  <div class="w-ad-banner__wrap  w-ba-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
       data-cycle-slides=".w-ba-banner__slide"
@@ -25,11 +25,11 @@
     {{html}}
   </div>
   <div class="ad-overlay w-ad-banner__overlay_{{subpart-id}}"></div>
-    <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}"></div>
+    <div class="w-ba-banner__caption w-ad-banner__pager-2 banner-pager banner_caption_{{subpart-id}}"></div>
     <ul class="controlplay"><a class="resume-slide active" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
     <ul class="button-mid">
-      <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="cursor: pointer;"></i>
-      <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="cursor: pointer;"></i>
+      <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>"></i>
+      <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>"></i>
     </ul>
   </div>
 </div>
@@ -85,7 +85,7 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
                     var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]");
                     banner_wrap.height(height).css({"padding-bottom":"4em","padding-top":""});
                     banner_wrap.find(".cycle-carousel-wrap").css("top","3em");
-                    delete event.target.B.onStateChange;
+                    delete (event.target.B || event.target.H).onStateChange;
                     var onStateChange_idx = event.target.l.i.onStateChange;
                     onStateChange_idx.reverse();
                     var event_size = 3;
@@ -178,10 +178,23 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
 }
 </script>
 <style type="text/css">
-  .controlplay .resume-slide.active i{
+  .w-ba-banner .controlplay .resume-slide.active i{
     color: #32D9C3;
   }
-  .controlplay .pause-slide.active i{
+  .w-ba-banner .controlplay .pause-slide.active i{
     color: #ff4500;
   }
-</style>
\ No newline at end of file
+  .w-ba-banner .controlplay{
+    width: auto;
+  }
+  .w-ba-banner .button-mid{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+  }
+  .next-button,.prev-button{
+    cursor: pointer;
+  }
+</style>
diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb
index 9462c90..908b2bc 100644
--- a/modules/announcement/_annc_widget15.html.erb
+++ b/modules/announcement/_annc_widget15.html.erb
@@ -6,20 +6,13 @@
     <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
   </div>
   <div style="position: absolute;top: 50%;bottom: 50%;width:100%;">
-	<button class="btn-left" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="float: left;height: 2.5em; width: 2.5em;background: border: 0;background-size: contain;position: absolute;transition:.3s; left: 0.6%;color: #ffffff;
-    background: rgba(0, 0, 0, 0.2);
-    border-radius: 50%;
-    border: none;"><i class="fa fa-angle-left prev-button" aria-hidden="true"></i><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %></span></button>
-	<button class="btn-right" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="float: right;;height: 2.5em; width: 2.5em;background-size: contain;border: 0;position: absolute;transition:.3s;right: 0.6%;color: #ffffff;
-    background: rgba(0, 0, 0, 0.2);
-    border-radius: 50%;
-    border: none;"><i class="fa fa-angle-right next-button" aria-hidden="true"></i><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %></span></button>
+	<button class="btn-left" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="float: left;height: 2.5em; width: 2.5em;background: url(/assets/left-01.png) no-repeat;border: 0;background-size: contain;position: absolute;transition:.3s; left: 0.6%;"><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %></span></button>
+	<button class="btn-right" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="float: right;;height: 2.5em; width: 2.5em;background: url(/assets/right-01.png) no-repeat;background-size: contain;border: 0;position: absolute;transition:.3s;right: 0.6%;"><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %></span></button>
   </div>
   <ul class="w-annc__list  row" data-level="0" data-list="announcements">
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye">
       <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
-      <div class="transitionfade"></div>
     </div>
     <div class="w-annc__content-wrap">
       <div class="w-annc__meta">
@@ -128,7 +121,7 @@
 			num=1;
 		}
 	var flag=false;
-	$('.btn-left').click(function(){
+	$('.btn-left').click(function(){	
 		if(!flag){
 			var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray();
 			var ul_length = uls.length;
diff --git a/modules/announcement/annc_index11.html.erb b/modules/announcement/annc_index11.html.erb
index 5df5931..b191161 100644
--- a/modules/announcement/annc_index11.html.erb
+++ b/modules/announcement/annc_index11.html.erb
@@ -1,6 +1,6 @@
 <div class="i-annc  index-announcement-11 {{display}}">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
-  <table class="i-annc__table  table  table-striped dt-responsive nowrap">
+  <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
         <th class="i-annc__th  i-annc__th--date all" id='date'>{{date-head}}</th>
diff --git a/modules/announcement/annc_index12.html.erb b/modules/announcement/annc_index12.html.erb
index e478a9f..3e1dbc6 100644
--- a/modules/announcement/annc_index12.html.erb
+++ b/modules/announcement/annc_index12.html.erb
@@ -1,6 +1,6 @@
 <div class="i-annc  index-announcement-12 {{display}}">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
-  <table class="i-annc__table  table  table-striped dt-responsive nowrap">
+  <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
         <th class="i-annc__th  i-annc__th--date all" id='date'>{{date-head}}</th>
diff --git a/modules/announcement/annc_index15.html.erb b/modules/announcement/annc_index15.html.erb
index 55ddde9..a521e5f 100644
--- a/modules/announcement/annc_index15.html.erb
+++ b/modules/announcement/annc_index15.html.erb
@@ -1,6 +1,6 @@
 <div class="i-annc  index-announcement-15 {{display}}">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
-  <table class="i-annc__table  table  table-striped dt-responsive nowrap">
+  <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
         <th class="i-annc__th  i-annc__th--date all" id='date'>{{date-head}}</th>
diff --git a/modules/announcement/annc_index16.html.erb b/modules/announcement/annc_index16.html.erb
index 006afa4..07e10c5 100644
--- a/modules/announcement/annc_index16.html.erb
+++ b/modules/announcement/annc_index16.html.erb
@@ -1,6 +1,6 @@
 <div class="i-annc  index-announcement-16 {{display}}">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
-  <table class="i-annc__table  table  table-striped dt-responsive nowrap">
+  <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
         <th class="i-annc__th  i-annc__th--date all" id='date'>{{date-head}}</th>
diff --git a/modules/member/member_index2.html.erb b/modules/member/member_index2.html.erb
index 7d4f475..6062e09 100644
--- a/modules/member/member_index2.html.erb
+++ b/modules/member/member_index2.html.erb
@@ -35,8 +35,8 @@
       $('.i-member img').eq(i).parent().attr('title','noname');
 		}
 	}
-	for(var i = 0;i < $('.i-member span a').length ; i++){
-		if($('.i-member span a').eq(i).html().trim().replace('&nbsp;','') == "")
-			$('.i-member span a').eq(i).html('noname');
+	for(var i = 0;i < $('.i-member span.member-data-value-name a').length ; i++){
+		if($('.i-member span.member-data-value-name a').eq(i).html().trim().replace('&nbsp;','') == "")
+			$('.i-member span.member-data-value-name a').eq(i).html('noname');
 	}
 </script>
\ No newline at end of file
diff --git a/modules/member/show.html.erb b/modules/member/show.html.erb
index 66c0f89..ea66f67 100644
--- a/modules/member/show.html.erb
+++ b/modules/member/show.html.erb
@@ -21,7 +21,7 @@
         {{data_intro_title}}
       </div>
 
-      <table class="table table-hover table-striped dt-responsive nowrap {{complete_display}}">
+      <table class="table table-hover table-striped dt-responsive {{complete_display}}">
         <thead>
           <tr data-list="pd_title" data-level="1">
             <th>{{plugin_data_title}}</th>
diff --git a/modules/personal_activity/index.html.erb b/modules/personal_activity/index.html.erb
index 6c80469..36ad70f 100644
--- a/modules/personal_activity/index.html.erb
+++ b/modules/personal_activity/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index activities-index dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index activities-index dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr>
diff --git a/modules/personal_course/index.html.erb b/modules/personal_course/index.html.erb
index 53f10cc..83fd717 100644
--- a/modules/personal_course/index.html.erb
+++ b/modules/personal_course/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index courses-index dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index courses-index dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr>
diff --git a/modules/personal_honor/index.html.erb b/modules/personal_honor/index.html.erb
index 119a0b9..831e4c3 100644
--- a/modules/personal_honor/index.html.erb
+++ b/modules/personal_honor/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index personal-honor dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index personal-honor dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr data-level="0" data-list="headers">
diff --git a/modules/personal_lab/index.html.erb b/modules/personal_lab/index.html.erb
index a469853..b22a8de 100644
--- a/modules/personal_lab/index.html.erb
+++ b/modules/personal_lab/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index personal-lab dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index personal-lab dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr>
diff --git a/modules/personal_research/index.html.erb b/modules/personal_research/index.html.erb
index 180bbab..6538b0b 100644
--- a/modules/personal_research/index.html.erb
+++ b/modules/personal_research/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index personal-researchs  dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index personal-researchs  dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr>
diff --git a/modules/web_resource/_web_res_widget1.html.erb b/modules/web_resource/_web_res_widget1.html.erb
index 5b3ef48..80c965b 100644
--- a/modules/web_resource/_web_res_widget1.html.erb
+++ b/modules/web_resource/_web_res_widget1.html.erb
@@ -4,6 +4,9 @@
   </h3>
   <ul class="list-unstyled" data-level="0" data-list="web_link">
     <li class="widget-content">
+      <div class="link-img-wrap{{display_image}}">
+        <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      </div>
       <a class="widget-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
       <span data-list="statuses" data-level="1">
         <span class="label status {{status-class}}">{{status}}</span>
diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb
index b85221e..017ce7f 100644
--- a/modules/web_resource/_web_res_widget2.html.erb
+++ b/modules/web_resource/_web_res_widget2.html.erb
@@ -4,6 +4,9 @@
   </h3>
   <ul class="list-unstyled" data-level="0" data-list="web_link">
     <li class="widget-content widget-content-horizontal">
+      <div class="link-img-wrap{{display_image}}">
+        <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      </div>
       <a class="widget-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
       <span data-list="statuses" data-level="1">
         <span class="label status {{status-class}}">{{status}}</span>
diff --git a/modules/web_resource/web_res_index1.html.erb b/modules/web_resource/web_res_index1.html.erb
index f225a23..040dde9 100644
--- a/modules/web_resource/web_res_index1.html.erb
+++ b/modules/web_resource/web_res_index1.html.erb
@@ -4,13 +4,18 @@
   </h1>
   <ul class="list-unstyled" data-list="web_link" data-level="0">
     <li class="index-content">
-      <h4>
-        <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
-        <span data-list="statuses" data-level="1">
-          <span class="label status {{status-class}}">{{status}}</span>
-        </span>
-      </h4>
-      <small class="index-context">{{context}}</small>
+      <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">
+        <h4>
+          <div class="link-img-wrap{{display_image}}">
+            <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+          </div>
+          {{title}}
+          <span data-list="statuses" data-level="1">
+            <span class="label status {{status-class}}">{{status}}</span>
+          </span>
+        </h4>
+        <small class="index-context">{{context}}</small>
+      </a>
     </li>
   </ul>
 </div>
diff --git a/modules/web_resource/web_res_index2.html.erb b/modules/web_resource/web_res_index2.html.erb
index 6432ea6..86db2aa 100644
--- a/modules/web_resource/web_res_index2.html.erb
+++ b/modules/web_resource/web_res_index2.html.erb
@@ -4,13 +4,20 @@
   </h1>
   <ul class="list-unstyled" data-list="web_link" data-level="0">
     <li class="index-content col-md-4 col-sm-4">
-      <h4>
-        <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
-        <span data-list="statuses" data-level="1">
-          <span class="label status {{status-class}}">{{status}}</span>
-        </span>
-      </h4>
-      <small class="index-context">{{context}}</small>
+      <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">
+        <div class="link-img-wrap{{display_image}}">
+          <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        </div>
+        <h4>
+          <span class="link-title">
+            {{title}}
+          </span>
+          <span data-list="statuses" data-level="1">
+            <span class="label status {{status-class}}">{{status}}</span>
+          </span>
+        </h4>
+        <small class="index-context">{{context}}</small>
+      </a>
     </li>
   </ul>
 </div>
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;">