instedd-rails 0.0.2 → 0.0.3

data/app/views/layouts/_navigation.html.erb

@@ -0,0 +1 @@
+<%= section 'Home', root_path, :home %>

data/app/views/layouts/{application.html.erb → instedd_application.html.erb}

@@ -19,44 +19,10 @@
       <ul id="instedd-pulldown"></ul>
         <div id="NavMenu">
       <ul>
-        <%= section 'Home', root_path, :home %>
-        <%= section 'Reminders', schedules_path, :schedules, [:schedules, :subscribers, :logs] unless current_user.nil? %>
-        <%= section 'Tour', tour_path(:start), :tour %>
-        <%= section 'Community', community_path, :community %>
-        <%= section 'Help', help_path , :help %>
+        <%= yield(:navigation) %>
       </ul>
     </div>
-      
-      <ul class="RightMenu">
-        <%- if !current_user.nil? %>
-        <li>
-        <div id="User">
-          <%=current_user.email%><br><br>
-          <div class="container">
-            <ul>
-              <li><%= link_to 'Reminders', schedules_path %></li>
-              <li><%= link_to 'Settings', edit_user_registration_path %></li>
-            </ul>
-            <hr/>
-            <ul>
-              <li><a href="mailto:support@instedd.org?subject=[<%= application_name.underscore %>-bug]">Report a bug</a></li>
-              <li><%= link_to "Sign Out", destroy_user_session_path %></li>
-            </ul>
-          </div>
-        </div>
-        </li>
-        <li>
-          <%= link_to '', edit_user_registration_path, :class => 'fsettings' %>
-        </li>
-        <% else %>
-        <li>
-          <%= link_to "Create account", new_user_registration_path, :class => 'fedit' %>
-        </li>
-        <li>
-          <%= link_to "Log in", new_user_session_path, :class => 'fuser' %>
-        </li>
-        <% end %>
-      </ul>
+        <%= yield(:right_menu) %>
     </div>
     
   <div id="header">
@@ -86,21 +52,18 @@
             </div>
             <div class="right">
               <a href="http://instedd.org/technologies/" class="more">Learn more</a>
-              <div id="instedd-footer" data-app-name="remindem"></div>
+              <div id="instedd-footer" data-app-name="<%= application_name.underscore %>"></div>
             </div>
             <div class="clear"></div>
           </div>
           <div>
             <div class="left">
               <a href="http://instedd.org">&copy; 2011 InSTEDD</a>
-              <a href="#TODO">Terms and conditions</a>
+              <a href="<%= terms_and_conditions_path %>">Terms and conditions</a>
               <a href="mailto:support@instedd.org?subject=[<%= application_name.titleize %>]">Contact us</a>
             </div>
             <div class="right">
-              <a href="<%= root_path %>">Home</a>
-              <a href="<%= tour_path(:start) %>">Tour</a>
-              <a href="<%= community_path %>">Community</a>
-              <a href="<%= help_path %>">Help</a>
+              <%= yield(:footer_links) %>
               <span class="VersionNumber">Version <%= version_name %></span>
             </div>
             <div class="clear">

data/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  # get 'tour(/:page)', :action => :show, :controller => :tour, :as => 'tour'
+  
 end

data/lib/generators/instedd_rails/layout_generator.rb

@@ -0,0 +1,13 @@
+module InsteddRails
+  module Generators
+    class LayoutGenerator < ::Rails::Generators::Base
+      source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+
+      desc "Copy layout files to your application."
+
+      def copy_initializer
+        copy_file "application.html.erb", "app/views/layouts/application.html.erb"
+      end
+    end
+  end
+end

data/lib/generators/instedd_rails/templates/application.html.erb

@@ -0,0 +1,45 @@
+<% content_for :navigation do %> 
+  <%= section 'Home', root_path, :home %>
+  <%= section 'Tour', tour_path(:start), :tour %>
+  <%= section 'Community', community_path, :community %>
+  <%= section 'Help', help_path , :help %>
+<% end %>
+<% content_for :right_menu do %> 
+  <ul class="RightMenu">
+        <%- if !current_user.nil? %>
+        <li>
+        <div id="User">
+          <%=current_user.email%><br><br>
+          <div class="container">
+            <ul>
+              <li><%= link_to 'Reminders', schedules_path %></li>
+              <li><%= link_to 'Settings', edit_user_registration_path %></li>
+            </ul>
+            <hr/>
+            <ul>
+              <li><a href="mailto:support@instedd.org?subject=[<%= application_name.underscore %>-bug]">Report a bug</a></li>
+              <li><%= link_to "Sign Out", destroy_user_session_path %></li>
+            </ul>
+          </div>
+        </div>
+        </li>
+        <li>
+          <%= link_to '', edit_user_registration_path, :class => 'fsettings' %>
+        </li>
+        <% else %>
+        <li>
+          <%= link_to "Create account", new_user_registration_path, :class => 'fedit' %>
+        </li>
+        <li>
+          <%= link_to "Log in", new_user_session_path, :class => 'fuser' %>
+        </li>
+        <% end %>
+      </ul>
+<% end %>
+<% content_for :footer_links do %> 
+  <a href="<%= root_path %>">Home</a>
+  <a href="<%= tour_path(:start) %>">Tour</a>
+  <a href="<%= community_path %>">Community</a>
+  <a href="<%= help_path %>">Help</a>
+<% end %>
+<%= render :file => 'layouts/instedd_application' %>

data/lib/instedd_rails/version.rb

@@ -1,3 +1,3 @@
 module InsteddRails
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: instedd-rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Instedd
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 Z
+date: 2011-11-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -59,7 +59,8 @@ files:
 - app/views/kaminari/_page.html.erb
 - app/views/kaminari/_paginator.html.erb
 - app/views/kaminari/_prev_page.html.erb
-- app/views/layouts/application.html.erb
+- app/views/layouts/_navigation.html.erb
+- app/views/layouts/instedd_application.html.erb
 - app/views/layouts/mail.html.erb
 - app/views/layouts/mail.text.erb
 - app/views/layouts/tour.html.erb
@@ -72,6 +73,8 @@ files:
 - config/routes.rb
 - instedd-rails.gemspec
 - lib/generators/instedd_rails/config_generator.rb
+- lib/generators/instedd_rails/layout_generator.rb
+- lib/generators/instedd_rails/templates/application.html.erb
 - lib/generators/instedd_rails/templates/instedd_rails_config.rb
 - lib/instedd-rails.rb
 - lib/instedd_rails/config.rb