developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix after merge from NCCU, the translations still need to be cleaned

This commit is contained in:
chris 2012-10-30 11:08:26 +08:00
parent 65ac6980c4
commit cc5e238576
7 changed files with 44 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
app/assets/stylesheets/style.css.erb
View File

@ -470,202 +470,6 @@
padding: 5px; padding: 5px;
}*/ }*/
<<<<<<< HEAD
.member td.teacher {
/*background-color: #AF0045;
border-left: 2px solid #AF0045;*/
}
.gender {
position: absolute;
border-radius: 0 0 5px 0;
border-width: 10px;
margin: 0;
border-style: solid;
z-index: 10;
bottom: 0;
right: 0;
}
.gender.male {
border-color: transparent #41B1D5 #41B1D5 transparent;
}
.gender.female {
border-color: transparent #DB186E #DB186E transparent;
}
.user-info {
position: fixed;
right: 0px;
left: 160px;
top: 31px;
background-color: #FFF;
padding: 20px 20px 0;
}
.user-info hr {
margin-bottom: 0px;
}
.roles-nav {
position: relative;
list-style: none;
margin: 0;
padding: 0;
position: fixed;
}
.roles-nav li {
list-style: none;
background-color: #D8D8D8;
}
.roles-nav li a {
display: block;
padding: 5px 20px;
text-decoration: none;
}
/*.user-info .roles-nav li:first-child a {
border-radius: 0 0 0 4px;
}*/
/*.user-info .roles-nav li:last-child a {
border-radius: 0 0 4px 0;
}*/
/*.user-info .roles-nav li hr {
position: absolute;
top: 0;
left: 0;
right: 0;
height: 3px;
margin: 0;
border: none;
display: none;
}*/
/*.user-info .roles-nav li.teacher a {
background-color: #F36F08;
}*/
/*.user-info .roles-nav li.student a {
background-color: #186AB6;
}*/
/*.user-info .roles-nav li.staff a {
background-color: #139E2F;
}*/
/*.user-info .roles-nav li.active a {
border-bottom: none;
height: 18px;
margin-top: 0;
opacity: 1;
-moz-opacity: 1;
filter:alpha(opacity=10);
}*/
/*.user-info .roles-nav li.active hr {
display: block;
}*/
.user-info-basic {
position: relative;
background-color: #F0F0F0;
margin-left: 100px;
padding: 20px 20px 0;
border-radius: 5px 5px 0 0;
}
.user-info-basic .gender {
border-radius: 0;
top: 0;
left: 0;
right: auto;
bottom: auto;
border-radius: 5px 0 0 0;
}
.user-info-basic .gender.male {
border-color: #41B1D5 transparent transparent #41B1D5;
}
.user-info-basic .gender.female {
border-color: #DB186E transparent transparent #DB186E;
}
.user-info-roles {
margin-left: 100px;
background-color: #F0F0F0;
border-radius: 0 0 5px 5px;
padding: 20px;
}
.user-avatar {
overflow: hidden;
width: 80px;
height: 80px;
margin-bottom: 10px;
margin-right: 20px;
border-radius: 5px;
box-shadow: 0 1px 3px rgba(0,0,0,.8);
}
.user-avatar .reflective {
background-image: url(<%= asset_path 'reflective.png' %>);
background-repeat: no-repeat;
background-position: 0;
height: 80px;
width: 80px;
position: absolute;
}
.user .user-avatar .reflective {
background-image: url(<%= asset_path 'reflective.png' %>);
background-repeat: no-repeat;
background-position: 0 -20px;
height: 80px;
width: 80px;
position: absolute;
top: 10px;
left: 10px;
opacity: 0;
-moz-opacity: 0;
filter:alpha(opacity=0);
}
.user:hover .user-avatar .reflective {
background-position: 0 0;
opacity: 1;
-moz-opacity: 1;
filter:alpha(opacity=10);
}
.user-name {
font-size: 2.2em;
line-height: 24px;
color: #555;
margin: 0 0 3px;
font-family: Helvetica, "微軟正黑體";
}
.user-data {
padding: 0 0 20px 0;
margin: 109px 20px 0;
}
/*.data-block hr {
background-color: #666;
height: 8px;
border: none;
margin: 0;
border-radius: 5px 5px 0px 0px;
-moz-border-radius: 5px 5px 0px 0px;
-webkit-border-radius: 5px 5px 0px 0px;
}*/
/*.data-block .info_input {
margin-bottom:50px;
position:relative;
padding: 10px;
background-color: rgba(227,227,227,1);
border-radius: 0px 0px 5px 5px;
-moz-border-radius: 0px 0px 5px 5px;
-webkit-border-radius: 0px 0px 5px 5px;
-moz-box-shadow: 0px 1px 0px rgba(0,0,0,.3); /* Firefox */
/*-webkit-box-shadow: 0px 1px 0px rgba(0,0,0,.3);/* Safari 和 Chrome */
/*box-shadow: 0px 1px 0px rgba(0,0,0,.3); /* Opera 10.5 + */
/*}*/
/*.data-block .info_input table {
width: 100%;
}*/
/*.data-block .info_input table .list_head td {
border-bottom: 1px solid #AAA;
}*/
/*.teacher hr {
background-color: #F36F08;
}*/
/*.student hr {
background-color: #186AB6;
}*/
/*.staff hr {
background-color: #139E2F;
}*/
=======
>>>>>>> various_bugs
.view-mode { .view-mode {
margin: 6px 10px 0 0; margin: 6px 10px 0 0;
} }

