radiant-forum-extension 2.1.6 → 3.0.0.rc3

data/app/views/topics/_topic.html.haml

@@ -3,24 +3,20 @@
 %div{:id => topic.dom_id}
   .post
     .wrapper
-      .speaker
-        = standard_gravatar_for(post.reader, forum_topic_url(topic.forum, topic))
+      = standard_gravatar_for(post.reader, topic_url(topic))
       .post_header
         %h2
-          = link_to topic.name, forum_topic_url(topic.forum, topic)
+          = link_to_topic(topic)
           = feed_link(topic_path(topic, :format => :rss))
           
-        %p.context
-          = render :partial => "topics/context", :locals => {:topic => topic}
-          = render :partial => 'posts/edit_links', :locals => {:post => post}
+        = render :partial => "topics/context", :locals => {:topic => topic}
 
       .post_body
-        = truncate_and_textilize(post.body, 100)
+        = truncate_words(scrub_html(post.body), 24)
         = render :partial => 'posts/attachments', :locals => {:post => post}
 
       - if topic.has_replies?
         .post_replies
-          %p.voices
-            = render :partial => 'topics/voices', :locals => {:topic => topic}
           %p.replies
+            = render :partial => 'topics/voices', :locals => {:topic => topic}
             = render :partial => 'topics/replies', :locals => {:topic => topic}

data/app/views/topics/_topic.rss.builder

@@ -5,5 +5,5 @@ xm.item do
   xm.pubDate topic.created_at.to_s(:rfc822)
   xm.guid [ActionController::Base.session_options[:session_key], topic.forum_id.to_s, topic.id.to_s].join(":"), "isPermaLink" => "false"
   xm.author h(topic.reader.name)
-  xm.link forum_topic_url(topic.forum, topic)
+  xm.link topic_url(topic)
 end

data/app/views/topics/index.html.haml

@@ -1,27 +1,24 @@
-= render :partial => 'forums/standard_parts'
-
 - content_for :messages do
   - if @topics.empty?
     %p 
-      = t('no_topics')
+      = t('forum_extension.no_topics')
   - else
     = render :partial => 'topics/topic', :collection => @topics
 
 - content_for :sidebar do
-  = render :partial => 'posts/search_form', :locals => {:minimal => true}
   = render :partial => 'forums/latest'
   = render :partial => 'topics/busiest'
 
 - content_for :pagination do
-  = pagination_and_summary_for(@topics, t('topics'))
+  = pagination_and_summary_for(@topics, t('forum_extension.topics'))
 
 - content_for :breadcrumbs do
-  = link_to t('forum').titlecase, topics_url
-  = t('separator')
+  = link_to t('forum_extension.forum').titlecase, topics_url
+  = t('reader_extension.separator')
   = yield :title
 
 - content_for :title do
-  = t('topics_heading')
+  = t('forum_extension.topics_heading')
 
 - content_for :feedurl do
   = topics_url(:format => :rss)
@@ -29,14 +26,21 @@
 - content_for :feedlink do
   = feed_link(topics_url(:format => :rss))
 
+- content_for :head do
+  %h1
+    = yield :title
+
 - content_for :introduction do
   %p
-    =t('topics_introduction')
+    =t('forum_extension.topics_introduction')
+
+= render :partial => 'shared/standard_forum_parts'
 
-#forum
+.forum
   = yield :pagination if @topics.previous_page
   = yield :messages
   = yield :pagination if @topics.next_page
+  = yield :newtopic
 
 
 

data/app/views/topics/index.rss.builder

@@ -4,8 +4,8 @@ xml.channel do
     :rel => 'self', :type => 'application/rss+xml'
   }
 
-  xml.title "#{@site_title} : #{t('latest_topics')}"
-  xml.description t("latest_topics_description")
+  xml.title "#{@site_title} : #{t('forum_extension.latest_topics')}"
+  xml.description t("forum_extension.latest_topics_description")
   xml.link topics_url
   xml.language I18n.locale.to_s
   xml.ttl "60"

data/app/views/topics/show.html.haml

@@ -1,15 +1,12 @@
-= render :partial => 'forums/standard_parts'
-
-- content_for :newtopic do
-  .newmessage
-    = link_to t('new_topic_here'), new_post_url(:forum_id => @forum.id)
-
 - content_for :pagination do
