diff --git a/app/models/doc_item.rb b/app/models/doc_item.rb index 43d3dc7..8c2124d 100644 --- a/app/models/doc_item.rb +++ b/app/models/doc_item.rb @@ -1,6 +1,6 @@ class DocItem class NotFound < Exception; end - attr_accessor :id, :title, :text, :language + attr_accessor :id, :title, :text, :language, :order def initialize(attrs = {}) attrs.each do |name,value| self.send("#{name}=", value) diff --git a/app/models/doc_topic.rb b/app/models/doc_topic.rb index ae4a3e8..c6c887b 100644 --- a/app/models/doc_topic.rb +++ b/app/models/doc_topic.rb @@ -4,15 +4,26 @@ class DocTopic < DocItem raise DocItem::NotFound end lines = File.readlines(file) - title = _find_title(lines) + title_line = _find_title(lines) File.basename(file) =~ /(.*)\.([^\.]+)\.xhtml$/ id = $1 language = $2 - new(:id => id, :title => title, :text => lines.join, :language => language) + new(:id => id, :title => title(title_line), :text => lines.join, :language => language, :order => order(title_line)) end def self._find_title(lines) - lines.find {|line| line =~ /^

(.*)<\/h1>/ } + lines.find {|line| line =~ /^(.*<\/h1>)/ } $1 end + + def self.title(line) + line =~ /(.*)<\/h1>/ + $1 + end + + def self.order(line) + line =~ /

