github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove all the references to asset_collections

This commit is contained in:
did 2011-06-21 06:12:20 -07:00
parent a0293b161b
commit 3c31c8dbcf
38 changed files with 24 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/admin/assets_controller.rb
View File

@ -4,8 +4,6 @@ module Admin
include ActionView::Helpers::SanitizeHelper
include ActionView::Helpers::TextHelper
# defaults :collection_name => 'assets', :instance_name => 'asset'
respond_to :json, :only => [:index, :create, :destroy]
def index
@ -50,8 +48,7 @@ module Admin
:content_type => asset.content_type,
:url => asset.source.url,
:vignette_url => asset.vignette_url,
:destroy_url => admin_asset_url(asset, :json),
:destroy_url => admin_asset_url(asset, :json)
}
end

9
app/controllers/admin/custom_fields_controller.rb
View File

@ -23,13 +23,8 @@ module Admin
protected
def set_parent_and_fields
if params[:parent] == 'asset_collection'
@parent = current_site.asset_collections.where(:slug => params[:slug]).first
@fields = @parent.asset_custom_fields
else
@parent = current_site.content_types.where(:slug => params[:slug]).first
@fields = @parent.content_custom_fields
end
@parent = current_site.content_types.where(:slug => params[:slug]).first
@fields = @parent.content_custom_fields
end
end

51
app/controllers/admin/images_controller.rb
View File

@ -1,51 +0,0 @@
module Admin
class ImagesController < BaseController
include ActionView::Helpers::SanitizeHelper
include ActionView::Helpers::TextHelper
defaults :collection_name => 'assets', :instance_name => 'asset'
respond_to :json, :only => [:index, :create, :destroy]
def index
index! do |response|
response.json do
render :json => { :images => @assets.collect { |image| image_to_json(image) } }
end
end
end
def create
params[:asset] = { :name => params[:name], :source => params[:file] } if params[:file]
create! do |success, failure|
success.json do
render :json => image_to_json(@asset)
end
failure.json do
render :json => { :status => 'error' }
end
end
rescue Exception => e
render :json => { :status => 'error', :message => e.message }
end
protected
def collection
@assets ||= begin_of_association_chain.assets.only_image
end
def image_to_json(image)
{
:status => 'success',
:name => truncate(image.name, :length => 15),
:url => image.source.url,
:vignette_url => image.vignette_url,
:destroy_url => admin_image_url(image, :json)
}
end
end
end

36
app/views/admin/asset_collections/edit.html.haml
View File

@ -1,36 +0,0 @@
- title link_to(@asset_collection.name.blank? ? @asset_collection.name_was : @asset_collection.name, '#', :rel => 'asset_collection_name', :title => t('.ask_for_name'), :class => 'editable')
- content_for :head do
= include_javascripts :asset_collections
= include_stylesheets :fancybox
- content_for :submenu do
= render 'admin/shared/menu/assets'
- content_for :actions do
= render 'admin/shared/actions/assets'
%p!= t('.help')
- content_for :buttons do
= admin_button_tag :add_asset, new_admin_asset_url(@asset_collection), :class => 'new'
%p.no-items{ :style => "#{'display: none' unless @asset_collection.assets.empty? }" }
!= t('.no_items', :url => new_admin_asset_url(@asset_collection))
%ul#assets.assets.sortable
= render :partial => 'asset', :collection => @asset_collection.ordered_assets
%li.clear
= semantic_form_for @asset_collection, :url => admin_asset_collection_url(@asset_collection), :html => { :multipart => true } do |f|
= f.hidden_field :assets_order
= f.foldable_inputs :name => :options do
= f.input :name
= f.input :slug, :required => false
= render 'admin/custom_fields/index', :form => f, :collection_name => 'assets'
= render 'admin/shared/form_actions', :delete_button => link_to(content_tag(:em, escape_once('&nbsp;')) + t('.destroy'), admin_asset_collection_url(@asset_collection), :confirm => t('admin.messages.confirm'), :method => :delete, :class => 'button small remove'), :button_label => :update
= render 'admin/custom_fields/edit_field'

11
app/views/admin/asset_collections/index.html.haml
View File

@ -1,11 +0,0 @@
- title t('.title')
- content_for :submenu do
= render 'admin/shared/menu/assets'
- content_for :actions do
= render 'admin/shared/actions/assets'
%p!= t('.help')
%p.no-items!= t('.no_items', :url => new_admin_asset_collection_url)