-  = pagination_and_summary_for(@posts, t('post'))
+  = pagination_and_summary_for(@posts, t('forum_extension.post'))
 
 - content_for :title do
   = @topic.name
 
+- content_for :context do
+  = render :partial => 'topics/context'
+
 - content_for :person do
   = standard_gravatar_for(@topic.reader)
 
@@ -17,7 +14,6 @@
   = render :partial => 'posts/post', :locals => {:post => @topic.posts.first, :headless => true, :with_context => true}
 
 - content_for :sidebar do
-  = render :partial => 'posts/search_form', :locals => {:minimal => true}
   = render :partial => 'topics/latest'
 
 - content_for :feedurl do
@@ -27,16 +23,22 @@
   = feed_link(topic_path(@topic, :format => :rss))
 
 - content_for :parent do
-  = link_to @topic.forum.name + ':', forum_url(@topic.forum)
+  - if @topic.forum
+    = link_to @topic.forum.name + ':', forum_url(@topic.forum)
 
 - content_for :breadhead do
-  = link_to t('forum').titlecase + t('separator'), topics_url
-  = yield :parent
+  %span.breadhead
+    = link_to t('forum_extension.forum').titlecase, topics_url
+    = t('reader_extension.separator')
+    = yield :parent
 
 - content_for :breadcrumbs do
-  = yield :breadhead
-  = t('separator')
-  = yield :title
+  %p.breadcrumbs
+    = link_to t('forum_extension.forum').titlecase, topics_url
+    = t('reader_extension.separator')
+    = yield :parent
+    = t('reader_extension.separator')
+    = yield :title
 
 - content_for :messages do
   = yield :pagination if @posts.previous_page
@@ -44,13 +46,12 @@
   = yield :pagination if @posts.next_page
 
 - content_for :reply_form do
-  .new_post
-    .wrapper
-      %p.add_reply
-        = link_to t('add_reply'), new_topic_post_url(@topic), :class => 'remote autoload'
+  = render :partial => 'topics/reply'
 
+= render :partial => 'shared/standard_forum_parts'
 
-#forum
+.forum
   = yield :first_post
   = yield :messages
   = yield :reply_form unless @posts.next_page
+

data/app/views/topics/show.rss.builder

@@ -1,12 +1,12 @@
 xml.channel do
   xml.atom :link, nil, {
-    :href => forum_topic_url(@topic.forum, @topic, :format => 'rss'),
+    :href => topic_url(@topic, :format => 'rss'),
     :rel => 'self', :type => 'application/rss+xml'
   }
 
   xml.title "#{@site_title} : #{@topic.name}"
-  xml.description "#{@posts.length} #{t('posts')}, #{t('most_recently')} #{t('from_reader', :name => @posts.last.reader.name)} #{t('on_date', :date => friendly_date(@posts.last.created_at))}"
-  xml.link forum_topic_url(@topic.forum, @topic)
+  xml.description "#{@posts.length} #{t('forum_extension.posts')}, #{t('forum_extension.most_recently')} #{t('forum_extension.from_reader', :name => @posts.last.reader.name)} #{t('forum_extension.on_date', :date => friendly_date(@posts.last.created_at))}"
+  xml.link topic_url(@topic)
   xml.language I18n.locale.to_s
   xml.ttl "60"
 

data/config/initializers/radiant_config.rb

@@ -1,8 +1,11 @@
 Radiant.config do |config|
   config.namespace('forum') do |forum|
     forum.define 'public?', :default => true
+    forum.define 'cached?', :default => true
+    forum.define 'cache_duration', :default => 60, :type => :integer, :units => "minutes"
     forum.define 'toolbar?', :default => true
-    forum.define 'editable_period', :type => :integer, :default => 15, :units => "minutes"
+    forum.define 'editable_period', :type => :integer, :default => 30, :units => "minutes"
+    forum.define 'offer_rss?', :default => false
     forum.define 'allow_page_comments?', :default => true
     forum.define 'allow_attachments?', :default => true
     forum.define 'attachment.content_types'

data/config/locales/en.yml

@@ -1,29 +1,13 @@
 en:
-  a_reply_to: "A reply to"
-  add_post: "Add a %{message_type}"
-  add_comment: "Add a comment"
-  add_reply: "Add a reply"
-  ago: "ago"
-  all: "all"
-  anyone: "anyone"
-  anywhere: "anywhere"
-  attached: "attached"
-  attach_file: "attach a file"
-  author: "author"
-  begun_on: "begun on %{date}"
-  busy_topics: "Busy topics"
-  busy_readers: "Busiest people"
-  by: "by"
-  by_content_and_author: "by content, author or category."
-  comment: "comment"
-  comment_count:
-    zero: "No comments yet"
-    one: "One comment"
-    other: "%{count} comments."
-  comment_on_page: "a comment added to the page"
-  comments_closed: "Comments closed."
-  comments_on: "Comments on"
-  comments: "comments"
+  activerecord:
+    attributes:
+      post:
+        body: "Your message"
+      topic:
+        forum_id: "File in category"
+        name: "Discussion title"
+        sticky: "Sticky"
+        locked: "Locked"
   config:
     forum:
       allow_attachments?: "Posts have attachments?"
@@ -34,165 +18,205 @@ en:
       commentable_period: "Pages commentable for"
       editable_period: "Posts editable for"
       layout: "Forum layout"
+      offer_rss?: "Show RSS links"
       public?: "Forum public?"
-  confirm_removal_of: "Are you sure you want to delete this post from %{author}? There's no way to get it back if you change your mind."
-  confirm_remove_forum: "Delete forum?"
-  confirm_remove_post: "Delete post?"
-  confirm_remove_topic: "Delete topic?"
-  containing: "containing the phrase"
-  definitely_remove_post: "Yes: delete it"
-  edit_forum: "Edit forum"
-  edit_minimal: "e"
-  edit_post: "Edit post"
-  edit_topic: "Edit topic"
-  edit_your_post: "edit your post"
-  error:
-    message_empty: "Sorry: message can't be empty"
-    no_file: "You must choose a file to upload!"
-  filed_in: "under %{name}"
-  for_comments: "for page comments"
+      toolbar?: "Enable editing toolbar"
   forum: "Forum"
-  forums: "Discussion categories"
-  forum_configuration: "Forum settings"
-  forum_messages: "Forum messages"
-  forum_search: "Forum Search"
-  forum_show_introduction: ""
-  forums_heading: "Forum categories"
-  forums_introduction: 'These are the broad filing areas we use to organise the forum. You can also see lists of <a href="/forum/topics">all the latest topics</a> or <a href="/forum/posts">posts</a> across all these categories.'
-  from_reader: "from %{name}"
-  if_you_not: "If you're not %{name}, please"
-  in: "in"
-  in_forum: "filed under"
-  in_reply_to: "in reply to"
-  label:
-    post:
-      body: "Your message"
-    topic:
-      forum: "File in category"
-      name: "Discussion title"
-      sticky: "Sticky"
-      locked: "Locked"
-  last_seen: "last here"
-  latest_activity: "latest activity"
-  latest_discussion: "Latest topics"
-  latest_posts: "Latest posts"
-  latest_posts_description: "Topics and replies from across the forum in descending date order."
-  latest_topics: "Latest topics"
-  latest_topics_description: "Topics most recently posted or replied to."
-  locked: "locked"
-  matching: "matching"
-  messages_from_reader: "Messages from %{name}"
-  most_recently: "most recently"
-  navigation:
+  topics: "Topics"
+  forums: "Categories"
+  posts: "Posts"
+  settings: "Settings"
+  forum_extension:
+    a_reply_to: "A reply to"
+    add_post: "Add a %{message_type}"
+    add_comment: "Add a comment"
+    add_reply: "Add a reply"
+    administer_by_browsing: 'The easiest way to administer the forum is by <a href="/forum">browsing around it.</a>'
+    ago: "ago"
+    all: "all"
+    anyone: "anyone"
+    anywhere: "anywhere"
+    attached: "attached"
+    attach_file: "attach a file"
+    author: "author"
+    begun_on: "begun on %{date}"
+    body: "body"
+    by: "by"
+    by_content_and_author: "by content, author or category."
+    comment: "comment"
+    comment_count:
+      zero: "No comments yet"
+      one: "One comment"
+      other: "%{count} comments."
+    comment_count_from:
+      zero: "No comments."
+      one: "One coment, from "
+      other: "%{count} comments, most recently from "
+    comment_on_page: "a comment added to the page"
+    comments_closed: "Comments closed."
+    comments_on: "Comments on"
+    comments: "comments"
+    confirm_removal_of_comment: "Are you sure you want to delete this comment from %{author}? There's no way to get it back if you change your mind."
+    confirm_removal_of_post: "Are you sure you want to delete this post from %{author}? There's no way to get it back if you change your mind."
+    confirm_removal_of_topic: "Are you sure you want to delete this topic and all of its replies? There's no way to get any of it back if you change your mind."
+    confirm_remove_forum: "Delete forum?"
+    confirm_remove_post: "Delete post?"
+    confirm_remove_topic: "Delete topic?"
+    containing: "containing the phrase"
+    definitely_remove_post: "Yes: delete it"
+    description: Description
+    edit_forum: "Edit forum"
+    edit_minimal: "e"
+    edit_post: "Edit post"
+    edit_topic: "Edit topic"
+    edit_your_post: "edit your post"
+    error:
+      message_empty: "Sorry: message can't be empty"
+      no_file: "You must choose a file to upload!"
+    filed_in: "under %{name}"
+    for_comments: "for page comments"
     forum: "Forum"