.*<\/h1>/ + $1 + end + end diff --git a/doc/noosfero/cms/adding-images-to-gallery.textile b/doc/noosfero/cms/adding-images-to-gallery.textile index 3afb256..a74436a 100644 --- a/doc/noosfero/cms/adding-images-to-gallery.textile +++ b/doc/noosfero/cms/adding-images-to-gallery.textile @@ -1,4 +1,4 @@ -h1. Adding pictures to gallery +h1(order-310). Adding pictures to gallery p. _You can publish pictures on your image gallery_ diff --git a/doc/noosfero/cms/creating-blog.textile b/doc/noosfero/cms/creating-blog.textile index 3d25280..e3b9f91 100644 --- a/doc/noosfero/cms/creating-blog.textile +++ b/doc/noosfero/cms/creating-blog.textile @@ -1,4 +1,4 @@ -h1. Creating a blog +h1(order-320). Creating a blog p. _You can have a blog in your system._ diff --git a/doc/noosfero/cms/managing-content.textile b/doc/noosfero/cms/managing-content.textile index 9d9b8b1..f6f8042 100644 --- a/doc/noosfero/cms/managing-content.textile +++ b/doc/noosfero/cms/managing-content.textile @@ -1,4 +1,4 @@ -h1. Managing your content +h1(order-350). Managing your content p. _Folder is a structure used to organize files in a computer and can also be called a directory. It may contain other files and folders, which may also contain other directories_ diff --git a/doc/noosfero/cms/posting-on-blog.textile b/doc/noosfero/cms/posting-on-blog.textile index 0565f64..6b22a90 100644 --- a/doc/noosfero/cms/posting-on-blog.textile +++ b/doc/noosfero/cms/posting-on-blog.textile @@ -1,4 +1,4 @@ -h1. Posting on blog +h1(order-330). Posting on blog p. _You can have a blog and publish posts on it._ diff --git a/doc/noosfero/cms/writing-advanced-article.textile b/doc/noosfero/cms/writing-advanced-article.textile index 4f9fcb0..c4fbf0c 100644 --- a/doc/noosfero/cms/writing-advanced-article.textile +++ b/doc/noosfero/cms/writing-advanced-article.textile @@ -1,4 +1,4 @@ -h1. Writing an advanced article (inserting images, links, videos and audio) +h1(order-340). Writing an advanced article (inserting images, links, videos and audio) p. _You can add images and links to the articles created on the system to make it more interesting._ diff --git a/doc/noosfero/cms/writing-article.textile b/doc/noosfero/cms/writing-article.textile index 00050d5..811bf2b 100644 --- a/doc/noosfero/cms/writing-article.textile +++ b/doc/noosfero/cms/writing-article.textile @@ -1,4 +1,4 @@ -h1. Writing an article +h1(order-300). Writing an article p. _To publish your articles you can create an aticle, as explained below._ diff --git a/doc/noosfero/community/accepting-members.textile b/doc/noosfero/community/accepting-members.textile index 0bbb97e..ad18820 100644 --- a/doc/noosfero/community/accepting-members.textile +++ b/doc/noosfero/community/accepting-members.textile @@ -1,4 +1,4 @@ -h1. Accepting new members +h1(order-130). Accepting new members p. _If a community is moderated, the administrator/moderator needs to approve the requests of new members._ diff --git a/doc/noosfero/community/creating-community.textile b/doc/noosfero/community/creating-community.textile index 726581e..a4544e4 100644 --- a/doc/noosfero/community/creating-community.textile +++ b/doc/noosfero/community/creating-community.textile @@ -1,4 +1,4 @@ -h1. Creating a community +h1(order-110). Creating a community p. _You can create communities to interact to others users_ diff --git a/doc/noosfero/community/editing-appearance.textile b/doc/noosfero/community/editing-appearance.textile index d152634..403221d 100644 --- a/doc/noosfero/community/editing-appearance.textile +++ b/doc/noosfero/community/editing-appearance.textile @@ -1,4 +1,4 @@ -h1. Editing appearance +h1(order-150). Editing appearance p. _You can customize the page of your community, changing the template of it._ diff --git a/doc/noosfero/community/editing-header-footer.textile b/doc/noosfero/community/editing-header-footer.textile index b198482..022de74 100644 --- a/doc/noosfero/community/editing-header-footer.textile +++ b/doc/noosfero/community/editing-header-footer.textile @@ -1,4 +1,4 @@ -h1. Editing header and footer +h1(order-170). Editing header and footer p. _You can customize the page of your community, adding some text or image on header or footer._ diff --git a/doc/noosfero/community/editing-sideboxes.textile b/doc/noosfero/community/editing-sideboxes.textile index 2de2753..c422041 100644 --- a/doc/noosfero/community/editing-sideboxes.textile +++ b/doc/noosfero/community/editing-sideboxes.textile @@ -1,4 +1,4 @@ -h1. Editing sideboxes +h1(order-160). Editing sideboxes p. _You can customize the page of your community, changing the blocks that will be displayed on it._ diff --git a/doc/noosfero/community/invite-contacts.textile b/doc/noosfero/community/invite-contacts.textile index 5f068a1..9c489de 100644 --- a/doc/noosfero/community/invite-contacts.textile +++ b/doc/noosfero/community/invite-contacts.textile @@ -1,4 +1,4 @@ -h1. Inviting contacts from e-mail +h1(order-120). Inviting contacts from e-mail p. _If you are a community administrator, you can invite e-mail contacts to join your community. If the e-mail is registered on the system, the user will receive an invitation through the system. If it is not registered, the user will receive an invitation on his e-mail._ diff --git a/doc/noosfero/community/joining-community.textile b/doc/noosfero/community/joining-community.textile index beef965..6a02af3 100644 --- a/doc/noosfero/community/joining-community.textile +++ b/doc/noosfero/community/joining-community.textile @@ -1,4 +1,4 @@ -h1. Joining a community +h1(order-100). Joining a community p. _You can be part of a community and interact with its others members. To do that, you can join a community, as explained below._ diff --git a/doc/noosfero/community/moderating-articles.textile b/doc/noosfero/community/moderating-articles.textile index 7c881ef..c54e787 100644 --- a/doc/noosfero/community/moderating-articles.textile +++ b/doc/noosfero/community/moderating-articles.textile @@ -1,4 +1,4 @@ -h1. Moderating articles +h1(order-140). Moderating articles p. _Community's members can publish articles on community. If the community is moderated, the administrator/moderator needs to approve or deny the publication._ diff --git a/doc/noosfero/enterprise/activating-enterprise.textile b/doc/noosfero/enterprise/activating-enterprise.textile index 24515f9..f3ad651 100644 --- a/doc/noosfero/enterprise/activating-enterprise.textile +++ b/doc/noosfero/enterprise/activating-enterprise.textile @@ -1,4 +1,4 @@ -h1. Activating your enterprise +h1(order-200). Activating your enterprise p. _If you have an enterprise that is registered in the system, you might have the activation code of the enterprise._ diff --git a/doc/noosfero/enterprise/disabling-enterprise.textile b/doc/noosfero/enterprise/disabling-enterprise.textile index 1e055b7..6a5d805 100644 --- a/doc/noosfero/enterprise/disabling-enterprise.textile +++ b/doc/noosfero/enterprise/disabling-enterprise.textile @@ -1,4 +1,4 @@ -h1. Disabling an enterprise +h1(order-260). Disabling an enterprise p. _If you are an administrator of any enterprise and you don't want that it appears in the system anymore, you can disable it by following this steps._ diff --git a/doc/noosfero/enterprise/editing-appearance.textile b/doc/noosfero/enterprise/editing-appearance.textile index 7fc2bef..55f1417 100644 --- a/doc/noosfero/enterprise/editing-appearance.textile +++ b/doc/noosfero/enterprise/editing-appearance.textile @@ -1,4 +1,4 @@ -h1. Editing appearance +h1(order-240). Editing appearance p. _You can customize the page of your enterprise, changing the template of it._ diff --git a/doc/noosfero/enterprise/editing-enterprise-info.textile b/doc/noosfero/enterprise/editing-enterprise-info.textile index d3ee048..4854a27 100644 --- a/doc/noosfero/enterprise/editing-enterprise-info.textile +++ b/doc/noosfero/enterprise/editing-enterprise-info.textile @@ -1,4 +1,4 @@ -h1. Editing enterprise settings +h1(order-220). Editing enterprise settings p. _If you are administrator of an enterprise, you can edit its settings._ diff --git a/doc/noosfero/enterprise/editing-header-footer.textile b/doc/noosfero/enterprise/editing-header-footer.textile index 8e4c00d..fdd2aea 100644 --- a/doc/noosfero/enterprise/editing-header-footer.textile +++ b/doc/noosfero/enterprise/editing-header-footer.textile @@ -1,4 +1,4 @@ -h1. Editing header and footer +h1(order-250). Editing header and footer p. _You can customize the page of your enterprise, adding some text or image on header or footer._ diff --git a/doc/noosfero/enterprise/editing-sideboxes.textile b/doc/noosfero/enterprise/editing-sideboxes.textile index faafa12..9d5443c 100644 --- a/doc/noosfero/enterprise/editing-sideboxes.textile +++ b/doc/noosfero/enterprise/editing-sideboxes.textile @@ -1,4 +1,4 @@ -h1. Editing sideboxes +h1(order-230). Editing sideboxes p. _You can customize the page of your enterprise, changing the blocks that will be displayed on it._ diff --git a/doc/noosfero/enterprise/managing-enterprise-members.textile b/doc/noosfero/enterprise/managing-enterprise-members.textile index 9f4fd8d..cff1953 100644 --- a/doc/noosfero/enterprise/managing-enterprise-members.textile +++ b/doc/noosfero/enterprise/managing-enterprise-members.textile @@ -1,4 +1,4 @@ -h1. Managing and adding members to an enterprise +h1(order-210). Managing and adding members to an enterprise p. _If you are an enterprise administrator, you can add or remove members from enterprise and also define which permissions each member will have_ diff --git a/doc/noosfero/navigation/advanced-search.textile b/doc/noosfero/navigation/advanced-search.textile index 8bfe27c..2dd0c30 100644 --- a/doc/noosfero/navigation/advanced-search.textile +++ b/doc/noosfero/navigation/advanced-search.textile @@ -1,4 +1,4 @@ -h1. Advanced search +h1(order-620). Advanced search p. _When an user is navigating on the system, he can do a search to find articles, communities, people, enterprises or products._ diff --git a/doc/noosfero/navigation/searching-communities.textile b/doc/noosfero/navigation/searching-communities.textile index aa2a9e6..08c5a4c 100644 --- a/doc/noosfero/navigation/searching-communities.textile +++ b/doc/noosfero/navigation/searching-communities.textile @@ -1,4 +1,4 @@ -h1. Finding communities +h1(order-600). Finding communities p. _To find a community in the system, you can use the search specific for communities._ diff --git a/doc/noosfero/navigation/searching-enterprises.textile b/doc/noosfero/navigation/searching-enterprises.textile index 339f84a..a03e009 100644 --- a/doc/noosfero/navigation/searching-enterprises.textile +++ b/doc/noosfero/navigation/searching-enterprises.textile @@ -1,4 +1,4 @@ -h1. Finding enterprises +h1(order-650). Finding enterprises p. _To find an enterprise in the system, you can use the search specific for enterprises._ diff --git a/doc/noosfero/navigation/searching-people.textile b/doc/noosfero/navigation/searching-people.textile index 086ef96..74f95e7 100644 --- a/doc/noosfero/navigation/searching-people.textile +++ b/doc/noosfero/navigation/searching-people.textile @@ -1,4 +1,4 @@ -h1. Finding people +h1(order-610). Finding people p. _To find an user in the system, you can use the search specific for people._ diff --git a/doc/noosfero/navigation/searching-products-services.textile b/doc/noosfero/navigation/searching-products-services.textile index 9501fae..7935985 100644 --- a/doc/noosfero/navigation/searching-products-services.textile +++ b/doc/noosfero/navigation/searching-products-services.textile @@ -1,4 +1,4 @@ -h1. Finding products and services +h1(order-640). Finding products and services p. _To find a product or service in the system, you can use the search specific for products and services._ diff --git a/doc/noosfero/navigation/searching.textile b/doc/noosfero/navigation/searching.textile index f2a2729..100098a 100644 --- a/doc/noosfero/navigation/searching.textile +++ b/doc/noosfero/navigation/searching.textile @@ -1,4 +1,4 @@ -h1. Searching on the system +h1(order-630). Searching on the system p. _To find articles, communities, people, enterprises or products and services, an user in the system, can do a search._ diff --git a/doc/noosfero/user/accepting-friends.textile b/doc/noosfero/user/accepting-friends.textile index c8c8616..0f75fdb 100644 --- a/doc/noosfero/user/accepting-friends.textile +++ b/doc/noosfero/user/accepting-friends.textile @@ -1,4 +1,4 @@ -h1. Accepting friends +h1(order-460). Accepting friends p. _When one person asks to be your friend, you should accept or reject the request. This is what will be explained._ diff --git a/doc/noosfero/user/adding-friends.textile b/doc/noosfero/user/adding-friends.textile index 89c68a0..6f994e9 100644 --- a/doc/noosfero/user/adding-friends.textile +++ b/doc/noosfero/user/adding-friends.textile @@ -1,4 +1,4 @@ -h1. Adding friends +h1(order-450). Adding friends p. _To interact with others system users, you can include them in your contact list, adding them as friends._ diff --git a/doc/noosfero/user/changing-password.textile b/doc/noosfero/user/changing-password.textile index e7de3fa..e7bf923 100644 --- a/doc/noosfero/user/changing-password.textile +++ b/doc/noosfero/user/changing-password.textile @@ -1,4 +1,4 @@ -h1. Changing password +h1(order-510). Changing password p. _Whenever you want, you can change your password._ diff --git a/doc/noosfero/user/commenting.textile b/doc/noosfero/user/commenting.textile index 9c9c6f7..4dd94d3 100644 --- a/doc/noosfero/user/commenting.textile +++ b/doc/noosfero/user/commenting.textile @@ -1,4 +1,4 @@ -h1. Commenting articles +h1(order-470). Commenting articles p. _Articles, pictures and events of the system can be commented. When a person creates an article or upload a picture, she can allow other people to comment._ diff --git a/doc/noosfero/user/editing-appearance.textile b/doc/noosfero/user/editing-appearance.textile index 9e7193e..ee837e6 100644 --- a/doc/noosfero/user/editing-appearance.textile +++ b/doc/noosfero/user/editing-appearance.textile @@ -1,4 +1,4 @@ -h1. Editing appearance +h1(order-530). Editing appearance p. _You can customize your page, changing the template of it._ diff --git a/doc/noosfero/user/editing-header-footer.textile b/doc/noosfero/user/editing-header-footer.textile index bfabd2c..482d23c 100644 --- a/doc/noosfero/user/editing-header-footer.textile +++ b/doc/noosfero/user/editing-header-footer.textile @@ -1,4 +1,4 @@ -h1. Editing header and footer +h1(order-540). Editing header and footer p. _You can customize your page, adding some text or image on header or footer._ diff --git a/doc/noosfero/user/editing-person-info.textile b/doc/noosfero/user/editing-person-info.textile index 8beabe1..b0ed060 100644 --- a/doc/noosfero/user/editing-person-info.textile +++ b/doc/noosfero/user/editing-person-info.textile @@ -1,4 +1,4 @@ -h1. Editing user settings +h1(order-420). Editing user settings p. _You can change your profile information and settings in the system._ diff --git a/doc/noosfero/user/editing-sideboxes.textile b/doc/noosfero/user/editing-sideboxes.textile index b102e90..3df92a9 100644 --- a/doc/noosfero/user/editing-sideboxes.textile +++ b/doc/noosfero/user/editing-sideboxes.textile @@ -1,4 +1,4 @@ -h1. Editing sideboxes +h1(order-500). Editing sideboxes p. _You can customize your page, changing the blocks that will be displayed on it._ diff --git a/doc/noosfero/user/invite-contacts.textile b/doc/noosfero/user/invite-contacts.textile index 680e090..c0f01be 100644 --- a/doc/noosfero/user/invite-contacts.textile +++ b/doc/noosfero/user/invite-contacts.textile @@ -1,4 +1,4 @@ -h1. Inviting contacts from e-mail +h1(order-440). Inviting contacts from e-mail p. _You can invite e-mail contacts to be your friend on the system. If the e-mail is registered on the system, the user will receive an invitation through the system. If it is not registered, the user will receive an invitation on his e-mail._ diff --git a/doc/noosfero/user/login.textile b/doc/noosfero/user/login.textile index 07bc137..79344b1 100644 --- a/doc/noosfero/user/login.textile +++ b/doc/noosfero/user/login.textile @@ -1,4 +1,4 @@ -h1. Login into the system +h1(order-410). Login into the system p. _Some system features only can be used when the user is logged in._ diff --git a/doc/noosfero/user/logout.textile b/doc/noosfero/user/logout.textile index 06aeb06..d8a800e 100644 --- a/doc/noosfero/user/logout.textile +++ b/doc/noosfero/user/logout.textile @@ -1,4 +1,4 @@ -h1. Leaving the system +h1(order-430). Leaving the system p. _After finishing your navigation, we recommend leaving the system._ diff --git a/doc/noosfero/user/registering-new-user.textile b/doc/noosfero/user/registering-new-user.textile index 8856cdc..20f8a79 100644 --- a/doc/noosfero/user/registering-new-user.textile +++ b/doc/noosfero/user/registering-new-user.textile @@ -1,4 +1,4 @@ -h1. Registering a new user +h1(order-400). Registering a new user p. _To be part of the system, you need to register yourself. After registering, you will be able to join communities, enterprises, add friends and much more._ diff --git a/doc/noosfero/user/removing-comments.textile b/doc/noosfero/user/removing-comments.textile index f0d2328..fc8d859 100644 --- a/doc/noosfero/user/removing-comments.textile +++ b/doc/noosfero/user/removing-comments.textile @@ -1,4 +1,4 @@ -h1. Removing comments +h1(order-480). Removing comments p. _If you are the author of an article or if you have permission to moderate the comments of a profile (community/enterprise), you can remove the unwanted comments posted on it._ diff --git a/doc/noosfero/user/removing-friends.textile b/doc/noosfero/user/removing-friends.textile index 51642c0..553f16b 100644 --- a/doc/noosfero/user/removing-friends.textile +++ b/doc/noosfero/user/removing-friends.textile @@ -1,4 +1,4 @@ -h1. Removing friends +h1(order-520). Removing friends p. _How you can remove one friend from your contact list._ diff --git a/doc/noosfero/user/sending-messages.textile b/doc/noosfero/user/sending-messages.textile index 4eab79c..7c59dfc 100644 --- a/doc/noosfero/user/sending-messages.textile +++ b/doc/noosfero/user/sending-messages.textile @@ -1,4 +1,4 @@ -h1. Sending messages +h1(order-490). Sending messages p. _To interact with other system users, you can send messages through the system. The messages will be received by email._ diff --git a/lib/tasks/doc.rake b/lib/tasks/doc.rake index 281e547..314114f 100644 --- a/lib/tasks/doc.rake +++ b/lib/tasks/doc.rake @@ -33,8 +33,11 @@ namespace :noosfero do section = File.basename(File.dirname(toc)) output_file.puts "" output_file.puts "
    " + topics = [] section_topics.each do |item| - topic = DocTopic.loadfile(item) + topics << DocTopic.loadfile(item) + end + topics.sort_by { |t| t.order }.each do |topic| output_file.puts "
  • #{topic.title}
    • " end output_file.puts "
" diff --git a/po/noosfero-doc.pot b/po/noosfero-doc.pot index eea9ced..ec68ae9 100644 --- a/po/noosfero-doc.pot +++ b/po/noosfero-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-03-16 20:53-0300\n" +"POT-Creation-Date: 2010-04-22 19:54-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -120,12 +120,12 @@ msgid "Related topics" msgstr "" # type: Content of: