Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix some typos, add some common attachment file formats.

  • Loading branch information...
commit 2beb25dc2a789057e0eb76bce0ec4d489a744ee3 1 parent 4234a49
@vanderhoorn vanderhoorn authored
View
12 app/helpers/application_helper.rb
@@ -39,9 +39,9 @@ def bread_crumbs_for(node, options = {})
# :suffix: A tree that follows the node, e.g. a category of a product catalogue
def bread_crumbs_track_for(node, options = {})
options = { :minimum_crumbs => 1, :separator => ' > ', :include_root => true }.merge(options)
-
+
host = options.delete :host
-
+
crumb_track = String.new
crumb_nodes = node.self_and_ancestors
crumb_nodes.shift unless node.containing_site.root?
@@ -103,7 +103,7 @@ def side_box_error_messages_for(obj)
# Returns the html for the double-level main menu.
def create_main_menu
top_level_main_menu_items = current_site.closure_for(current_site.descendants(:to_depth => 2).accessible.public.shown_in_menu.all(:order => :position)).values.first
-
+
if top_level_main_menu_items.any?
content_tag(:ul, top_level_main_menu_items.map { |item, sub_items| create_main_menu_item(item, sub_items.keys) }.join("\n"), :id => 'main_menu', :class => 'clearfix')
else
@@ -250,12 +250,12 @@ def header_image(node = nil, big_header = false)
image_tag = image_tag(image_url, :alt => header_title, :title => header_title)
elsif (big_header)
header_title = random_image.title
- image_tag = image_tag big_header_image_path(random_image, :format => :jpg), :alt => random_image.alt, :title => header_title
image_url = big_header_image_path(random_image, :format => :jpg)
+ image_tag = image_tag big_header_image_path(random_image, :format => :jpg), :alt => random_image.alt, :title => header_title
else
header_title = random_image.title
- image_tag = image_tag header_image_path(random_image, :format => :jpg), :alt => random_image.alt, :title => header_title
image_url = header_image_path(random_image, :format => :jpg)
+ image_tag = image_tag header_image_path(random_image, :format => :jpg), :alt => random_image.alt, :title => header_title
end
return { :title => header_title, :image_tag => image_tag, :url => image_url }
@@ -415,7 +415,7 @@ def error_messages_for(*params)
objects = params.collect {|object_name| instance_variable_get("@#{object_name}") }.compact
end
- count = objects.inject(0) {|sum, object| sum + object.errors.count }
+ count = objects.inject(0) {|sum, object| sum + object.errors.count }
unless count.zero?
html = {}
View
8 app/helpers/attachments_helper.rb
@@ -2,13 +2,13 @@ module AttachmentsHelper
# Returns the proper attachment icon based on the given +attachment+ extension.
def attachment_icon(attachment, options = {})
case attachment.extension
- when 'jpg', 'jpeg', 'gif', 'png'
+ when 'jpg', 'jpeg', 'gif', 'png', 'bmp', 'tif', 'tiff'
file_name = 'image.png'
- when 'doc', 'docx'
+ when 'doc', 'docx', 'odt'
file_name = 'word.png'
- when 'xls', 'xlsx', 'csv'
+ when 'xls', 'xlsx', 'csv', 'ods'
file_name = 'excel.png'
- when 'ppt', 'pptx'
+ when 'ppt', 'pptx', 'pps', 'ppsx', 'odp'
file_name = 'powerpoint.png'
when 'tar', 'zip', 'rar', 'gz'
file_name = 'compressed.png'
View
2  app/helpers/video_helper.rb
@@ -1,5 +1,5 @@
module VideoHelper
- # Return HTML to embed a youtube video based on a given +youtube_id+.
+ # Return HTML to embed a YouTube video based on a given +youtube_id+.
def youtube_object_for_id(youtube_id)
case Settler[:display_videos_as_images]
when true
View
4 config/locales/other/nl.yml
@@ -36,7 +36,7 @@ nl:
updated: Wijzigingen opgeslagen!
week: "Week %{week}"
y: Ja
- youtube_video: Naar een youtube filmpje
+ youtube_video: Naar een YouTube filmpje
responsible_user: Verantwoordelijke redacteur
current_responsible_user: Ingestelde verantwoordelijke redacteur
new_responsible_user: Nieuwe verantwoordelijke redacteur
@@ -1155,7 +1155,7 @@ nl:
welcome: Welkom als gebruiker van deze website. Voordat u kunt inloggen dient u uw e-mailadres te verifiëren. U kunt dit doen door de instructies te volgen in de e-mail die zojuist naar u is verstuurd.
wrong_password: Verkeerd wachtwoord ingevoerd.
video:
- enter_video_id: Vul het Youtube video ID in
+ enter_video_id: Vul het YouTube video ID in
insert_video: Video invoegen
weblog_archives:
edit: Bewerken van weblogarchief
Please sign in to comment.
Something went wrong with that request. Please try again.