-    forum_help: "Help"
-    forums: "Categories"
-    readers: "People"
-    new_topic: "New topic"
+    forums: "Discussion categories"
+    forum_configuration: "Forum settings"
+    forum_messages: "Forum messages from %{name}"
+    forum_search: "Forum Search"
+    forum_show_introduction: ""
+    forums_heading: "Forum categories"
+    forums_introduction: 'These are the broad filing areas we use to organise the forum. You can also see lists of <a href="/forum/topics">all the latest topics</a> or <a href="/forum/posts">posts</a> across all these categories.'
+    from: "from"
+    from_reader: "from %{name}"
+    if_you_not: "If you're not %{name}, please"
+    in: "in"
+    in_forum: "filed under"
+    in_reply_to: "in reply to"
+    last_seen: "last here"
+    latest_activity: "latest activity"
+    latest_forum_activity: "Latest in the forum"
+    latest_discussion: "Latest topics"
+    latest_posts: "Latest posts"
+    latest_posts_description: "Topics and replies from across the forum in descending date order."
+    latest_topics: "Latest topics"
+    latest_topics_description: "Topics most recently posted or replied to."
+    locked: "locked"
+    matching: "matching"
+    messages_from_reader: "Messages from %{name}"
+    most_recently: "most recently"
+    navigation:
+      forum: "Forum"
+      forum_help: "Help"
+      forums: "Categories"
+      readers: "People"
+      new_topic: "New topic"
+      search: "Search"
+      topics: "Latest"
+    new_comment: "Add a comment"
+    new_forum: "New forum"
+    new_reply_to: "New reply to"
+    new_reply_from: "New reply from"
+    new_topic: "Start a new discussion"
+    new_topic_button: "Submit topic"
+    new_topic_heading: "Start a new topic"
+    new_topic_introduction: ""
+    new_topic_here: "start a new<br />topic here"
+    new_topic_started: "New topic started"
+    no_description_provided: "No description provided."
+    no_forums: "No discussion categories defined here yet."
+    no_messages_yet: "No messages yet"
+    no_posts: "The forum is empty."
+    no_posts_found: "No messages found."
+    no_search_results: "Sorry: no messages match your criteria. Please use the form below to broaden your search."
+    no_topics: "No talk here yet."
+    notice:
+      topic_deleted: "Topic '%{name}' was deleted."
+      post_deleted: "Post deleted."
+    now_has: "now has"
+    of: "of"
+    on_date: "on %{date}"
+    pages_with_latest_comments: "Latest page comments"
+    page_locked: "Sorry: comments are not allowed on this page"
+    post: "comment"
+    post_body: "Post body"
+    post_count: 
+      zero: ""
+      one: "One reply"
+      other: "%{count} replies"
+    post_post: "Post %{message_type}"
+    post_removed: "Post removed"
+    posted: "posted"
+    posted_and_updated_on: "posted on %{posted} and updated on %{updated}"
+    posted_on: "posted"
+    posted_by: "posted by"
+    post: "message"
+    posts: "Messages"
+    posts_found: 
+      zero: "Nothing found"
+      one: "One message found"
+      other: "%{count} messages found"
+    posts_heading: "Search the forum"
+    posts_introduction: 'This begins as a full list of all the posts in the forum. Add criteria below to cut down the list to specific subjects and speakers.'
+    really_remove_post: "Are you sure you want to delete this comment?"
+    recent_topics: "Recent topics"
+    remove_minimal: "x"
+    remove_post: "delete comment"
+    replied_on: "replied on %{date}"
+    reply_from: "reply from"
+    reply_posted: "reply posted"
+    reply_to: "Reply to"
+    reply: "reply"
+    rss: "RSS"
+    rss_feed: "RSS feed"
+    save_changes: "Save changes"
+    save_post: "Save post"
     search: "Search"
