developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix announcement versioning 

Conflicts:

	Gemfile
This commit is contained in:
iCross 2013-06-26 21:47:59 +08:00
parent 2eaa44c279
commit 11e9f5d7cd
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -64,6 +64,8 @@ gem 'rmmseg-cpp-huacnlee', '0.2.9'
gem 'redis-namespace' gem 'redis-namespace'
gem 'redis-search' gem 'redis-search'
gem 'syslog-logger' gem 'syslog-logger'
gem "recaptcha", :require => "recaptcha/rails"
gem 'mongoid-versioning'
# Gems used only for assets and not required # Gems used only for assets and not required
# in production environments by default. # in production environments by default.

2
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/index.html.erb vendored
View File

@ -11,7 +11,7 @@
<% @bulletin.versions.reverse.each do |version| %> <% @bulletin.versions.reverse.each do |version| %>
<tr class="with_action"> <tr class="with_action">
<td> <td>
<%= version.title[I18n.locale.to_s] %> <%= version.title %>
<div class="quick-edit"> <div class="quick-edit">
<%= link_to '顯示', panel_announcement_back_end_bulletin_bulletin_version_path(@bulletin, version.version) %> <%= link_to '顯示', panel_announcement_back_end_bulletin_bulletin_version_path(@bulletin, version.version) %>
</div> </div>

6
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/show.html.erb vendored
View File

@ -1,15 +1,15 @@
<ul> <ul>
<li> <li>
<b><%= t(:name) %></b> <b><%= t(:name) %></b>
<%= @version.title[I18n.locale.to_s] %> <%= @version.title %>
</li> </li>
<li> <li>
<b><%= t(:subtitle) %></b> <b><%= t(:subtitle) %></b>
<%= @version.subtitle[I18n.locale.to_s] %> <%= @version.subtitle %>
</li> </li>
<li> <li>
<b><%= t(:text) %></b> <b><%= t(:text) %></b>
<%= simple_format @version.text[I18n.locale.to_s] %> <%= simple_format @version.text %>
</li> </li>
<li> <li>
<b><%= t(:deadline) %></b> <b><%= t(:deadline) %></b>