Commit 18ff456

mo khan <mo@mokhan.ca>
2017-02-12 00:21:25
render the send to strong lifters info.
master
1 parent b1ce210
Changed files (5)
app
views
application
_navigation.html.erb
layouts
application.html.erb
workouts
_import_address_modal.html.erb
index.html.erb
config
locales
en.yml
app/views/application/_navigation.html.erb
@@ -0,0 +1,44 @@
+<div class="container">
+  <nav class="nav">
+    <div class="nav-left">
+      <a class="nav-item is-brand" href="https://www.stronglifters.com">
+        <%= image_tag("logos.svg") %>
+      </a>
+      <%= link_to t(".home"), dashboard_path, class: 'nav-item' %>
+      <a class="nav-item" href="http://slog.stronglifters.com">
+        Blog
+      </a>
+    </div>
+    <div class="nav-center">
+      <a class="nav-item" href="https://github.com/stronglifters/">
+        <span class="icon">
+          <i class="fa fa-github"></i>
+        </span>
+      </a>
+      <a class="nav-item" href="https://twitter.com/stronglifters">
+        <span class="icon">
+          <i class="fa fa-twitter"></i>
+        </span>
+      </a>
+    </div>
+    <!-- This "nav-toggle" hamburger menu is only visible on mobile -->
+    <!-- You need JavaScript to toggle the "is-active" class on "nav-menu" -->
+    <span class="nav-toggle">
+      <span></span>
+      <span></span>
+      <span></span>
+    </span>
+
+    <!-- This "nav-menu" is hidden on mobile -->
+    <!-- Add the modifier "is-active" to display it on mobile -->
+    <div class="nav-right nav-menu">
+      <%= link_to profile_path(current_user), class: 'nav-item is-tab' do %>
+        <figure class="image is-16x16" style="margin-right: 8px;">
+          <%= gravatar_for(current_user, size: 16) %>
+        </figure>
+        <%= t(".profile") %>
+      <% end %>
+      <%= link_to t(".nav.user.log_out"), session_path('me'), method: :delete, class: 'nav-item is-tab' %>
+    </div>
+  </nav>
+</div>
app/views/layouts/application.html.erb
@@ -13,75 +13,30 @@
     <%= yield(:head) %>
   </head>
   <body class="<%= controller_name %> <%= action_name %>">
-    <div class="off-canvas-wrapper">
-      <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
+    <%= render partial: "navigation" %>
+    <%= render partial: 'layouts/flash' %>
 
-        <!-- off-canvas title bar for 'small' screen -->
-        <div class="title-bar" data-responsive-toggle="widemenu" data-hide-for="medium">
-          <div class="title-bar-left">
-            <button class="menu-icon" type="button" data-open="offCanvas"></button>
-            <span class="title-bar-title"><%= link_to t(".title"), dashboard_path %></span>
+    <div class="container">
+      <div class="columns">
+        <div class="column is-2 is-offset-5">
+          <div class="align-middle loading-indicator hide">
+            <p><i class="fa fa-spinner fa-pulse"></i> <%= t('.loading') %></p>
           </div>
         </div>
-
-        <!-- off-canvas left menu -->
-        <div class="off-canvas position-left" id="offCanvas" data-off-canvas>
-          <ul class="vertical dropdown menu" data-dropdown-menu>
-            <li> <%= search_form(id: "mobile-search-form") %> </li>
-            <li><%= link_to t(".nav.user.workouts"), workouts_path %></li>
-            <li><%= link_to t(".new_workout"), new_workout_path %></li>
-            <li><%= link_to t(".gyms"), gyms_path %></li>
-            <li><%= link_to t(".nav.user.profile_edit"), edit_profile_path(current_user) %></li>
-            <li><%= link_to t(".nav.user.profile_view"), profile_path(current_user) %></li>
-            <li><%= link_to t(".nav.user.log_out"), session_path('me'), method: :delete %></li>
-          </ul>
-        </div>
-
-        <!-- "wider" top-bar menu for 'medium' and up -->
-        <div id="widemenu" class="top-bar">
-          <div class="row">
-            <div class="columns">
-              <div class="top-bar-left">
-                <ul class="dropdown menu" data-dropdown-menu>
-                  <li class="title-bar-title"><%= link_to t(".title"), dashboard_path %></li>
-                  <li> <%= search_form %> </li>
-                  <li><%= link_to t(".nav.user.workouts"), workouts_path %></li>
-                  <li><%= link_to t(".gyms"), gyms_path %></li>
-                  <li><%= link_to t(".nav.user.profile_edit"), edit_profile_path(current_user) %></li>
-                  <li><%= link_to t(".nav.user.profile_view"), profile_path(current_user) %></li>
-                  <li><%= link_to t(".nav.user.log_out"), session_path('me'), method: :delete %></li>
-                </ul>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- original content goes in this container -->
-        <div class="off-canvas-content" data-off-canvas-content>
-          <!-- start main content -->
-          <div class="row">
-            <div class="columns">
-              <%= render partial: 'layouts/flash' %>
-              <div class="align-middle loading-indicator hide">
-                <p><i class="fa fa-spinner fa-pulse"></i> <%= t('.loading') %></p>
-              </div>
-              <%= yield %>
-            </div>
-          </div>
-          <footer class="row">
-            <div class="columns">
-              <p><%= t("footer.copyright") %></p>
-              <ul class="menu align-center">
-                <li><a href="https://twitter.com/StrongLifters/">Twitter</a></li>
-                <li><a href="https://github.com/stronglifters">Github</a></li>
-              </ul>
-            </div>
-          </footer>
-          <!-- end main content -->
-        </div>
-
-      <!-- close wrapper, no more content after this -->
       </div>
     </div>
