From a5328a71c62cb22ab38acf3f0bdc2d3d4b154b76 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 6 Jan 2009 11:05:25 -0300 Subject: [PATCH] ActionItem806: changes in blog --- app/models/blog.rb | 2 +- app/views/profile_editor/index.rhtml | 10 ++++++---- script/release-v0.13.0-ecosol | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/models/blog.rb b/app/models/blog.rb index 9f27b66..646d334 100644 --- a/app/models/blog.rb +++ b/app/models/blog.rb @@ -11,7 +11,7 @@ class Blog < Folder end settings_items :posts_per_page, :type => :integer, :default => 20 - settings_items :title, :type => :string, :default => _('My blog') + settings_items :title, :type => :string, :default => N_('Blog') def initialize(*args) super(*args) diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml index f7f0a5c..dd30ecc 100644 --- a/app/views/profile_editor/index.rhtml +++ b/app/views/profile_editor/index.rhtml @@ -25,10 +25,12 @@ <%= file_manager_button(_('Manage Content'), 'icons-app/cms.png', :controller => 'cms') unless environment.enabled?('disable_cms') || profile.community? %> - <% if profile.has_blog? %> - <%= file_manager_button(_('Config my blog'), 'icons-app/blog.png', :controller => 'cms', :action => 'edit', :id => profile.blog) %> - <% else %> - <%= file_manager_button(_('Create my blog'), 'icons-app/blog-disabled.png', :controller => 'cms', :action => 'new', :type => 'Blog') %> + <% unless profile.enterprise? %> + <% if profile.has_blog? %> + <%= file_manager_button(_('Configure blog'), 'icons-app/blog.png', :controller => 'cms', :action => 'edit', :id => profile.blog) %> + <% else %> + <%= file_manager_button(_('Create blog'), 'icons-app/blog-disabled.png', :controller => 'cms', :action => 'new', :type => 'Blog') %> + <% end %> <% end %> <%= file_manager_button(_('Change Password'), 'icons-app/change-password.png', :controller => 'account', :action => 'change_password') if profile.person? %> diff --git a/script/release-v0.13.0-ecosol b/script/release-v0.13.0-ecosol index 8069cbc..fa6bf86 100755 --- a/script/release-v0.13.0-ecosol +++ b/script/release-v0.13.0-ecosol @@ -94,7 +94,7 @@ script/runner 'env = Environment.default right.blocks << [FriendsBlock.new, EnterprisesBlock.new, CommunitiesBlock.new] main.blocks << MainBlock.new template.articles.destroy_all - template.articles << Blog.new(:name => "Blog", :profile => template) + template.articles << Blog.new(:name => "blog", :title => "Blog", :profile => template) template.home_page = template.blog template.save!' @@ -114,7 +114,7 @@ script/runner 'env = Environment.default right.blocks << MembersBlock.new main.blocks << MainBlock.new template.articles.destroy_all - template.articles << Blog.new(:name => "Blog", :profile => template) + template.articles << Blog.new(:name => "blog", :title => "Blog", :profile => template) template.home_page = template.blog template.save!' -- libgit2 0.21.2