20
app/views/admin/asset_collections/new.html.haml
View File

@ -1,20 +0,0 @@
- title t('.title')
- content_for :head do
= include_javascripts :asset_collections
- content_for :submenu do
= render 'admin/shared/menu/assets'
- content_for :actions do
= render 'admin/shared/actions/assets'
%p!= t('.help')
= semantic_form_for @asset_collection, :url => admin_asset_collections_url do |f|
= f.inputs :name => :information do
= f.input :name
= f.input :slug, :required => false
= render 'admin/shared/form_actions', :back_url => admin_asset_collections_url, :button_label => :create

2
app/views/admin/asset_collections/_asset.html.haml → app/views/admin/assets/_asset.html.haml
View File

@ -1,5 +1,5 @@
%li{ :id => "asset-#{asset.id}", :class => "asset #{'last' if (asset_counter + 1) % 6 == 0}"}
%h4= link_to truncate(asset.name, :length => 17), edit_admin_asset_path(@asset_collection, asset)
%h4= link_to truncate(asset.name, :length => 17), edit_admin_asset_path(asset)
= vignette_tag(asset)
.actions
= link_to image_tag('admin/list/icons/cross.png'), '#', :class => 'remove', :confirm => t('admin.messages.confirm')

17
app/views/admin/assets/_form.html.haml
View File

@ -1,17 +0,0 @@
- content_for :head do
= include_javascripts :edit_custom_fields, :assets
= include_stylesheets :fancybox
= f.inputs :name => :information do
= f.input :name
= f.input :source, :hint_options => @asset.persisted? ? { :url => link_to(@asset.source_filename, @asset.source.url), :escaping => false } : {}
- unless @asset.custom_fields.blank?
= render 'admin/custom_fields/custom_form', :form => f, :title => :other_fields, :parent => @asset_collection
- if @asset.image? && @asset.valid?
= f.foldable_inputs :name => "#{t('formtastic.titles.preview')} #{image_dimensions_and_size(@asset)}", :class => 'preview' do
%li
.image
.inside
= image_tag(@asset.source.url(:preview))

18
app/views/admin/assets/edit.html.haml
View File

@ -1,18 +0,0 @@
- title t('.title')
- content_for :submenu do
= render 'admin/shared/menu/assets'
- content_for :actions do
= render 'admin/shared/actions/assets'
- content_for :buttons do
= admin_button_tag t('admin.asset_collections.edit.add_asset'), new_admin_asset_url(@asset_collection), :class => 'new'
%p!= t('.help')
= semantic_form_for @asset, :url => admin_asset_url(@asset_collection, @asset), :html => { :multipart => true, :class => 'save-with-shortcut' } do |form|
= render 'form', :f => form
= render 'admin/shared/form_actions', :back_url => edit_admin_asset_collection_url(@asset_collection), :button_label => :update

15
app/views/admin/assets/new.html.haml
View File

@ -1,15 +0,0 @@
- title t('.title')
- content_for :submenu do
= render 'admin/shared/menu/assets'
- content_for :actions do
= render 'admin/shared/actions/assets'
%p!= t('.help')
= semantic_form_for @asset, :url => admin_assets_url(@asset_collection), :html => { :multipart => true } do |form|
= render 'form', :f => form
= render 'admin/shared/form_actions', :back_url => edit_admin_asset_collection_url(@asset_collection), :button_label => :create

2
app/views/admin/imports/show.html.haml
View File

@ -9,7 +9,7 @@
%p!= t('.help')
%ul{ :id => 'import-steps', :class => 'list', :'data-url' => admin_import_url(:json), :'data-success-message' => t('.messages.success'), :'data-failure-message' => t('.messages.failure') }
- %w(site content_types assets asset_collections snippets pages).each do |step|
- %w(site content_types assets snippets pages).each do |step|
%li{ :id => "#{step}-step" }
%em
%strong

1
app/views/admin/shared/actions/_assets.html.haml
View File

@ -1 +0,0 @@
= link_to content_tag(:span, t('admin.asset_collections.index.new')), new_admin_asset_collection_url

7
config/assets.yml
View File

