update template

app/templates/nccu/assets/javascripts/app.js

@@ -1,4 +1,4 @@
-;(function($) {
+(function($) {
 
     // Init functions
     function init() {
@@ -7,6 +7,16 @@
 
         }
 
+        function heightCompare () {
+            var priHeight = $('.primary').height();
+            var secHeight = $('.secondary').height();
+            if( priHeight <= secHeight ) {
+                $('.primary')
+                    .children('.inner')
+                    .css('height', secHeight + 30);
+            } 
+        }
+
         function searchDetect () {
             if( $('body').attr('data-module') == 'news' || $('body').attr('data-module') == 'announcement' ) {
                 if( window.location.search.length < 1 ) {
@@ -115,6 +125,7 @@
             bullsEye();
             moveElement();
             searchDetect();
+            heightCompare();
         }
     }
 

app/templates/nccu/assets/stylesheets/template/base/_default.scss

@@ -625,18 +625,17 @@ button, input, select, textarea {
     float: left;
 }
 
-.main_menu.expansion .page_menu.level_1 > li:last-child {
+html[lang="zh_tw"] .main_menu.expansion .page_menu.level_1 > li:last-child {
     background-color: #ff9900;
 }
-
+html[lang="zh_tw"] .main_menu.expansion .page_menu.level_1 > li:last-child:hover {
-.main_menu.expansion .page_menu.level_1 > li:last-child:hover {
     background-color: #ff9900;
     -moz-box-shadow: inset 0 -4px 0 #FF7A00;
     -webkit-box-shadow: inset 0 -4px 0 #FF7A00;
     box-shadow: inset 0 -4px 0 #FF7A00;
 }
 
-.main_menu.expansion .page_menu.level_1 > li:last-child > a {
+html[lang="zh_tw"]  .main_menu.expansion .page_menu.level_1 > li:last-child > a {
     color: #FFF;
     text-shadow: 0 1px 0 rgba(0, 0, 0, 0.6);
 }
@@ -3205,7 +3204,7 @@ article.page_content .linkAndFile > div:last-child {
 }
 
 .content .content-inner {
-    padding: 1em 1em;
+    padding: 1em 1em 0 1em;
 }
 
 .content .content-inner:before, .content .content-inner:after {
@@ -3474,9 +3473,10 @@ article.page_content .linkAndFile > div:last-child {
 
 .index_page .primary > .right .events .event_title a {
     color: #888888;
-    font-size: 24px;
+    font-size: 18px;
     line-height: 36px;
     font-weight: normal;
+    padding-left: 10px;
 }
 
 .index_page .primary > .right .events .event_title a:active {
@@ -3841,11 +3841,14 @@ img {
     clear: both;
 }
 
-
+.inside_page .primary .inner{
+    @include clearfix();
+    border-right: 1px solid #cfcfcf; 
+    padding: 0 20px 0 0;
+    margin: 2em 0 2em 2em;
+}
 
 #main-content {
-    padding-right: 20px;
-    border-right: 1px solid #cfcfcf; 
     font-size: 13px;
     font-size: 0.8125rem;
     font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;

app/templates/nccu/assets/stylesheets/template/base/_tab.scss

@@ -131,6 +131,7 @@
         float: left;
         width: 26%;
         .wlink-heading {
+            font-weight: bold;
             height: 2.3em;
             margin: 0;
             line-height: 1.6em;
@@ -152,6 +153,7 @@
             text-overflow: ellipsis;
             border-bottom: 1px solid #ccc;
             & > a {
+                font-family: $sub-font;
                 color: #333;
                 &:hover {
                     color: #cc0033;

app/templates/nccu/assets/stylesheets/template/modules/announcement.scss

@@ -195,9 +195,33 @@ $table-th-bgcolor: $theme-color-main;
 // Announcement widget 12 -- table
 .annc-widget-12 {}
 
-// Announcement widget 12 -- table
+// Announcement widget 13
 .annc-widget-13 {}
 
+// Announcement widget 14 -- table
+.annc-widget-14 {
+    .w-announcement__table {
+        border: 1px solid #ddd;
+        font-family: $sub-font;
+    }
+    .w-announcement__th {
+        padding: 3px;
+        color: #000;
+        background: none;
+    }
+    .w-announcement__link {
+        font-family: $sub-font;
+        background: url(/assets/disc.jpg) 3px center no-repeat;
+        padding-left: 17px;
+    }
+    th, td {
+        padding: 3px;
+        line-height: 18px;
+        text-align: left;
+        border: 1px solid #ddd;
+    }
+}
+
 //  ******************  index  ******************
 
 // Announcement index 1 -- table

app/templates/nccu/assets/stylesheets/template/modules/news.scss

@@ -26,6 +26,7 @@
     .i-news__content-wrap {
         display: inline-block;
         width: 58.79828326180258%;
+        vertical-align: top;
     }
     .i-news__title {
         margin: 0 0 0.5em 0;

app/templates/nccu/modules/announcement/_annc_widget14.html.erb

@@ -0,0 +1,19 @@
+<!--
+    Announcement widget-14
+    Fields: widget-title, title, postdate
+ -->
+<div class="w-announcement  annc-widget-14  w-announcement--table">
+  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
+  <table class="w-announcement__table">
+    <thead>
+        <th class="w-announcement__th">{{title-head}}</th>
+        <th class="w-announcement__th">{{date-head}}</th>
+    </thead>
+    <tbody class="w-announcement__list" data-level="0" data-list="announcements">
+        <tr>
+          <td><a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a></td>
+          <td date-format="%Y-%m-%d">{{postdate}}</td>
+        </tr>
+    </tbody>
+  </table>
+</div>

app/templates/nccu/modules/announcement/info.json

@@ -121,6 +121,14 @@
 				"en" : "13. List (widget-title, title)"
 				},
 			"thumbnail" : "thumbnail-block.png"
+		},
+		{
+			"filename" : "annc_widget14",
+			"name" : {
+				"zh_tw" : "14. 表格列表( 模組標題, 標題, 日期 )",
+				"en" : "14. Table (widget-title, title, postdate)"
+				},
+			"thumbnail" : "thumbnail-block.png"
 		}
 	]
 }

app/templates/nccu/modules/news/_news_widget1.html.erb

@@ -2,7 +2,7 @@
     News widget-1
  -->
 <div class="w-news  news-widget-1">
-  <a href="/zh_tw/news/"><h2 class="topic_title">{{widget-title}}</h2></a>
+  <a href="/<%= I18n.locale.to_s %>/news/"><h2 class="topic_title">{{widget-title}}</h2></a>
 <div class="btn-group topic_note">
     <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
       更多+
@@ -24,7 +24,7 @@
   <div class="list_mask">
     <ul id="topic_list" data-level="0" data-list="news">
       <li>
-        <div class="news_img resizeing">
+        <div class="news_img bullseye">
           <a href="{{link_to_show}}">
             <img src="{{img_src}}" alt="Announcement image">
           </a>

app/templates/nccu/widgets/announcement_link_widget/_widget1.html.erb

@@ -7,7 +7,7 @@
       <div class="tab-body">
         <div class="annc-content">
           <h3 class="annc-heading">
-            <a href="/zh_tw/announcement/" class="annc-more">{{heading-announcements}}</a>
+            <a href="/<%= I18n.locale.to_s %>/announcement/" class="annc-more">{{heading-announcements}}</a>
           </h3>
           <div class="pagination" data-quant="1">
             <a href="{{annc-prev}}" class="prev" rel="prev">{{Prev}}</a>