Merge branch 'refs/heads/pulls/663/add-alt-tags' into feature/2.4.0/accessibility-master

Conflicts:
	config/locales/de.yml
	config/locales/en.yml

app/helpers/application_helper.rb

@@ -159,12 +159,18 @@ module ApplicationHelper
   #   link_to_project(project, {:only_path => false}, :class => "project") # => 3rd arg adds html options
   #   link_to_project(project, {}, :class => "project") # => html options with default url (project overview)
   #
-  def link_to_project(project, options={}, html_options = nil)
+  def link_to_project(project, options={}, html_options = nil, show_icon = false)
+    if show_icon && User.current.member_of?(project)
+      icon = image_tag('fav.png', :title => l(:description_my_project))
+    else
+      icon = ""
+    end
+
     if project.active?
       url = {:controller => 'projects', :action => 'show', :id => project}.merge(options)
-      link_to(h(project), url, html_options)
+      link_to(h(project) + icon, url, html_options)
     else
-      h(project)
+      h(project) + icon
     end
   end
 

app/helpers/projects_helper.rb

@@ -69,7 +69,7 @@ module ProjectsHelper
         end
         classes = (ancestors.empty? ? 'root' : 'child')
         s << "<li class='#{classes}'><div class='#{classes}'>" +
-               link_to_project(project, {}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
+               link_to_project(project, {}, {:class => "project"}, true)
         s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank?
         s << "</div>\n"
         ancestors << project

config/locales/de.yml

@@ -1010,6 +1010,7 @@ de:
   label_path_encoding: Path encoding
   text_mercurial_repo_example: local repository (e.g. /hgrepo, c:\hgrepo)
   label_diff: diff
+<<<<<<< HEAD
   description_filter: Filter
   description_search: Suchfeld
   description_choose_project: Projekte
@@ -1042,3 +1043,4 @@ de:
   description_attachment_toggle: Dateien aus/einblenden
   description_autocomplete: Für dieses Feld werden sie mit einer Autovervollständigung unterstützt. Sie können einen Teil des Tickettitels schreiben und bekommen eine Liste von möglichen Tickets angezeigt. Wählen Sie mit den Pfeiltasten den gewünschten Eintrag und bestätigen Sie mit Tab oder Enter. Sie können aber auch die Ticketnummer direkt eintragen.
   description_noscript: Sie müssen JavaScript aktiveren, um Chiliproject nutzen zu können!
+  description_my_project: Sie sind Mitglied

config/locales/en.yml

@@ -992,6 +992,7 @@ en:
   enumeration_doc_categories: Document categories
   enumeration_activities: Activities (time tracking)
   enumeration_system_activity: System Activity
+<<<<<<< HEAD
   description_filter: Filter
   description_search: Searchfield
   description_choose_project: Projects
@@ -1024,3 +1025,4 @@ en:
   description_attachment_toggle: Show/Hide attachments
   description_autocomplete: This field uses autocomplete. While typing the title of an issue you will receive a list of possible candidates. Choose one using the arrow up and arrow down key and select it with tab or enter. Alternatively you can enter the issue number directly.
   description_noscript: You need to activate JavaScript in order to use Chiliproject!
+  description_my_project: You are member