diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js
index 70bc22bd..f5fed368 100644
--- a/app/assets/javascripts/new_admin.js
+++ b/app/assets/javascripts/new_admin.js
@@ -16,4 +16,4 @@
//= require orbit-bar-search
//= require side_bar_history
//= require rss
-//= require ajax_form
\ No newline at end of file
+//= require ajax_form
diff --git a/app/assets/javascripts/tinymce_orbit.js b/app/assets/javascripts/tinymce_orbit.js.erb
similarity index 61%
rename from app/assets/javascripts/tinymce_orbit.js
rename to app/assets/javascripts/tinymce_orbit.js.erb
index 9e0853e3..51f86b6f 100644
--- a/app/assets/javascripts/tinymce_orbit.js
+++ b/app/assets/javascripts/tinymce_orbit.js.erb
@@ -4,7 +4,7 @@ function load_tinymce() {
// General options
theme: 'advanced',
file_browser_callback : 'myFileBrowser',
- plugins : "autolink,lists,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template",
+ plugins : "autolink,lists,pagebreak,style,layer,table,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
// Theme options
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
@@ -42,37 +42,36 @@ function load_tinymce() {
staffid : "991234"
}
});
- function myFileBrowser (field_name, url, type, win) {
+}
+function myFileBrowser(field_name, url, type, win) {
+ var cmsURL = window.location.toString();
+ cmsURL = cmsURL.split("/");
+ cmsURL = "<%= Rails.application.routes.url_helpers.file_upload_admin_assets_path %>";
+ console.log(cmsURL);
+ // script URL - use an absolute path!
+ if (cmsURL.indexOf("?") < 0) {
+ //add the type as the only query parameter
+ cmsURL = cmsURL + "?type=" + type;
+ }
+ else {
+ //add the type as an additional query parameter
+ // (PHP session ID is now included if there is one at all)
+ cmsURL = cmsURL + "&type=" + type;
+ }
-
- var cmsURL = window.location.toString();
- cmsURL = cmsURL.split("/");
- // cmsURL = "http:///modules/modules/filemanager/";
-
- // script URL - use an absolute path!
- if (cmsURL.indexOf("?") < 0) {
- //add the type as the only query parameter
- cmsURL = cmsURL + "?type=" + type;
- }
- else {
- //add the type as an additional query parameter
- // (PHP session ID is now included if there is one at all)
- cmsURL = cmsURL + "&type=" + type;
- }
-
- tinyMCE.activeEditor.windowManager.open({
- file : cmsURL,
- title : 'File Browser',
- width : 850, // Your dimensions may differ - toy around with them!
- height : 455,
- resizable : "no",
- inline : "no", // This parameter only has an effect if you use the inlinepopups plugin!
- close_previous : "no"
- }, {
- window : win,
- input : field_name
- });
- return false;
+ tinyMCE.activeEditor.windowManager.open({
+ file : cmsURL,
+ title : 'File Browser',
+ width : 850, // Your dimensions may differ - toy around with them!
+ height : 455,
+ resizable : "no",
+ inline : "no", // This parameter only has an effect if you use the inlinepopups plugin!
+ close_previous : "no"
+ }, {
+ window : win,
+ input : field_name,
+ });
+ return false;
}
function ajaxSave() {
var ed = tinyMCE.get('content');
@@ -83,7 +82,6 @@ function load_tinymce() {
alert(ed.getContent());
}, 3000);
}
-}
$(document).ready(function() {
load_tinymce();
diff --git a/app/controllers/admin/asset_tags_controller.rb b/app/controllers/admin/asset_tags_controller.rb
new file mode 100644
index 00000000..ea3fc41e
--- /dev/null
+++ b/app/controllers/admin/asset_tags_controller.rb
@@ -0,0 +1,8 @@
+class Admin::AssetTagsController < Admin::TagsController
+
+ def initialize
+ super
+ @app_title = 'asset'
+ end
+
+end
\ No newline at end of file
diff --git a/app/controllers/admin/assets_controller.rb b/app/controllers/admin/assets_controller.rb
index b595ed5b..fb4865a2 100644
--- a/app/controllers/admin/assets_controller.rb
+++ b/app/controllers/admin/assets_controller.rb
@@ -11,6 +11,7 @@ class Admin::AssetsController < OrbitBackendController
def new
@asset = Asset.new
@asset_categories = AssetCategory.all
+ @tags = AssetTag.all
respond_to do |format|
format.html {}
format.js { render 'js/show_pop_up', :locals => {:partial => 'admin/assets/new'} }
@@ -20,6 +21,7 @@ class Admin::AssetsController < OrbitBackendController
def edit
@asset = Asset.find(params[:id])
@asset_categories = AssetCategory.all
+ @tags = AssetTag.all
respond_to do |format|
format.html {}
format.js { render 'js/show_pop_up', :locals => {:partial => 'admin/assets/edit'} }
@@ -28,15 +30,29 @@ class Admin::AssetsController < OrbitBackendController
def create
@asset = Asset.new(params[:asset])
- if @asset.save
+ @asset.filename = @asset.i18n_variable[I18n.locale] rescue nil
+ if @asset.filename && @asset.save
respond_to do |format|
- format.html { redirect_to admin_assets_url }
- format.js { render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'append', :id => 'tbody_assets', :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil} }
+ format.js {
+ if params[:uploader]
+ render 'create'
+ else
+ render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'replaceWith', :id => "asset_#{@asset.id}", :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil}
+ end
+ }
end
else
+ flash[:error] = t(:create_fail)
+ @asset_categories = AssetCategory.all
+ @tags = AssetTag.all
respond_to do |format|
- format.html { render :action => :new }
- format.js { render 'js/reload_pop_up', :locals => {:value => @asset, :values => nil, :partial => 'admin/assets/new', :locals => {:is_html => false}} }
+ format.js {
+ if params[:uploader]
+ render 'file_upload'
+ else
+ render 'js/reload_pop_up', :locals => {:value => @asset, :values => nil, :partial => 'admin/assets/new', :locals => {:is_html => false}}
+ end
+ }
end
end
end
@@ -49,6 +65,9 @@ class Admin::AssetsController < OrbitBackendController
format.js { render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'replaceWith', :id => "asset_#{@asset.id}", :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil} }
end
else
+ flash[:error] = t(:update_fail)
+ @asset_categories = AssetCategory.all
+ @tags = AssetTag.all
respond_to do |format|
format.html { render :action => :edit }
format.js { render 'js/reload_pop_up', :locals => {:value => @asset, :values => nil, :partial => 'admin/assets/edit', :locals => {:is_html => false}} }
@@ -71,5 +90,17 @@ class Admin::AssetsController < OrbitBackendController
end
redirect_to assets_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
end
+
+ def file_upload
+ @asset = Asset.new
+ @asset_categories = AssetCategory.all
+ @tags = AssetTag.all
+ render :layout => false
+ end
+
+ def file_select
+ @assets = Asset.all
+ render :layout => false
+ end
end
diff --git a/app/helpers/admin/dashboard_helper.rb b/app/helpers/admin/dashboard_helper.rb
index f69185f3..dfe5763f 100644
--- a/app/helpers/admin/dashboard_helper.rb
+++ b/app/helpers/admin/dashboard_helper.rb
@@ -20,7 +20,7 @@ module Admin::DashboardHelper
when 'news_bulletin'
panel_news_front_end_news_bulletin_path(object)
when'page_context'
- panel_page_content_front_end_page_context_path(object)
+ "/#{object.page.path}"
when'web_link'
panel_web_resource_front_end_web_link_path(object)
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 59b45c27..fc93c29a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -200,4 +200,8 @@ module ApplicationHelper
display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
end
+ def at_least_module_manager
+ is_manager? || is_admin?
+ end
+
end
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 2bb02dfc..9819934f 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -8,9 +8,16 @@ class Asset
field :filename
field :description
+ has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
+
validates_presence_of :filename, :data
belongs_to :asset_category
belongs_to :assetable, polymorphic: true
+ has_and_belongs_to_many :tags, :class_name => "AssetTag"
+
+ def sorted_tags
+ tags.order_by(I18n.locale, :asc)
+ end
end
diff --git a/app/models/asset_tag.rb b/app/models/asset_tag.rb
new file mode 100644
index 00000000..344a8e2e
--- /dev/null
+++ b/app/models/asset_tag.rb
@@ -0,0 +1,5 @@
+class AssetTag < Tag
+
+ has_and_belongs_to_many :assets
+
+end
\ No newline at end of file
diff --git a/app/views/admin/assets/_asset.html.erb b/app/views/admin/assets/_asset.html.erb
index 99ac636e..9eb4e77a 100644
--- a/app/views/admin/assets/_asset.html.erb
+++ b/app/views/admin/assets/_asset.html.erb
@@ -1,7 +1,8 @@
<%= check_box_tag 'to_delete[]', asset.id, false, :class => "checkbox_in_list" %>
+ <%= asset.i18n_variable[I18n.locale] rescue nil %>
- <%= image_tag(asset.data.url) %>
+
<%= link_to t(:edit), edit_admin_asset_path(asset), :remote => true, :class => 'edit' %>
@@ -9,8 +10,22 @@
- <%= asset.description %>
<%= asset.data.file.content_type %>
- <%= asset.data_identifier %>
<%= number_to_human_size(asset.data.file.file_length) %>
+ <%= asset.category.i18n_variable[I18n.locale] rescue nil %>
+
+
+
+ <% asset.sorted_tags.each do |tag| %>
+ <%= tag[I18n.locale] %>
+ <% end %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/admin/assets/_edit.html.erb b/app/views/admin/assets/_edit.html.erb
index a62524c0..0e592d19 100644
--- a/app/views/admin/assets/_edit.html.erb
+++ b/app/views/admin/assets/_edit.html.erb
@@ -1,6 +1,8 @@
<%= t('editing_asset') %>
+ <%= flash_messages %>
+
<%= form_for @asset, :url => admin_asset_path(@asset), :html => {:id => (is_html ? nil : 'ajaxForm'), :multipart => true } do |f| %>
<%= f.error_messages %>
<%= render :partial => "form", :locals => { :f => f } %>
@@ -9,7 +11,7 @@
<%= link_back %>
<%= f.submit t(:edit) %>
<% else %>
-
<%= t(:update) %>
+
<%= t(:update) %>
<% end %>
<% end %>
diff --git a/app/views/admin/assets/_form.html.erb b/app/views/admin/assets/_form.html.erb
index 6abb883e..4e1589f4 100644
--- a/app/views/admin/assets/_form.html.erb
+++ b/app/views/admin/assets/_form.html.erb
@@ -1,19 +1,38 @@
-
-<%= f.label :filename, t('admin.file_name') %>
-<%= f.text_field :filename, :class => 'text' %>
-
-
-
-<%= f.label :description, t('admin.description') %>
-<%= f.text_field :description, :class => 'text' %>
-
-
-
-<%= f.label :category %>
-<%= f.select :asset_category_id, @asset_categories.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
-
-
-
-<%= f.label :data, t('admin.data'), :class => 'file' %>
-<%= f.file_field :data %>
-
\ No newline at end of file
+
+
<%= t 'admin.title' %>
+
+ <%= f.fields_for :i18n_variable, (@asset.new_record? ? @asset.build_i18n_variable : @asset.i18n_variable) do |f| %>
+ <% @site_valid_locales.each do |locale| %>
+ <%= content_tag :label do -%>
+
+ <%= I18nVariable.from_locale(locale) %>
+ <%= f.text_field locale, :class => "input-large" %>
+
+ <% end %>
+ <% end %>
+ <% end %>
+
+
+
+
<%= f.label :category, t('admin.category') %>
+
+ <%= f.select :asset_category_id, @asset_categories.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-large" %>
+
+
+
+
<%= t 'admin.tags' %>
+
+ <% @tags.each do |tag| %>
+ <%= content_tag :label, :class => "checkbox inline" do -%>
+ <%= check_box_tag 'asset[tag_ids][]', tag.id, @asset.tag_ids.include?(tag.id) %>
+ <%= tag[I18n.locale] %>
+ <% end %>
+ <% end %>
+
+
+
+
<%= f.label :data, t('admin.data') %>
+
+ <%= f.file_field :data, :class => 'upload' %>
+
+
\ No newline at end of file
diff --git a/app/views/admin/assets/_new.html.erb b/app/views/admin/assets/_new.html.erb
index 85d3c2e5..d8838278 100644
--- a/app/views/admin/assets/_new.html.erb
+++ b/app/views/admin/assets/_new.html.erb
@@ -1,16 +1,13 @@
<%= t('admin.new_asset') %>
- <%= form_for :asset, :url => admin_assets_path, :html => {:id => (is_html ? nil : 'ajaxForm'), :multipart => true } do |f| %>
+ <%= flash_messages %>
+
+ <%= form_for :asset, :url => admin_assets_path, :html => {:id => 'ajaxForm', :multipart => true } do |f| %>
<%= f.error_messages %>
<%= render :partial => "form", :locals => { :f => f } %>
<% end %>
diff --git a/app/views/admin/assets/_sort_headers.html.erb b/app/views/admin/assets/_sort_headers.html.erb
index 2c8ca234..86e5f86a 100644
--- a/app/views/admin/assets/_sort_headers.html.erb
+++ b/app/views/admin/assets/_sort_headers.html.erb
@@ -1,5 +1,6 @@
-<%= render_sort_bar(true, ['title', 'title','span1-2', 'admin.title'],
- ['description', 'description', 'span1-2', 'admin.description'],
- ['intro', 'intro', 'span1-2', 'admin.intro'],
- ['intro', 'intro', 'span1-2', 'admin.intro'],
- ['intro', 'intro', 'span1-2', 'admin.file_length']).html_safe %>
+<%= render_sort_bar(true, ['title', 'title','span4', 'admin.title'],
+ ['description', 'description', 'span1-2', 'admin.data'],
+ ['intro', 'intro', 'span1-2', 'admin.file_type'],
+ ['intro', 'intro', 'span1-2', 'admin.file_length'],
+ ['intro', 'intro', 'span1-2', 'admin.category'],
+ ['intro', 'intro', 'span1-2', 'admin.tags']).html_safe %>
diff --git a/app/views/admin/assets/create.js.erb b/app/views/admin/assets/create.js.erb
new file mode 100644
index 00000000..38c7992c
--- /dev/null
+++ b/app/views/admin/assets/create.js.erb
@@ -0,0 +1,19 @@
+
+// Uncomment and change this document.domain value if you are loading the script cross subdomains
+// document.domain = 'moxiecode.com';
+
+var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/page_parts/edit.js.erb b/app/views/admin/page_parts/edit.js.erb
index 5dd8351c..3e50360c 100644
--- a/app/views/admin/page_parts/edit.js.erb
+++ b/app/views/admin/page_parts/edit.js.erb
@@ -1 +1,44 @@
-$('#back_main').html("<%= j render(:partial => 'edit') %>");
\ No newline at end of file
+$('#back_main').html("<%= j render(:partial => 'edit') %>");
+tinymce.init({
+ // General options
+ mode: 'textareas',
+ theme: 'advanced',
+ file_browser_callback : 'myFileBrowser',
+ plugins : "autolink,lists,pagebreak,style,layer,table,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
+
+ // Theme options
+ theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
+ theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,bullist,numlist,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,forecolor,backcolor",
+ theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,fullscreen",
+ theme_advanced_toolbar_location : "top",
+ theme_advanced_toolbar_align : "left",
+ theme_advanced_statusbar_location : "bottom",
+ theme_advanced_resizing : true,
+
+ // Skin options
+ skin : "o2k7",
+ skin_variant : "silver",
+
+ // Drop lists for link/image/media/template dialogs
+ template_external_list_url : "js/template_list.js",
+ // external_link_list_url : "js/link_list.js",
+ // external_image_list_url : "js/image_list.js",
+ // media_external_list_url : "js/media_list.js"
+
+ // Style formats
+ style_formats : [
+ {title : 'Bold text', inline : 'b'},
+ {title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},
+ {title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},
+ {title : 'Example 1', inline : 'span', classes : 'example1'},
+ {title : 'Example 2', inline : 'span', classes : 'example2'},
+ {title : 'Table styles'},
+ {title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}
+ ],
+
+ // Replace values for the template plugin
+ template_replace_values : {
+ username : "Some User",
+ staffid : "991234"
+ }
+});
\ No newline at end of file
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index fc3635c1..53314765 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -70,3 +70,12 @@
<%= content_tag :li, link_to(t('admin.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('admin.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('admin.all_assets'), admin_assets_path), :class => active_for_action('assets', 'index') %>
+ <%= content_tag :li, link_to(t('admin.categories'), admin_asset_categories_path), :class => active_for_action('asset_categories', 'index') %>
+ <%= content_tag :li, link_to(t('admin.tags'), admin_asset_tags_path), :class => active_for_action('/admin/asset_tags', 'index') %>
+ <% end -%>
+<% end -%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7bafadba..15598a8e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -11,6 +11,7 @@ en:
back: Back
browse: Browse
cancel: Cancel
+ create_fail: Creation failed
create: Create
delete: Delete
desktop: Desktop
@@ -41,6 +42,7 @@ en:
submit: Submit
sure?: Are you sure?
update: Update
+ update_failed: Update failed
view: View
view_count: View count
yes_: "Yes"
@@ -119,6 +121,7 @@ en:
calendar: Calendar
cant_delete_self: You can not delete yourself.
cant_revoke_self_admin: You can not revoke your admin role yourself.
+ category: Category
choose_file: Choose a file...
class: Class
content: Content
@@ -148,6 +151,7 @@ en:
enabled_for: Enabled for
file_name: Filename
file_size: File size
+ file_upload: File upload
format: Format
home: Home
id: ID
@@ -233,6 +237,7 @@ en:
site_title: Site title
super_pages: Super pages
structure: Structure
+ tags: Tags
title: Title
translation: Translation
type: Type
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index af1eec60..72140d35 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -9,6 +9,7 @@ zh_tw:
browse: 選擇檔案
cancel: 取消
create: 新增
+ create_fail: 創建失敗
delete: 刪除
desktop: 桌面
disable: 禁用
@@ -35,6 +36,7 @@ zh_tw:
submit: 送出
sure?: 您肯定嗎?
update: 更新
+ update: 更新失敗
view: 檢視
view_count: 查看次數
yes_: "Yes"
@@ -114,6 +116,7 @@ zh_tw:
calendar: 行事曆
cant_delete_self: 您不可以刪除自己。
cant_revoke_self_admin: 您不可以撤銷自己的管理身份。
+ category: 類別
choose_file: 請選擇一個文件...
class: 階級
content: 內容
@@ -150,6 +153,7 @@ zh_tw:
enabled_for: 啟用
file_name: 檔名
file_size: 檔案大小
+ file_upload: 文件上載
format: 格式
home: 首頁
id: ID
@@ -237,6 +241,7 @@ zh_tw:
site_setting: 網站設定
super_pages: 可編頁面
structure: 網站結構
+ tags: 標籤
title: 標題
translation: 翻譯
type: 類型
diff --git a/config/routes.rb b/config/routes.rb
index e1a6a1c7..6faccb27 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,10 +15,12 @@ Orbit::Application.routes.draw do
mount Resque::Server.new, :at => "/resque"
resources :assets do
collection do
+ get 'file_upload'
post 'delete'
end
end
resources :asset_categories
+ resources :asset_tags
resources :app_auths
resources :object_auths do
match 'new_interface/:ob_type/:title/new' => "object_auths_new_interface#new" ,:as => :init_ob_auth,:via => :get
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 4ffea341..05247251 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -50,13 +50,13 @@
Start
- <%= f.datetime_select :postdate, {:use_month_numbers => true, :order => [:day, :month, :year] }, {:class => 'input-small'} %>
+ <%= f.datetime_select :postdate, {:use_month_numbers => true, :order => [:day, :month, :year] }, {:class => 'span1'} %>
End
- <%= f.datetime_select :deadline, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'input-small'} %>
+ <%= f.datetime_select :deadline, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'span1'} %>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
index 8959c6ae..e1c07e3b 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.html.erb
@@ -2,10 +2,10 @@
<%= @news_bulletin.title[I18n.locale] %>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb
index a27a56e7..474ace53 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb
@@ -3,8 +3,9 @@
<%= flash_messages %>
+
<%= dislpay_view_count(@page_context) %>
<%= @page_context.page.i18n_variable[I18n.locale] rescue nil %>
<%= @page_context.context[I18n.locale].html_safe rescue nil %>
-
<%= dislpay_view_count(@page_context) %>
+