@ -38,13 +38,6 @@ javascripts:
- public/javascripts/admin/plugins/mustache.js
- public/javascripts/admin/custom_fields/category.js
- public/javascripts/admin/custom_fields/has_many.js
asset_collections:
- public/javascripts/admin/plugins/fancybox.js
- public/javascripts/admin/plugins/mustache.js
- public/javascripts/admin/custom_fields.js
- public/javascripts/admin/asset_collections.js
assets:
- public/javascripts/admin/assets.js
contents:
- public/javascripts/admin/plugins/tiny_mce/tinymce.js
- public/javascripts/admin/contents.js

17
config/locales/admin_ui.de.yml
View File

@ -190,22 +190,6 @@ de:
title: Bilder anzeigen
no_items: "Momentan gibt es keine Bilder."
asset_collections:
index:
title: Galerie
help: "Der Name der Galerie kann durch darauf klicken bearbeitet werden. Du kannst die Bilder in einer Galerie bearbeiten, indem du neue Felder hinzufügst."
new: neue Galerie
no_items: "Momentan gibt es keine Galerien. Klicke einfach <a href='%{url}'>hier</a>, um eine neue Galerie zu erstellen."
new:
title: Neue Galerie
help: "Gib erst mal einen Namen ein. Alle anderen Einstellungen kannst du vornehmen, sobald das Formular abgesendet ist."
edit:
help: "Der Name der Galerie kann durch darauf klicken bearbeitet werden. Du kannst Bilder in einer Galerie bearbeiten, indem du neue Felder hinzufügst."
add_asset: Bild hinzufügen
destroy: Galerie löschen
no_items: "Momentan gibt es keine Bilder. Klicke einfach <a href='%{url}'>hier</a>, um das erste Bild zu erstellen."
ask_for_name: "Gib den neuen Namen ein"
assets:
new:
title: Neues Bild
@ -287,7 +271,6 @@ de:
site: Webseiten-Informationen
content_types: Benutzerdefinierte Inhalts-Typen
assets: Template-Dateien
asset_collections: Galerien
snippets: Snippets
pages: Seiten
messages:

17
config/locales/admin_ui.en.yml
View File

@ -188,22 +188,6 @@ en:
title: Listing images
no_items: "There are no files for now."
asset_collections:
index:
title: Asset collections
help: "The collection name can be updated by clicking it. You can customize assets in a collection by adding new fields."
new: new collection
no_items: "There are no collections for now. Just click <a href=\"%{url}\">here</a> to create the first one."
new:
title: New collection
help: "For now, just type a name. Other settings will come once the form is sent."
edit:
help: "The collection name can be updated by clicking it. You can customize assets in a collection by adding new fields."
add_asset: add asset
destroy: remove collection
no_items: "There are no assets for now. Just click <a href=\"%{url}\">here</a> to create the first one."
ask_for_name: "Please type the new name"
assets:
new:
title: New asset
@ -268,7 +252,6 @@ en:
site: Site information
content_types: Custom content types
assets: Theme files
asset_collections: Asset collections
snippets: Snippets
pages: Pages
messages:

17
config/locales/admin_ui.fr.yml
View File

@ -187,22 +187,6 @@ fr:
title: Liste des images
no_items: "Il n'y a pas d'images."
asset_collections:
index:
title: Collections
help: "Le nom de la collection est modifiable en cliquant dessus. Vous pouvez personnaliser une collection en ajoutant d'autres champs à vos médias."
new: nouvelle collection
no_items: "Il n'existe pas de collections. Vous pouvez commencer par créer une <a href='%{url}'>ici</a>."
new:
title: Nouvelle collection
help: "Pour le moment, veuillez rentrer le nom. Les autres options viendront dans le formulaire suivant."
edit:
help: "Le nom de la collection est modifiable en cliquant dessus. Vous pouvez personnaliser une collection en ajoutant d'autres champs à vos médias."
add_asset: ajouter média
destroy: supprimer collection
no_items: "Il n'existe pas de médias. Vous pouvez commencer par créer un <a href='%{url}'>ici</a>."
ask_for_name: "Veuillez entrer le nouveau nom"
assets:
new:
title: "Nouveau média"
@ -267,7 +251,6 @@ fr:
site: Informations sur le site
content_types: Modèles de données personnalisés
assets: Fichiers du thème
asset_collections: Collections de média
snippets: Snippets
pages: Pages
messages:

17
config/locales/admin_ui.it.yml
View File

@ -188,22 +188,6 @@ it:
title: Lista immagini
no_items: "Per ora non ci sono file."
asset_collections:
index:
title: Collezioni di risorse
help: "Puoi cambiare il nome della collezione cliccandoci sopra. Puoi personalizzare le risorse in una collezione aggiugendo nuovi campi."
new: nuov collezione
no_items: "Per ora non ci sono collezioni. Clicca <a href=\"%{url}\">qui</a> per creare la prima."
new:
title: Nuova collezione
help: "Per ora inserisci solo in nome. Altre opzioni appariranno dopo aver inviato il modulo."
edit:
help: "Puoi cambiare il nome della collezione cliccandoci sopra. Puoi personalizzare le risorse in una collezione aggiugendo nuovi campi."
add_asset: aggiungi risorsa
destroy: elimina collezione
no_items: "Per ora non ci sono risorse. Clicca <a href=\"%{url}\">qui</a> per creare la prima."
ask_for_name: "Prego, digita il nuovo nome"
assets:
new:
title: Nuova risorsa
@ -268,7 +252,6 @@ it:
site: Informazioni sito
content_types: Tipi di contenuti personalizzati
assets: File del tema
asset_collections: Collezioni di risorse
snippets: Frammenti
pages: Pagine
messages:

17
config/locales/admin_ui.pt-BR.yml
View File

@ -185,22 +185,6 @@ pt-BR:
title: Listando imagens
no_items: "Não existem imagens ainda."
asset_collections:
index:
title: Coleções de arquivos
help: "O nome da coleção pode ser alterado clicando nele. Você pode customizar os arquivos nas coleções adicionando campos."
new: nova coleção
no_items: "Não existem coleções ainda. Clique <a href=\"%{url}\">aqui</a> para criar a primeira."
new:
title: Nova Coleção
help: "Por enquanto, apenas insira o nome. Outras opções irão aparecer após o formulário ser enviado."
edit:
help: "O nome da coleção pode ser alterado clicando nele. Você pode customizar os arquivos nas coleções adicionando campos."
add_asset: adicionar arquivo
destroy: excluir coleção
no_items: "Não existem coleções ainda. Clique <a href=\"%{url}\">aqui</a> para criar a primeira."
ask_for_name: Por favor preencha o novo nome"
assets:
new:
title: Novo arquivo
@ -262,7 +246,6 @@ pt-BR:
site: Informações do site
content_types: Tipos de Conteúdo customizados
assets: Arquivos do Tema
asset_collections: Coleções de Arquivos
snippets: Blocos
pages: Páginas
messages:

4
config/locales/default.de.yml
View File

@ -72,11 +72,7 @@ de:
highlighted_field_name: Hervorgehobener Feld-Name
group_by_field_name: Gruppierung nach Feld-Name
api_enabled: API aktiviert
asset_collection:
name: Name
slug: Slug
asset:
name: Name
source: Quelle
account:
email: Email

4
config/locales/default.fr.yml
View File

@ -71,11 +71,7 @@ fr:
highlighted_field_name: Champ mis en avant
group_by_field_name: Champ pour grouper
api_enabled: Activation API
asset_collection:
name: Nom
slug: Raccourci
asset:
name: Nom
source: Fichier
account:
email: E-mail

4
config/locales/default.it.yml
View File

@ -77,11 +77,7 @@ it:
highlighted_field_name: Campo evidenziato
group_by_field_name: Raggruppa per nome campo
api_enabled: API Attiva
asset_collection:
name: Nome
slug: Slug
asset:
name: Nome
source: Sorgente
account:
email: Email

4
config/locales/default.pt-BR.yml
View File

@ -71,11 +71,7 @@ pt-BR:
highlighted_field_name: Nome do Campo em destaque
group_by_field_name: Agrupar por name do campo
api_enabled: Activation API
asset_collection:
name: Nome
slug: Slug
asset:
name: Nome
source: Arquivo
account:
email: Email

10
config/locales/flash.de.yml
View File

@ -73,16 +73,6 @@ de:
alert: "Account wurde nicht erstellt."
already_created: "Account wurde bereits zu dieser Webseite hinzugefügt."
asset_collections:
create:
notice: "Sammlung wurde erfolgreich erstellt."
alert: "Sammlung wurde nicht erstellt."
update:
notice: "Sammlung wurde erfolreich aktualisiert."
alert: "Sammlung wurde nicht aktualisiert."
destroy:
notice: "Sammlung wurde erfolgreich gelöscht."
assets:
create:
notice: "Asset wurde erfolgreich erstellt."