85
app/views/layouts/_side_bar.html.erb
View File

@ -1,87 +1,3 @@
<<<<<<< HEAD
<%#= content_tag :li, :class => active_for_controllers('purchases') do -%>
<%#= link_to content_tag(:i, nil, :class => 'icons-purchase') + t(:purchase), admin_purchases_path %>
<%# end -%>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag "/static/kernel.js" %>
<% end %>
<%= content_tag :li, :class => (active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') || active_for_app_auth('Announcement') || active_for_ob_auths_object("BulletinCategory") ) do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('announcement.announcement'), panel_announcement_back_end_bulletins_path %>
<%= content_tag :ul, :class => ("nav nav-list " + (visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')||active_for_ob_auths_object("BulletinCategory"))) do -%>
<%= content_tag :li, link_to(t(:list_), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
<%= content_tag :li, link_to(t(:add), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
<%= content_tag :li, link_to(t(:categories), panel_announcement_back_end_bulletin_categorys_path), :class =>( active_for_action('bulletin_categorys', 'index') || active_for_ob_auths_object("BulletinCategory") ) %>
<%= content_tag :li, link_to(t(:tags), panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index') %>
<%= content_tag :li, link_to(t('approval.setting'), panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting') if (is_manager? rescue true) %>
<%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_for_app_auth('Announcement') if (is_admin? rescue nil) %>
<% end -%>
<% end -%>
<%= content_tag :li, :class =>( active_for_controllers('news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals')|| active_for_app_auth('news') || active_for_ob_auths_object("NewsBulletinCategory")) do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t(:news), panel_news_back_end_news_bulletins_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals')) do -%>
<%= content_tag :li, link_to(t(:list_), panel_news_back_end_news_bulletins_path), :class => active_for_action('news_bulletins', 'index') %>
<%= content_tag :li, link_to(t(:add), new_panel_news_back_end_news_bulletin_path), :class => active_for_action('news_bulletins', 'new') %>
<%= content_tag :li, link_to(t(:categories), panel_news_back_end_news_bulletin_categorys_path), :class => active_for_action('news_bulletin_categorys', 'index') || active_for_ob_auths_object("NewsBulletinCategory") %>
<%= content_tag :li, link_to(t(:tags), panel_news_back_end_tags_path), :class => active_for_action('/panel/news/back_end/tags', 'index') %>
<%= content_tag :li, link_to(t('approval.setting'), panel_news_back_end_approval_setting_path), :class => active_for_action('news_approvals', 'setting') if (is_manager? rescue true) %>
<%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "news"}))), :class => active_for_app_auth('news') if (is_admin? rescue nil) %>
<% end -%>
<% end -%>
<%#= content_tag :li, :class => active_for_controllers('users') do -%>
<%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member), admin_users_path %>
<%# end -%>
<%= content_tag :li, :class => active_for_controllers('page_contexts') || active_for_app_auth('page_content') || active_for_ob_auths_object("PageContext") do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-page') + t(:page), panel_page_content_back_end_page_contexts_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%>
<%#= content_tag :li, link_to(t(:list_), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %>
<%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "page_content"}))), :class => active_for_app_auth('page_content') if (is_admin? rescue nil) %>
<% end -%>
<% end -%>
<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') ||active_for_ob_auths_object("AdBanner") ||active_for_app_auth('ad_banners') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-link') + t(:ad_banner), admin_ad_banners_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images') ) do -%>
<%#= content_tag :li, link_to(t('list.ad_banner'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
<%#= content_tag :li, link_to(t('new.banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
<%#= content_tag :li, link_to(t('ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
<%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "ad_banners"}))), :class => active_for_app_auth('ad_banners') if (is_admin? rescue nil) %>
<% end -%>
<% end %>
<%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') || active_for_app_auth('web_resource') || active_for_ob_auths_object("WebLinkCategory") do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-link') + t(:link), panel_web_resource_back_end_web_links_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys')) do -%>
<%= content_tag :li, link_to(t(:list_), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_links', 'index') %>
<%= content_tag :li, link_to(t(:add), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') %>
<%= content_tag :li, link_to(t(:categories), panel_web_resource_back_end_web_link_categorys_path), :class => (active_for_action('web_link_categorys', 'index') || active_for_ob_auths_object("WebLinkCategory")) %>
<%= content_tag :li, link_to(t(:tags), panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') %>
<%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "web_resource"}))), :class => active_for_app_auth('web_resource') if (is_admin? rescue nil) %>
<% end -%>
<% end -%>
<%#= content_tag :li, :class => active_for_controllers('assets', '/admin/asset_tags', 'asset_categories') do -%>
<%#= link_to content_tag(:i, nil, :class => 'icons-link') + t(:asset), admin_assets_path %>
<%#= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('assets', '/admin/asset_tags', 'asset_categories')) do -%>
<%#= content_tag :li, link_to(t('list.asset'), admin_assets_path), :class => active_for_action('assets', 'index') %>
<%#= content_tag :li, link_to(t(:categories), admin_asset_categories_path), :class => active_for_action('asset_categories', 'index') %>
<%#= content_tag :li, link_to(t(:tags), admin_asset_tags_path), :class => active_for_action('/admin/asset_tags', 'index') %>
<%# end -%>
<%# end -%>
<div class="content">
<% flash.each do |key, msg| %>
<%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
<% end%>
</div>
=======
<div id="main-sidebar" class="my_scroll"> <div id="main-sidebar" class="my_scroll">
<div id="position"> <div id="position">
<%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-dashboard') + content_tag(:span, (local_assigns.has_key? :link_name) ? link_name : t('admin.dashboard')), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %> <%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-dashboard') + content_tag(:span, (local_assigns.has_key? :link_name) ? link_name : t('admin.dashboard')), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
@ -102,4 +18,3 @@
</div> </div>
</div> </div>
</div> </div>
>>>>>>> various_bugs

