Merge pull request #68 from vcostin/feature/19841-apply-new-button-styling

19841 apply new button styles
pull/6827/head
Florian Kraft 9 years ago
commit be3bf36508
  1. 2
      app/views/meeting_contents/_form.html.erb
  2. 2
      app/views/meeting_contents/history.html.erb
  3. 2
      app/views/meetings/edit.html.erb
  4. 2
      app/views/meetings/new.html.erb

@ -26,7 +26,7 @@ See doc/COPYRIGHT.md for more details.
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %></p> :'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %></p>
<%= f.hidden_field :lock_version %> <%= f.hidden_field :lock_version %>
<p><label for="<%= content_type %>_comment"><%= Meeting.human_attribute_name(:comments) %></label><%= f.text_field :comment, :size => 120 %></p> <p><label for="<%= content_type %>_comment"><%= Meeting.human_attribute_name(:comments) %></label><%= f.text_field :comment, :size => 120 %></p>
<p><%= submit_tag l(:button_save), class: 'button -highlight' %> <p><%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% path = send("preview_#{content_type}_path", content.meeting) %> <% path = send("preview_#{content_type}_path", content.meeting) %>
<%= preview_link path, "#{content_type}_form", { class: 'button preview' } %> <%= preview_link path, "#{content_type}_form", { class: 'button preview' } %>
<%= link_to l(:button_cancel), "#", <%= link_to l(:button_cancel), "#",

@ -53,7 +53,7 @@ See doc/COPYRIGHT.md for more details.
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<%= submit_tag l(:label_view_diff), class: 'button -small -highlight' if show_diff %> <%= styled_button_tag l(:label_view_diff), class: '-small -highlight' if show_diff %>
<%= pagination_links_full @content_versions %> <%= pagination_links_full @content_versions %>
<% end %> <% end %>

@ -24,7 +24,7 @@ See doc/COPYRIGHT.md for more details.
<%= toolbar title: "#{l(:label_meeting)} ##{@meeting.id}" %> <%= toolbar title: "#{l(:label_meeting)} ##{@meeting.id}" %>
<%= labelled_tabular_form_for @meeting, :url => {:controller => '/meetings', :action => 'update'}, :html => {:id => 'meeting-form', :method => :put} do |f| -%> <%= labelled_tabular_form_for @meeting, :url => {:controller => '/meetings', :action => 'update'}, :html => {:id => 'meeting-form', :method => :put} do |f| -%>
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<%= submit_tag l(:button_save), class: 'button -highlight' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), { :action => 'show', :id => @meeting }, <%= link_to l(:button_cancel), { :action => 'show', :id => @meeting },
class: 'button' %> class: 'button' %>
<% end if @project %> <% end if @project %>

@ -23,7 +23,7 @@ See doc/COPYRIGHT.md for more details.
<%= toolbar title: l(:label_meeting_new) %> <%= toolbar title: l(:label_meeting_new) %>
<%= labelled_tabular_form_for @meeting, :url => {:controller => '/meetings', :action => 'create', :project_id => @project}, :html => {:id => 'meeting-form'} do |f| -%> <%= labelled_tabular_form_for @meeting, :url => {:controller => '/meetings', :action => 'create', :project_id => @project}, :html => {:id => 'meeting-form'} do |f| -%>
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<%= submit_tag l(:button_create), class: 'button -highlight' %> <%= styled_button_tag l(:button_create), class: '-highlight' %>
<%= link_to l(:button_cancel), { :action => 'index', :project_id => @project }, <%= link_to l(:button_cancel), { :action => 'index', :project_id => @project },
class: 'button' %> class: 'button' %>
<% end if @project %> <% end if @project %>

Loading…
Cancel
Save