diff --git a/app/models/article_block.rb b/app/models/article_block.rb index b83a265..45ecb3c 100644 --- a/app/models/article_block.rb +++ b/app/models/article_block.rb @@ -1,7 +1,7 @@ class ArticleBlock < Block def self.description - _('Display one of your contents.') + _('Display one of your contents') end def help diff --git a/app/models/blog_archives_block.rb b/app/models/blog_archives_block.rb index 47a851d..e6b8284 100644 --- a/app/models/blog_archives_block.rb +++ b/app/models/blog_archives_block.rb @@ -7,7 +7,7 @@ class BlogArchivesBlock < Block include DatesHelper def self.description - _('List posts of your blog') + _('Blog posts') end def default_title diff --git a/app/models/communities_block.rb b/app/models/communities_block.rb index a99f5f2..d17403f 100644 --- a/app/models/communities_block.rb +++ b/app/models/communities_block.rb @@ -1,7 +1,7 @@ class CommunitiesBlock < ProfileListBlock def self.description - __('A block that displays your communities') + __('Communities') end def default_title diff --git a/app/models/disabled_enterprise_message_block.rb b/app/models/disabled_enterprise_message_block.rb index ba0e353..4dcd7c8 100644 --- a/app/models/disabled_enterprise_message_block.rb +++ b/app/models/disabled_enterprise_message_block.rb @@ -1,7 +1,7 @@ class DisabledEnterpriseMessageBlock < Block def self.description - _('Disabled enterprise message block') + _('"Disabled enterprise" message') end def help diff --git a/app/models/enterprises_block.rb b/app/models/enterprises_block.rb index f0c791d..07625c8 100644 --- a/app/models/enterprises_block.rb +++ b/app/models/enterprises_block.rb @@ -9,7 +9,7 @@ class EnterprisesBlock < ProfileListBlock end def self.description - __('A block that displays your enterprises') + __('Enterprises') end def footer diff --git a/app/models/environment_statistics_block.rb b/app/models/environment_statistics_block.rb index 0125295..67706d4 100644 --- a/app/models/environment_statistics_block.rb +++ b/app/models/environment_statistics_block.rb @@ -1,7 +1,7 @@ class EnvironmentStatisticsBlock < Block def self.description - _('Statistical overview of your environment.') + _('Environment stastistics') end def default_title diff --git a/app/models/favorite_enterprises_block.rb b/app/models/favorite_enterprises_block.rb index 7aa6378..5d6d1cc 100644 --- a/app/models/favorite_enterprises_block.rb +++ b/app/models/favorite_enterprises_block.rb @@ -5,11 +5,11 @@ class FavoriteEnterprisesBlock < ProfileListBlock end def help - __('This block lists the favorite enterprises of the user.') + __('This block lists your favorite enterprises.') end def self.description - __('A block that displays your favorite enterprises') + __('Favorite enterprises') end def footer diff --git a/app/models/feed_reader_block.rb b/app/models/feed_reader_block.rb index b579fbf..2cca224 100644 --- a/app/models/feed_reader_block.rb +++ b/app/models/feed_reader_block.rb @@ -33,7 +33,7 @@ class FeedReaderBlock < Block end def self.description - _('List the latest N posts from a given RSS feed.') + _('Feed reader') end def help diff --git a/app/models/friends_block.rb b/app/models/friends_block.rb index 594f382..11b1204 100644 --- a/app/models/friends_block.rb +++ b/app/models/friends_block.rb @@ -1,7 +1,7 @@ class FriendsBlock < ProfileListBlock def self.description - __('A block that displays your friends') + __('Friends') end def default_title diff --git a/app/models/link_list_block.rb b/app/models/link_list_block.rb index ad3b177..580e6d5 100644 --- a/app/models/link_list_block.rb +++ b/app/models/link_list_block.rb @@ -35,7 +35,7 @@ class LinkListBlock < Block end def self.description - _('Display a list of links.') + _('Links (static menu)') end def help diff --git a/app/models/location_block.rb b/app/models/location_block.rb index 915ed5c..c5d4711 100644 --- a/app/models/location_block.rb +++ b/app/models/location_block.rb @@ -4,7 +4,7 @@ class LocationBlock < Block settings_items :map_type, :type => :string , :default => 'roadmap' def self.description - _('Location map block') + _('Location map') end def help diff --git a/app/models/login_block.rb b/app/models/login_block.rb index 4a07832..3d7b40c 100644 --- a/app/models/login_block.rb +++ b/app/models/login_block.rb @@ -1,7 +1,7 @@ class LoginBlock < Block def self.description - _('A login box for your users.') + _('Login/logout') end def help diff --git a/app/models/main_block.rb b/app/models/main_block.rb index ec0e179..e6e5666 100644 --- a/app/models/main_block.rb +++ b/app/models/main_block.rb @@ -1,7 +1,7 @@ class MainBlock < Block def self.description - _('Block for main content (i.e. your articles, photos, etc)') + _('Main content') end def help diff --git a/app/models/members_block.rb b/app/models/members_block.rb index 600c030..5cd590d 100644 --- a/app/models/members_block.rb +++ b/app/models/members_block.rb @@ -1,7 +1,7 @@ class MembersBlock < ProfileListBlock def self.description - _('A block that displays members.') + _('Members') end def default_title diff --git a/app/models/my_network_block.rb b/app/models/my_network_block.rb index fd5794c..4c63835 100644 --- a/app/models/my_network_block.rb +++ b/app/models/my_network_block.rb @@ -3,7 +3,7 @@ class MyNetworkBlock < Block include ActionController::UrlWriter def self.description - _('A block that displays a summary of your network') + _('My network') end def default_title diff --git a/app/models/people_block.rb b/app/models/people_block.rb index 803c408..9e40648 100644 --- a/app/models/people_block.rb +++ b/app/models/people_block.rb @@ -9,7 +9,7 @@ class PeopleBlock < ProfileListBlock end def self.description - _('A block displays random people') + _('Random people') end def profile_finder diff --git a/app/models/products_block.rb b/app/models/products_block.rb index 8c69160..eb724ae 100644 --- a/app/models/products_block.rb +++ b/app/models/products_block.rb @@ -5,7 +5,7 @@ class ProductsBlock < Block include ActionController::UrlWriter def self.description - _('A block that displays products') + _('Products') end def default_title diff --git a/app/models/profile_image_block.rb b/app/models/profile_image_block.rb index ec83fc5..933bf07 100644 --- a/app/models/profile_image_block.rb +++ b/app/models/profile_image_block.rb @@ -3,11 +3,11 @@ class ProfileImageBlock < Block settings_items :show_name, :type => :boolean, :default => false def self.description - _('A block that displays only image of profiles') + _('Picture') end def help - _('This block presents the profile image.') + _('This block presents the profile image') end def content diff --git a/app/models/profile_info_block.rb b/app/models/profile_info_block.rb index 43c4ad5..6f16380 100644 --- a/app/models/profile_info_block.rb +++ b/app/models/profile_info_block.rb @@ -1,7 +1,7 @@ class ProfileInfoBlock < Block def self.description - _('Profile information block') + _('Profile information') end def help diff --git a/app/models/profile_list_block.rb b/app/models/profile_list_block.rb index 4b8fe90..832424a 100644 --- a/app/models/profile_list_block.rb +++ b/app/models/profile_list_block.rb @@ -3,7 +3,7 @@ class ProfileListBlock < Block settings_items :limit, :type => :integer, :default => 6 def self.description - _('A block that displays random profiles') + _('Random profiles') end # Override this method to make the block list specific types of profiles diff --git a/app/models/recent_documents_block.rb b/app/models/recent_documents_block.rb index 5d22985..dc253d0 100644 --- a/app/models/recent_documents_block.rb +++ b/app/models/recent_documents_block.rb @@ -1,7 +1,7 @@ class RecentDocumentsBlock < Block def self.description - _('List of recent content') + _('Last updates') end def default_title @@ -9,7 +9,7 @@ class RecentDocumentsBlock < Block end def help - _('This block lists your recent content.') + _('This block lists your content most recently updated.') end settings_items :limit, :type => :integer, :default => 5 diff --git a/app/models/sellers_search_block.rb b/app/models/sellers_search_block.rb index ce0de7b..0ed2ac5 100644 --- a/app/models/sellers_search_block.rb +++ b/app/models/sellers_search_block.rb @@ -5,7 +5,7 @@ class SellersSearchBlock < Block end def self.short_description - _('Sellers search block') + _('Products/Enterprises search') end def default_title diff --git a/app/models/slideshow_block.rb b/app/models/slideshow_block.rb index 23cabcb..57db140 100644 --- a/app/models/slideshow_block.rb +++ b/app/models/slideshow_block.rb @@ -6,7 +6,7 @@ class SlideshowBlock < Block settings_items :navigation, :type => 'boolean', :default => false def self.description - _('Slideshow block') + _('Slideshow') end def gallery diff --git a/app/models/tags_block.rb b/app/models/tags_block.rb index 6a7e575..c37f454 100644 --- a/app/models/tags_block.rb +++ b/app/models/tags_block.rb @@ -7,7 +7,7 @@ class TagsBlock < Block settings_items :limit, :type => :integer, :default => 12 def self.description - _('Block listing content count by tag') + _('Tags') end def default_title diff --git a/app/views/box_organizer/add_block.rhtml b/app/views/box_organizer/add_block.rhtml index 7563e09..496b811 100644 --- a/app/views/box_organizer/add_block.rhtml +++ b/app/views/box_organizer/add_block.rhtml @@ -7,12 +7,19 @@

<%= _('Select the type of block you want to add to your page.') %>

- <% @block_types.each do |item| %> -
- <%= radio_button_tag('type', item.name) %> - <%= item.description %> + <% @block_types.in_groups_of(2) do |block1, block2| %> +
+ <%= radio_button_tag('type', block1.name) %> + <%= label_tag "type_#{block1.name.downcase}", block1.description %>
+ <% if block2 %> +
+ <%= radio_button_tag('type', block2.name) %> + <%= label_tag "type_#{block2.name.downcase}", block2.description %> +
+ <% end %> <% end %> +
<% button_bar do %> <%= submit_button(:add, _("Add")) %> -- libgit2 0.21.2