Merge pull request #60 from finnlabs/feature/foundation-apps-framework

Initial update for Foundation for Apps integration

app/views/meeting_contents/_form.html.erb

@@ -25,11 +25,13 @@ See doc/COPYRIGHT.md for more details.
 <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit),
                    :'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %></p>
 <%= f.hidden_field :lock_version %>
-<p><label for="<%= content_type %>_comment"><%= Meeting.human_attribute_name(:comments) %></label><br /><%= f.text_field :comment, :size => 120 %></p>
-<p><%= submit_tag l(:button_save) %>
+<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' %>
 <% path = send("preview_#{content_type}_path", content.meeting) %>
-<%= preview_link path, "#{content_type}_form", { class: 'preview' } %>
-<%= link_to l(:button_cancel), "#", :onclick => "$$('.show-#{content_type}').invoke('show'); $$('.edit-#{content_type}').invoke('hide'); return false;" %></p>
+<%= preview_link path, "#{content_type}_form", { class: 'button preview' } %>
+<%= link_to l(:button_cancel), "#",
+      :onclick => "$$('.show-#{content_type}').invoke('show'); $$('.edit-#{content_type}').invoke('hide'); return false;",
+      class: 'button' %></p>
 <%= wikitoolbar_for "#{content_type}_text" %>
 <% end %>
 

app/views/meeting_contents/history.html.erb

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

app/views/meetings/_form.html.erb

@@ -24,8 +24,20 @@ See doc/COPYRIGHT.md for more details.
 <div class="box tabular">
   <p><%= f.text_field :title, :required => true, :size => 60, :class => "autofocus" %></p>
   <p><%= f.text_field :location, :size => 60 %></p>
-  <p><%= f.text_field :start_date, :required => true, :size => 10 %><%= calendar_for('meeting_start_date') %> <%= accessible_time_select "meeting", "start_time", :ignore_date => true, :minute_step => 5 %> <%= Time.zone %></p>
-  <p><%= f.text_field :duration, :required => true, :size => 5 %><em>(<%=l :text_in_hours %>)</em>
+  <p>
+    <%= f.text_field :start_date, :required => true, :size => 10 %>
+    <%= calendar_for('meeting_start_date') %>
+    <span class="inline-label">
+      <%= accessible_time_select "meeting", "start_time", :ignore_date => true, :minute_step => 5 %>
+      <span class="form-label"><%= Time.zone %></span>
+    </span>
+  </p>
+  <p>
+    <span class="inline-label">
+      <%= f.text_field :duration, :required => true, :size => 5 %>
+      <span class="form-label"><%=l :text_in_hours %></span>
+    </span>
+  </p>
   <div><label><%=Meeting.human_attribute_name(:participants) %></label>
     <table class="list">
       <thead><tr>

app/views/meetings/edit.html.erb

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

app/views/meetings/new.html.erb

@@ -24,5 +24,7 @@ See doc/COPYRIGHT.md for more details.
 <h2><%= l(:label_meeting_new) %></h2>
 <%= 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} %>
-  <%= submit_tag l(:button_create) %> <%= link_to l(:button_cancel), :action => 'index', :project_id => @project %>
+  <%= submit_tag l(:button_create), class: 'button -highlight' %>
+  <%= link_to l(:button_cancel), { :action => 'index', :project_id => @project },
+        class: 'button' %>
 <% end if @project %>

app/views/meetings/show.html.erb

@@ -34,17 +34,24 @@ See doc/COPYRIGHT.md for more details.
 </div>
 
 <div class="meeting details box">
-  <%= avatar(@meeting.author, :size => "64") %>
-  <p class="author"><%= authoring @meeting.created_at, @meeting.author %></p>
-  <div class="splitcontentleft">
-  <p><strong><%= Meeting.human_attribute_name(:start_time) %></strong>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %> - <%= format_time @meeting.end_time, false %> <%= Time.zone %></p>
+  <div class="grid-block wrap">
+    <div class="grid-content small-12">
+      <%= avatar(@meeting.author, :size => "64") %>
+      <p class="author"><%= authoring @meeting.created_at, @meeting.author %></p>
+    </div>
+    <div class="grid-content small-6">
+      <p><strong><%= Meeting.human_attribute_name(:start_time) %></strong>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %> - <%= format_time @meeting.end_time, false %> <%= Time.zone %></p>
+    </div>
+    <div class="grid-content small-6">
+      <p><strong><%= Meeting.human_attribute_name(:location) %></strong>: <%=h @meeting.location %></p>
+    </div>
+    <div class="grid-content small-12">
+      <p><strong><%= Meeting.human_attribute_name(:participants_invited) %></strong>: <%= format_participant_list @meeting.participants.invited %></p>
+    </div>
+    <div class="grid-content small-12">
+      <p><strong><%= Meeting.human_attribute_name(:participants_attended) %></strong>: <%= format_participant_list @meeting.participants.attended %></p>
+    </div>
   </div>
-  <div class="splitcontentright">
-  <p><strong><%= Meeting.human_attribute_name(:location) %></strong>: <%=h @meeting.location %></p>
-  </div>
-  <div style="clear:both;"> </div>
-  <p><strong><%= Meeting.human_attribute_name(:participants_invited) %></strong>: <%= format_participant_list @meeting.participants.invited %></p>
-  <p><strong><%= Meeting.human_attribute_name(:participants_attended) %></strong>: <%= format_participant_list @meeting.participants.attended %></p>
 </div>
 
 <%= render_tabs [{:name => 'agenda', :action => :create_meeting_agendas, :partial => 'meeting_contents/show', :label => :label_meeting_agenda, :content => @meeting.agenda || @meeting.build_agenda, :content_type => "meeting_agenda"},