From 018557ba41634c96f507e02fe11c7106f23130e0 Mon Sep 17 00:00:00 2001
From: nccu <nccu@test174.(none)>
Date: Tue, 11 Nov 2014 15:48:55 +0800
Subject: [PATCH] update template

---
 .../template/modules/announcement.scss        | 41 +++++++++++++++++++
 .../stylesheets/template/widget/sitemenu.scss |  9 ++++
 .../modules/announcement/annc_index3.html.erb |  3 +-
 .../modules/announcement/annc_index4.html.erb | 27 ++++++++++++
 .../nccu/modules/announcement/info.json       | 12 +++++-
 5 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 app/templates/nccu/modules/announcement/annc_index4.html.erb

diff --git a/app/templates/nccu/assets/stylesheets/template/modules/announcement.scss b/app/templates/nccu/assets/stylesheets/template/modules/announcement.scss
index e6c41b3..019359a 100644
--- a/app/templates/nccu/assets/stylesheets/template/modules/announcement.scss
+++ b/app/templates/nccu/assets/stylesheets/template/modules/announcement.scss
@@ -301,6 +301,47 @@ $table-th-bgcolor: $theme-color-main;
     }
 }
 
+// Announcement index 4 -- table
+.annc-index-4 {
+    .i-announcement__table {
+        border: 1px solid #ddd;
+        font-family: $sub-font;
+    }
+    .i-announcement__th {
+        padding: 3px;
+        color: #000;
+        background: none;
+        font-size: 12px;
+        font-size: 0.75rem;
+    }
+    .i-announcement__th--date {
+        text-align: center;
+    }
+    .i-announcement__date {
+        font-size: 12px;
+        font-size: 0.75rem;
+        text-align: center;
+        display: block;
+    }
+    .i-announcement__link {
+        font-family: $sub-font;
+        background: url(/assets/disc.jpg) 3px center no-repeat;
+        padding-left: 17px;
+        font-size: 12px;
+        font-size: 0.75rem;
+    }
+    tr:nth-child(odd) {
+        background: none;
+    }
+    th, td {
+        padding: 3px;
+        line-height: 18px;
+        text-align: left;
+        border: 1px solid #ddd;
+    }
+}
+
+
 // Announcement SHOW
 .show-announcement {
     .show-title {
diff --git a/app/templates/nccu/assets/stylesheets/template/widget/sitemenu.scss b/app/templates/nccu/assets/stylesheets/template/widget/sitemenu.scss
index dc5577d..dc02ea1 100644
--- a/app/templates/nccu/assets/stylesheets/template/widget/sitemenu.scss
+++ b/app/templates/nccu/assets/stylesheets/template/widget/sitemenu.scss
@@ -1,3 +1,12 @@
+.site-map {
+    h2 {
+        font: 2em/100% sans-serif;
+        margin: 0 0 5px;
+        border-bottom: 1px solid #CFCFCF;
+        padding-bottom: 10px;
+        font-weight: bold;
+    }
+}
 .submenu-wrap {
     padding: 20px 1em;
 }
diff --git a/app/templates/nccu/modules/announcement/annc_index3.html.erb b/app/templates/nccu/modules/announcement/annc_index3.html.erb
index 3b74e64..c610907 100644
--- a/app/templates/nccu/modules/announcement/annc_index3.html.erb
+++ b/app/templates/nccu/modules/announcement/annc_index3.html.erb
@@ -1,9 +1,8 @@
 <!--
-    Announcement index-2
+    Announcement index-3
     Fields: widget-title, date-head, title-head, postdate, title, pagination
  -->
 <div class="i-announcement  annc-index-3  i-announcement--table">
-  <h3 class="i-announcement__widget-title">{{widget-title}}</h3>
   <table class="i-announcement__table">
     <tbody class="i-announcement__tbody" data-level="0" data-list="announcements">
       <tr>
diff --git a/app/templates/nccu/modules/announcement/annc_index4.html.erb b/app/templates/nccu/modules/announcement/annc_index4.html.erb
new file mode 100644
index 0000000..a5c1c47
--- /dev/null
+++ b/app/templates/nccu/modules/announcement/annc_index4.html.erb
@@ -0,0 +1,27 @@
+<!--
+    Announcement index-4
+    Fields: widget-title, title-head, date-head, title, postdate, pagination
+ -->
+<div class="i-announcement  annc-index-4  i-announcement--table">
+  <table class="i-announcement__table">
+    <thead>
+      <tr>
+        <th class="i-announcement__th  i-announcement__th--title">{{title-head}}</th>
+        <th class="i-announcement__th  i-announcement__th--date">{{date-head}}</th>
+      </tr>
+    </thead>
+    <tbody class="i-announcement__tbody" data-level="0" data-list="announcements">
+      <tr>
+        <td>
+          <a class="i-announcement__link  i-announcement__td--link" href="{{link_to_show}}">{{title}}</a>
+        </td>
+        <td>
+          <span class="i-announcement__date  i-announcement__td--postdate" date-format="%Y-%m-%d">{{postdate}}</span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+{{pagination_goes_here}}
+<div class="i-sidebar">
+</div>
\ No newline at end of file
diff --git a/app/templates/nccu/modules/announcement/info.json b/app/templates/nccu/modules/announcement/info.json
index 9074002..21d28eb 100644
--- a/app/templates/nccu/modules/announcement/info.json
+++ b/app/templates/nccu/modules/announcement/info.json
@@ -11,7 +11,7 @@
         {
             "filename" : "annc_index2",
             "name" : {
-                "zh_tw" : "2. 純文字無圖片(招生公告專用) ( 模組標題, 日期, 標題 )",
+                "zh_tw" : "2. 純文字無圖片 ( 模組標題, 日期, 標題 )",
                 "en" : "2. Text without image (widget-title, postdate, title)"
                 },
             "thumbnail" : "thumbnail-block-list.png"
@@ -19,10 +19,18 @@
        {
             "filename" : "annc_index3",
             "name" : {
-                "zh_tw" : "3. 純文字無圖片(沒有sidebar) ( 模組標題, 日期, 標題 )",
+                "zh_tw" : "3. 純文字無圖片(招生公告專用) ( 模組標題, 日期, 標題 )",
                 "en" : "3. Text without image and no sidebar (widget-title, postdate, title)"
                 },
             "thumbnail" : "thumbnail-block-list.png"
+        },
+       {
+            "filename" : "annc_index4",
+            "name" : {
+                "zh_tw" : "4. 純文字無圖片(在校學生, 訪客, 教職員工專用) ( 模組標題, 日期, 標題 )",
+                "en" : "4. Text without image and no sidebar (widget-title, title, postdate)"
+                },
+            "thumbnail" : "thumbnail-block-list.png"
         }
 	],
 	"widgets" : [