lib/ubiquo/template.erb in ubiquo-0.2.10 vs lib/ubiquo/template.erb in ubiquo-0.2.11

- old
+ new

@@ -197,11 +197,11 @@ map.namespace :ubiquo do |ubiquo| end # Ubiquo plugins routes. See routes.rb from each plugin path. #{ubiquo_routes} -<% if @opts[:template] == :edge %> +<% if @opts[:template] == :edge && @opts[:profile] == :complete %> <%= "map.from_plugin :ubiquo_categories" %> <% end %> <% if opts[:gnuine] %> <%= "map.from_plugin :ubiquo_design" %> <% end %> @@ -257,10 +257,10 @@ end CODE ubiquo_branch = <%= @opts[:template] == :edge ? 'nil' : "'0.7-stable'" %> add_plugins(selected_plugins + external_plugins, :branch => ubiquo_branch, :devel => <%= @opts[:devel] ? true : false %>) -<% if @opts[:template] == :edge %> +<% if @opts[:template] == :edge && @opts[:profile] == :complete %> add_plugins(['ubiquo_categories'], :branch => nil) <% end %> <% if @opts[:gnuine] && opts[:profile] == :complete %> plugin 'ubiquo_design', :git => 'gitosis@gandalf.gnuine.com:ubiquo_design.git', :submodule => true, :branch => ubiquo_branch <% end %>