clean up stuff in js + do not display the internal asset collection in the assets section + fix ui bug with custom fields in the assets section
@ -19,7 +19,7 @@ module Admin
|
|||||||
protected
|
protected
|
||||||
|
|
||||||
def set_collections
|
def set_collections
|
||||||
@asset_collections = current_site.asset_collections.order_by([[:name, :asc]])
|
@asset_collections = current_site.asset_collections.not_internal.order_by([[:name, :asc]])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -25,6 +25,7 @@ class AssetCollection
|
|||||||
|
|
||||||
## named scopes ##
|
## named scopes ##
|
||||||
scope :internal, :where => { :internal => true }
|
scope :internal, :where => { :internal => true }
|
||||||
|
scope :not_internal, :where => { :internal => false }
|
||||||
|
|
||||||
## methods ##
|
## methods ##
|
||||||
|
|
||||||
@ -41,7 +42,7 @@ class AssetCollection
|
|||||||
end
|
end
|
||||||
|
|
||||||
def self.find_or_create_internal(site)
|
def self.find_or_create_internal(site)
|
||||||
site.asset_collections.internal.first || site.asset_collections.create(:name => t('.system_name'), :slug => 'system', :internal => true)
|
site.asset_collections.internal.first || site.asset_collections.create(:name => 'system', :slug => 'system', :internal => true)
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
- content_for :head do
|
- content_for :head do
|
||||||
= javascript_include_tag 'admin/plugins/fancybox', 'admin/asset_collections', 'admin/custom_fields'
|
= javascript_include_tag 'admin/plugins/fancybox', 'admin/asset_collections', 'admin/custom_fields'
|
||||||
= stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
|
= stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
|
||||||
|
|
||||||
- content_for :submenu do
|
- content_for :submenu do
|
||||||
= render 'admin/shared/menu/assets'
|
= render 'admin/shared/menu/assets'
|
||||||
|
BIN
public/javascripts/admin/plugins/tiny_mce/themes/advanced/skins/locomotive/img/butt2.png
vendored
Executable file
After Width: | Height: | Size: 135 B |
BIN
public/javascripts/admin/plugins/tiny_mce/themes/advanced/skins/locomotive/img/button-bg.png
vendored
Executable file
After Width: | Height: | Size: 296 B |
BIN
public/javascripts/admin/plugins/tiny_mce/themes/advanced/skins/locomotive/img/down_arrow.gif
vendored
Executable file
After Width: | Height: | Size: 60 B |
BIN
public/javascripts/admin/plugins/tiny_mce/themes/advanced/skins/locomotive/img/fade-butt.png
vendored
Executable file
After Width: | Height: | Size: 785 B |
BIN
public/javascripts/admin/plugins/tiny_mce/themes/advanced/skins/locomotive/img/icons.png
vendored
Executable file
After Width: | Height: | Size: 29 KiB |
BIN
public/javascripts/admin/plugins/tiny_mce/themes/advanced/skins/locomotive/img/menu-arrow.png
vendored
Executable file
After Width: | Height: | Size: 209 B |
BIN
public/javascripts/admin/plugins/tiny_mce/themes/advanced/skins/locomotive/img/menu-check.png
vendored
Executable file
After Width: | Height: | Size: 214 B |
BIN
public/javascripts/admin/plugins/tiny_mce/themes/advanced/skins/locomotive/img/toolbarbg.png
vendored
Executable file
After Width: | Height: | Size: 143 B |