Commit `443479d3`

mo khan <mo@mokhan.ca>

2014-11-02 03:19:21

use fluid container on some pages and ignore turbolinks for backbone links.

master

1 parent 9f31c8a

Changed files (7)

app

helpers

application_helper.rb

views

cakes

index.html.erb

layouts

_header.html.erb

application.html.erb

shared

_my_nav.html.erb

profiles

index.html.erb

tutorials

index.html.erb

@@ -30,4 +30,8 @@ module ApplicationHelper
     return "" if content.nil?
     GitHub::Markdown.render_gfm(content)
   end
+
+  def configuration_for(key, default)
+    content_for(key) || default
+  end
 end

@@ -1,5 +1,6 @@
 <% provide(:description, "CakeSide is a free site to share your cake creations and ideas with other cake fanatics like yourself") -%>
 <% provide(:search_path, request.env['PATH_INFO'] || cakes_path) %>
+<% provide(:container_class, 'container-fluid') %>
 <% unless user_signed_in?  -%>
   <div class="row-fluid">
     <div class="span6">

@@ -10,7 +10,7 @@
       <div class="nav-collapse collapse">
         <ul class="nav">
           <li>
-            <%= form_tag(yield(:search_path).blank? ? search_path : yield(:search_path), method: :get, name: "search", class: "navbar-search pull-left") do %>
+            <%= form_tag(configuration_for(:search_path, search_path), method: :get, name: "search", class: "navbar-search pull-left") do %>
               <%= text_field_tag :q, params[:q], class: 'search-query', placeholder: 'Search' %>
             <% end %>
           </li>
@@ -30,12 +30,12 @@
               <i class="fa fa-plus"></i> <b class="caret"></b>
             </a>
             <ul class="dropdown-menu">
-              <li>
+              <li data-no-turbolink>
                 <%= link_to my_root_path(anchor: 'cakes/new') do %>
                   <i class="fa fa-upload"></i> New Cake
                 <% end %>
               </li>
-              <li>
+              <li data-no-turbolink>
                 <%= link_to my_root_path(anchor: 'tutorials/new') do %>
                   <i class="fa fa-pencil-square"></i> New Tutorial
                 <% end %>
@@ -47,7 +47,7 @@
               <i class="fa fa-inbox"></i>
             <% end %>
           </li>
-          <li>
+          <li data-no-turbolink>
             <%= link_to my_root_path(anchor: 'profile/me') do %>
               <i class="fa fa-cog"></i>
             <% end %>

@@ -32,7 +32,7 @@
 </head>
 <body>
 <%= render "layouts/header" %>
-<div class="container">
+<div class="<%= configuration_for(:container_class, 'container') %>">
   <%= render "layouts/messages" %>
   <%= yield %>
 </div> <!-- /container -->

@@ -2,25 +2,20 @@
   <%= link_to new_my_avatar_path, title: 'Change your avatar', data: { toggle: 'tooltip', placement: 'bottom', animation: 'true' }, class: 'tooltip-item' do %>
     <%= avatar_for(current_user) %>
   <% end %>
-  <ul class="nav nav-list" data-no-turbolink>
+  <ul class="nav nav-list">
     <li class="nav-header"><%= current_user.name %></li>
     <li class="<%= "active" if controller?("dashboard") %>"><%= link_to "<i class='fa fa-tachometer'></i> Dashboard".html_safe, my_root_path %></li>
-    <!--
-    <li id="cakes-tab" class="<%= "active" if controller?("cakes") %>"><%= link_to "Creations", my_root_path(anchor: 'cakes') %></li>
-    <li id="tutorial-tab"><%= link_to "Tutorials", my_root_path(anchor: 'tutorials') %></li>
-    -->
-    <!--<li class="<%= 'active' if controller?('settings') %>"><%= link_to "<i class='fa fa-cog'></i> Settings".html_safe, my_settings_path %></li>-->
-    <li id='profile-tab'><%= link_to "<i class='fa fa-cog'></i> Profile".html_safe, my_root_path(anchor: 'profile/me') %></li>
+    <li id='profile-tab' data-no-turbolink><%= link_to "<i class='fa fa-cog'></i> Profile".html_safe, my_root_path(anchor: 'profile/me') %></li>
     <li class="<%= 'active' if controller?('passwords') %>"><%= link_to "<i class='fa fa-eye'></i> Account".html_safe, my_passwords_path %></li>
     <li class="<%= "active" if controller?("favorites") %>"><%= link_to "<i class='fa fa-star'></i> Favorites".html_safe, my_favorites_path %></li>
     <li class="<%= 'active' if controller?('avatars') %>"><%= link_to "<i class='fa fa-picture-o'></i> Picture".html_safe, new_my_avatar_path %></li>
     <li class="nav-header">Actions</li>
-    <li>
+    <li data-no-turbolink>
       <%= link_to my_root_path(anchor: 'cakes/new') do %>
         <i class="fa fa-upload"></i> New Cake
       <% end %>
     </li>
-    <li>
+    <li data-no-turbolink>
       <%= link_to my_root_path(anchor: 'tutorials/new') do %>
         <i class="fa fa-pencil-square"></i> New Tutorial
       <% end %>

@@ -1,4 +1,5 @@
 <%= provide(:search_path, profiles_path) %>
+<% provide(:container_class, 'container-fluid') %>
 <div id="bakery">
   <%= render partial: 'index' %>
 </div>

@@ -1,4 +1,5 @@
 <%= provide(:search_path, tutorials_path) %>
+<% provide(:container_class, 'container-fluid') %>
 <div class="row-fluid">
   <% @tutorials.each_slice(6).each do |batch| %>
     <ul class='thumbnails'>

Commit 443479d3

Commit `443479d3`