Download as
Browse Code »

Commit 5d932494d86289eabf028463ca3986550173b907

Authored by Braulio Bhavamitra
1 parent 5992a0fc
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Fix events view

Showing 2 changed files with 11 additions and 12 deletions   Show diff stats
app/views/events/events.rhtml
  Diff comments   View file @5d93249
1 -<h1 id='agenda-title'>  
2 - <div id='agenda-toolbar'>  
3 - <%= button :back, _('Back to %s') % profile.name, profile.url %>  
4 - <% if user && user.has_permission?('post_content', profile) %>  
5 - <%= button :new, _('New event'), myprofile_url(:controller => 'cms', :action => 'new', :type => 'Event') %>  
6 - <% end %>  
7 - </div>  
8 - <%= _("%s's events") % profile.name %>  
9 -</h1> 1 +<h1 id='agenda-title'><%= _("%s's events") % profile.name %></h1>
  2 +
  3 +<div id='agenda-toolbar'>
  4 + <%= button :back, _('Back to %s') % profile.name, profile.url %>
  5 + <% if user && user.has_permission?('post_content', profile) %>
  6 + <%= button :new, _('New event'), myprofile_url(:controller => 'cms', :action => 'new', :type => 'Event') %>
  7 + <% end %>
  8 +</div>
  9 +
  10 +<div style="clear: both"></div>
10 11
11 <%= render :partial => 'agenda' %> 12 <%= render :partial => 'agenda' %>
public/stylesheets/application.css
  Diff comments   View file @5d93249
@@ -3217,9 +3217,7 @@ div#article-parent { @@ -3217,9 +3217,7 @@ div#article-parent {
3217 height: 90%; 3217 height: 90%;
3218 } 3218 }
3219 #agenda-toolbar { 3219 #agenda-toolbar {
3220 - position: absolute;  
3221 - right: 0;  
3222 - top: -10px; 3220 + float: right;
3223 font-variant: normal; 3221 font-variant: normal;
3224 font-weight: normal; 3222 font-weight: normal;
3225 } 3223 }