Merge /home/andis/fetsite

config/environments/development.rb

@@ -16,7 +16,7 @@ Fetsite::Application.configure do
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.delivery_method =:sendmail
-  config.action_mailer.default_url_options = {}#{:host=> "localhost", :port=>3000} #  :host => 'glonass.htu.tuwien.ac.at' }
+  config.action_mailer.default_url_options = {:host=> "localhost", :port=>3000} #  :host => 'glonass.htu.tuwien.ac.at' }
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 

config/routes.rb

@@ -8,7 +8,20 @@
        resources :comments, contstraints: {id: /[0-9]+/}, only: :show
 
 
-    
+## Inserted for testing tests
+      resources :members , controller: :fetprofiles , as: :fetprofiles do
+        collection do
+          get 'verwalten'
+          get 'internlist'
+        end
+      end
+     resources :gremien do 
+        collection do 
+          get 'verwalten'
+        end
+      end
+#
+    # #-------------------------
 
    namespace :survey do
      resources :questions do
@@ -26,7 +39,12 @@
   themes_for_rails
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
   resources :home, :only=>[:index] do
-  end
+end
+resources :emails, :only=>[:index] do
+     collection do
+ get :daily_reminder
+    end
+end
   get ':locale', constraints: {locale: /en|de/}, action: :language,controller: :home, as: "language"
   scope '(:locale)/admin' do
     resources :users, :only=>[]  do 
@@ -35,6 +53,7 @@
         post :all_update
       end
       member do
+         get :set_preferred_theme
         get :fb_set_default_publish_page
       end
     end
@@ -60,6 +79,7 @@
     scope '(t/:theme)' do
       get "" , controller: :home, action: :index
       get "intern" , controller: :home, action: :intern
+      get "infoscreen" , controller: :home, action: :infoscreen
       get "beispielsammlung", to: redirect('/studien')
       scope '(:ansicht)' do
         resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do
@@ -125,12 +145,12 @@
           get 'verwalten'
         end
       end
-      resources :fetprofiles, as: :fetprofiles_bak do
-        collection do 
-          get 'verwalten'
-          get 'internlist'
-        end
-      end
+#      resources :fetprofiles, as: :fetprofiles_bak do
+#        collection do 
+#          get 'verwalten'
+#          get 'internlist'
+#        end
+#      end
       resources :members , controller: :fetprofiles , as: :fetprofiles do
         collection do
           get 'verwalten'
@@ -165,7 +185,7 @@
             get 'publish_to_facebook'
             get 'mail_to_fet'
             get 'mail_preview'
- 
+             get 'flag'
           end
           collection do
             get 'newsletter_preview'