-    topics: "Latest"
-  new_forum: "New forum"
-  new_reply_to: "New reply to"
-  new_reply_from: "New reply from"
-  new_topic: "Start a new discussion"
-  new_topic_button: "Submit topic"
-  new_topic_heading: "Start a new topic"
-  new_topic_introduction: ""
-  new_topic_here: "start a new<br />topic here"
-  new_topic_started: "New topic started"
-  no_description_provided: "No description provided."
-  no_forums: "No discussion categories defined here yet."
-  no_messages_yet: "No messages yet"
-  no_posts: "The forum is empty."
-  no_posts_found: "No messages found."
-  no_search_results: "Sorry: no messages match your criteria. Please use the form below to broaden your search."
-  no_topics: "No talk here yet."
-  notice:
-    topic_deleted: "Topic '%{name}' was deleted."
-    post_deleted: "Post deleted."
-  now_has: "now has"
-  of: "of"
-  on_date: "on %{date}"
-  page_locked: "Sorry: comments are not allowed on this page"
-  post: "comment"
-  post_body: "Post body"
-  post_count_from: 
-    zero: ""
-    one: "One reply, from"
-    other: "%{count} replies, most recently from"
-  post_post: "Post %{message_type}"
-  post_removed: "Post removed"
-  posted: "posted"
-  posted_and_updated_on: "posted on %{posted} and updated on %{updated}"
-  posted_on: "posted"
-  posted_by: "posted by"
-  post: "message"
-  posts: "Messages"
-  posts_found: 
-    zero: "Nothing found"
-    one: "One message found"
-    other: "%{count} messages found"
-  posts_heading: "Search the forum"
-  posts_introduction: 'This begins as a full list of all the posts in the forum. Add criteria below to cut down the list to specific subjects and speakers.'
-  really_remove_post: "Are you sure you want to delete this comment?"
-  recent_topics: "Recent topics"
-  remove_minimal: "x"
-  remove_post: "delete comment"
-  replied_on: "replied on %{date}"
-  reply_from: "reply from"
-  reply_posted: "reply posted"
-  reply_to: "Reply to"
-  reply: "reply"
-  rss: "RSS"
-  rss_feed: "RSS feed"
-  save_changes: "Save changes"
-  save_post: "Save post"
-  search: "Search"
-  search_feed: "Search Results Feed"
-  search_form:
-    forum_label: "In this discussion category"
-    person_label: "From this person"
-    minimal_query_label: "Forum search"
-    query_label: "Search for this text"
-  search_header: "Forum Search"
-  search_introduction: "Please choose a search phrase and/or a person or discussion category."
-  search_results: "Search Results"
-  search_whole_forum: "search the whole forum"
-  separator: ':'
-  showing: "showing"
-  sorry_locked: "Sorry: this topic is locked."
-  start_topic: "Start a new conversation"
-  started: "started"
-  started_by: "Started by"
-  started_topic_in: "started a new topic under"
-  started_topic_on: "started a new topic on %{date}"
-  sticky: "sticky"
+    search_feed: "Search Results Feed"
+    search_form:
+      forum_label: "In this discussion category"
+      person_label: "From this person"
+      minimal_query_label: "Forum search"
+      query_label: "Search for this text"
+    search_header: "Forum Search"
+    search_introduction: "Please choose a search phrase and/or a person or discussion category."
+    search_results: "Search Results"
+    search_whole_forum: "search the whole forum"
+    separator: ':'
+    showing: "showing"
+    sorry_cannot_edit: "Sorry: either you don't have the authority to edit this post, or its editable period has finished."
+    sorry_locked: "Sorry: this topic is locked."
+    start_topic: "Start a new conversation"
+    started: "started"
+    started_by: "Started by"
+    started_topic_in: "started a new topic under"
+    started_topic_on: "started a new topic on %{date}"
+    sticky: "sticky"
+    stopwords: "a about above across after afterwards again against all almost alone along already also although always am among amongst amoungst amount an and another any anyhow anyone anything anyway anywhere are around as at back be became because become becomes becoming been before beforehand behind being below beside besides between beyond bill both bottom but by call can cannot cant co computer con could couldnt cry de describe detail do done down due during each eg eight either eleven else elsewhere empty enough etc even ever every everyone everything everywhere except few fifteen fify fill find fire first five for former formerly forty found four from front full further get give go had has hasnt have he hence her here hereafter hereby herein hereupon hers herse” him himse” his how however hundred i ie if in inc indeed interest into is it its itse” keep last latter latterly least less ltd made many may me meanwhile might mill mine more moreover most mostly move much must my myse” name namely neither never nevertheless next nine no nobody none noone nor not nothing now nowhere of off often on once one only onto or other others otherwise our ours ourselves out over own part per perhaps please put rather re same see seem seemed seeming seems serious several she should show side since sincere six sixty so some somehow someone something sometime sometimes somewhere still such system take ten than that the their them themselves then thence there thereafter thereby therefore therein thereupon these they thick thin third this those though three through throughout thru thus to together too top toward towards twelve twenty two un under until up upon us very via was we well were what whatever when whence whenever where whereafter whereas whereby wherein whereupon wherever whether which while whither who whoever whole whom whose why will with within without would yet you your yours yourself yourselves"
+    time_remaining_to_edit: "You have %{time} left to "
+    to_comment: "To comment"
+    to_post: "To post messages"
+    to_start_topic: "To start a topic"
+    top_topics: "Top topics"
+    top_readers: "Top posters"
+    topic_count:
+      zero: "No discussion."
+      one: "One topic: "
+      other: "%{count} topics, most recently "
+    topic_show_introduction: ""
+    topic_removed: "Topic removed"
+    topics_and_posts: "Topics and messages"
+    to: "to"
+    to_add_post: "To add a %{message_type}"
+    topic: "topic"
+    topic_body: "Opening message"
+    topic_empty: "Topic empty!"
+    topic_name: "Topic name"
+    topics: "Topics"
+    topics_heading: "Latest topics"
+    topics_introduction: 'This is a list of all the discussions going on here, with the most recently updated first. You can also see a more organised list of <a href="/forum/forums">discussion categories</a> or  <a href="/forum/posts">search</a> for particular posts and people.'
+    under: "under"
+    unknown_date: "unknown date"
   time:
     formats:
-      recently: "%A at %l:%M%p"
+      recently: "on %A at %l:%M%p"
       standard: "on %B %e, %Y at %l:%M%p"
-      this_year: "%B %e at %l:%M%p"
+      this_year: "on %B %e at %l:%M%p"
       today: "today at %l:%M%p"
       yesterday: "yesterday at %l:%M%p"
-  time_remaining_to_edit: "You have %{time} left to "
-  to_comment: "To comment"
-  to_post: "To post messages"
-  to_start_topic: "To start a topic"
-  topic_count:
-    zero: "No discussion."
-    one: "One topic: "
-    other: "%{count} topics, most recently "
-  topic_show_introduction: ""
-  topic_removed: "Topic removed"
-  topics_and_posts: "Topics and messages"
-  to: "to"
-  to_add_post: "To add a %{message_type}"
-  topic: "topic"
-  topic_body: "Opening message"
-  topic_empty: "Topic empty!"
-  topic_name: "Topic name"
-  topics: "Topics"
-  topics_heading: "Latest topics"
-  topics_introduction: 'This is a list of all the discussions going on here, with the most recently updated first. You can also see a more organised list of <a href="/forum/forums">discussion categories</a> or  <a href="/forum/posts">search</a> for particular posts and people.'
-  under: "under"
-  unknown_date: "unknown date"

data/db/migrate/002_pages_commentable.rb

@@ -3,8 +3,7 @@ class PagesCommentable < ActiveRecord::Migration
     add_column :pages, :commentable, :boolean, :default => true
     add_column :pages, :comments_closed, :boolean, :default => false
     add_column :topics, :page_id, :integer
-    add_index :topics, :page_id
-    
+    add_index :topics, :page_id, :name => "index_topics_on_page_id"
   end
 
   def self.down