10
config/locales/flash.en.yml
View File

@ -73,16 +73,6 @@ en:
alert: "Membership was not created."
already_created: "Account was already added the current site."
asset_collections:
create:
notice: "Collection was successfully created."
alert: "Collection was not created."
update:
notice: "Collection was successfully updated."
alert: "Collection was not updated."
destroy:
notice: "Collection was successfully deleted."
assets:
create:
notice: "Asset was successfully created."

10
config/locales/flash.fr.yml
View File

@ -73,16 +73,6 @@ fr:
alert: "Le compte n'a pas été ajouté."
already_created: "Le compte a déjà été ajouté pour ce site."
asset_collections:
create:
notice: "La collection a été créée avec succès."
alert: "La collection n'a pas été créée."
update:
notice: "La collection a été mise à jour avec succès."
alert: "La collection n'a pas été mise à jour."
destroy:
notice: "La collection a été supprimée avec succès."
assets:
create:
notice: "Le média a été crée avec succès."

10
config/locales/flash.it.yml
View File

@ -73,16 +73,6 @@ it:
alert: "La partecipazione non è stata creata."
already_created: "L'account è già stato aggiunto al corrente sito."
asset_collections:
create:
notice: "La collezione è stata creata con successo."
alert: "La collezione non è stata creata."
update:
notice: "La collezione è stata modificata con successo."
alert: "La collezione non è stata modificata."
destroy:
notice: "La collezione è stata eliminata con successo."
assets:
create:
notice: "La risorsa è stata creata con successo."

10
config/locales/flash.pt-BR.yml
View File

@ -73,16 +73,6 @@ pt-BR:
alert: "Adesão não foi criada."
already_created: "Conta já foi adicionada ao site atual."
asset_collections:
create:
notice: "Coleção criada com sucesso."
alert: "Coleção não foi criada."
update:
notice: "Coleção foi atualizada com sucesso."
alert: "Coleção não foi atualizada."
destroy:
notice: "Coleção foi apagada com sucesso."
assets:
create:
notice: "Asset foi criada com sucesso."

2
config/routes.rb
View File

@ -33,7 +33,7 @@ Rails.application.routes.draw do
get :all, :action => 'index', :on => :collection, :defaults => { :all => true }
end
resources :assets # TODO
resources :assets
resources :images, :controller => 'assets', :defaults => { :image => true }

5
doc/TODO
View File

@ -3,13 +3,14 @@ BOARD:
x bushido version
x default template
~ editable_elements: inheritable: false (Mattias) => seems to be fixed by Dirk's last pull request (#44) => content tag
x locomedia tinyMCE plugin (Bernd)
- remove asset_collections
x site templates
x tinyMCE plugin
x vignette.rb
x code
- helpers
- ui
x helpers
x ui
x rake task
x internal collection
x assign same _id

1
lib/locomotive/import.rb
View File

@ -3,7 +3,6 @@ require 'locomotive/import/base'
require 'locomotive/import/job'
require 'locomotive/import/site'
require 'locomotive/import/assets'
require 'locomotive/import/asset_collections'
require 'locomotive/import/content_types'
require 'locomotive/import/snippets'
require 'locomotive/import/pages'

87
lib/locomotive/import/asset_collections.rb
View File

