updated Readme, detailed install instructions.

.gitignore

@@ -1,3 +1,4 @@
+.idea
 .yardoc
 .DS_Store
 .svn

README.md

@@ -68,6 +68,7 @@ Installation
 
 Use the installer (recommended):
 
+    gem install alchemy_cms --pre
     alchemy new my_magicpage
 
 Start the local server:
@@ -76,6 +77,17 @@ Start the local server:
 
 Then just switch to your browser and open `http://localhost:3000`.
 
+Add to existing Rails project:
+
+    add gem 'alchemy_cms' to Gemfile
+
+    bundle install
+    rake alchemy:prepare
+    rake alchemy:standard_set:install (optional)
+    rake db:migrate
+    rake db:seed
+
+
 Tipps
 -----
 

app/helpers/pages_helper.rb

@@ -84,7 +84,7 @@ def language_switches(options={})
     }
     options = default_options.merge(options)
     if multi_language?
-      languages = []
+      language_links = []
       pages = (options[:link_to_public_child] == true) ? Page.language_roots : Page.public_language_roots
       pages.each_with_index do |page, i|
         if(options[:link_to_page_with_layout] != nil)
@@ -97,33 +97,29 @@ def language_switches(options={})
           active = session[:language_id] == page.language.id
           linkname = page.language.label(options[:linkname])
           if options[:as_select_box]
-            languages << [linkname, show_page_url(:urlname => page.urlname, :lang => page.language.code)]
+            language_links << [linkname, show_page_url(:urlname => page.urlname, :lang => page.language.code)]
           else
-            languages << link_to(
+            language_links << link_to(
               "#{content_tag(:span, '', :class => "flag")}#{ content_tag(:span, linkname)}".html_safe,
               show_page_path(:urlname => page.urlname, :lang => page.language.code),
               :class => "#{(active ? 'active ' : nil)}#{page.language.code} #{(i == 0) ? 'first' : (i==pages.length-1) ? 'last' : nil}",
-              :title => options[:show_title] ? I18n.t("alchemy.languages.#{page.language.code}.title", :default => page.language.name) : nil
+              :title => options[:show_title] ? I18n.t("alchemy.language_links.#{page.language.code}.title", :default => page.language.name) : nil
             )
           end
         end
       end
-      languages.reverse! if options[:reverse]
+      language_links.reverse! if options[:reverse]
       if options[:as_select_box]
         return select_tag(
           'language',
           options_for_select(
-            languages,
+            language_links,
             show_page_url(:urlname => @page.urlname, :lang => @page.language.code)
           ),
           :onchange => "window.location=this.value"
         )
       else
-        if options[:spacer].blank?
-          return languages.html_safe
-        else
-          return languages.join(options[:spacer]).html_safe
-        end
+        raw(language_links.join(options[:spacer]))
       end
     end
   end

spec/helpers/pages_helper_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe PagesHelper do
+
+  describe "language_switches" do
+    before :each do
+      helper.stub(:configuration)
+    end
+
+    it "should return links to all other languages" do
+      helper.stub(:multi_language?).and_return(true)
+      Page.create(:language_code => "en", :public => true)
+      Page.create(:language_code => "de")
+                                                 ss
+      helper.language_switches.should == ""
+    end
+
+    it "should return nil if there is only one language" do
+      helper.stub(:multi_language?).and_return(nil)
+      helper.language_switches.should be nil
+    end
+  end
+end