18
config/locales/en.yml
View File

@ -214,14 +214,14 @@ en:
text: Text Area text: Text Area
passed: Approved passed: Approved
password: Password password: Password
<<<<<<< HEAD # : <<<<<<< HEAD
pending: Pending pending: Pending
picture: Picture picture: Picture
postdate: Postdate postdate: Postdate
posted_by: Posted by posted_by: Posted by
preview: Preview preview: Preview
purchase: Purchase purchase: Purchase
======= # : =======
register: Register register: Register
remember_me: Remember me remember_me: Remember me
search_google: Search Google search_google: Search Google
@ -247,7 +247,7 @@ en:
member: Member member: Member
module: Module module: Module
most_visited_page: Most Visited Page most_visited_page: Most Visited Page
>>>>>>> various_bugs # : >>>>>>> various_bugs
quantity: Quantity quantity: Quantity
quick_edit: Quick edit quick_edit: Quick edit
recent_update: Recent Update recent_update: Recent Update
@ -347,7 +347,7 @@ en:
visitors_today: Today's visitors visitors_today: Today's visitors
yes_: "Yes" yes_: "Yes"
<<<<<<< HEAD # : <<<<<<< HEAD
nccu: nccu:
date: Date date: Date
file: File file: File
@ -356,7 +356,7 @@ en:
link_name: Name link_name: Name
picture: Picture picture: Picture
selected_file: File selected_file: File
======= # : =======
errors: errors:
at_least_one: must at least have one value at_least_one: must at least have one value
@ -530,11 +530,11 @@ en:
site_title: Site title site_title: Site title
super_pages: Super pages super_pages: Super pages
structure: Structure structure: Structure
>>>>>>> various_bugs # : >>>>>>> various_bugs
tags: Tags tags: Tags
url: URL url: URL
<<<<<<< HEAD # : <<<<<<< HEAD
======= # : =======
user: User user: User
user_new_interface: user_new_interface:
sys_basic_form: User system info sys_basic_form: User system info
@ -585,4 +585,4 @@ en:
result_get: "Searched about ' %{search_word} ' Found %{item_num} items" result_get: "Searched about ' %{search_word} ' Found %{item_num} items"
too_many: "Search about ' %{search_word} 'resulted more than %{exceed_num} items maybe try to search with more specific terms?" too_many: "Search about ' %{search_word} 'resulted more than %{exceed_num} items maybe try to search with more specific terms?"
unit_get: "Listed items created by :%{unit_name} Found %{item_num} items" unit_get: "Listed items created by :%{unit_name} Found %{item_num} items"
>>>>>>> various_bugs # : >>>>>>> various_bugs

