public/jquery.alerts/images/help.gif public/jquery.alerts/images/important.gif public/jquery.alerts/images/info.gif public/jquery.alerts/images/title.gif public/jquery.alerts/jquery.alerts.css public/jquery.alerts/jquery.alerts.js @@ -4,9 +4,9 @@ class Admin::TaxonsController < Admin::BaseController before_filter :load_object, :only => [:selected, :available, :remove] belongs_to :product - create.wants.js {render :text => @taxon.to_json()} + create.wants.html {render :text => @taxon.id} update.wants.html {render :text => @taxon.name} - destroy.wants.js {render :text => ""} + destroy.wants.html {render :text => ""} create.before do @taxon.taxonomy_id = params[:taxonomy_id] app/controllers/admin/taxons_controller.rb @@ -2,8 +2,16 @@ <%= stylesheet_link_tag '/jsTree/source/tree_component.css' %> <%= javascript_include_tag '/jsTree/source/_lib.js' %> <%= javascript_include_tag '/jsTree/source/tree_component.js' %> - + + <%= javascript_include_tag '/jquery.alerts/jquery.alerts.js' %> + <%= stylesheet_link_tag '/jquery.alerts/jquery.alerts.css' %> + <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %> - <%= javascript_tag "var taxonomy_id = #{@taxonomy.id};" %> + <%= javascript_tag "var taxonomy_id = #{@taxonomy.id}; + var loading = '#{t('loading')}'; + var new_taxon = '#{t('new_taxon')}'; + var server_error = '#{t('server_error')}'; + var taxonomy_tree_error = '#{t('taxonomy_tree_error')}';" + %> <%= javascript_include_tag 'taxonomy' %> -<% end %> +<% end %> \ No newline at end of file app/views/admin/taxonomies/_js_head.html.erb @@ -1,6 +1,6 @@ <ul> <% taxon.children.each do |child| %> - <li id="<%= child.id %>"> + <li id="<%= child.id %>" rel="taxon"> <a href="#"><%= child.name %></a> <% if child.children.length > 0 %> <%= render :partial => "taxon", :locals => {:taxon => child} %> app/views/admin/taxonomies/_taxon.html.erb @@ -4,19 +4,24 @@ <h1>Edit Taxonomy</h1> +<p id="ajax_error" class="errorExplanation" style="display:none;"></p> + <% form_for(:taxon, :url => admin_taxonomy_url, :html => { :method => :put }) do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <div> <label><%= t("tree")%></label><br /> <div id="taxonomy_tree" class="tree"> <ul> - <li id="<%= @taxonomy.root.id %>" class="open"> + <li id="<%= @taxonomy.root.id %>" class="open" rel="root"> <a href="#"><%= @taxonomy.root.name %></a> <%= render :partial => "taxon", :locals => {:taxon => @taxonomy.root} %> </li> </ul> </div> </div> + <p id="progress" style="display:none;"> + <img src="/images/spinner.gif?1234540747" alt="Spinner" style="vertical-align:bottom;"/> <%= t('updating') %>.. + </p> <p><br/><small>* Right click a child in the tree to access the menu for adding, deleting or sorting a child.</small></p> <p class="form-buttons"> app/views/admin/taxonomies/edit.html.erb @@ -250,10 +250,6 @@ da: expiration_year: "Expiration Year" extension: Extension extensions: Extensions - ext_tax_calculator_tax_rates: "Moms satser" - ext_tax_calculator_tax_rates_description: "Moms satser per geografisk område og produkt kategori." - ext_tax_calculator_tax_settings: "Moms indstillinger" - ext_tax_calculator_tax_settings_description: "Vælg om priser skal vises med eller uden moms." filename: Filename final_confirmation: "Final Confirmation" first_name: "First Name" @@ -294,6 +290,7 @@ da: listing_reports: "Listing Reports" listing_tax_categories: "Listing Tax Categories" listing_users: "Listing Users" + loading: Loading locale_changed: "Locale Changed" log_in: "Log In" logged_in_as: "Logged in as" @@ -332,6 +329,7 @@ da: new_state: "New State" new_tax_category: "New Tax Category" new_tax_rate: "New Tax Rate" + new_taxon: "New Taxon" new_taxonomy: "New Taxonomy" new_user: "New User" new_variant: "New Variant" @@ -424,6 +422,7 @@ da: send_copy_of_orders_mails_to: Send Copy of Order Mails To send_mails_as: Send Mails As send_order_mails_as: Send Order Mails As + server_error: "The server returned an error" ship: ship ship_address: "Ship Address" shipment: Shipment @@ -446,8 +445,6 @@ da: show_incomplete_orders: "Show Incomplete Orders" show_only_complete_orders: "Only show complete orders" show_out_of_stock_products: "Show out-of-stock products" - show_price_inc_vat: "Pris inkl. moms" - show_price_incl_vat: "Vis pris inkl. moms" sign_up: "Sign up" site_name: "Site Name" site_url: "Site URL" @@ -479,12 +476,12 @@ da: tax_categories: "Tax Categories" tax_categories_setting_description: "Set up tax categories to identify which products should be taxable." tax_category: "Tax Category" - tax_settings: "Moms indstillinger" tax_total: "Tax Total" tax_type: "Tax Type" taxon: Taxon taxonomies: Taxonomies taxonomies_setting_description: "Create and manage taxonomies" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Taxons thank_you_for_your_order: "Thank you for your business. Please print out a copy of this confirmation page for your records." this_file_language: "Dansk (DK)" @@ -502,6 +499,7 @@ da: update: Update update_password: "Update my password and log me in" updated_successfully: + updating: Updating use_as_shipping_address: Use as Shipping Address use_billing_address: Use Billing Address use_different_shipping_address: "Use Different Shipping Address" config/locales/da.yml @@ -290,6 +290,7 @@ de: listing_reports: Berichte listing_tax_categories: "Listing Tax Categories" listing_users: Benutzer + loading: Loading locale_changed: "Sprache geändert" log_in: Anmelden logged_in_as: "Angemldet unter" @@ -328,6 +329,7 @@ de: new_state: "Neues Bundesland" new_tax_category: "Neue Steuer-Kategorie" new_tax_rate: "Neuer Steuersatz" + new_taxon: "New Taxon" new_taxonomy: "New Taxonomy" new_user: "Neuer Benutzer" new_variant: "Neue Variante" @@ -420,6 +422,7 @@ de: send_copy_of_orders_mails_to: Send Copy of Order Mails To send_mails_as: Send Mails As send_order_mails_as: Send Order Mails As + server_error: "The server returned an error" ship: ship ship_address: Lieferadresse shipment: Shipment @@ -478,6 +481,7 @@ de: taxon: Taxon taxonomies: Taxonomies taxonomies_setting_description: "Create and manage taxonomies" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Taxons thank_you_for_your_order: "Vielen Dank für ihre Bestellung" this_file_language: Deutsch @@ -495,6 +499,7 @@ de: update: Speichern update_password: "Update my password and log me in" updated_successfully: "Erfolgreich aktualisiert" + updating: Updating use_as_shipping_address: Use as Shipping Address use_billing_address: Use Billing Address use_different_shipping_address: "Andere Lieferaddresse verwenden" config/locales/de.yml @@ -290,6 +290,7 @@ en-GB: listing_reports: "Listing Reports" listing_tax_categories: "Listing Tax Categories" listing_users: "Listing Users" + loading: Loading locale_changed: "Locale Changed" log_in: "Log In" logged_in_as: "Logged in as" @@ -328,6 +329,7 @@ en-GB: new_state: "New State" new_tax_category: "New Tax Category" new_tax_rate: "New Tax Rate" + new_taxon: "New Taxon" new_taxonomy: "New Taxonomy" new_user: "New User" new_variant: "New Variant" @@ -420,6 +422,7 @@ en-GB: send_copy_of_orders_mails_to: Send Copy of Order Mails To send_mails_as: Send Mails As send_order_mails_as: Send Order Mails As + server_error: "The server returned an error" ship: ship ship_address: "Ship Address" shipment: Shipment @@ -478,6 +481,7 @@ en-GB: taxon: Taxon taxonomies: Taxonomies taxonomies_setting_description: "Create and manage taxonomies" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Taxons thank_you_for_your_order: "Thank you for your business. Please print out a copy of this confirmation page for your records." this_file_language: "English (UK)" @@ -495,6 +499,7 @@ en-GB: update: Update update_password: "Update my password and log me in" updated_successfully: + updating: Updating use_as_shipping_address: Use as Shipping Address use_billing_address: Use Billing Address use_different_shipping_address: "Use Different Shipping Address" config/locales/en-GB.yml @@ -4,8 +4,6 @@ en-US: abbreviation: Abbreviation access_denied: "Access Denied" account: Account - new_taxon: "New Taxon" - loading: Loading account_updated: "Account updated!" action: Action actions: @@ -292,6 +290,7 @@ en-US: listing_reports: "Listing Reports" listing_tax_categories: "Listing Tax Categories" listing_users: "Listing Users" + loading: Loading locale_changed: "Locale Changed" log_in: "Log In" logged_in_as: "Logged in as" @@ -330,6 +329,7 @@ en-US: new_state: "New State" new_tax_category: "New Tax Category" new_tax_rate: "New Tax Rate" + new_taxon: "New Taxon" new_taxonomy: "New Taxonomy" new_user: "New User" new_variant: "New Variant" @@ -422,6 +422,7 @@ en-US: send_copy_of_orders_mails_to: Send Copy of Order Mails To send_mails_as: Send Mails As send_order_mails_as: Send Order Mails As + server_error: "The server returned an error" ship: ship ship_address: "Ship Address" shipment: Shipment @@ -480,6 +481,7 @@ en-US: taxon: Taxon taxonomies: Taxonomies taxonomies_setting_description: "Create and manage taxonomies" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Taxons thank_you_for_your_order: "Thank you for your business. Please print out a copy of this confirmation page for your records." this_file_language: "English (US)" @@ -497,6 +499,7 @@ en-US: update: Update update_password: "Update my password and log me in" updated_successfully: "Updated Successfully" + updating: Updating use_as_shipping_address: Use as Shipping Address use_billing_address: Use Billing Address use_different_shipping_address: "Use Different Shipping Address" config/locales/en-US.yml @@ -290,6 +290,7 @@ es: listing_reports: "Listado de reportes" listing_tax_categories: "Listado de Taxons" listing_users: "Listado de usuarios" + loading: Loading locale_changed: "Se ha cambiado el idioma" log_in: "Iniciar sesión" logged_in_as: "Identificado como" @@ -328,6 +329,7 @@ es: new_state: "Nueva provincia" new_tax_category: "Nueva categoría" new_tax_rate: "Nuevo iipo impositivo" + new_taxon: "New Taxon" new_taxonomy: "New Taxonomy" new_user: "Nuevo usuario" new_variant: "Nueva Variante" @@ -420,6 +422,7 @@ es: send_copy_of_orders_mails_to: Envia una copia de todos los correos de pedidos a send_mails_as: Enviar correos como send_order_mails_as: Enviar correos de pedidos como + server_error: "The server returned an error" ship: enviar ship_address: "Direccion de envio" shipment: Envio @@ -478,6 +481,7 @@ es: taxon: Taxon taxonomies: Taxonomias taxonomies_setting_description: "Crear y manejar taxonomias" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Taxons thank_you_for_your_order: "Gracias por su pedido" this_file_language: "Español (España)" @@ -495,6 +499,7 @@ es: update: Actualizar update_password: "Actualiza mi contraseña y dejame entrar" updated_successfully: "Actualizado correctamente" + updating: Updating use_as_shipping_address: Usar como direccion de envio use_billing_address: Usar la direccion de facturacion use_different_shipping_address: "Usar una dirección de envío diferente" config/locales/es.yml @@ -290,6 +290,7 @@ fr-FR: listing_reports: "Liste des statistiques" listing_tax_categories: "Liste des catégories de taxes" listing_users: "Liste des utilisateurs" + loading: Loading locale_changed: "Locale changée" log_in: "S'identifier" logged_in_as: "Identifié en tant que" @@ -328,6 +329,7 @@ fr-FR: new_state: "Nouvelle région" new_tax_category: "Nouvelle catégorie de taxes" new_tax_rate: "Nouvelle taxe" + new_taxon: "New Taxon" new_taxonomy: "New Taxonomy" new_user: "Nouvel utilisateur" new_variant: "Nouvelle gamme" @@ -420,6 +422,7 @@ fr-FR: send_copy_of_orders_mails_to: Envoyer une copie des commandes email à send_mails_as: Envoyer des mails en tant que send_order_mails_as: Envoyer des commandes email en tant que + server_error: "The server returned an error" ship: livraison ship_address: "Adresse de livraison" shipment: Livraison @@ -478,6 +481,7 @@ fr-FR: taxon: Taxon taxonomies: Arborescence taxonomies_setting_description: "Création et gestion des Arborescence" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Arborescence thank_you_for_your_order: "Merci de nous avoir fait confiance. Imprimez cette page de confirmation pour vos archives." this_file_language: "Français (FR)" @@ -495,6 +499,7 @@ fr-FR: update: Mise à jour update_password: "Update my password and log me in" updated_successfully: "Mise à jour effectuée avec succès" + updating: Updating use_as_shipping_address: Use as Shipping Address use_billing_address: Use Billing Address use_different_shipping_address: "Utiliser une adresse de facturation différente" config/locales/fr-FR.yml @@ -290,6 +290,7 @@ it: listing_reports: Report listing_tax_categories: "Listing Tax Categories" listing_users: Utente + loading: Loading locale_changed: "Locale Changed" log_in: Login logged_in_as: "Loggato con" @@ -328,6 +329,7 @@ it: new_state: "New State" new_tax_category: "New Tax Category" new_tax_rate: "New Tax Rate" + new_taxon: "New Taxon" new_taxonomy: "New Taxonomy" new_user: "Nuovo utente" new_variant: "Nuova variante" @@ -420,6 +422,7 @@ it: send_copy_of_orders_mails_to: Send Copy of Order Mails To send_mails_as: Send Mails As send_order_mails_as: Send Order Mails As + server_error: "The server returned an error" ship: ship ship_address: "Indirizzo di consegna" shipment: Shipment @@ -478,6 +481,7 @@ it: taxon: Taxon taxonomies: Taxonomies taxonomies_setting_description: "Create and manage taxonomies" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Taxons thank_you_for_your_order: "Thank you for your business. Please print out a copy of this confirmation page for your records." this_file_language: Italian @@ -495,6 +499,7 @@ it: update: Salva update_password: "Update my password and log me in" updated_successfully: + updating: Updating use_as_shipping_address: Use as Shipping Address use_billing_address: Use Billing Address use_different_shipping_address: "Altro indirizzo di consegna" config/locales/it.yml @@ -290,6 +290,7 @@ nb-NO: listing_reports: "Rapporter" listing_tax_categories: "Momskategorier" listing_users: "Brukere" + loading: Loading locale_changed: "Endret språk" log_in: "Logg inn" logged_in_as: "Innlogget som" @@ -328,6 +329,7 @@ nb-NO: new_state: "Ny stat" new_tax_category: "Ny momskategori" new_tax_rate: "Nytt momsnivå" + new_taxon: "New Taxon" new_taxonomy: "Ny klassifikasjon" new_user: "Ny bruker" new_variant: "Ny variant" @@ -420,6 +422,7 @@ nb-NO: send_copy_of_orders_mails_to: "Send kopi av alle ordre-eposter til" send_mails_as: "Send epost som" send_order_mails_as: "Send ordre-epost som" + server_error: "The server returned an error" ship: send ship_address: "Leveringsadresse" shipment: Leveranse @@ -478,6 +481,7 @@ nb-NO: taxon: Klasse taxonomies: Klassifikasjoner taxonomies_setting_description: "Konfigurer klassifikasjoner." + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Klasser thank_you_for_your_order: "Takk for bestillingen. Vennligst skriv ut og ta vare på denne bekreftelsen." this_file_language: "Norsk" @@ -495,6 +499,7 @@ nb-NO: update: Oppdater update_password: "Update my password and log me in" updated_successfully: "Oppdatert" + updating: Updating use_as_shipping_address: "Bruk som leveringsadresse" use_billing_address: "Bruk fakturaadressen" use_different_shipping_address: "Bruk en annen leveringsadresse" config/locales/nb-NO.yml @@ -290,6 +290,7 @@ nl-BE: listing_reports: "Lijst Rapporten" listing_tax_categories: "Lijst BTW categorieën" listing_users: "Lijst Gebruikers" + loading: Loading locale_changed: "Regionale Instellingen Gewijzigd" log_in: "Aanmelden" logged_in_as: "Aangemeld als" @@ -328,6 +329,7 @@ nl-BE: new_state: "Nieuwe Status" new_tax_category: "Nieuwe BTW Categorie" new_tax_rate: "Nieuw BTW Tarief" + new_taxon: "New Taxon" new_taxonomy: "Nieuwe Taxonomie" new_user: "Nieuwe Gebruiker" new_variant: "Nieuwe Variant" @@ -420,6 +422,7 @@ nl-BE: send_copy_of_orders_mails_to: "Zend kopie van bestelmails naar" send_mails_as: "Zend mail als" send_order_mails_as: "Zend bestelmaild als" + server_error: "The server returned an error" ship: Verzenden ship_address: "Afleveringssadres" shipment: Verzending @@ -478,6 +481,7 @@ nl-BE: taxon: Taxon taxonomies: Taxonomieën taxonomies_setting_description: "Aanmaken en wijzigen taxonomieën" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Taxons thank_you_for_your_order: "Hartelijk dank voor uw bestelling. U kan deze pagina afdrukken als bewijs van bestelling." this_file_language: "Nederlands (BE)" @@ -495,6 +499,7 @@ nl-BE: update: Updaten update_password: "Update my password and log me in" updated_successfully: "Succesvol Aangepast" + updating: Updating use_as_shipping_address: "Gebruik als afleveringsadres" use_billing_address: "Gebruik als factuuradres" use_different_shipping_address: "Ander afleveringsadres gebruiken" config/locales/nl-BE.yml @@ -290,6 +290,7 @@ pl: listing_reports: "Lista raportów" listing_tax_categories: "Listing Tax Categories" listing_users: "Lista użytkowników" + loading: Loading locale_changed: "Locale Changed" log_in: Zaloguj logged_in_as: "Zalogowany jako" @@ -328,6 +329,7 @@ pl: new_state: "Nowy stan" new_tax_category: "Nowa kategoria podatkowa" new_tax_rate: "New Tax Rate" + new_taxon: "New Taxon" new_taxonomy: "New Taxonomy" new_user: "Nowy użytkownik" new_variant: "Nowy wariant" @@ -420,6 +422,7 @@ pl: send_copy_of_orders_mails_to: Send Copy of Order Mails To send_mails_as: Send Mails As send_order_mails_as: Send Order Mails As + server_error: "The server returned an error" ship: wyślij ship_address: "Adres Dostawy" shipment: Shipment @@ -478,6 +481,7 @@ pl: taxon: Taxon taxonomies: Taxonomies taxonomies_setting_description: "Create and manage taxonomies" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Taxons thank_you_for_your_order: "Thank you for your business. Please print out a copy of this confirmation page for your records." this_file_language: Polski @@ -495,6 +499,7 @@ pl: update: Aktualizuj update_password: "Update my password and log me in" updated_successfully: + updating: Updating use_as_shipping_address: Use as Shipping Address use_billing_address: Use Billing Address use_different_shipping_address: "Użyj innego adresy dostawy" config/locales/pl.yml @@ -290,6 +290,7 @@ pt-BR: listing_reports: "Listando Relatórios" listing_tax_categories: "Listando Categorias de Impostos" listing_users: "Listando Usuários" + loading: Loading locale_changed: "Localização Modificada" log_in: Entre logged_in_as: "Logado como" @@ -328,6 +329,7 @@ pt-BR: new_state: "Novo Estado" new_tax_category: "Nova Categoria de Imposto" new_tax_rate: "Nova Taxa de Imposto" + new_taxon: "New Taxon" new_taxonomy: "Nova Taxonomia" new_user: "Novo Usuário" new_variant: "Nova Variante" @@ -420,6 +422,7 @@ pt-BR: send_copy_of_orders_mails_to: Enviar Cópia de Emails de Pedidos Para send_mails_as: Enviar Emails como send_order_mails_as: Enviar Emails de Pedidos como + server_error: "The server returned an error" ship: entregar ship_address: "Endereço da Entrega" shipment: Entrega @@ -478,6 +481,7 @@ pt-BR: taxon: Grupo de Taxonomia taxonomies: Taxonomias taxonomies_setting_description: "Criar e gerenciar taxonomias" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Grupos de Taxonomias thank_you_for_your_order: "Obrigado por sua compra. Por favor, imprima uma cópia desta página de confirmação para seu controle." this_file_language: "Português (Brasil)" @@ -495,6 +499,7 @@ pt-BR: update: Atualizar update_password: "Atualizar minha senha e fazer meu login" updated_successfully: "Atualizado com Sucesso" + updating: Updating use_as_shipping_address: Use como Endereço de Entrega use_billing_address: Use como Endereço de Cobrança use_different_shipping_address: "Use um Endereço de Entrega Diferente" config/locales/pt-BR.yml @@ -290,6 +290,7 @@ pt-PT: listing_reports: "Listando Relatórios" listing_tax_categories: "Listando Categorias de IVA" listing_users: "Listando Utilizadores" + loading: Loading locale_changed: "Localização Alterada" log_in: Entre logged_in_as: "Registado como" @@ -328,6 +329,7 @@ pt-PT: new_state: "Novo Estado" new_tax_category: "Nova Categoria de IVA" new_tax_rate: "Nova Taxa de IVA" + new_taxon: "New Taxon" new_taxonomy: "Nova Taxonomia" new_user: "Novo Utilizador" new_variant: "Nova Variante" @@ -420,6 +422,7 @@ pt-PT: send_copy_of_orders_mails_to: Send Copy of Order Mails To send_mails_as: Send Mails As send_order_mails_as: Send Order Mails As + server_error: "The server returned an error" ship: ship ship_address: "Endereço da Entrega" shipment: Distribuição @@ -478,6 +481,7 @@ pt-PT: taxon: Taxon taxonomies: Taxonomias taxonomies_setting_description: "Criar e gerir taxonomias" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Taxons thank_you_for_your_order: "Obrigado por sua compra. Por favor, imprima uma cópia desta página de confirmação para seu controle." this_file_language: "Português" @@ -495,6 +499,7 @@ pt-PT: update: Actualizar update_password: "Update my password and log me in" updated_successfully: Actualizado com sucesso + updating: Updating use_as_shipping_address: Use as Shipping Address use_billing_address: Use Billing Address use_different_shipping_address: "Use um Endereço de Entrega Diferente" config/locales/pt-PT.yml @@ -290,6 +290,7 @@ ru-RU: listing_reports: "Список отчетов" listing_tax_categories: "Список категорий налогов" listing_users: "Список пользователей" + loading: Loading locale_changed: "Локаль изменена" log_in: "Зайти" logged_in_as: "Пользователь" @@ -328,6 +329,7 @@ ru-RU: new_state: "Новая область" new_tax_category: "Новая категория налогов" new_tax_rate: "Новая ставка налога" + new_taxon: "New Taxon" new_taxonomy: "Новая таксономия" new_user: "Новый пользователь" new_variant: "Новый вариант" @@ -420,6 +422,7 @@ ru-RU: send_copy_of_orders_mails_to: Отсылать копии всех писем с заказами на send_mails_as: Отсылать почту как send_order_mails_as: Отсылать почту с заказами как + server_error: "The server returned an error" ship: доставка ship_address: "Ship Address" shipment: Доставка @@ -478,6 +481,7 @@ ru-RU: taxon: Таксон taxonomies: Таксонономии taxonomies_setting_description: "Create and manage taxonomies" + taxonomy_tree_error: "The requested change has not been accepted and the tree has been returned to its previous state, please try again." taxons: Таксоны thank_you_for_your_order: "Thank you for your business. Please print out a copy of this confirmation page for your records." this_file_language: "Русский (RU)" @@ -495,6 +499,7 @@ ru-RU: update: Изменить update_password: "Update my password and log me in" updated_successfully: "Успешна изменена" + updating: Updating use_as_shipping_address: Use as Shipping Address use_billing_address: Use Billing Address use_different_shipping_address: "использовать другой адрес доставки" config/locales/ru-RU.yml @@ -1,6 +1,26 @@ var base_url = "/admin/taxonomies/" + taxonomy_id + "/taxons/"; +var creating = false; +var delete_confirmed = false; +var last_rollback = null; -var handle_move = function(li, target, droppped) { + +var show_progress = function(){ + $("#progress").show(); + $("#ajax_error").hide(); +} + +var hide_progress = function(){ + $("#progress").hide(); +} + +var handle_ajax_error = function(XMLHttpRequest, textStatus, errorThrown){ + $.tree_rollback(last_rollback); + $("#progress").hide(); + $("#ajax_error").show().html("<strong>" + server_error + "</strong><br/>" + taxonomy_tree_error); +}; + +var handle_move = function(li, target, droppped, tree, rb) { + last_rollback = rb; var position = $(li).prevAll().length; var parent = -1; @@ -16,7 +36,10 @@ var handle_move = function(li, target, droppped) { $.ajax({ type: "POST", url: base_url + li.id, - data: ({_method: "put", "taxon[parent_id]": parent.id, "taxon[position]": position, authenticity_token: AUTH_TOKEN}) + data: ({_method: "put", "taxon[parent_id]": parent.id, "taxon[position]": position, authenticity_token: AUTH_TOKEN}), + beforeSend: show_progress, + error: handle_ajax_error, + success: hide_progress }); return true @@ -26,14 +49,77 @@ var handle_dblclick = function(li, tree) { tree.rename(); }; -var handle_rename = function(li) { +var handle_create = function(parent, sib, created, tree, rb){ + last_rollback = rb; + creating=true; +}; + +var handle_created = function(id,result) { + hide_progress(); + + $.tree_reference('taxonomy_tree').selected.attr('id', id); +} + +var handle_rename = function(li, bl, tree, rb) { var name = $(li).children()[0].text; - $.ajax({ + if (creating){ + //actually creating new + var position = $(li).prevAll().length; + var parent = $(li).parents()[1]; + + $.ajax({ + type: "POST", + url: base_url, + data: ({"taxon[name]": name, "taxon[parent_id]": parent.id, "taxon[position]": position, authenticity_token: AUTH_TOKEN}), + beforeSend: show_progress, + error: handle_ajax_error, + success: handle_created + }); + + creating = false; + }else{ + //just renaming + last_rollback = rb; + + $.ajax({ + type: "POST", + url: base_url + li.id, + data: ({_method: "put", "taxon[name]": name, authenticity_token: AUTH_TOKEN}), + beforeSend: show_progress, + error: handle_ajax_error, + success: hide_progress + }); + } +}; + +var handle_before_delete = function(li){ + + if (!delete_confirmed){ + jConfirm('Are you sure you want to delete this taxon?', 'Confirm Taxon Deletion', function(r) { + if(r){ + delete_confirmed = true; + $.tree_reference('taxonomy_tree').remove(li); + } + }); + } + + return delete_confirmed; +}; + +var handle_delete = function(li, tree, rb){ + last_rollback = rb; + + $.ajax({ type: "POST", url: base_url + li.id, - data: ({_method: "put", "taxon[name]": name, authenticity_token: AUTH_TOKEN}) + data: ({_method: "delete", authenticity_token: AUTH_TOKEN}), + beforeSend: show_progress, + error: handle_ajax_error, + success: hide_progress }); + + delete_confirmed = false; }; conf = { @@ -45,7 +131,7 @@ conf = { label : "Create", icon : "create.png", visible : function (NODE, TREE_OBJ) { if(NODE.length != 1) return false; return TREE_OBJ.check("creatable", NODE); }, - action : function (NODE, TREE_OBJ) { TREE_OBJ.create(false, TREE_OBJ.get_node(NODE)); } + action : function (NODE, TREE_OBJ) { TREE_OBJ.create({ attributes : { 'rel' : 'taxon' } }, TREE_OBJ.get_node(NODE)); } }, "separator", { @@ -81,23 +167,28 @@ conf = { ] }, lang : { - new_node : "<%= t('new_taxon') %>", - loading : "<%= t('loading') %> ..." + new_node : new_taxon, + loading : loading + "..." }, rules : { droppable : [ "tree-drop" ], multiple : true, - deletable : "all", - draggable : "all" + deletable : ["taxon"], + draggable : ["taxon"], + dragrules : [ "taxon * taxon", "taxon inside root", ], }, callback : { onmove: handle_move, ondblclk: handle_dblclick, - onrename: handle_rename + onrename: handle_rename, + oncreate: handle_create, + beforedelete: handle_before_delete, + ondelete: handle_delete } }; $(document).ready(function(){ + tax_tree = $.tree_create(); tax_tree.init($("#taxonomy_tree"), $.extend({},conf)); public/javascripts/taxonomy.js 0c35872d78bc867f9f28c5464d8b32e0fce74127 Brian Quinn briandquinn@gmail.com http://github.com/railsdog/spree/commit/a8cad91cb9e0d4478ad4ca2f9e495c1e3892d631 a8cad91cb9e0d4478ad4ca2f9e495c1e3892d631 2009-05-22T09:50:56-07:00 2009-05-22T09:50:56-07:00 Added more handlers for creating / renaming / updating taxons, with progress indicators and error handling 2515c279830e33abe3d8a9f82e0a63427fc4d087 Brian Quinn briandquinn@gmail.com