+    <%= yield %>
+    <footer class="footer">
+      <div class="container">
+        <div class="content has-text-centered">
+          <p><%= t("footer.copyright") %></p>
+          <p>
+            <a class="icon" href="https://github.com/stronglifters">
+              <i class="fa fa-github"></i>
+            </a>
+          </p>
+        </div>
+      </div>
+    </footer>
   </body>
 </html>
app/views/workouts/_import_address_modal.html.erb
@@ -1,33 +1,30 @@
-<div id="sendToStrongLiftsModal" class="reveal" data-reveal>
-  <h2 id="modalTitle"><%= t('.title') %></h2>
-  <p class="lead"><%= t('.lead') %></p>
+<div class="container">
+  <div class="columns">
+    <div class="column is-8 is-offset-2">
+      <div class="content is-large">
+        <p>
+          <%= t('.blurb_html') %>
+        </p>
+        <p>
+          <%= text_field_tag :import_address, current_user.import_address, class: 'input is-large' %>
+        </p>
+        <button class="button clipboard-button" data-clipboard-target="#import_address">
+          <i class="fa fa-copy"></i> <%= t('.copy') %>
+        </button>
+        <p>
+          <%= mail_to(current_user.import_address, User.human_attribute_name(:import_address)) %>
+        </p>
+        <% if current_user.default_time_zone? %>
+          <p>
+            <i class="fa fa-warning"></i>
+            <%= link_to t('.warning'), edit_profile_path(current_user.profile) %>
+          </p>
+        <% end %>
+      </div>
 
-  <p><%= raw t('.blurb') %></p>
-  <div class="row">
-    <div class="large-8 columns">
-      <p><%= text_field_tag :import_address, current_user.import_address %></p>
+      <div class="column is-4 is-offset-2">
+        <iframe width="560" height="560" src="https://www.youtube-nocookie.com/embed/vVowk0wSiwY?rel=0" frameborder="0" allowfullscreen></iframe>
+      </div>
     </div>
-    <div class="large-4 columns">
-      <button class="button clipboard-button" data-clipboard-target="#import_address">
-        <i class="fa fa-copy"></i> <%= t('.copy') %>
-      </button>
-    </div>
-  </div>
-  <p class="text-center"><%= mail_to(current_user.import_address, User.human_attribute_name(:import_address)) %></p>
-  <% if current_user.default_time_zone? %>
-    <div class="panel">
-      <p><i class="fa fa-warning"></i><%= link_to t('.warning'), edit_profile_path(current_user.profile) %></p>
-    </div>
-  <% end %>
-
-  <div class="flex-video widescreen youtube">
-    <iframe width="420" height="315" src="https://www.youtube-nocookie.com/embed/vVowk0wSiwY?rel=0" frameborder="0" allowfullscreen></iframe>
   </div>
-  <p class="text-center">
-    <%= link_to t('.help'), stronglifts_export_path %>
-    <i class="fa fa-question-circle"></i>
-  </p>
-  <button class="close-button" data-close aria-label="Close modal" type="button">
-    <span aria-hidden="true">&times;</span>
-  </button>
 </div>
app/views/workouts/index.html.erb
@@ -43,26 +43,7 @@
       <%= paginate @workouts, remote: false %>
     </div>
   </div>
-  <% if feature_enabled?(:csv_import) %>
-  <div class="row">
-    <div class="columns">
-      <p class="text-center">
-        <a data-open="sendToStrongLiftsModal">
-          <%= User.human_attribute_name(:import_address) %>
-        </a>
-      </p>
-    </div>
-  </div>
-  <% end %>
 <% else %>
-  <div class="row">
-    <div class="columns">
-      <% if feature_enabled?(:csv_import) %>
-      <p class="text-center"> <a href="#" data-reveal-id="sendToStrongLiftsModal"><%= User.human_attribute_name(:import_address) %></a> </p>
-      <% end %>
-      <%= random_video %>
-    </div>
-  </div>
+  <%= render partial: 'import_address_modal' %>
 <% end %>
 
-<%= render partial: 'import_address_modal' %>
config/locales/en.yml
@@ -41,6 +41,10 @@ en:
         social_tolerance: Social Tolerance
       user:
         import_address: Send-to-Stronglifters
+  application:
+    navigation:
+      home: Home
+      profile: Profile
   time:
     formats:
       short: "%a, %d %b %Y"
@@ -107,7 +111,7 @@ en:
       register_link: "Create an account"
   workouts:
     import_address_modal:
-      blurb: This is your custom email address for sending CSV exports from the <a href="http://stronglifts.com/apps/">StrongLifts 5x5 mobile application</a>.
+      blurb_html: This is your custom email address for sending CSV exports from the <a href="http://stronglifts.com/apps/">StrongLifts 5x5 mobile application</a>.
       copy: Copy
       help: I need help.
       lead: Your custom email address.