default widgets and sidebar.

This commit is contained in:
Matthew K. Fu JuYuan committed 2012-12-03 18:52:36 +08:00
1 parent f9bcb27efc
commit 4bc80f2bd3
28 files changed
+275 -92

No files matched your search

+5 -5
View File
@@ -867,11 +867,11 @@ zh_tw:
widget:
default_widget: 系統預設Widget
_default_widget:
style1: 表格列表
style2: 單行列佐圖(同邊)
style3: 多行列佐圖(同邊)
style4: 多行列佐圖(異邊)
style5: 單行列佐單圖(同邊)
typeA: 表格列表
typeB_style2: 單行列佐圖(同邊)
typeB_style3: 多行列佐圖(同邊)
typeB_style4: 多行列佐圖(異邊)
typeC: 單行列佐單圖(同邊)
# : <<<<<<< HEAD
mongoid:
models:
+1 -1
View File
@@ -220,7 +220,7 @@ Orbit::Application.routes.draw do
# match '/desktop_orbit/eventajaxload' => 'desktop_publications#update_journal'
match '/panel/orbit_app/widget/:type' => 'default_widget#default_widget'
match '/panel/:app_name/front_end/:app_action/:id(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|
!request.query_string.include?("inner=true")