Commit eb16447

mo khan <mo@mokhan.ca>
2016-07-13 03:31:23
fix a bunch of pages.
master
1 parent 3dbac0b
Changed files (7)
app
views
programs
show.html.erb
routines
_routine.html.erb
static_pages
export.html.erb
user_mailer
registration_email.text.erb
workouts
edit.html.erb
index.html.erb
new.html.erb
app/views/programs/show.html.erb
@@ -1,6 +1,8 @@
 <div class="row">
   <div class="columns">
     <h1><%= link_to @program.name, program_path(@program) %></h1>
-    <%= render @program.routines.includes(recommendations: :exercise) %>
   </div>
 </div>
+<div class="row">
+  <%= render @program.routines.includes(recommendations: :exercise) %>
+</div>
app/views/routines/_routine.html.erb
@@ -1,7 +1,7 @@
 <div class="columns">
   <div class="panel">
     <%= link_to '', {}, name: routine.slug %>
-    <h1>routine <%= routine.name %>
+    <h1>Routine <%= routine.name %>
     <%= render routine.recommendations %>
   </div>
 </div>
app/views/static_pages/export.html.erb
@@ -1,30 +1,32 @@
 <div class="row">
   <div class="columns">
-    <ul data-orbit>
-      <li data-orbit-slide="headline-1">
-      <div>
-        <h2>Step 1: Go to Settings</h2>
-        <p> <%= image_tag "sl5x5-android-settings.png" %> </p>
-      </div>
-      </li>
-      <li data-orbit-slide="headline-2">
-      <div>
-        <h2>Step 2: Choose Export</h2>
-        <p> <%= image_tag "sl5x5-android-export.png" %> </p>
-      </div>
-      </li>
-      <li data-orbit-slide="headline-3">
-      <div>
-        <h2>Step 3: Choose Send</h2>
-        <p> <%= image_tag "sl5x5-android-send.png" %> </p>
-      </div>
-      </li>
-      <li data-orbit-slide="headline-4">
-      <div>
-        <h2>Step 4: Paste the email address provided</h2>
-        <p> <%= image_tag "sl5x5-android-compose.png" %> </p>
-      </div>
-      </li>
-    </ul>
+    <div class="orbit" role="region" aria-label="Send to Stronglifters" data-orbit>
+      <ul class="orbit-container">
+        <button class="orbit-previous"><span class="show-for-sr">Previous Slide</span>&#9664;&#xFE0E;</button>
+        <button class="orbit-next"><span class="show-for-sr">Next Slide</span>&#9654;&#xFE0E;</button>
+        <li class="is-active orbit-slide">
+          <%= image_tag "sl5x5-android-settings.png", class: "orbit-image" %>
+          <figcaption class="orbit-caption">Step 1: Go to Settings</figcaption>
+        </li>
+        <li class="orbit-slide">
+          <%= image_tag "sl5x5-android-export.png", class: "orbit-image" %>
+          <figcaption class="orbit-caption">Step 2: Choose Export</figcaption>
+        </li>
+        <li class="orbit-slide">
+          <%= image_tag "sl5x5-android-send.png", class: "orbit-image" %>
+          <figcaption class="orbit-caption">Step 3: Choose Send</figcaption>
+        </li>
+        <li class="orbit-slide">
+          <%= image_tag "sl5x5-android-compose.png", class: "orbit-image" %>
+          <figcaption class="orbit-caption">Step 4: Paste the email address provided</figcaption>
+        </li>
+      </ul>
+      <nav class="orbit-bullets">
+        <button class="is-active" data-slide="0"><span class="show-for-sr">Step 1: Go to Settings</span><span class="show-for-sr">Current Slide</span></button>
+        <button data-slide="1"><span class="show-for-sr">Step 2: Choose Export</span></button>
+        <button data-slide="2"><span class="show-for-sr">Step 3: Choose Send</span></button>
+        <button data-slide="3"><span class="show-for-sr">Step 4: Paste the email address provided</span></button>
+      </nav>
+    </div>
   </div>
 </div>
app/views/user_mailer/registration_email.text.erb
@@ -1,3 +1,3 @@
 <%= "Hi, #{@username}." %>
 
-The Stronglifters Team
+The Strong Lifters Team
app/views/workouts/edit.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="large-12 columns">
+  <div class="columns">
     <div id="workout-view"></div>
     <%= link_to t(:done), workouts_path, class: 'button right' %>
   </div>
app/views/workouts/index.html.erb
@@ -1,6 +1,6 @@
 <% if @workouts.any? %>
   <div class="row">
-    <div class="large-12 columns">
+    <div class="columns">
       <% if feature_enabled?(:csv_import) %>
         <p class="text-center">
           <a data-open="sendToStrongLiftsModal">
app/views/workouts/new.html.erb
@@ -8,16 +8,16 @@
     <% end %>
     <%= form_for @workout do |f| %>
       <%= f.hidden_field :routine_id %>
-      <fieldset>
+      <fieldset class="fieldset">
         <legend><%= Workout.human_attribute_name(:body_weight) %></legend>
         <%= f.number_field :body_weight %>
       </fieldset>
       <% @workout.sets.group_by(&:exercise).each do |exercise, sets| %>
-        <fieldset>
+        <fieldset class="fieldset">
           <legend><%= exercise.name %></legend>
           <% sets.each.with_index(1) do |set, index| %>
             <%= f.fields_for :exercise_sets, set do |s| %>
-              <fieldset name="<%= exercise.slug %>-<%= index %>" class="panel <%= set.work? ? "callout" : "" %>">
+              <fieldset name="<%= exercise.slug %>-<%= index %>" class="panel <%= set.work? ? "callout" : "" %>" class="fieldset">
                 <legend><%= set.model_name.human %></legend>
                 <div class="row">
                   <div class="columns">