Merge branch 'master' of github.com:fetsite/fetsite

Conflicts: app/controllers/application_controller.rb
2015-03-09 17:40:52 +01:00
parent d5e0d20884 63e3d68053
commit 3cc9de7d29
3 changed files with 12 additions and 9 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -40,15 +40,18 @@
  

 def get_theme
-  if params[:theme]== "default" || params[:theme]=="2003" || params[:theme].nil?
-    params[:theme]="blue1"
-    end
-  if ThemesForRails.available_theme_names.include?(params[:theme])
-  params[:theme]
+
+#  if params[:theme]== "default" || params[:theme]=="2003" || params[:theme].nil?
+
+#    params[:theme]="blue1"
+#    end
+#  if ThemesForRails.available_theme_names.include?(params[:theme])
+#  params[:theme]
+
 
-else
+#else
 "blue1"
-end
+#end
 end
  def default_url_options
    {locale: I18n.locale, theme: (theme_name=="blue1") ? nil : theme_name , ansicht: nil}