diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ca6bee5..7d2bfdb 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base def get_reseaux - if session[:reseaux_id] + if session[:reseaux_id] and current_customer @reseaux = current_customer.reseauxes.find(session[:reseaux_id]) @reseaux_layout = true end diff --git a/app/controllers/public/customers_auths_controller.rb b/app/controllers/public/customers_auths_controller.rb index cb3a007..82b18db 100755 --- a/app/controllers/public/customers_auths_controller.rb +++ b/app/controllers/public/customers_auths_controller.rb @@ -1,7 +1,7 @@ # -*- encoding : utf-8 -*- class Public::CustomersAuthsController < ApplicationController layout "public" - + before_filter :get_reseaux def new @biglogo = true @no_search = true @@ -12,6 +12,16 @@ class Public::CustomersAuthsController < ApplicationController else session[:for_annonce] = nil end + + + if params[:p] + @reseaux = Reseaux.where(:token => params[:p].to_s).first + if @reseaux + session[:reseaux_id] = @reseaux.id + @reseaux_layout = true + + end + end @customer = Customer.new() if params[:p] @@ -29,7 +39,12 @@ class Public::CustomersAuthsController < ApplicationController end def create - + if session[:reseaux_id] + @reseaux = Reseaux.find(session[:reseaux_id]) + @reseaux_layout = true + end + + @biglogo = true @customer = Customer.new() if cookies[:mlm_token] and @parent = Customer.find_parrain(cookies[:mlm_token]) @@ -70,7 +85,11 @@ class Public::CustomersAuthsController < ApplicationController end else - redirect_to public_my_reseauxes_path + if @reseaux + redirect_to public_reseaux_products_path(:reseaux_id => @reseaux.id) + else + redirect_to public_my_reseauxes_path + end end else diff --git a/app/controllers/public/reseauxes_controller.rb b/app/controllers/public/reseauxes_controller.rb index fef3398..3fb92f9 100755 --- a/app/controllers/public/reseauxes_controller.rb +++ b/app/controllers/public/reseauxes_controller.rb @@ -1,6 +1,6 @@ class Public::ReseauxesController < ApplicationController layout "public" - before_filter :auth_customer + before_filter :auth_customer, :except => :find_sub_domain def index @reseauxes = current_customer.own_reseauxes.order(:name) @@ -24,5 +24,22 @@ class Public::ReseauxesController < ApplicationController end + + def find_sub_domain + if ["negos.pro", "localhost.qz"].include?(request.domain(1)) + + sub_domain = request.domain(2).split(".")[0] + @reseaux = Reseaux.where(:sub_domain => sub_domain.to_s).first + + if request.domain(1) == "localhost.qz" + redirect_to "http://localhost:3000/public/customers_auths/new?p="+@reseaux.token.to_s + + else + render :inline => @reseaux.id.to_s + end + + + end + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index cbcb026..8bfb5dc 100755 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -122,7 +122,12 @@ class Customer < ActiveRecord::Base end - + after_create do + if reseaux = Reseaux.find_by_token(self.reseaux_token) + self.reseauxes << reseaux + + end + end before_validation do diff --git a/app/models/product_order_document.rb b/app/models/product_order_document.rb index 2ac461c..c00b941 100644 --- a/app/models/product_order_document.rb +++ b/app/models/product_order_document.rb @@ -28,7 +28,7 @@ class ProductOrderDocument < ActiveRecord::Base self.d_year = self.product_order.created_at.year - + self.public = self.product_order_document_type.public self.d_prefix = self.product_order_document_type.prefix.to_s self.label = self.product_order_document_type.label.to_s self.header = self.product_order_document_type.header.to_s diff --git a/app/views/admin/product_order_document_types/_form.html.haml b/app/views/admin/product_order_document_types/_form.html.haml index dc4d6e9..2ce538a 100755 --- a/app/views/admin/product_order_document_types/_form.html.haml +++ b/app/views/admin/product_order_document_types/_form.html.haml @@ -1,6 +1,7 @@ = semantic_form_for [:admin,@product_order_document_type], :remote => true do |form| .content + = form.input :public, :label => "Visible des clients ?" = form.input :label, :label => "Label :" = form.input :name, :label => "Nom :" = form.input :prefix, :label => "Prefix :" diff --git a/app/views/admin/product_order_documents/_vsg_fournisseurs.html.haml b/app/views/admin/product_order_documents/_vsg_fournisseurs.html.haml index 599ab28..125f2fb 100644 --- a/app/views/admin/product_order_documents/_vsg_fournisseurs.html.haml +++ b/app/views/admin/product_order_documents/_vsg_fournisseurs.html.haml @@ -74,10 +74,10 @@ -if true %td - =number_to_currency sub_products[0].price_ht + =number_to_currency sub_products[0].price_ht_with_qte %td{:style => "text-align:right;"} - =number_to_currency sub_products[0].price_ht * i + =number_to_currency sub_products[0].price_ht_with_qte * i %tr %td{:colspan => 4, :style => "text-align:right;"} diff --git a/app/views/admin/product_order_documents/show.html.haml b/app/views/admin/product_order_documents/show.html.haml index 30dfc17..0fdd8ef 100644 --- a/app/views/admin/product_order_documents/show.html.haml +++ b/app/views/admin/product_order_documents/show.html.haml @@ -95,7 +95,11 @@ %body - -if @product_order.reseaux_id == 19 #distributeurs vouisstar + -if @product_order.reseaux_id == 18 #distributeurs vouisstar + + -if @product_order_document.product_order_document_type.fournisseur + =render :partial => "admin/product_order_documents/vsg_fournisseurs" + -elsif @product_order.reseaux_id == 19 #distributeurs vouisstar -if @product_order_document.product_order_document_type.fournisseur =render :partial => "admin/product_order_documents/vsg_fournisseurs" diff --git a/app/views/admin/reseauxes/_form.html.haml b/app/views/admin/reseauxes/_form.html.haml index 6095991..fcc5c81 100755 --- a/app/views/admin/reseauxes/_form.html.haml +++ b/app/views/admin/reseauxes/_form.html.haml @@ -13,6 +13,7 @@ =f.input :description, :label => "A propos : ", :input_html => {:class => "redactor_textarea"} -if !@reseaux.parent =f.input :chef_reseau, :label => "Chef réseau : ", :collection => Customer.where(:chef_reseau => true).pluck(Arel.sql("CONCAT(`firstname`, ' ', `name`)"), :id) + =f.input :sub_domain, :label => "Sous domaine (pour l'url) :" =f.input :logo_image_file_id, :label => "Logo :", :as => :qi_image_select =f.input :background_image_file_id, :label => "Image de fond :", :as => :qi_image_select diff --git a/app/views/admin/reseauxes/_reseaux.html.haml b/app/views/admin/reseauxes/_reseaux.html.haml index 603c384..63c65c4 100755 --- a/app/views/admin/reseauxes/_reseaux.html.haml +++ b/app/views/admin/reseauxes/_reseaux.html.haml @@ -6,6 +6,8 @@ = reseaux.chef_reseau.pseudo_admin if reseaux.chef_reseau %td = reseaux.token + %td + = reseaux.sub_domain %td = reseaux.customers.count diff --git a/app/views/public/customers/_new_form.haml b/app/views/public/customers/_new_form.haml index e4f75df..88675db 100755 --- a/app/views/public/customers/_new_form.haml +++ b/app/views/public/customers/_new_form.haml @@ -71,7 +71,8 @@ .error Votre mot de passe = error - -if false + -if @customer.reseaux_token + Code réseau : .form-group{:class => ("has-error has-feedback" if @customer.errors[:reseaux_token].size > 0)} =f.text_field :reseaux_token, :class => "form-control", :placeholder => "Code réseau" -if @customer.errors[:reseaux_token].uniq diff --git a/app/views/public/product_order_documents/show.html.haml b/app/views/public/product_order_documents/show.html.haml index 30dfc17..d33bae5 100644 --- a/app/views/public/product_order_documents/show.html.haml +++ b/app/views/public/product_order_documents/show.html.haml @@ -95,7 +95,11 @@ %body - -if @product_order.reseaux_id == 19 #distributeurs vouisstar + -if @product_order.reseaux_id == 18 + -if @product_order_document.product_order_document_type.fournisseur + =render :partial => "admin/product_order_documents/vsg_fournisseurs" + + -elsif @product_order.reseaux_id == 19 #distributeurs vouisstar -if @product_order_document.product_order_document_type.fournisseur =render :partial => "admin/product_order_documents/vsg_fournisseurs" diff --git a/app/views/public/product_orders/payment_instructions.html.haml b/app/views/public/product_orders/payment_instructions.html.haml index c2c61d5..e9a9884 100644 --- a/app/views/public/product_orders/payment_instructions.html.haml +++ b/app/views/public/product_orders/payment_instructions.html.haml @@ -8,7 +8,7 @@ Téléchargez dès maintenant vos documents : %table.table - -@product_order_ar.product_order_documents.each do |product_order_document| + -@product_order_ar.product_order_documents.where(:public => true).each do |product_order_document| %tr %td{:style => "width:300px;"} =product_order_document.name diff --git a/config/routes.rb b/config/routes.rb index c45e7d1..e0599eb 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,563 +1,576 @@ Rails.application.routes.draw do - get 'mail_assets/:token.png' => "admin/mail_trackings#update", :as => :image_tracking - - get "vouisstar" => "public/home#vouisstar" - - get "/ogoneipn" => "public/payments#ogone_ipn", :as => :ogone_ipn_public_payments + constraints :subdomain => /^(?!commander|negos)(\w+)/ do + get "/" => 'public/reseauxes#find_sub_domain' + end constraints subdomain: 'commander' do get "/" => "public/home#vouisstar" end + + constraints domain: ['negos.pro', 'negos.quartz.xyz', "localhost"] do + + get 'mail_assets/:token.png' => "admin/mail_trackings#update", :as => :image_tracking - get "affiliation/:mlm_token" => "public/home#affiliation" - get "affiliation" => "public/home#affiliation" + get "vouisstar" => "public/home#vouisstar" + + + get "/ogoneipn" => "public/payments#ogone_ipn", :as => :ogone_ipn_public_payments + + + + get "affiliation/:mlm_token" => "public/home#affiliation" + get "affiliation" => "public/home#affiliation" - constraints domain: ['sideplace-affiliation.dev', 'affiliation-sideplace.com'] do - get "/:mlm_token" => "public/home#redirect_affiliation" - get "/" => "public/home#redirect_affiliation" - end - get 'p/:mlm_token' => "public/customers#parrainage", :as => :mlm_token + get 'p/:mlm_token' => "public/customers#parrainage", :as => :mlm_token - namespace :public do + namespace :public do - resources :payments do - member do - get :paid_by_ogone - get :paid_by_ogone_confirm - get :paid + resources :payments do + member do + get :paid_by_ogone + get :paid_by_ogone_confirm + get :paid + end + collection do + get :ogone_ipn + end end - collection do - get :ogone_ipn - end - end - resources :abonnements + resources :abonnements - resources :conversations - get 'documents/:download_token', to: 'documents#download', as: :download_document + resources :conversations + get 'documents/:download_token', to: 'documents#download', as: :download_document - resources :customer_favs - resources :customer_ribs do - - end - resources :annonce_cats do - collection do - get :search - end - end - resources :commissions - resources :orders do - collection do - get :e_trans_cancel - get :e_trans_ipn - get :e_trans_refuse - get :e_trans_effectue - - get :billing - get :bills - end - - member do - get :bill_print - get :paid - get :paid_force + resources :customer_favs + resources :customer_ribs do end - end - resources :credit_products - resources :cities do - collection do - get :search + resources :annonce_cats do + collection do + get :search + end end - end - resources :credits - resources :mlm_points + resources :commissions + resources :orders do + collection do + get :e_trans_cancel + get :e_trans_ipn + get :e_trans_refuse + get :e_trans_effectue - resources :annonce_photos do - member do - get :rotate - end - end - resources :annonces do - collection do + get :billing + get :bills + end - - - get :geocode - end - member do - get :photos - get :specific - get :publish - get :contact - get :options - get :buy_option - end - end - get 'my_account/mes-reseaux' => "my_account#my_reseauxes", :as => "my_reseauxes" - get 'my_account/favoris', :as => "favs" - get 'my_account/filleuls', :as => "filleuls" - get 'my_account/binary', :as => "binary" - get 'my_account/index', :as => "my_account" - get 'my_account/edit_infos', :as => "edit_infos" - get 'my_account/my_annonces', :as => "my_annonces" - get 'my_account/reconfirm', :as => "reconfirm_email" - - resources :accepted_offers do - - resources :documents do member do - get :download - get :download_returned - post :upload_returned - get :destroy_returned + get :bill_print + get :paid + get :paid_force end end - - - end - resources :needs do - get :download_devis - resources :messages - resources :wishes do - member do - get :download_devis + resources :credit_products + resources :cities do + collection do + get :search end end - resources :offers do + resources :credits + resources :mlm_points + + resources :annonce_photos do member do - get :accept - post :accept_save + get :rotate end end - member do - get 'wish', as: 'wish' + resources :annonces do + collection do + + + + get :geocode + end + member do + get :photos + get :specific + get :publish + get :contact + get :options + get :buy_option + end end - end + get 'my_account/mes-reseaux' => "my_account#my_reseauxes", :as => "my_reseauxes" + get 'my_account/favoris', :as => "favs" + get 'my_account/filleuls', :as => "filleuls" + get 'my_account/binary', :as => "binary" + get 'my_account/index', :as => "my_account" + get 'my_account/edit_infos', :as => "edit_infos" + get 'my_account/my_annonces', :as => "my_annonces" + get 'my_account/reconfirm', :as => "reconfirm_email" - resources :contact_messages do + resources :accepted_offers do - end + resources :documents do + member do + get :download + get :download_returned + post :upload_returned + get :destroy_returned - end + end + end - - get "evenements/:id.html" => "public/events#show", :as => "public_event" - get "evenements.html" => "public/events#index", :as => "public_events" - - - post "search.:f" => "public/annonces#search", :as => :search_public_annonces, :f => "html" - get "search.:f" => "public/annonces#search", :f => "html" - - - constraints subdomain: 'blog' do - get "blog/archives/:year/:month.html"=> "public/articles#archives", :as => :archive_public_article - get "blog/tags/:id.html"=> "public/articles#tags", :as => :public_tag - get "blog/categorie/:slug.:f"=> "public/articles#category", :as => :category_public_article, :f => "html" - get 'blog/:id.html' => "public/articles#show", :as => "public_article" - get 'blog/:slug.:f' => 'public/articles#show', :as => :article, :f => "html" - get 'blog.:f' => 'public/articles#index', :as => :articles, :f => "html" - get '/' => 'public/articles#index' - - end - - - - - - get "/" => "public/ebooks#show",:id => "arreter-de-fumer" ,:constraints => {:domain => ["arreter-de-fumer-avec-eft.dev", "bally.me", "arreter-de-fumer-avec-eft.com"]} - - - - - get "categorie/:id.:f" => "public/annonces#search", :as => :public_annonce_category, :f => "html" - post "categorie/:id.:f" => "public/annonces#search", :as => :post_public_annonce_category, :f => "html" - - - - - get "sitemap.:f" => "public/sitemap#sitemap" - namespace :public do - resources :product_order_documents - get :my_cart, to: "product_orders#my_cart" - - - resources :militer_cats - - resources :product_sizes - - resources :product_images - - resources :product_categories - - resources :products - - resources :product_orders do - member do - get :payment_instructions end - - collection do - get :paid_by_ogone - get :paid_by_ogone_confirm - - post :payplug_ipn - - post :vourcher - - get :particulars - post :particulars_save - get :select_payment - get :select_fdp - post :select_fdp_save - get :select_fdp_save - post :select_payment_save - - - get :payment_instructions - - end - - end - resources :product_order_products - - - resources :product_customers do - member do - get :confirm - get :mail - get :mail_confirm - get :show_details + resources :needs do + get :download_devis + resources :messages + resources :wishes do + member do + get :download_devis + end + end + resources :offers do + member do + get :accept + post :accept_save + end + end + member do + get 'wish', as: 'wish' + end end - collection do - get :find_parrain + resources :contact_messages do + end end - resources :product_customers_auths do - collection do - get :logout + get "evenements/:id.html" => "public/events#show", :as => "public_event" + get "evenements.html" => "public/events#index", :as => "public_events" + + + post "search.:f" => "public/annonces#search", :as => :search_public_annonces, :f => "html" + get "search.:f" => "public/annonces#search", :f => "html" + + + constraints subdomain: 'blog' do + get "blog/archives/:year/:month.html"=> "public/articles#archives", :as => :archive_public_article + get "blog/tags/:id.html"=> "public/articles#tags", :as => :public_tag + get "blog/categorie/:slug.:f"=> "public/articles#category", :as => :category_public_article, :f => "html" + get 'blog/:id.html' => "public/articles#show", :as => "public_article" + get 'blog/:slug.:f' => 'public/articles#show', :as => :article, :f => "html" + get 'blog.:f' => 'public/articles#index', :as => :articles, :f => "html" + get '/' => 'public/articles#index' - end end + + + + + + get "/" => "public/ebooks#show",:id => "arreter-de-fumer" ,:constraints => {:domain => ["arreter-de-fumer-avec-eft.dev", "bally.me", "arreter-de-fumer-avec-eft.com"]} + + + + + get "categorie/:id.:f" => "public/annonces#search", :as => :public_annonce_category, :f => "html" + post "categorie/:id.:f" => "public/annonces#search", :as => :post_public_annonce_category, :f => "html" + + + + + get "sitemap.:f" => "public/sitemap#sitemap" + namespace :public do + resources :product_order_documents + get :my_cart, to: "product_orders#my_cart" - resources :reseauxes do + + resources :militer_cats + + resources :product_sizes + + resources :product_images + + resources :product_categories + resources :products - resources :product_orders - resources :customers do - - end - - end - resources :virements - resources :comments - resources :customer_messages do - member do - get :answer - post :answer_save - end - end - - - resources :customers do - member do - get :confirm - get :mail - get :mail_confirm - get :show_details - end - - collection do - get :find_parrain - end - - end - - resources :customers_auths do - - collection do - - get :logout - - end - end - - resources :password_resets - - end - - namespace :portlet do - resources :event_contents - resources :break_contents - resources :download_contents - resources :dynamic_contents - resources :gallery_contents - resources :gallery_images do - collection do - get :reorder - end - end - resources :html_contents - resources :image_contents - resources :link_contents - resources :img_link_contents - resources :text_contents - resources :map_contents - resources :title_contents - resources :table_contents - resources :block_contents - resources :table_rows - resources :table_cols - resources :portlets do - collection do - post :reorder - end - end - end - - namespace :admin do - resources :fournisseurs - resources :product_order_documents - resources :product_order_document_types - resources :product_order_payments - resources :product_orders do - collection do - get :export - get :export2 - end - member do - get :ship - get :bill - get :bl - get :subs - end - end - - - resources :product_sizes do - collection do - get :reorder - end - end - resources :product_images do - collection do - get :reorder - end - end - resources :product_categories do - collection do - post :reorder - end - resources :product_collections - end - resources :products do - collection do - post :reorder - end - + resources :product_orders do member do - get :stock + get :payment_instructions + end + + collection do + get :paid_by_ogone + get :paid_by_ogone_confirm + + post :payplug_ipn + + post :vourcher + + get :particulars + post :particulars_save + get :select_payment + get :select_fdp + post :select_fdp_save + get :select_fdp_save + post :select_payment_save + + + get :payment_instructions + + end + + end + resources :product_order_products + + + resources :product_customers do + member do + get :confirm + get :mail + get :mail_confirm + get :show_details + end + + collection do + get :find_parrain + end + + end + + resources :product_customers_auths do + + collection do + + get :logout + + end + end + + resources :reseauxes do + resources :products + resources :product_orders + resources :customers do + + + end + + end + resources :virements + resources :comments + resources :customer_messages do + member do + get :answer + post :answer_save + end + end + + + resources :customers do + member do + get :confirm + get :mail + get :mail_confirm + get :show_details + end + + collection do + get :find_parrain + end + + end + + resources :customers_auths do + + collection do + + get :logout + + end + end + + resources :password_resets + + end + + namespace :portlet do + resources :event_contents + resources :break_contents + resources :download_contents + resources :dynamic_contents + resources :gallery_contents + resources :gallery_images do + collection do + get :reorder + end + end + resources :html_contents + resources :image_contents + resources :link_contents + resources :img_link_contents + resources :text_contents + resources :map_contents + resources :title_contents + resources :table_contents + resources :block_contents + resources :table_rows + resources :table_cols + resources :portlets do + collection do + post :reorder + end + end + end + + namespace :admin do + resources :fournisseurs + resources :product_order_documents + resources :product_order_document_types + resources :product_order_payments + resources :product_orders do + collection do + get :export + get :export2 + end + member do + get :ship + get :bill + get :bl + get :subs + end end - end + + resources :product_sizes do + collection do + get :reorder + end + end + resources :product_images do + collection do + get :reorder + end + end + resources :product_categories do + collection do + post :reorder + end + resources :product_collections + end + resources :products do + collection do + post :reorder + end + + member do + get :stock + end + + end - resources :reseauxes - resources :documents + resources :reseauxes + resources :documents - resources :domains - resources :annonces do + resources :domains + resources :annonces do - end - - resources :orders do - member do - get :cancel - get :force_pref - post :force end - end - resources :virements do - member do - - get :valid - end - end - resources :virement_remises do - member do - - get :sended - end - end - resources :annonces - resources :annonce_photos - resources :customer_ribs do - member do - - get :valid - end - end - resources :newsletters do - member do - get :history - get :history_detail - - get "select_recipients" - put "select_recipients" - post "send_test" - post "send_newsletter" - end - end - - - - resources :need_categories - resources :needs do - get :download_devis - resources :messages - resources :wishes do + resources :orders do member do - get :download_devis + get :cancel + get :force_pref + post :force end end + + resources :virements do + member do + + get :valid + end + end + resources :virement_remises do + member do + + get :sended + end + end + resources :annonces + resources :annonce_photos + resources :customer_ribs do + member do + + get :valid + end + end + resources :newsletters do + member do + get :history + get :history_detail + + get "select_recipients" + put "select_recipients" + post "send_test" + post "send_newsletter" + end + end + + + + resources :need_categories + resources :needs do + get :download_devis + resources :messages + resources :wishes do + member do + get :download_devis + end + end + resources :offers do + + end + member do + get :validate + get :refuse + get :negociate + get :accept + get :reject + get :back_to_verified + get :back_to_negociating + end + end + + resources :conversations do + + end + + resources :contact_messages do + + end resources :offers do + resources :accepted_offers do + resources :documents do + post :upload_document + post :upload_returned_document + get :download + get :download_returned + get :delete + get :delete_returned + get :verify_returned + get :destroy + get :force_verified + end + member do + get :validate_all_documents + end + end + member do + get :download_zip + get :upload_documents + post :upload_documents + get :accepted + end end - member do - get :validate - get :refuse - get :negociate - get :accept - get :reject - get :back_to_verified - get :back_to_negociating + get :connected_customers, to: "customers#connected_customers" + resources :customers do + + member do + + get :validate + end end - end - resources :conversations do + resources :categories do + collection do + post :reorder + end + end + resources :annonce_cats + resources :comments + resources :articles + resources :events - end + resources :tags + resources :password_resets - resources :contact_messages do + resources :admin_auths do + collection do + get :logout + end + end - end - resources :offers do - resources :accepted_offers do - resources :documents do - post :upload_document - post :upload_returned_document - get :download - get :download_returned - get :delete - get :delete_returned - get :verify_returned - get :destroy - get :force_verified + resources :admins + + + + resources :external_links do + collection do + get :cible + end + end + + + resources :menus + resources :menu_items do + collection do + get :cible + post :reorder + get :import end member do - get :validate_all_documents + get :clone end end - - member do - get :download_zip - get :upload_documents - post :upload_documents - get :accepted - end - end - get :connected_customers, to: "customers#connected_customers" - resources :customers do - - member do - - get :validate - end - end - - resources :categories do - collection do - post :reorder - end - end - resources :annonce_cats - resources :comments - resources :articles - resources :events - - resources :tags - resources :password_resets - - resources :admin_auths do - collection do - get :logout + resources :image_files do + member do + get :rotate end + end + resources :file_folders + resources :data_files + resources :pages + resources :menu_urls + resources :menu_aliases + resources :blocks + resources :albums + resources :cibles + + end - resources :admins - - - - resources :external_links do - collection do - get :cible - end - end - - - resources :menus - resources :menu_items do - collection do - get :cible - post :reorder - get :import - end - member do - get :clone - end - end - resources :image_files do - member do - get :rotate - end - end - resources :file_folders - resources :data_files - resources :pages - resources :menu_urls - resources :menu_aliases - resources :blocks - resources :albums - resources :cibles + resources :download_data_files + get 'admin' => "admin/admin_auths#index" + get '*url.html' => 'public/menu_items#show', :as => :menu_item, :f => "html" + get '*url.:f' => 'public/menu_items#redirect', :f => "html" + + + get "/" => 'public/needs#index' end - resources :download_data_files - get 'admin' => "admin/admin_auths#index" + #root "" - get '*url.html' => 'public/menu_items#show', :as => :menu_item, :f => "html" - get '*url.:f' => 'public/menu_items#redirect', :f => "html" - - root 'public/needs#index' + #root 'public/needs#index' + end