saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap

This commit is contained in:
Christophe Vilayphiou 2012-04-23 18:10:16 +08:00
parent 5a423178e3 e0d3319ea9
commit 4f87165039
3 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendored
View File

@ -2,17 +2,17 @@
<ul class="nav nav-pills filter">
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:status) %> <b class="web-symbol"></b></a>
<a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("announcement.status") %> <b class="web-symbol"></b></a>
</div>
</li>
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:category) %> <b class="web-symbol"></b></a>
<a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("announcement.categories") %> <b class="web-symbol"></b></a>
</div>
</li>
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:tags) %> <b class="web-symbol"></b></a>
<a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("announcement.tags") %> <b class="web-symbol"></b></a>
</div>
</li>
</ul>
@ -30,4 +30,4 @@
<%= render 'sort_headers' %>
</div>
</div>
</div>
</div>

4
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb vendored
View File

@ -9,7 +9,7 @@
<%= link_to t('bulletin.status') + content_tag(:b, nil, :class => is_sort?('status')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('status'))), :class => 'js_history' %>
</th>
<th class="sort span1-2 <%= is_sort_active?('category') %>">
<%= link_to t('bulletin.category') + content_tag(:b, nil, :class => is_sort?('category')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('category'))), :class => 'js_history' %>
<%= (link_to t('bulletin.category') + content_tag(:b, nil, :class => is_sort?('category')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('category'))), :class => 'js_history').html_safe %>
</th>
<th class="sort span7 <%= is_sort_active?('title') %>">
<%= link_to t('bulletin.title') + content_tag(:b, nil, :class => is_sort?('title')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('title'))), :class => 'js_history' %>
@ -28,4 +28,4 @@
</th>
</tr>
</thead>
</table>
</table>

36
vendor/built_in_modules/announcement/config/locales/zh_tw.yml vendored
View File

@ -2,6 +2,12 @@ zh_tw:
_locale: 中文
basic: 基礎資訊
picture: 圖片
tags: 標籤
link: 連結
file: 檔案
add: 新增
back: 回去
create: 創造
@ -18,7 +24,22 @@ zh_tw:
update: 更新
yes_: "Yes"
is_hot: 熱門
is_top: 置頂
is_hidden: 隱藏
is_checked: 通過
is_pending: 待審核
is_rejected: 不通過
clear: 清除
quick_edit: 快速編輯
announcement:
add_new: 新增公告
all_articles: 公告列表
tags: 標籤
categories: 分類
status: 狀態
sure?: 確定嗎?
campus_news: 校園新聞
more: 更多+
@ -33,12 +54,23 @@ zh_tw:
fact_check: 公告審核
fact_check_setting: 審核設定
fact_check_stat: 審核狀況
fact_check_pending: 審核中
fact_check_pending: 待審核
fact_check_not_pass: '不通過'
fact_check_pass: '通過'
fact_check_not_pass_reason: '不通過原因'
fact_check_setting_window_title: '單位'
# admin:
bulletin:
last_modified: 最後修改於
tags: 標籤
end_date: 下架時間
start_date: 上架時間
category: 分類
status: 狀態
title: 標題
fact_check: 公告審核
delete: 刪除
edit: 編輯
# action: 行動
# add_language: 新增語言
# admin: 管理