Download as
Browse Code »

Commit c35cbcf4f14947d251086dfdb9804a001a9cd6d0

Authored by Daniela Feitosa
1 parent 483f5d55
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

Some enhancements

Showing 4 changed files with 8 additions and 5 deletions   Show diff stats
app/models/enterprise_homepage.rb
  Diff comments   View file @c35cbcf
@@ -5,7 +5,7 @@ class EnterpriseHomepage < Article @@ -5,7 +5,7 @@ class EnterpriseHomepage < Article
5 end 5 end
6 6
7 def self.short_description 7 def self.short_description
8 - __('Enterprise homepage.') 8 + __('Enterprise homepage')
9 end 9 end
10 10
11 def self.description 11 def self.description
app/views/content_viewer/_article_toolbar.rhtml
  Diff comments   View file @c35cbcf
@@ -34,11 +34,11 @@ @@ -34,11 +34,11 @@
34 <%= expirable_button @page, :locale, content, url %> 34 <%= expirable_button @page, :locale, content, url %>
35 <% end %> 35 <% end %>
36 36
37 - <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) if !remove_content_button(:new) %> 37 + <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new) %>
38 <% end %> 38 <% end %>
39 39
40 <% if @page.accept_uploads? && @page.allow_create?(user) %> 40 <% if @page.accept_uploads? && @page.allow_create?(user) %>
41 - <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) if !remove_content_button(:upload)%> 41 + <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload)%>
42 <% end %> 42 <% end %>
43 43
44 <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %> 44 <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb
  Diff comments   View file @c35cbcf
1 <%= render :partial => 'folder', :locals => {:f => f} %> 1 <%= render :partial => 'folder', :locals => {:f => f} %>
2 2
3 -<%= f.check_box(:publish_submissions) %> 3 +<%= labelled_check_box(_('Publish submissions'), 'article[publish_submissions]', true, @article.publish_submissions) %>
public/stylesheets/application.css
  Diff comments   View file @c35cbcf
@@ -2290,6 +2290,9 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation @@ -2290,6 +2290,9 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
2290 background: none; 2290 background: none;
2291 border: none; 2291 border: none;
2292 } 2292 }
  2293 +.formfield.type-select select {
  2294 + max-width: 100%;
  2295 +}
2293 .submitline { 2296 .submitline {
2294 text-align: center; 2297 text-align: center;
2295 } 2298 }
@@ -2438,7 +2441,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation @@ -2438,7 +2441,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
2438 width: 50%; 2441 width: 50%;
2439 } 2442 }
2440 2443
2441 -.description { 2444 +.controller-admin_panel .description {
2442 background-color: #E6E6E6; 2445 background-color: #E6E6E6;
2443 border: 1px solid #CCC; 2446 border: 1px solid #CCC;
2444 padding: 5px; 2447 padding: 5px;