Download as
Browse Code »

Commit a5328a71c62cb22ab38acf3f0bdc2d3d4b154b76

Authored by Antonio Terceiro
1 parent c1dfb886
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

ActionItem806: changes in blog

Showing 3 changed files with 9 additions and 7 deletions   Show diff stats
app/models/blog.rb
  Diff comments   View file @a5328a7
... ... @@ -11,7 +11,7 @@ class Blog < Folder
11 11 end
12 12  
13 13 settings_items :posts_per_page, :type => :integer, :default => 20
14   - settings_items :title, :type => :string, :default => _('My blog')
  14 + settings_items :title, :type => :string, :default => N_('Blog')
15 15  
16 16 def initialize(*args)
17 17 super(*args)
... ...
app/views/profile_editor/index.rhtml
  Diff comments   View file @a5328a7
... ... @@ -25,10 +25,12 @@
25 25  
26 26 <%= file_manager_button(_('Manage Content'), 'icons-app/cms.png', :controller => 'cms') unless environment.enabled?('disable_cms') || profile.community? %>
27 27  
28   - <% if profile.has_blog? %>
29   - <%= file_manager_button(_('Config my blog'), 'icons-app/blog.png', :controller => 'cms', :action => 'edit', :id => profile.blog) %>
30   - <% else %>
31   - <%= file_manager_button(_('Create my blog'), 'icons-app/blog-disabled.png', :controller => 'cms', :action => 'new', :type => 'Blog') %>
  28 + <% unless profile.enterprise? %>
  29 + <% if profile.has_blog? %>
  30 + <%= file_manager_button(_('Configure blog'), 'icons-app/blog.png', :controller => 'cms', :action => 'edit', :id => profile.blog) %>
  31 + <% else %>
  32 + <%= file_manager_button(_('Create blog'), 'icons-app/blog-disabled.png', :controller => 'cms', :action => 'new', :type => 'Blog') %>
  33 + <% end %>
32 34 <% end %>
33 35  
34 36 <%= file_manager_button(_('Change Password'), 'icons-app/change-password.png', :controller => 'account', :action => 'change_password') if profile.person? %>
... ...
script/release-v0.13.0-ecosol
  Diff comments   View file @a5328a7
... ... @@ -94,7 +94,7 @@ script/runner &#39;env = Environment.default
94 94 right.blocks << [FriendsBlock.new, EnterprisesBlock.new, CommunitiesBlock.new]
95 95 main.blocks << MainBlock.new
96 96 template.articles.destroy_all
97   - template.articles << Blog.new(:name => "Blog", :profile => template)
  97 + template.articles << Blog.new(:name => "blog", :title => "Blog", :profile => template)
98 98 template.home_page = template.blog
99 99 template.save!'
100 100  
... ... @@ -114,7 +114,7 @@ script/runner &#39;env = Environment.default
114 114 right.blocks << MembersBlock.new
115 115 main.blocks << MainBlock.new
116 116 template.articles.destroy_all
117   - template.articles << Blog.new(:name => "Blog", :profile => template)
  117 + template.articles << Blog.new(:name => "blog", :title => "Blog", :profile => template)
118 118 template.home_page = template.blog
119 119 template.save!'
120 120  
... ...