Download as
Browse Code »

Commit 5d932494d86289eabf028463ca3986550173b907

Authored by Braulio Bhavamitra
1 parent 5992a0fc
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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 12 <%= render :partial => 'agenda' %>
... ...
public/stylesheets/application.css
  Diff comments   View file @5d93249
... ... @@ -3217,9 +3217,7 @@ div#article-parent {
3217 3217 height: 90%;
3218 3218 }
3219 3219 #agenda-toolbar {
3220   - position: absolute;
3221   - right: 0;
3222   - top: -10px;
  3220 + float: right;
3223 3221 font-variant: normal;
3224 3222 font-weight: normal;
3225 3223 }
... ...