12
config/locales/zh_tw.yml
View File

@ -338,8 +338,8 @@ zh_tw:
<<<<<<< HEAD # : <<<<<<< HEAD
======= # : =======
errors: errors:
at_least_one: 必須至少有一個值 at_least_one: 必須至少有一個值
@ -603,7 +603,7 @@ zh_tw:
>>>>>>> various_bugs # : >>>>>>> various_bugs
# Chinese (Taiwan) translations for Ruby on Rails # Chinese (Taiwan) translations for Ruby on Rails
# by tsechingho (http://github.com/tsechingho) # by tsechingho (http://github.com/tsechingho)
date: date:
@ -818,7 +818,7 @@ zh_tw:
other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。" other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。"
body: "以下欄位發生問題：" body: "以下欄位發生問題："
<<<<<<< HEAD # : <<<<<<< HEAD
mongoid: mongoid:
models: models:
news_bulletin: 新聞 news_bulletin: 新聞
@ -835,7 +835,7 @@ zh_tw:
web_link: web_link:
title: 名稱 title: 名稱
url: 路徑 url: 路徑
======= # : =======
helpers: helpers:
select: select:
prompt: "請選擇" prompt: "請選擇"
@ -856,4 +856,4 @@ zh_tw:
object_disable: object_disable:
change_to_true: "設為停用" change_to_true: "設為停用"
change_to_false: "重新啓用" change_to_false: "重新啓用"
>>>>>>> various_bugs # : >>>>>>> various_bugs

2
config/mongoid.yml
View File

@ -2,7 +2,7 @@ defaults: &defaults
host: localhost host: localhost
# slaves: # slaves:
# - host: slave1.local # - host: slave1.local
port: 37017 port: 27017
# - host: slave2.local # - host: slave2.local
# port: 27019 # port: 27019

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

@ -14,6 +14,20 @@
<div class="accordion-heading"> <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(:tags) %> <b class="web-symbol"></b></a>
</div> </div>
</li>
</ul>
<div class="filters">
<div class="accordion-body collapse" id="collapse-status">
<%= render 'filter_status' %>
</div>
<div class="accordion-body collapse" id="collapse-category">
<%= render 'filter_categories' %>
</div>
<div class="accordion-body collapse" id="collapse-tags">
<%= render 'filter_tags' %>
</div>
<div id="sort_headers" class="table-label">
<%= render 'sort_headers' %>
</div> </div>
</div> </div>
</div> </div>

14
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb vendored
View File

@ -14,6 +14,20 @@
<div class="accordion-heading"> <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(:tags) %> <b class="web-symbol"></b></a>
</div> </div>
</li>
</ul>
<div class="filters">
<div class="accordion-body collapse" id="collapse-status">
<%= render 'filter_status' %>
</div>
<div class="accordion-body collapse" id="collapse-category">
<%= render 'filter_categories' %>
</div>
<div class="accordion-body collapse" id="collapse-tags">
<%= render 'filter_tags' %>
</div>
<div id="sort_headers" class="table-label">
<%= render 'sort_headers' %>
</div> </div>
</div> </div>
</div> </div>