@ -1,87 +0,0 @@
# module Locomotive
# module Import
# class AssetCollections < Base
#
# def process
# asset_collections = database['site']['asset_collections']
#
# return if asset_collections.nil?
#
# asset_collections.each do |name, attributes|
# self.log "slug = #{attributes['slug']}"
#
# asset_collection = site.asset_collections.where(:slug => attributes['slug']).first
#
# asset_collection ||= self.build_asset_collection(attributes.merge(:name => name))
#
# self.add_or_update_fields(asset_collection, attributes['fields'])
#
# if options[:samples] && attributes['assets']
# self.insert_samples(asset_collection, attributes['assets'])
# end
#
# asset_collection.save!
#
# site.reload
# end
# end
#
# protected
#
# def build_asset_collection(data)
# attributes = { :internal => false }.merge(data)
#
# attributes.delete_if { |name, value| %w{fields assets}.include?(name) }
#
# site.asset_collections.build(attributes)
# end
#
# def add_or_update_fields(asset_collection, fields)
# return if fields.blank?
#
# fields.each_with_index do |data, position|
# name, data = data.keys.first, data.values.first
#
# attributes = { :_alias => name, :label => name.humanize, :kind => 'string', :position => position }.merge(data).symbolize_keys
#
# field = asset_collection.asset_custom_fields.detect { |f| f._alias == attributes[:_alias] }
#
# field ||= asset_collection.asset_custom_fields.build(attributes)
#
# field.send(:set_unique_name!) if field.new_record?
#
# field.attributes = attributes
# end
# end
#
# def insert_samples(asset_collection, assets)
# assets.each_with_index do |data, position|
# value, attributes = data.is_a?(Array) ? [data.first, data.last] : [data.keys.first, data.values.first]
#
# url = attributes.delete('url')
#
# # build with default attributes
# asset = asset_collection.assets.build(:name => value, :position => position, :source => self.open_sample_asset(url))
#
# attributes.each do |name, value|
# field = asset_collection.asset_custom_fields.detect { |f| f._alias == name }
#
# value = (case field.kind.downcase
# when 'file' then self.open_sample_asset(value)
# when 'boolean' then Boolean.set(value)
# else
# value
# end)
#
# asset.send("#{name}=", value)
# end
#
# asset.save
#
# self.log "insert asset '#{asset.name}'"
# end
# end
#
# end
# end
# end

2
lib/locomotive/import/site.rb
View File

@ -3,7 +3,7 @@ module Locomotive
class Site < Base
def process
attributes = database['site'].clone.delete_if { |name, value| %w{name pages assets content_types asset_collections}.include?(name) }
attributes = database['site'].clone.delete_if { |name, value| %w{name pages assets content_types}.include?(name) }
site.attributes = attributes

2
lib/locomotive/render.rb
View File

@ -59,7 +59,7 @@ module Locomotive
assigns = {
'site' => current_site,
'page' => @page,
'asset_collections' => Locomotive::Liquid::Drops::AssetCollections.new,
'asset_collections' => Locomotive::Liquid::Drops::AssetCollections.new, # depracated, will be removed shortly
'contents' => Locomotive::Liquid::Drops::Contents.new,
'current_page' => self.params[:page],
'params' => self.params,

55
public/javascripts/admin/asset_collections.js
View File

@ -1,55 +0,0 @@
$(document).ready(function() {
// automatic slug from collection name
$('#asset_collection_name').keypress(function() {
var input = $(this);
var slug = $('#asset_collection_slug');
if (!slug.hasClass('filled')) {
setTimeout(function() {
slug.val(input.val().replace(/\s/g, '_').toLowerCase());
}, 50);
}
});
$('#asset_collection_slug').keypress(function() { $(this).addClass('filled'); });
// sortable assets
var updateAssetsOrder = function() {
var list = $('ul.assets.sortable');
var ids = jQuery.map(list.sortable('toArray'), function(e) {
return e.match(/asset-(\w+)/)[1];
}).join(',');
$('#asset_collection_assets_order').val(ids || '');
}
var setLastClassForAssets = function() {
$('ul.assets li.last').removeClass('last');
var i = parseInt($('ul.assets li.asset').size() / 6);
while (i > 0) {
$('ul.assets li.asset:eq(' + (i * 6 - 1) + ')').addClass('last');
i--;
}
}
$('ul.assets.sortable').sortable({
items: 'li.asset',
stop: function(event, ui) { updateAssetsOrder(); setLastClassForAssets(); }
});
$('ul.assets.sortable li div.actions a.remove').click(function(e) {
if (confirm($(this).attr('data-confirm'))) {
$(this).parents('li').remove();
updateAssetsOrder();
if ($('ul.assets li.asset').size() == 0) $('p.no-items').show();
setLastClassForAssets();
}
e.preventDefault();
e.stopPropagation();
});
});

5
public/javascripts/admin/assets.js
View File

@ -1,5 +0,0 @@
$(document).ready(function() {
$('textarea.html').tinymce(TinyMceDefaultSettings);
});

2
public/javascripts/admin/import.js
View File

@ -5,7 +5,7 @@ $(document).ready(function() {
dataType: 'json',
minTimeout: 100
}, function(data) {
var steps = ['site', 'content_types', 'assets', 'asset_collections', 'snippets', 'pages'];
var steps = ['site', 'content_types', 'assets', 'snippets', 'pages'];
var currentIndex = data.step == 'done' ? steps.length - 1 : steps.indexOf(data.step);

49
public/javascripts/admin/plugins/tiny_mce/plugins/locomedia/editor_plugin.js vendored
View File

@ -1,48 +1 @@
// (function(){tinymce.create('tinymce.plugins.LocoMediafilePlugin',{init:function(ed,url){ed.addCommand('locoMediafile',function(){ed.windowManager.open({file:url+'/mediafile.htm',width:645,height:650,inline:1},{plugin_url:url})});ed.addButton('mediafile',{title:'locomediafile.image_desc',cmd:'locoMediaFile'})},getInfo:function(){return{longname:'Locomotive Media File',author:'Locomotive Engine',authorurl:'http://www.locomotivecms.com',infourl:'http://www.locomotiveapp.com',version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add('locomedia',tinymce.plugins.LocoMediafilePlugin)})();
/**
* editor_plugin_src.js
*
* Copyright 2009, Moxiecode Systems AB
* Released under LGPL License.
*
* License: http://tinymce.moxiecode.com/license
* Contributing: http://tinymce.moxiecode.com/contributing
*/
(function() {
tinymce.create('tinymce.plugins.LocoMediaPlugin', {
init : function(ed, url) {
// Register commands
ed.addCommand('locoMedia', function() {
ed.windowManager.open({
file : url + '/dialog.htm',
width : 645,
height : 650,
inline : 1
}, {
plugin_url : url
});
});
// Register buttons
ed.addButton('locomedia', {
title : 'locomedia.image_desc',
cmd : 'locoMedia'
});
},
getInfo : function() {
return {
longname : 'Locomotive Media File',
author : 'Didier Lafforgue',
authorurl : 'http://www.locomotivecms.com',
infourl : 'http://www.locomotivecms.com',
version : tinymce.majorVersion + "." + tinymce.minorVersion
};
}
});
// Register plugin
tinymce.PluginManager.add('locomedia', tinymce.plugins.LocoMediaPlugin);
})();
(function(){tinymce.create('tinymce.plugins.LocoMediaPlugin',{init:function(ed,url){ed.addCommand('locoMedia',function(){ed.windowManager.open({file:url+'/dialog.htm',width:645,height:650,inline:1},{plugin_url:url})});ed.addButton('locomedia',{title:'locomedia.image_desc',cmd:'locoMedia'})},getInfo:function(){return{longname:'Locomotive Media File',author:'Didier Lafforgue',authorurl:'http://www.locomotivecms.com',infourl:'http://www.locomotivecms.com',version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add('locomedia',tinymce.plugins.LocoMediaPlugin)})();

14
public/javascripts/admin/plugins/tiny_mce/plugins/locomedia/editor_plugin_src.js vendored
View File

@ -9,10 +9,10 @@
*/
(function() {
tinymce.create('tinymce.plugins.LocoMediafilePlugin', {
tinymce.create('tinymce.plugins.LocoMediaPlugin', {
init : function(ed, url) {
// Register commands
ed.addCommand('locoMediafile', function() {
ed.addCommand('locoMedia', function() {
ed.windowManager.open({
file : url + '/dialog.htm',
width : 645,
@ -24,16 +24,16 @@
});
// Register buttons
ed.addButton('mediafile', {
title : 'locomediafile.image_desc',
cmd : 'locoMediaFile'
ed.addButton('locomedia', {
title : 'locomedia.image_desc',
cmd : 'locoMedia'
});
},
getInfo : function() {
return {
longname : 'Locomotive Media File',
author : 'Locomotive Engine',
author : 'Didier Lafforgue',
authorurl : 'http://www.locomotivecms.com',
infourl : 'http://www.locomotivecms.com',
version : tinymce.majorVersion + "." + tinymce.minorVersion
@ -42,5 +42,5 @@
});
// Register plugin
tinymce.PluginManager.add('locomedia', tinymce.plugins.LocoMediafilePlugin);
tinymce.PluginManager.add('locomedia', tinymce.plugins.LocoMediaPlugin);
})();