mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-24 16:58:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Growstuff/growstuff into homepagecleanup

Browse Source
This commit is contained in:
Skud
2012-09-24 21:30:24 +01:00
parent 7ef4a6784f be9d20df0b
commit 76d1eef20c
8 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/layouts/_footer.html.haml
View File

@@ -1,6 +1,3 @@
</div></div>
- # There are some tags here, such as these close div tags and the close body and html tags below, which were opened in the header fragment. HAML can't handle this, so they're done in HTML instead.
.row
.ten.columns
%ul.link-list
@@ -14,6 +11,3 @@
= link_to "Mailing list", "http://lists.growstuff.org/mailman/listinfo/discuss"
%li
= link_to "Community Guidelines", "https://github.com/Growstuff/policy/blob/master/community-guidelines.md"
</body>
</html>

16
app/views/layouts/_header.html.haml
View File

@@ -1,18 +1,3 @@
<html>
- # There are some tags here, such as html, body, etc, which are opened in this file and closed in the footer fragment. HAML can't handle this, so they're left as HTML. If you were wondering.
%head
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href='http://fonts.googleapis.com/css?family=Sevillana' rel='stylesheet' type='text/css'>
%title
= content_for?(:title) ? yield(:title) : "Growstuff"
= stylesheet_link_tag "application", :media => "all"
= javascript_include_tag "application"
= csrf_meta_tags
<body>
.row
.ten.columns
- if user_signed_in?
@@ -34,4 +19,3 @@
%h1
= link_to('Growstuff', root_path)
<div class="row"><div class="ten columns">

10
app/views/layouts/_meta.html.haml Normal file
View File

@@ -0,0 +1,10 @@
%head
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href='http://fonts.googleapis.com/css?family=Sevillana' rel='stylesheet' type='text/css'>
%title
= content_for?(:title) ? yield(:title) : "Growstuff"
= stylesheet_link_tag "application", :media => "all"
= javascript_include_tag "application"
= csrf_meta_tags

23
app/views/layouts/application.html.haml
View File

@@ -1,9 +1,14 @@
= render :partial => "layouts/header"
- if notice
%p.notice
= notice
- if alert
%p.alert
= alert
= yield
= render :partial => "layouts/footer"
%html
= render :partial => "layouts/meta"
%body
= render :partial => "layouts/header"
.row
.ten.columns
- if notice
%p.notice
= notice
- if alert
%p.alert
= alert
= yield
= render :partial => "layouts/footer"

3
config/application.rb
View File

@@ -58,5 +58,8 @@ module Growstuff
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
# Don't try to connect to the database when precompiling assets
config.assets.initialize_on_precompile = false
end
end

2
config/deploy.rb
View File

@@ -48,6 +48,8 @@ Cape do
mirror_rake_tasks 'db:migrate', :roles => :app do |env|
env['RAILS_ENV'] = rails_env
end
mirror_rake_tasks :assets
end
after :deploy, 'db:migrate'
after :deploy, 'assets:precompile'

16
lib/tasks/testing.rake
View File

@@ -1,12 +1,14 @@
require 'rake'
require 'rspec/core/rake_task'
begin
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec)
RSpec::Core::RakeTask.new(:spec)
task :default => :spec
task :default => :spec
task :run_tests do
system("rspec spec/")
system("rake test")
task :run_tests do
system("rspec spec/")
system("rake test")
end
rescue LoadError
end

9
lib/tasks/watchr.rake
View File

@@ -1,4 +1,7 @@
desc "Run watchr"
task :watchr do
sh %{bundle exec watchr .watchr}
begin
desc "Run watchr"
task :watchr do
sh %{bundle exec watchr .watchr}
end
rescue LoadError
end