From f1acfa34ac9a3fdf896f01369bc7b16bafeeda2e Mon Sep 17 00:00:00 2001
From: rulingcom <rulingcom@tp.rulingcom.com>
Date: Tue, 6 Jan 2015 15:22:41 +0800
Subject: [PATCH] template default modified

---
 .../orbit_bootstrap/assets/javascripts/app.js | 174 +++++++++---------
 .../stylesheets/template/base/_genernal.scss  |   8 -
 .../stylesheets/template/base/_global.scss    |  26 +++
 .../stylesheets/template/base/_variables.scss |  57 +-----
 .../template/modules/announcement.scss        |  61 +++---
 .../stylesheets/template/modules/member.scss  | 139 ++++++--------
 .../assets/stylesheets/template/template.scss |  11 +-
 .../stylesheets/template/widget/sitemenu.scss | 100 ++++------
 .../orbit_bootstrap/home/index.html.erb       |   2 +-
 .../orbit_bootstrap/home/pagination.html.erb  |   8 +-
 .../ad_banner/_ad_banner_widget1.html.erb     |   4 +-
 .../ad_banner/_ad_banner_widget2.html.erb     |  18 ++
 .../_ad_banner_widget2_video.html.erb         |   3 +-
 .../ad_banner/_ad_banner_widget3.html.erb     |  13 +-
 .../modules/ad_banner/info.json               |  15 +-
 .../announcement/_annc_widget1.html.erb       |   2 +-
 .../announcement/_annc_widget10.html.erb      |   2 +-
 .../announcement/_annc_widget11.html.erb      |   2 +-
 .../announcement/_annc_widget12.html.erb      |   2 +-
 .../announcement/_annc_widget2.html.erb       |   2 +-
 .../announcement/_annc_widget3.html.erb       |   2 +-
 .../announcement/_annc_widget4.html.erb       |   2 +-
 .../announcement/_annc_widget5.html.erb       |   2 +-
 .../announcement/_annc_widget6.html.erb       |   2 +-
 .../announcement/_annc_widget7.html.erb       |   2 +-
 .../announcement/_annc_widget8.html.erb       |   2 +-
 .../announcement/_annc_widget9.html.erb       |   2 +-
 .../modules/announcement/annc_index1.html.erb |   2 +-
 .../modules/announcement/annc_index2.html.erb |   2 +-
 .../modules/announcement/show.html.erb        |  45 +++--
 .../modules/archive/_archive_widget1.html.erb |   2 +-
 .../modules/archive/archive_index1.html.erb   |   2 +-
 .../modules/archive/archive_index2.html.erb   |   1 +
 .../modules/archive/show.html.erb             |   4 +-
 ..._widget.html.erb => _faq_widget1.html.erb} |   0
 ...widget1.html.erb => _faq_widget2.html.erb} |   0
 .../{index.html.erb => faq_index.html1.erb}   |   0
 .../{index1.html.erb => faq_index2.html.erb}  |   0
 .../orbit_bootstrap/modules/faq/show.html.erb |   2 +-
 ...get.html.erb => _gallery_widget1.html.erb} |   0
 ...et1.html.erb => _gallery_widget2.html.erb} |   2 +-
 ...et2.html.erb => _gallery_widget3.html.erb} |   2 +-
 ...index.html.erb => gallery_index1.html.erb} |   0
 ...ndex1.html.erb => gallery_index2.html.erb} |   0
 ..._staff.html.erb => member_index1.html.erb} |  22 +--
 ...r.html.erb => member_index_staff.html.erb} |  22 +--
 ...html.erb => member_index_teacher.html.erb} |  19 +-
 .../modules/member/show.html.erb              |  32 +++-
 ...get.html.erb => _web_res_widget1.html.erb} |   0
 ...et1.html.erb => _web_res_widget2.html.erb} |   0
 ...index.html.erb => web_res_index1.html.erb} |   0
 ...ndex1.html.erb => web_res_index2.html.erb} |   0
 .../widgets/site_menu_widget/_widget.html.erb |  16 +-
 built_in_extensions.rb                        |   2 +-
 config/mongoid.yml                            |   6 +-
 config/unicorn.rb                             |   2 +-
 56 files changed, 389 insertions(+), 459 deletions(-)
 delete mode 100644 app/templates/orbit_bootstrap/assets/stylesheets/template/base/_genernal.scss
 create mode 100644 app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss
 create mode 100644 app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb
 rename app/templates/orbit_bootstrap/modules/faq/{_widget.html.erb => _faq_widget1.html.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/faq/{_widget1.html.erb => _faq_widget2.html.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/faq/{index.html.erb => faq_index.html1.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/faq/{index1.html.erb => faq_index2.html.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/gallery/{_widget.html.erb => _gallery_widget1.html.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/gallery/{_widget1.html.erb => _gallery_widget2.html.erb} (93%)
 rename app/templates/orbit_bootstrap/modules/gallery/{_widget2.html.erb => _gallery_widget3.html.erb} (86%)
 rename app/templates/orbit_bootstrap/modules/gallery/{index.html.erb => gallery_index1.html.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/gallery/{index1.html.erb => gallery_index2.html.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/member/{index_staff.html.erb => member_index1.html.erb} (51%)
 rename app/templates/orbit_bootstrap/modules/member/{index_teacher.html.erb => member_index_staff.html.erb} (51%)
 rename app/templates/orbit_bootstrap/modules/member/{index.html.erb => member_index_teacher.html.erb} (51%)
 rename app/templates/orbit_bootstrap/modules/web_resource/{_widget.html.erb => _web_res_widget1.html.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/web_resource/{_widget1.html.erb => _web_res_widget2.html.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/web_resource/{index.html.erb => web_res_index1.html.erb} (100%)
 rename app/templates/orbit_bootstrap/modules/web_resource/{index1.html.erb => web_res_index2.html.erb} (100%)

diff --git a/app/templates/orbit_bootstrap/assets/javascripts/app.js b/app/templates/orbit_bootstrap/assets/javascripts/app.js
index a9dd1ed..276189f 100644
--- a/app/templates/orbit_bootstrap/assets/javascripts/app.js
+++ b/app/templates/orbit_bootstrap/assets/javascripts/app.js
@@ -1,110 +1,106 @@
 (function($) {
 
     "use strict"
-
-    // Init functions
+    
     function init () {
-        // Announcement modules
-        var annc = {
-            truncation : function (el, maxLength) {
+        var doc = document;
+
+        var orbit = {
+            // Cross browser add class function
+            addClass : function(el, className) {
+                if( el.classList ) {
+                    el.classList.add(className);
+                } else {
+                    el.className += ' ' + className;
+                }
+            },
+            // Cross browser has class function
+            hasClass : function(el, cls) {
+                return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1;
+            },
+            // Add class name to the menu item when its children items are more than eight
+            addMegaDropdownClass : function(el, len) {
+              for( var i = 0; i < el.length; i++ ) {
+                if( el[i].children.length > len ) {
+                   orbit.addClass(el[i].parentNode, 'mega-dropdown');
+                }
+              }
+            },
+            // Append caret to menu item if it has dropdown
+            addCaret : function() {
+              var list = doc.querySelectorAll('.page_menu.level_2');
+              for( var i = 0, len = list.length; i < len; i++ ) {
+                var node = doc.createElement('span');
+                node.className = 'caret';
+                list[i].parentNode.appendChild(node);
+              }
+            },
+            // Add link and cursor class name on element that has data-link attribute
+            addLinkOnADBanner : function(els) {
+                $.each(els, function(i) {
+                    if ($(this).data('link') !== "" && !$(this).hasClass('youtube')) {
+                        $(this).on('click', function() {
+                            var target = $(this).data('target'),
+                                link = $(this).data('link');
+                            if (target === '_blank') {
+                                window.open(link, target);
+                            } else {
+                                window.location.href = link;
+                            }
+                        }).addClass('cursor');
+                    }
+                });
+            },
+            // Announcement text truncation
+            truncation : function (el, len) {
                 for( var i = 0; i < el.length; i ++ ) {
                     if ( el[i].firstChild !== null ) {
-                        if( el[i].firstChild.length > maxLength ) {
-                            var newTitle = el[i].firstChild.nodeValue;
-                            var newTitle = newTitle.substring(0, maxLength) + '...'
+                        if( el[i].firstChild.length > len ) {
+                            var newStr = el[i].firstChild.nodeValue,
+                                newStr = newStr.substring(0, len) + '...'
                             el
                                 .eq(i)
-                                .text(newTitle);
+                                .text(newStr);
                         }
                     }
                 }
-            }
-        }
+            },
+            // Sitemenu dropdown
+            sitemenuDropdown : function() {
+                var el = doc.querySelectorAll('.sitemenu__list.level-2');
+                for( var i = 0, len = el.length; i < len; i++ ) {
+                    if( el[i].hasChildNodes() ) {
+                        var caret = doc.createElement('span');
+                        caret.className = 'sitemenu___dropdown-toggle fa fa-caret-down';
+                        caret.setAttribute('data-toggle', 'dropdown');
 
-        function anncFix() {
-            var w$ = $('.w-announcement-4');
-            if( w$.length ) {
-                annc.truncation(w$.find('.w-annc__subtitle'), 25);
-            }
-        }
-
-        // Necessary for Responsive images
-        function bullEye() {
-            // $(".bullseye").bullseye({
-            //     fadeEffect: false
-            // });
-        }
-
-        // Adding class to submenu that has dropdown items
-        function submenuFix () {
-            var item$ = $('.submenu__item.level-1');
-            var itemLen = item$.length;
-            var list$ = item$.find('.submenu__list.level-2');
-
-            for( var i=0; i<itemLen; i++ ) {
-                if( list$.eq(i).find('li').length ) {
-                    list$
-                        .eq(i)
-                        .addClass('dropdown');
-                }
-            }
-        }
-
-        // Main navigation dropdown
-        function dropdown () {
-            var navItemLevel1$ = $('.main-nav-item.level-1');
-            var dropdownMenu$ = $('.dropdown-menu.level-2');
-
-            // Adding class if nav item has dropdown
-            $(navItemLevel1$)
-                .has('.dropdown-menu')
-                    .children('a')
-                    .addClass('has-dropdown-menu');
-
-            // Hide all dropdowns when click on any HTML elements
-            $(document).on('click', function() {
-                $('.dropdown-menu.level-2')
-                    .addClass('hide')
-                    .removeClass('show');
-            })
-
-            // Hide all dropdown after page load
-            dropdownMenu$
-                .addClass('hide')
-                .removeClass('show');
-
-            $('.has-dropdown-menu').on('click', function () {
-                if( $(this).hasClass('has-dropdown-menu') ) {
-                    if( $(this).next('.dropdown-menu').hasClass('show') ) {
-                        dropdownMenu$.addClass('hide');
-                        $(this)
-                            .next('.dropdown-menu')
-                            .removeClass('show')
-                            .addClass('hide')
-
-                    } else if ( $(this).next('.dropdown-menu').hasClass('hide') ) {
-                         dropdownMenu$.addClass('hide');
-                         dropdownMenu$.removeClass('show');
-                         dropdownMenu$.addClass('hide');
-                        $(this)
-                            .next('.dropdown-menu')
-                            .removeClass('hide')
-                            .addClass('show')
+                        el[i].parentNode.insertBefore(caret, el[i]);
+                        orbit.addClass(el[i], 'dropdown-menu');
                     }
                 }
-
-                return false;
-            })
+            }
         }
 
-        // Targeting internal page
-        if( $('body').attr('class') !== 'page-main' ) {
-            submenuFix();
-        } 
-        dropdown();
-        bullEye();
+        var plugin = {
+            // RWD image resize script
+            bullEye : function() {
+                $(".bullseye").bullseye({
+                    fadeEffect: false
+                });
+            }
+        }
+
+        // Specific functions that will be running on homepage
+        if( doc.body.getAttribute('data-module') === 'home' ) {
+
+        }
+
+        // Functions that will be running on every page
+        orbit.sitemenuDropdown();
+        plugin.bullEye();
     }
 
+
     $(document).ready(function($) {
         init();
     });
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_genernal.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_genernal.scss
deleted file mode 100644
index d111388..0000000
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_genernal.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.admin-edit {
-    clear: both;
-}
-
-img {
-    max-width: 100%;
-    height: auto;
-}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss
new file mode 100644
index 0000000..1c08947
--- /dev/null
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss
@@ -0,0 +1,26 @@
+html {
+    font-size: 100%;
+}
+
+body {
+    font-family: $sub-font;
+    margin-top: 40px; // needed for Orbit bar
+    font-size: inherit;
+}
+
+a {}
+
+a:hover, a:focus {
+    text-decoration: none;
+}
+
+a:focus {}
+
+img {
+    max-width: 100%;
+    height: auto;
+}
+
+.admin-edit {
+    clear: both;
+}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss
index 82e7939..6635f66 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss
@@ -1,5 +1,8 @@
 @charset "utf-8";
 
+// Google fonts
+@import url(http://fonts.googleapis.com/css?family=Roboto);
+
 // Base Color
 $theme-gray: #495054;
 $theme-gray-light: #cecece;
@@ -16,55 +19,5 @@ $theme-color-third: #ed4c43;
 
 
 // Font stacks
-$main-font: Arial, "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif;
-$sub-font: Arial, "新細明體", "Helvetica Neue", Helvetica, sans-serif;
-
-
-//
-// Modules
-// --------------------------------------------------
-// ## commonly use in all widgets
-
-// Font sizes
-$w-widget-title-font-size: 1.5rem;
-
-// Colors
-$w-border-color: $theme-gray-lighter;
-
-
-
-//
-// AD banner Module
-// --------------------------------------------------
-
-// Font sizes
-$w-caption-font-size: 1.4rem;
-$w-caption-desc: 0.85rem;
-
-//
-// Announcement Module
-// --------------------------------------------------
-
-// Font sizes
-$w-title-font-size-small: 0.75rem;
-$w-subtitle-font-size: 0.75rem;
-$w-meta-font-size: 0.75rem;
-
-$w-table-th-font-size: 0.75em;
-$w-table-td-font-size: 0.75em;
-
-$i-title-font-size-large: 2em;
-
-// colors
-
-$link-color: $theme-color-main;
-$link-hover-color: lighten($theme-color-main, 10%);
-
-$table-th-bgcolor: $theme-color-main;
-
-//
-// Archive Module
-// --------------------------------------------------
-
-// Font sizes
-$w-item-heading-font-size: 0.85rem;
+$main-font: 'Roboto', "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif;
+$sub-font: 'Roboto', "新細明體", "Helvetica Neue", Helvetica, sans-serif;
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss
index 36e6d9f..66cae13 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss
@@ -61,7 +61,7 @@
 }
 
 // Widget-1
-.w-announcement-1 {
+.widget-announcement-1 {
     .w-annc__img-wrap {
         height: 200px;
         margin: 0 0 1em 0;
@@ -74,7 +74,7 @@
 }
 
 // Widget-2
-.w-announcement-2 {
+.widget-announcement-2 {
     .w-annc__img-wrap {
         height: 200px;
         margin: 0 0 1em 0;
@@ -87,7 +87,7 @@
 }
 
 // Widget-3
-.w-announcement-3 {
+.widget-announcement-3 {
     .w-annc__img-wrap {
         height: 200px;
         margin: 0 0 1em 0;
@@ -100,7 +100,7 @@
 }
 
 // Widget-4
-.w-announcement-4 {
+.widget-announcement-4 {
     .w-annc__title {
         font-family: $main-font;
         line-height: 1.3;
@@ -116,7 +116,7 @@
 }
 
 // Widget-5
-.w-announcement-5 {
+.widget-announcement-5 {
     .w-annc__title {
         font-family: $main-font;
         line-height: 1.3;
@@ -130,7 +130,7 @@
 }
 
 // Widget-6
-.w-announcement-6 {
+.widget-announcement-6 {
     .w-annc__item {
         margin-bottom: 0.8em;
         padding-bottom: 0.8em;
@@ -151,7 +151,7 @@
 }
 
 // Widget-7
-.w-announcement-7 {
+.widget-announcement-7 {
     .w-annc__item {
         margin-bottom: 0.8em;
         padding-bottom: 0.8em;
@@ -173,7 +173,7 @@
 
 // Widget-8 
 // ## Table
-.w-announcement-8 {
+.widget-announcement-8 {
     .w-annc__th {
         color: #fff;
         background: $theme-color-main;
@@ -194,7 +194,7 @@
 
 // Widget-9
 // ## Table
-.w-announcement-9 {
+.widget-announcement-9 {
     .w-annc__th {
         color: #fff;
         background: $theme-color-main;
@@ -214,7 +214,7 @@
 }
 
 // Widget-10
-.w-announcement-10 {
+.widget-announcement-10 {
     .w-annc__item {
         margin-bottom: 0.8em;
         padding-bottom: 0.8em;
@@ -234,7 +234,7 @@
 
 // Widget-11
 // ## Table
-.w-announcement-11 {
+.widget-announcement-11 {
     .w-annc__th {
         color: #fff;
         background: $theme-color-main;
@@ -254,7 +254,7 @@
 }
 
 // Widget-12
-.w-announcement-12 {
+.widget-announcement-12 {
     .w-annc__list {
         padding: 0 15px;
     }
@@ -348,7 +348,7 @@
 }
 
 // Index-1
-.i-announcement-1 {
+.index-announcement-1 {
     .i-annc__th {
         color: #fff;
         background: $theme-color-main;
@@ -407,18 +407,7 @@
         }
         .s-annc__tag-wrap {
             .s-annc__tag {
-                display: inline-block;
-                margin-bottom: 4px;
-                padding: 5px 8px;
-                font-size: 0.8em;
-                color: $theme-gray;
-                border: 1px solid $theme-gray-light;
-                text-decoration: none;
-                &:hover {
-                    color: $theme-color-main;
-                    border-color: $theme-color-main;
-                    background-color: $theme-gray-lighter;
-                }
+                font-weight: normal;
             }
         }
     }
@@ -430,6 +419,9 @@
         padding-top: 1em;
         border-top: 1px dotted $theme-gray-light;
     }
+    .s-annc__related-file {
+        margin-bottom: 15px;
+    }
     .s-annc__related-file,
     .s-annc__related-link {
         padding-bottom: 6px;
@@ -440,22 +432,17 @@
             color: darken($theme-gray-light, 10%);
         }
         a {
-            display: inline-block;
-            margin-bottom: 4px;
-            padding: 5px 8px;
-            font-size: 0.8em;
-            color: $theme-gray;
-            border: 1px solid $theme-gray-light;
-            text-decoration: none;
-            &:hover {
-                color: $theme-color-main;
-                border-color: $theme-color-main;
-                background-color: $theme-gray-lighter;
-            }
+
         }
     }
     .s-annc__related-link-list,
     .s-annc__related-file-list {
         display: inline-block;
     }
+    .s-annc__flie-title {
+        max-width: 9.375rem;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
 }
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss
index c826274..03a3d0d 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss
@@ -1,99 +1,64 @@
-// Member INDEX
+// Member index page
 .index-member {
   .index-title {
     @extend .unity-title;
   }
-  &.index1 {
-
+  th,
+  td {
+    font-size: 0.8125rem;
+    font-family: $main-font;
+  }
+  th[class^="member-data-title"] {
+    white-space: nowrap;
+  }
+  .index-member-item {
+    min-height: 200px;
+    margin-bottom: 20px;
+  }
+  .index-member-item:nth-child(2n+1) {
+    clear: both;
+  }
+  .member-data-title-job-title:before,
+  .member-data-title-name:before,
+  .member-data-title-email:before,
+  .member-data-title-office-tel:before{
+      content: "\f007";
+      font-family: "fontAwesome";
+      display: inline-block;
+      margin-right: 0.3125rem;
+      color: gray;
+      min-width: 15px;
+      font-size: 0.75rem;
+  }
+  .member-data-title-job-title:before {
+    content: "\f19d";
+  }
+  .member-data-title-email:before {
+    content: "\f0e0";
+  }
+  .member-data-title-office-tel:before{
+    content: "\f098";
+  }
+  .member-profile-data-wrap {
+    overflow: hidden; 
+  }
+  .member-pic {
+    border-radius: 0.25rem;
   }
 }
 
-// Member SHOW
+// Member show page
 .show-member {
-  .show-title {
-    @extend .unity-title;
+    font-family: $main-font;
+  th,
+  td {
+    font-size: 0.8125rem;
   }
-  .post-metadata {
-    border-bottom: 1px solid $theme-gray-light;
-    @include clearfix();
-    li {
-      margin-right: 1em;
-      margin-bottom: 0.6em;
-      float: left;
-      &.metadata-tags {
-        position: relative;
-        margin-right: 0;
-        padding-left: 1.6em;
-        clear: both;
-        float: none;
-        i {
-          position: absolute;
-          top: 7px;
-          left: 0;
-        }
-      }
-      &.metadata-tags {
-        .tag {
-          display: inline-block;
-          margin-bottom: 4px;
-          padding: 5px 8px;
-          font-size: 0.8em;
-          color: $theme-gray;
-          border: 1px solid $theme-gray-light;
-          text-decoration: none;
-          &:hover {
-            color: $theme-color-main;
-            border-color: $theme-color-main;
-            background-color: $theme-gray-lighter;
-          }
-        }
-      }
-      i {
-        color: darken($theme-gray-light, 10%);
-      }
-    }
-  }
-  .post-section {
-    @include clearfix();
-    margin-bottom: 2em;
-    .post-pic {
-      img {
-        @include size(100%, auto);
-      }
-    }
-  }
-  .post-related {
-    padding-top: 1em;
-    border-top: 1px solid $theme-gray-light;
-    li {
-      padding-bottom: 3px;
-      padding-left: 1.6em;
-      & + li {
-        padding-top: 8px;
-        border-top: 1px dotted $theme-gray-light;
-      }
-      i {
-        margin: 8px 0 0 -1.6em;
-        float: left;
-        color: darken($theme-gray-light, 10%);
-      }
-      & > div {
-        display: inline-block;
-      }
-      a {
-        display: inline-block;
-        margin-bottom: 4px;
-        padding: 5px 8px;
-        font-size: 0.8em;
-        color: $theme-gray;
-        border: 1px solid $theme-gray-light;
-        text-decoration: none;
-        &:hover {
-          color: $theme-color-main;
-          border-color: $theme-color-main;
-          background-color: $theme-gray-lighter;
-        }
-      }
+  .member-plugins {
+    margin-bottom: 20px;
+    a {
+      font-size: 0.8125rem;
     }
   }
+
 }
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss
index 320c950..da62bb5 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss
@@ -1,5 +1,4 @@
 // Base
-@import url("http://fonts.googleapis.com/css?family=Droid+Sans:400,700");
 @import "bootstrap/mixins";
 @import "bootstrap/variables";
 @import "base/mixins";
@@ -7,7 +6,7 @@
 @import "base/unity";
 @import "base/pagination";
 @import "base/orbitbar-override";
-@import "base/genernal";
+@import "base/global";
 
 // Layout
 @import "layout/header";
@@ -29,11 +28,3 @@
 // Widget
 @import "widget/breadcrumb";
 @import "widget/sitemenu";
-
-html {
-    font-size: 100%;
-}
-body {
-  margin-top: 40px; // needed for Orbit bar
-  font-size: inherit;
-}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/sitemenu.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/sitemenu.scss
index 02b965d..693db3f 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/sitemenu.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/sitemenu.scss
@@ -1,86 +1,52 @@
-.submenu-wrap {
-    @include clearfix();
+.sitemenu-wrap {
     padding: 10px 0;
-
-    .submenu__title {
+    @include clearfix;
+    .sitemenu__title {
         display: none;
     }
-
-    .submenu__list {
-        list-style: none;
-        padding: 0;
+    .sitemenu__list {
         margin: 0;
+        padding: 0;
+        list-style: none;
     }
-
-    .submenu__item.level-1 {
+    .sitemenu__item.level-1 {
+        font-size: 0.8125rem;
         position: relative;
         float: left;
         margin-right: 1%;
         margin-bottom: 12px;
-    }
-
-    .submenu__link.level-1 {
-        float: left;
+        padding: 8px .8em;
         padding-bottom: 8px;
-        font-size: 13px;
-        font-size: 0.8125rem;
-        background: $theme-color-second;
         color: #fff;
-        padding: 8px 0.8em;
-        border-radius: 0.2em;
-
+        border-radius: .2em;
+        background: $theme-color-second;
         &:hover {
             background: darken($theme-color-second, 10%);
         }
     }
-
-    .submenu__item:hover .dropdown {
-        display: block;
-    }
-
-    .touch .submenu__item .dropdown {
-        display: none !important;
-    }
-
-    // Submenu dropdown
-    .submenu__list.dropdown {
-        display: none;
-        padding: 20px 0 0 0;
-        position: absolute;
-        left: 0;
-        top: 80%;
-        border-radius: 2px;
-        z-index: 200;
-    }
-
-
-    .submenu__list .dropdown:before {
-        content: "";
-        border-style: solid;
-        border-width: 0px 7px 7px 7px;
-        border-color: transparent transparent $theme-color-main transparent;
-        position: absolute;
-        top: 15px;
-        left: 15px;
-    }
-
-    .submenu__item.level-2 {
-        display: block;
-        padding: 4px 8px;
-        background: $theme-color-main;
-        font-size: 0.8125rem;
-    }
-
-    .submenu__link.level-2 {
+    .sitemenu__link.level-1 {
+        margin-right: .25rem;
         color: #fff;
-        white-space: nowrap;
     }
-
-    .submenu__list.hidden--item {
-        display: none;
-
-        &:before {
-            display: none;
+    .sitemenu___dropdown-toggle {
+        font-size: 0.75rem;
+        padding: 2px .3125rem;
+        cursor: pointer;
+    }
+    // sitemenu dropdown
+    .sitemenu__list.dropdown-menu {
+        min-width: 100%;
+        margin-top: 4px;
+        border: none;
+        border-radius: .2em;
+        background: $theme-color-main;
+    }
+    .sitemenu__link.level-2 {
+        color: #fff;
+        font-size: 0.8125rem;
+        padding: 4px 0.625rem;
+        &:hover {
+            background: lighten($theme-color-second, 5%);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/home/index.html.erb b/app/templates/orbit_bootstrap/home/index.html.erb
index d1102e4..086ef7f 100644
--- a/app/templates/orbit_bootstrap/home/index.html.erb
+++ b/app/templates/orbit_bootstrap/home/index.html.erb
@@ -3,7 +3,7 @@
 <head>
   <%= render_partial("head") %>
 </head>
-<body class="page-main">
+<body class="page-home">
   <%= render_orbit_bar %>
   <%= render_header %>
   <section class="layout-slide" data-pp="4"></section>
diff --git a/app/templates/orbit_bootstrap/home/pagination.html.erb b/app/templates/orbit_bootstrap/home/pagination.html.erb
index 96c2b2f..0c22683 100644
--- a/app/templates/orbit_bootstrap/home/pagination.html.erb
+++ b/app/templates/orbit_bootstrap/home/pagination.html.erb
@@ -1,3 +1,5 @@
-<ul class="pagination" data-pagination="true">
-  <li class="{{pagination_active}}"><a href="{{pagination_link}}">{{page_number}}</a></li>
-</ul>
\ No newline at end of file
+<ul class="pagination pagination-sm" data-pagination="true">
+    <li class="{{pagination_active}}">
+        <a href="{{pagination_link}}">{{page_number}}</a>
+    </li>
+</ul>
diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb
index f1c354c..31c154f 100644
--- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb
@@ -1,4 +1,4 @@
-<div class="w-ad-banner ad-banner-widget-1 container">
+<div class="w-ad-banner ad-banner-widget-1">
   <div class="w-ad-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
@@ -21,3 +21,5 @@
     <div class="w-ad-banner__caption"></div>
     <ul class="w-ad-banner__pager"></ul>
 </div>
+
+
diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb
new file mode 100644
index 0000000..842ebc3
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb
@@ -0,0 +1,18 @@
+<div class="w-ad-banner ad-banner-widget-3">
+  <div class="w-ad-banner__wrap  cycle-slideshow"
+      data-list="images"
+      data-level="0"
+      data-cycle-slides=".w-ad-banner__slide"
+      data-cycle-log="false"
+      data-overlay=".w-ad-banner__caption"
+      data-pager=".w-ad-banner__pager"
+      data-pager-template="<li><a href='#'></a></li>"
+      data-pager-active-class="active-slide"
+      data-cycle-youtube=true
+      data-cycle-youtube-autostart=false
+    >
+    {{html}}
+  </div>
+    <ul class="w-ad-banner__pager"></ul>
+</div>
+
diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2_video.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2_video.html.erb
index 6b77a90..22c4aa5 100644
--- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2_video.html.erb
+++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2_video.html.erb
@@ -1,4 +1,4 @@
-<div class="w-ad-banner ad-banner-widget-2 container">
+<div class="w-ad-banner ad-banner-widget-2">
   <div class="w-ad-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
@@ -19,7 +19,6 @@
 </div>
 <script type="text/javascript">
   $("document").ready(function(){
-    // total_players = $("*[data-youtube-id]").length
     $("*[data-youtube-id]").each(function(){
       var obj = $(this).find("embed");
       obj.attr("id",$(this).data("youtube-id"));
diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb
index b739ba0..0524e45 100644
--- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb
+++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb
@@ -1,12 +1,19 @@
-<div class="w-ad-banner ad-banner-widget-2 container">
+<div class="w-ad-banner ad-banner-widget-3">
   <div class="w-ad-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
       data-cycle-slides=".w-ad-banner__slide"
       data-cycle-log="false"
+      data-pager=".w-ad-banner__pager"
+      data-pager-template="<li><a href='#'></a></li>"
+      data-pager-active-class="active-slide"
     >
-    <div class="w-ad-banner__slide {{class}}">
+    <div class="w-ad-banner__slide {{class}}"
+        data-link="{{link}}"
+      >
         <img class="w-ad-banner__image" src="{{image_link}}">
     </div>
   </div>
-</div>
\ No newline at end of file
+    <ul class="w-ad-banner__pager"></ul>
+</div>
+
diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/info.json b/app/templates/orbit_bootstrap/modules/ad_banner/info.json
index bfc594d..b1a540b 100644
--- a/app/templates/orbit_bootstrap/modules/ad_banner/info.json
+++ b/app/templates/orbit_bootstrap/modules/ad_banner/info.json
@@ -11,8 +11,8 @@
         {
             "filename" : "ad_banner_widget2_video",
             "name" : {
-                "zh_tw" : "2. 橫幅輪播 ( 圖片, 導航圖示 )",
-                "en" : "2. Carousel ( image, navigation, video )"
+                "zh_tw" : "2. 橫幅輪播 + Youtube影片 ( 圖片, Youtube影片, 導航圖示 )",
+                "en" : "2. Carousel ( image, Youtube video, navigation )"
             },
             "thumbnail" : "thumbnail-block.png"
         },
@@ -20,9 +20,18 @@
             "filename" : "ad_banner_widget3",
             "name" : {
                 "zh_tw" : "3. 廣告輪播 ( 圖片 )",
-                "en" : "2. AD banner ( image )"
+                "en" : "3. AD banner ( image )"
+            },
+            "thumbnail" : "thumbnail-block.png"
+        },
+        {
+            "filename" : "ad_banner_widget4",
+            "name" : {
+                "zh_tw" : "4. 廣告輪播 ( 圖片 )",
+                "en" : "4. AD banner ( image )"
             },
             "thumbnail" : "thumbnail-block.png"
         }
+
     ]
 }
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget1.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget1.html.erb
index 64a4416..224acfa 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget1.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-1">
+<div class="w-annc  widget-announcement-1">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb
index 4e0a944..35e18b2 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-10">
+<div class="w-annc  widget-announcement-10">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb
index 24a6df5..960730c 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-11">
+<div class="w-annc  widget-announcement-11">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb
index 6d8034e..8a4ee30 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-12">
+<div class="w-annc  widget-announcement-12">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb
index 758fb11..6675a91 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-2">
+<div class="w-annc  widget-announcement-2">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb
index 9a9c603..cf15416 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-3">
+<div class="w-annc  widget-announcement-3">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb
index 0a60eca..8a6cb09 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-4">
+<div class="w-annc  widget-announcement-4">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb
index 6ff8203..3fe5459 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-5">
+<div class="w-annc  widget-announcement-5">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb
index 2cd9ec6..2e27093 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-6">
+<div class="w-annc  widget-announcement-6">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb
index 7bb586f..f895a36 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-7">
+<div class="w-annc  widget-announcement-7">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb
index 1349098..9270b8c 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-8">
+<div class="w-annc  widget-announcement-8">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb
index 6613b06..883200f 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb
@@ -1,4 +1,4 @@
-<div class="w-annc  w-announcement-9">
+<div class="w-annc  widget-announcement-9">
   <h3 class="w-annc__widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb b/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb
index 985527b..d9a8168 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb
@@ -1,4 +1,4 @@
-<div class="i-annc  i-announcement-1">
+<div class="i-annc  index-announcement-1">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb b/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb
index cdfc614..e4338f2 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb
@@ -1,4 +1,4 @@
-<div class="i-annc  i-announcement-2">
+<div class="i-annc  index-announcement-2">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
   <ul class="i-annc__list" data-level="0" data-list="announcements">
     <li class="i-annc__item">
diff --git a/app/templates/orbit_bootstrap/modules/announcement/show.html.erb b/app/templates/orbit_bootstrap/modules/announcement/show.html.erb
index 4a024b5..b91631d 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/show.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/show.html.erb
@@ -1,5 +1,5 @@
-<article class="s-annc  s-announcement">
-  <h1 class="s-annc__show-title">{{title}}</h1>
+<article class="s-annc  show-announcement">
+  <h3 class="s-annc__show-title">{{title}}</h3>
   
   <ul class="s-annc__meta-wrap  list-unstyled">
     <li class="s-annc__date-wrap  s-annc__meta--item">
@@ -13,7 +13,7 @@
     <li class="s-annc__tag-wrap  s-annc__meta--item ">
       <i class="fa fa-tags"></i>
       <span data-list="tags" data-level="0">
-        <a href="{{url}}"><span class="s-annc__tag">{{tag}}</span></a>
+        <a href="{{url}}"><span class="s-annc__tag  label  label-default">{{tag}}</span></a>
       </span>
     </li>
   </ul>
@@ -26,14 +26,14 @@
     <li class="s-annc__related-file">
       <i class="fa fa-fw fa-paperclip"></i>
       <div class="s-annc__related-file-list" data-list="bulletin_files" data-level="0">
-        <a class="s-annc__flie-title" href="{{file_url}}">{{file_title}}</a>
+        <a class="s-annc__flie-title  btn  btn-default  btn-sm" href="{{file_url}}">{{file_title}}</a>
       </div>
     </li>
 
     <li class="s-annc__related-link">
       <i class="fa fa-fw fa-link"></i>
       <div class="s-annc__related-link-list" data-list="bulletin_links" data-level="0">
-        <a href="{{link_url}}" target="_blank">{{link_title}}</a>
+        <a class="s-annc__link-title  btn  btn-default  btn-sm" href="{{link_url}}" target="_blank">{{link_title}}</a>
       </div>
     </li>
   </ul>
@@ -47,26 +47,23 @@
 {{link_to_edit}}
 
 <script>
-  $(function() {
+  (function($) {
 
-    // 當metadata-tags沒內容時將會隱藏
-    if(!$('.metadata-tags .tag').length) {
-      $('.metadata-tags').remove();
+    function hideEmptyEl(el, elParent) {
+      if( el.length === 0) {
+        elParent.addClass('hide');
+      }
     }
 
-    // 當post-related沒內容時會隱藏
-    if($('.post-related').length) {
-      var element = ['.post-related-flises-list', '.post-related-links-list'],
-          n = 0;
-      $.each(element, function(index, val) {
-        if(!$(val).text()) {
-          $(val).closest('li').remove();
-          n += 1;
-        }
-        if(n == element.length) {
-          $('.post-related').remove();
-        }
-      });
-    }
-  });
+    // Hiding parent element when children elements are not present
+    // Tags
+    hideEmptyEl($('.s-annc__tag'), $('.s-annc__tag-wrap'));
+    
+    // Attachments
+    hideEmptyEl($('.s-annc__flie-title'), $('.s-annc__related-file'));
+    
+    // Links
+    hideEmptyEl($('.s-annc__link-title'), $('.s-annc__related-link'));
+  
+  }(jQuery));
 </script>
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/archive/_archive_widget1.html.erb b/app/templates/orbit_bootstrap/modules/archive/_archive_widget1.html.erb
index 761b3e1..e5bfe75 100644
--- a/app/templates/orbit_bootstrap/modules/archive/_archive_widget1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/archive/_archive_widget1.html.erb
@@ -1,4 +1,4 @@
-<div class="w-archive  archive-widget-1" module="archive" data-ps="">
+<div class="w-archive  widget-archive-1" module="archive" data-ps="">
   <h3 class="w-archive__widget-title">{{widget-title}}</h3>
   <ul class="w-archive__list  level-1"  data-list="categories" data-level="0">
     <li class="w-archive__item  level-1">
diff --git a/app/templates/orbit_bootstrap/modules/archive/archive_index1.html.erb b/app/templates/orbit_bootstrap/modules/archive/archive_index1.html.erb
index d7fafa8..b66ea44 100644
--- a/app/templates/orbit_bootstrap/modules/archive/archive_index1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/archive/archive_index1.html.erb
@@ -1,4 +1,4 @@
-<div class="i-archive  archive-index-1">
+<div class="i-archive  index-archive-1">
   <h3 class="i-archive__page-title">{{page-title}}</h3>
   <ul class="i-archive__list" data-list="categories" data-level="0">
     <li class="i-archive__item">
diff --git a/app/templates/orbit_bootstrap/modules/archive/archive_index2.html.erb b/app/templates/orbit_bootstrap/modules/archive/archive_index2.html.erb
index b54a794..be5c2ca 100644
--- a/app/templates/orbit_bootstrap/modules/archive/archive_index2.html.erb
+++ b/app/templates/orbit_bootstrap/modules/archive/archive_index2.html.erb
@@ -6,6 +6,7 @@
     <div class="panel panel-default">
       <div class="panel-heading">
         <h4 class="panel-title">
+          <i class="fa fa-th-list"></i>
           <a data-toggle="collapse" data-parent="#index-archive-group" href="#collapse" class="collapsed">
             {{category-title}}
           </a>
diff --git a/app/templates/orbit_bootstrap/modules/archive/show.html.erb b/app/templates/orbit_bootstrap/modules/archive/show.html.erb
index 11a8c05..12085b7 100644
--- a/app/templates/orbit_bootstrap/modules/archive/show.html.erb
+++ b/app/templates/orbit_bootstrap/modules/archive/show.html.erb
@@ -1,7 +1,7 @@
 <div class="show-archive">
-  <h1 class="show-title">
+  <h3 class="show-title">
     <span>{{title}}</span>
-  </h1>
+  </h3>
   <div class="show-archive-body">
     <dl class="dl-horizontal show-archive-item-group" data-list="archives" data-level="1">
       <dt class="show-archive-item-list">
diff --git a/app/templates/orbit_bootstrap/modules/faq/_widget.html.erb b/app/templates/orbit_bootstrap/modules/faq/_faq_widget1.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/faq/_widget.html.erb
rename to app/templates/orbit_bootstrap/modules/faq/_faq_widget1.html.erb
diff --git a/app/templates/orbit_bootstrap/modules/faq/_widget1.html.erb b/app/templates/orbit_bootstrap/modules/faq/_faq_widget2.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/faq/_widget1.html.erb
rename to app/templates/orbit_bootstrap/modules/faq/_faq_widget2.html.erb
diff --git a/app/templates/orbit_bootstrap/modules/faq/index.html.erb b/app/templates/orbit_bootstrap/modules/faq/faq_index.html1.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/faq/index.html.erb
rename to app/templates/orbit_bootstrap/modules/faq/faq_index.html1.erb
diff --git a/app/templates/orbit_bootstrap/modules/faq/index1.html.erb b/app/templates/orbit_bootstrap/modules/faq/faq_index2.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/faq/index1.html.erb
rename to app/templates/orbit_bootstrap/modules/faq/faq_index2.html.erb
diff --git a/app/templates/orbit_bootstrap/modules/faq/show.html.erb b/app/templates/orbit_bootstrap/modules/faq/show.html.erb
index e003463..5bee8fe 100644
--- a/app/templates/orbit_bootstrap/modules/faq/show.html.erb
+++ b/app/templates/orbit_bootstrap/modules/faq/show.html.erb
@@ -1,6 +1,6 @@
 <article>
   <div class="post-title">
-    <h1>{{question}}</h1>
+    <h3>{{question}}</h3>
   </div>
 
       <span data-list="tags" data-level="0">
diff --git a/app/templates/orbit_bootstrap/modules/gallery/_widget.html.erb b/app/templates/orbit_bootstrap/modules/gallery/_gallery_widget1.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/gallery/_widget.html.erb
rename to app/templates/orbit_bootstrap/modules/gallery/_gallery_widget1.html.erb
diff --git a/app/templates/orbit_bootstrap/modules/gallery/_widget1.html.erb b/app/templates/orbit_bootstrap/modules/gallery/_gallery_widget2.html.erb
similarity index 93%
rename from app/templates/orbit_bootstrap/modules/gallery/_widget1.html.erb
rename to app/templates/orbit_bootstrap/modules/gallery/_gallery_widget2.html.erb
index 54ed0c8..6a7fbe7 100644
--- a/app/templates/orbit_bootstrap/modules/gallery/_widget1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/gallery/_gallery_widget2.html.erb
@@ -1,4 +1,4 @@
-<div class="widget-gallery widget1">
+<div class="widget-gallery widget2">
   <h3 class="widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/gallery/_widget2.html.erb b/app/templates/orbit_bootstrap/modules/gallery/_gallery_widget3.html.erb
similarity index 86%
rename from app/templates/orbit_bootstrap/modules/gallery/_widget2.html.erb
rename to app/templates/orbit_bootstrap/modules/gallery/_gallery_widget3.html.erb
index 564938a..0b3bfe6 100644
--- a/app/templates/orbit_bootstrap/modules/gallery/_widget2.html.erb
+++ b/app/templates/orbit_bootstrap/modules/gallery/_gallery_widget3.html.erb
@@ -1,4 +1,4 @@
-<div class="widget-gallery widget2">
+<div class="widget-gallery widget3">
   <h3 class="widget-title">
     <span>{{widget-title}}</span>
   </h3>
diff --git a/app/templates/orbit_bootstrap/modules/gallery/index.html.erb b/app/templates/orbit_bootstrap/modules/gallery/gallery_index1.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/gallery/index.html.erb
rename to app/templates/orbit_bootstrap/modules/gallery/gallery_index1.html.erb
diff --git a/app/templates/orbit_bootstrap/modules/gallery/index1.html.erb b/app/templates/orbit_bootstrap/modules/gallery/gallery_index2.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/gallery/index1.html.erb
rename to app/templates/orbit_bootstrap/modules/gallery/gallery_index2.html.erb
diff --git a/app/templates/orbit_bootstrap/modules/member/index_staff.html.erb b/app/templates/orbit_bootstrap/modules/member/member_index1.html.erb
similarity index 51%
rename from app/templates/orbit_bootstrap/modules/member/index_staff.html.erb
rename to app/templates/orbit_bootstrap/modules/member/member_index1.html.erb
index 0246e7c..9afd77e 100644
--- a/app/templates/orbit_bootstrap/modules/member/index_staff.html.erb
+++ b/app/templates/orbit_bootstrap/modules/member/member_index1.html.erb
@@ -1,30 +1,30 @@
 <div class="index-member index1">
   <div class="index-member-group" data-list="roles" data-level="0">
     <div class="index-member-group-item">
-
       <div class="index-member-status" data-level="1" data-list="status-list">
-      
         <h3 class="index-title">
           <span>{{status-title}}</span>
         </h3>
-
         <div class="index-member-list row" data-level="2" data-list="members">
-          <div class="index-member-item clearfix col-sm-6 row" style="font-size: 12px; min-height:180px;">
-            <div class="col-sm-4">
-              <a href="{{link_to_show}}"><img class="member-pic" src="{{image}}" alt="{{name}}" title="{{name}}" width="100%"></a>
+          <div class="index-member-item clearfix col-lg-6 row">
+            <div class="member-pic-wrap col-xs-4">
+              <a href="{{link_to_show}}">
+                  <img class="member-pic" src="{{image}}" alt="{{name}}" title="{{name}}" width="100%">
+              </a>
             </div>
-            <div class="col-sm-8">
-              <table class="table table-condensed">
+            <div class="member-profile-data-wrap col-xs-8">
+              <table class="table">
                 <tbody data-list="profile_data" data-level="3">
-                  <tr><th class="{{title_class}}" style="min-width:70px;">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
+                  <tr>
+                      <th class="{{title_class}}">{{title}}</th>
+                      <td class="{{value_class}}">{{value}}</td>
+                  </tr>
                 </tbody>
               </table>
             </div>
           </div>
         </div>
-
       </div>
-
     </div>
   </div>
 </div>
diff --git a/app/templates/orbit_bootstrap/modules/member/index_teacher.html.erb b/app/templates/orbit_bootstrap/modules/member/member_index_staff.html.erb
similarity index 51%
rename from app/templates/orbit_bootstrap/modules/member/index_teacher.html.erb
rename to app/templates/orbit_bootstrap/modules/member/member_index_staff.html.erb
index 0246e7c..9afd77e 100644
--- a/app/templates/orbit_bootstrap/modules/member/index_teacher.html.erb
+++ b/app/templates/orbit_bootstrap/modules/member/member_index_staff.html.erb
@@ -1,30 +1,30 @@
 <div class="index-member index1">
   <div class="index-member-group" data-list="roles" data-level="0">
     <div class="index-member-group-item">
-
       <div class="index-member-status" data-level="1" data-list="status-list">
-      
         <h3 class="index-title">
           <span>{{status-title}}</span>
         </h3>
-
         <div class="index-member-list row" data-level="2" data-list="members">
-          <div class="index-member-item clearfix col-sm-6 row" style="font-size: 12px; min-height:180px;">
-            <div class="col-sm-4">
-              <a href="{{link_to_show}}"><img class="member-pic" src="{{image}}" alt="{{name}}" title="{{name}}" width="100%"></a>
+          <div class="index-member-item clearfix col-lg-6 row">
+            <div class="member-pic-wrap col-xs-4">
+              <a href="{{link_to_show}}">
+                  <img class="member-pic" src="{{image}}" alt="{{name}}" title="{{name}}" width="100%">
+              </a>
             </div>
-            <div class="col-sm-8">
-              <table class="table table-condensed">
+            <div class="member-profile-data-wrap col-xs-8">
+              <table class="table">
                 <tbody data-list="profile_data" data-level="3">
-                  <tr><th class="{{title_class}}" style="min-width:70px;">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
+                  <tr>
+                      <th class="{{title_class}}">{{title}}</th>
+                      <td class="{{value_class}}">{{value}}</td>
+                  </tr>
                 </tbody>
               </table>
             </div>
           </div>
         </div>
-
       </div>
-
     </div>
   </div>
 </div>
diff --git a/app/templates/orbit_bootstrap/modules/member/index.html.erb b/app/templates/orbit_bootstrap/modules/member/member_index_teacher.html.erb
similarity index 51%
rename from app/templates/orbit_bootstrap/modules/member/index.html.erb
rename to app/templates/orbit_bootstrap/modules/member/member_index_teacher.html.erb
index c593010..9afd77e 100644
--- a/app/templates/orbit_bootstrap/modules/member/index.html.erb
+++ b/app/templates/orbit_bootstrap/modules/member/member_index_teacher.html.erb
@@ -6,22 +6,25 @@
           <span>{{status-title}}</span>
         </h3>
         <div class="index-member-list row" data-level="2" data-list="members">
-          <div class="index-member-item clearfix col-sm-6 row" style="font-size: 12px; min-height:180px;">
-            <div class="col-sm-4">
-              <a href="{{link_to_show}}"><img class="member-pic" src="{{image}}" alt="{{name}}" title="{{name}}" width="100%"></a>
+          <div class="index-member-item clearfix col-lg-6 row">
+            <div class="member-pic-wrap col-xs-4">
+              <a href="{{link_to_show}}">
+                  <img class="member-pic" src="{{image}}" alt="{{name}}" title="{{name}}" width="100%">
+              </a>
             </div>
-            <div class="col-sm-8">
-              <table class="table table-condensed">
+            <div class="member-profile-data-wrap col-xs-8">
+              <table class="table">
                 <tbody data-list="profile_data" data-level="3">
-                  <tr><th class="{{title_class}}" style="min-width:70px;">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
+                  <tr>
+                      <th class="{{title_class}}">{{title}}</th>
+                      <td class="{{value_class}}">{{value}}</td>
+                  </tr>
                 </tbody>
               </table>
             </div>
           </div>
         </div>
-
       </div>
-
     </div>
   </div>
 </div>
diff --git a/app/templates/orbit_bootstrap/modules/member/show.html.erb b/app/templates/orbit_bootstrap/modules/member/show.html.erb
index 62f7a3b..a3be13b 100644
--- a/app/templates/orbit_bootstrap/modules/member/show.html.erb
+++ b/app/templates/orbit_bootstrap/modules/member/show.html.erb
@@ -1,21 +1,19 @@
-<div class="show" module="member">
+<div class="show-member" module="member">
   <div class="row">
-    <div class="member-pic col-md-3">
+    <div class="member-pic col-xs-3">
       <img src="{{image}}" alt="{{name}}" title="{{name}}" width="100%">
     </div>
-    <div class="member-data col-md-9">
+    <div class="member-data col-xs-9">
       <table class="table table-striped">
         <div data-list="profile_data" data-level="0">
-          <tr><th class="{{title_class}}" width="30%">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
+          <tr><th class="{{title_class}}">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
         </div>
       </table>
     </div>
   </div>
-  <br/>
-  <ul class="nav nav-pills" role="tablist" data-list="plugins" data-level="0">
+  <ul class="member-plugins nav nav-pills" role="tablist" data-list="plugins" data-level="0">
     <li class="{{plugin_class}}"><a href="#{{plugin_name}}" role="tab" data-toggle="tab">{{plugin_title}}</a></li>
   </ul>
-  <br/>
   <div class="tab-content" data-list="plugins" data-level="0">
     <div class="tab-pane {{plugin_class}}" id="{{plugin_name}}">
       <table class="table table-hover table-striped">
@@ -28,4 +26,22 @@
       </table>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
+<script>
+  (function() {
+    // Adding class on first element
+    function memberPlugins() {
+      var plugins = document.querySelector('.member-plugins');
+        if( plugins.children.length === 0 ) {
+            return;
+        }
+        if( plugins.querySelectorAll('.member-plugins .active').length === 0 ) {
+            var navs = plugins.querySelectorAll('.member-plugins > li'),
+                contents = plugins.nextElementSibling.children[0];
+            navs[0].className += ' ' + 'active';
+            contents.className += ' ' + 'active';
+        }
+    }
+    memberPlugins();
+  }())
+</script>
diff --git a/app/templates/orbit_bootstrap/modules/web_resource/_widget.html.erb b/app/templates/orbit_bootstrap/modules/web_resource/_web_res_widget1.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/web_resource/_widget.html.erb
rename to app/templates/orbit_bootstrap/modules/web_resource/_web_res_widget1.html.erb
diff --git a/app/templates/orbit_bootstrap/modules/web_resource/_widget1.html.erb b/app/templates/orbit_bootstrap/modules/web_resource/_web_res_widget2.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/web_resource/_widget1.html.erb
rename to app/templates/orbit_bootstrap/modules/web_resource/_web_res_widget2.html.erb
diff --git a/app/templates/orbit_bootstrap/modules/web_resource/index.html.erb b/app/templates/orbit_bootstrap/modules/web_resource/web_res_index1.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/web_resource/index.html.erb
rename to app/templates/orbit_bootstrap/modules/web_resource/web_res_index1.html.erb
diff --git a/app/templates/orbit_bootstrap/modules/web_resource/index1.html.erb b/app/templates/orbit_bootstrap/modules/web_resource/web_res_index2.html.erb
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/web_resource/index1.html.erb
rename to app/templates/orbit_bootstrap/modules/web_resource/web_res_index2.html.erb
diff --git a/app/templates/orbit_bootstrap/widgets/site_menu_widget/_widget.html.erb b/app/templates/orbit_bootstrap/widgets/site_menu_widget/_widget.html.erb
index b45ef1d..cc90a14 100644
--- a/app/templates/orbit_bootstrap/widgets/site_menu_widget/_widget.html.erb
+++ b/app/templates/orbit_bootstrap/widgets/site_menu_widget/_widget.html.erb
@@ -1,11 +1,11 @@
-<div class="submenu-wrap">
-	<h3 class="submenu__title">{{widget_title}}</h3>
-	<ul data-list="pages" class="submenu__list  level-1" data-level="0">
-		<li class="submenu__item  level-1">
-			<a class="submenu__link  level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
-			<ul class="submenu__list  level-2" data-list="children" data-level="1">
-				<li class="submenu__item  level-2">
-					<a class="submenu__link  level-2" href="{{url}}" target="{{target}}">{{page_name}}</a>
+<div class="sitemenu-wrap">
+	<h3 class="sitemenu__title">{{widget_title}}</h3>
+	<ul data-list="pages" class="sitemenu__list level-1" data-level="0">
+		<li class="sitemenu__item level-1">
+			<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">
+					<a class="sitemenu__link level-2" href="{{url}}" target="{{target}}">{{page_name}}</a>
 					<ul data-list="children" data-level="2">
 						<li>
 							<a href="{{url}}" target="{{target}}">{{page_name}}</a>
diff --git a/built_in_extensions.rb b/built_in_extensions.rb
index 98a8522..1c55da1 100644
--- a/built_in_extensions.rb
+++ b/built_in_extensions.rb
@@ -1,5 +1,5 @@
 gem 'announcement', git: 'http://gitlab.tp.rulingcom.com/saurabh/announcement-test.git'
-gem 'ad_banner', git: 'http://gitlab.tp.rulingcom.com/saurabh/adbanner-test.git'
+gem 'ad_banner', path: '/home/rulingcom/designer/modules/ad_banner_pro'
 gem "archive", git: 'http://gitlab.tp.rulingcom.com/saurabh/archive.git'
 gem 'gallery', git: 'http://gitlab.tp.rulingcom.com/saurabh/gallery.git'
 gem 'links', git: 'http://gitlab.tp.rulingcom.com/saurabh/links.git'
diff --git a/config/mongoid.yml b/config/mongoid.yml
index d0cb610..db95631 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -1,14 +1,14 @@
 development:
   sessions:
     default:
-      database: orbit_4_5
+      database: orbit_4_5_joshua
       hosts:
         - localhost:27017
 
 test:
   sessions:
     default:
-      database: orbit_4_5
+      database: orbit_4_5_joshua
       hosts:
         - localhost:27017
       options:
@@ -21,6 +21,6 @@ production:
     default:
       # username:
       # password:
-      database: orbit_4_5
+      database: orbit_4_5_joshua
       hosts:
         - localhost:27017
diff --git a/config/unicorn.rb b/config/unicorn.rb
index 4e5c8d1..21ebddb 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -26,4 +26,4 @@ before_fork do |server, worker|
     rescue Errno::ENOENT, Errno::ESRCH
     end
   end
-end
\ No newline at end of file
+end