Skip to content
This repository has been archived by the owner on Jun 7, 2021. It is now read-only.

Commit

Permalink
more little tweaks, fixing header nav, trying to add simplecov (unsuc…
Browse files Browse the repository at this point in the history 
…cessfully)
  • Loading branch information
@bborn
bborn committed Feb 17, 2011
1 parent 3d23418 commit c0d19c7
Show file tree
Hide file tree
Showing 11 changed files with 77 additions and 300 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Expand Up @@ -2,4 +2,5 @@
*~
pkg
.rvmrc
test/testapp/public/system/
test/testapp/public/system/
coverage
2 changes: 1 addition & 1 deletion README.markdown
View file
Expand Up @@ -187,4 +187,4 @@ Contributors - Thanks! :)



Bug tracking is via [Lighthouse](http://communityengine.lighthouseapp.com)
Bug tracking is via [GitHub Issues](https://github.com/bborn/communityengine/issues)
3 changes: 3 additions & 0 deletions Rakefile
View file
Expand Up @@ -63,6 +63,9 @@ begin
gem.add_dependency "paperclip", "~> 2.3"
gem.add_dependency 'acts_as_commentable', '~> 3.0.0'
gem.add_dependency 'recaptcha'

gem.add_dependency 'simplecov'

end
rescue
puts "Jeweler or one of its dependencies is not installed."
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_header.html.haml
View file
Expand Up @@ -13,7 +13,7 @@
#NavBar
%ul
- Category.find(:all).each do |c|
= topnav_tab c.name, {:url => category_path(c), :section => c.name}
= topnav_tab c.name, {:url => category_path(c), :section => [c.name]}
= topnav_tab :forums.l, { :url => forums_path, :section => ['forums'] }
= topnav_tab :popular.l, { :url => popular_path, :section => ['popular'] }
= topnav_tab :people.l, { :url => users_path, :section => ['users'] }
Expand Down
3 changes: 3 additions & 0 deletions community_engine.gemspec
View file
Expand Up @@ -2202,6 +2202,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<paperclip>, ["~> 2.3"])
s.add_runtime_dependency(%q<acts_as_commentable>, ["~> 3.0.0"])
s.add_runtime_dependency(%q<recaptcha>, [">= 0"])
s.add_development_dependency(%q<simplecov>, ["~> 0.4"])
else
s.add_dependency(%q<rails>, ["= 3.1.0.beta"])
s.add_dependency(%q<rack>, [">= 0"])
Expand Down Expand Up @@ -2242,6 +2243,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<paperclip>, ["~> 2.3"])
s.add_dependency(%q<acts_as_commentable>, ["~> 3.0.0"])
s.add_dependency(%q<recaptcha>, [">= 0"])
s.add_dependency(%q<simplecov>, ["~> 0.4"])
end
else
s.add_dependency(%q<rails>, ["= 3.1.0.beta"])
Expand Down Expand Up @@ -2283,6 +2285,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<paperclip>, ["~> 2.3"])
s.add_dependency(%q<acts_as_commentable>, ["~> 3.0.0"])
s.add_dependency(%q<recaptcha>, [">= 0"])
s.add_dependency(%q<simplecov>, ["~> 0.4"])
end
end

14 changes: 14 additions & 0 deletions test/test_helper.rb
View file
@@ -1,9 +1,23 @@
# Configure Rails Envinronment
ENV['RAILS_ENV'] = 'test'

require 'simplecov'
SimpleCov.start do
add_filter '/config/'
add_group 'Controllers', 'app/controllers'
add_group 'Models', 'app/models'
add_group 'Helpers', 'app/helpers'
add_group 'Libraries', 'lib'
add_group 'Specs', 'spec'
end

require File.expand_path("../testapp/config/environment.rb", __FILE__)
require "rails/test_help"

ActionMailer::Base.delivery_method = :test
ActionMailer::Base.perform_deliveries = true
ActionMailer::Base.default_url_options[:host] = "test.com"

Rails.backtrace_cleaner.remove_silencers!

require "authlogic/test_case"
Expand Down
1 change: 1 addition & 0 deletions test/testapp/Gemfile
View file
Expand Up @@ -22,5 +22,6 @@ gem "friendly_id", "~> 3.2.1"
gem "paperclip", "~> 2.3"
gem 'acts_as_commentable', "~> 3.0.0"
gem "recaptcha", :require => "recaptcha/rails"
gem 'simplecov'

gem 'sqlite3-ruby', :require => 'sqlite3'
8 changes: 8 additions & 0 deletions test/testapp/Gemfile.lock
View file
Expand Up @@ -29,6 +29,7 @@ PATH
community_engine (1.9.9)
acts_as_commentable (~> 3.0.0)
acts_as_commentable (~> 3.0.0)
arel
authlogic
authlogic
aws-s3
Expand All @@ -52,11 +53,14 @@ PATH
meta_search
paperclip (~> 2.3)
paperclip (~> 2.3)
rack
rack (= 1.2.1)
rails (= 3.1.0.beta)
rails (= 3.1.0.beta)
rakismet
rakismet
recaptcha
recaptcha
ri_cal
ri_cal
sqlite3-ruby
Expand Down Expand Up @@ -160,6 +164,9 @@ GEM
rakismet (1.0.1)
recaptcha (0.3.1)
ri_cal (0.8.7)
simplecov (0.4.0)
simplecov-html (~> 0.4.0)
simplecov-html (0.4.3)
sqlite3 (1.3.3)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
Expand Down Expand Up @@ -194,5 +201,6 @@ DEPENDENCIES
rakismet
recaptcha
ri_cal
simplecov
sqlite3-ruby
will_paginate (~> 3.0.pre2)
14 changes: 0 additions & 14 deletions test/testapp/app/views/layouts/application.html.erb
View file

This file was deleted.

88 changes: 44 additions & 44 deletions test/testapp/public/community_engine/stylesheets/screen.css
View file
Expand Up @@ -117,15 +117,15 @@ float: right;
padding-left: 20px;
margin-right: 20px;
background-color: transparent;
background-image: url(/plugin_assets/community_engine/images/icons/email_open.png);
background-image: url(/community_engine/images/icons/email_open.png);
background-repeat: no-repeat;
background-position: left center;
}

/* Navbar */

#NavBar{
background: #aba8a3 url(/plugin_assets/community_engine/images/bg_navbar.gif) repeat-x 0 0;
background: #aba8a3 url(/community_engine/images/bg_navbar.gif) repeat-x 0 0;
border-top: 1px solid #d9d6d3;
clear: both;
}
Expand Down Expand Up @@ -158,7 +158,7 @@ text-decoration: none !important;
font-size: 108%;
padding: 4px 15px 4px 5px;
margin: 11px 10px 0 0;
background: #fff url(/plugin_assets/community_engine/images/search.gif) no-repeat right center;
background: #fff url(/community_engine/images/search.gif) no-repeat right center;
border: none;
}

Expand Down Expand Up @@ -186,12 +186,12 @@ margin-bottom:.5em;
font-size: 108%;}

#welcome .box h4{
background:url(/plugin_assets/community_engine/images/bg_h6btn.gif) repeat-x left center;
background:url(/community_engine/images/bg_h6btn.gif) repeat-x left center;
}

#welcome .box h4 a{
background-color: transparent;
background-image: url(/plugin_assets/community_engine/images/icons/52.png);
background-image: url(/community_engine/images/icons/52.png);
background-repeat: no-repeat;
background-position: .5em center;
display: block;
Expand All @@ -205,7 +205,7 @@ border: 1px solid #9ec500;
}

#welcome .first .box h4 a{
background-image: url(/plugin_assets/community_engine/images/icons/31.png);
background-image: url(/community_engine/images/icons/31.png);
}

#welcome .box h4 a:hover{
Expand Down Expand Up @@ -348,22 +348,22 @@ font-weight: bold;
padding:0 0 3px 0;
}

.hentry .vcard ul li.update{background-image: url(/plugin_assets/community_engine/images/icons/date.png) }
.hentry .vcard ul li.view{background-image: url(/plugin_assets/community_engine/images/icons/page_white_magnify.png) }
.hentry .vcard ul li.comments{background-image: url(/plugin_assets/community_engine/images/icons/comments.png) }
.hentry .vcard ul li.msg{background-image: url(/plugin_assets/community_engine/images/icons/email_go.png) }
.hentry .vcard ul li.addfriend{background-image: url(/plugin_assets/community_engine/images/icons/user_add.png) }
.hentry .vcard ul li.print{background-image: url(/plugin_assets/community_engine/images/icons/printer.png) }
.hentry .vcard ul li.email{background-image: url(/plugin_assets/community_engine/images/icons/user_go.png) }
.hentry .vcard ul li.update{background-image: url(/community_engine/images/icons/date.png) }
.hentry .vcard ul li.view{background-image: url(/community_engine/images/icons/page_white_magnify.png) }
.hentry .vcard ul li.comments{background-image: url(/community_engine/images/icons/comments.png) }
.hentry .vcard ul li.msg{background-image: url(/community_engine/images/icons/email_go.png) }
.hentry .vcard ul li.addfriend{background-image: url(/community_engine/images/icons/user_add.png) }
.hentry .vcard ul li.print{background-image: url(/community_engine/images/icons/printer.png) }
.hentry .vcard ul li.email{background-image: url(/community_engine/images/icons/user_go.png) }
.hentry .vcard ul li.share{
/* background-image: url(/plugin_assets/community_engine/images/icons/group_go.png) */
/* background-image: url(/community_engine/images/icons/group_go.png) */
padding-left:0;
}
.hentry .vcard ul li.tags{background-image: url(/plugin_assets/community_engine/images/icons/tag_blue.png) }
.hentry .vcard ul li.skills{background-image: url(/plugin_assets/community_engine/images/icons/wrench.png) }
.hentry .vcard ul li.geo{background-image: url(/plugin_assets/community_engine/images/icons/world.png) }
.hentry .vcard ul li.edit{background-image: url(/plugin_assets/community_engine/images/icons/post.png) }
.hentry .vcard ul li.delete{background-image: url(/plugin_assets/community_engine/images/icons/delete.png) }
.hentry .vcard ul li.tags{background-image: url(/community_engine/images/icons/tag_blue.png) }
.hentry .vcard ul li.skills{background-image: url(/community_engine/images/icons/wrench.png) }
.hentry .vcard ul li.geo{background-image: url(/community_engine/images/icons/world.png) }
.hentry .vcard ul li.edit{background-image: url(/community_engine/images/icons/post.png) }
.hentry .vcard ul li.delete{background-image: url(/community_engine/images/icons/delete.png) }

.entry-content h6{
border-bottom: 1px dotted #a2a19b;
Expand All @@ -377,7 +377,7 @@ font-size: 85%;
font-weight: bold;
text-transform: uppercase;
text-decoration: none;
background: transparent url(/plugin_assets/community_engine/images/icons/add.png) no-repeat left center;
background: transparent url(/community_engine/images/icons/add.png) no-repeat left center;
padding-left: 20px;
padding: 2px 2px 2px 20px;
}
Expand Down Expand Up @@ -405,7 +405,7 @@ background: red;
display: block;
margin: 0 10px 5px 0;
padding: 2px 0 2px 15px;
background: url(/plugin_assets/community_engine/images/icons/tag_blue.png) no-repeat left center;
background: url(/community_engine/images/icons/tag_blue.png) no-repeat left center;
}


Expand All @@ -426,13 +426,13 @@ border-bottom: 1px dotted #a2a19b;
.checks li, .page li{
padding-left: 20px;
background-color: transparent;
background-image: url(/plugin_assets/community_engine/images/icons/accept.png);
background-image: url(/community_engine/images/icons/accept.png);
background-repeat: no-repeat;
background-position: left center;
}

.checks li{background-image: url(/plugin_assets/community_engine/images/icons/accept.png)}
.page li{background-image:url(/plugin_assets/community_engine/images/icons/page_white.png)}
.checks li{background-image: url(/community_engine/images/icons/accept.png)}
.page li{background-image:url(/community_engine/images/icons/page_white.png)}

/* user list */
dl.vcard{
Expand Down Expand Up @@ -471,17 +471,17 @@ background-repeat: no-repeat;
background-color: transparent;
}

dl.vcard dd.member{background-image: url(/plugin_assets/community_engine/images/icons/user.png);}
dl.vcard dd.post{background-image: url(/plugin_assets/community_engine/images/icons/page_white.png);}
dl.vcard dd.rss{background-image: url(/plugin_assets/community_engine/images/icons/rss.png);}
dl.vcard dd.member{background-image: url(/community_engine/images/icons/user.png);}
dl.vcard dd.post{background-image: url(/community_engine/images/icons/page_white.png);}
dl.vcard dd.rss{background-image: url(/community_engine/images/icons/rss.png);}

h6.all{margin:.5em 0;}

h6.all a{
font-size: 85%;
font-weight: bold;
text-transform: uppercase;
background: transparent url(/plugin_assets/community_engine/images/icons/add.png) no-repeat left center;
background: transparent url(/community_engine/images/icons/add.png) no-repeat left center;
padding:3px 0 3px 20px;
color: #379d00;
}
Expand Down Expand Up @@ -632,19 +632,19 @@ margin-left: 12.3846em; /* about 200px - 3em*/

.fresh dt {
padding-left: 20px;
background-image: url(/plugin_assets/community_engine/images/icons/activity_default.png);
background-image: url(/community_engine/images/icons/activity_default.png);
background-repeat: no-repeat;
background-position: left center;
background-color: transparent;
}

.fresh .comment dt {background-image: url(/plugin_assets/community_engine/images/icons/comment.png);}
.fresh .photo dt {background-image: url(/plugin_assets/community_engine/images/icons/picture.png);}
.fresh .clipping dt {background-image: url(/plugin_assets/community_engine/images/icons/book.png);}
.fresh .updated_profile dt {background-image: url(/plugin_assets/community_engine/images/icons/user_edit.png);}
.fresh .favorite dt {background-image: url(/plugin_assets/community_engine/images/icons/heart_add.png);}
.fresh .post dt, .fresh .sb_post dt, .fresh .topic dt{background-image: url(/plugin_assets/community_engine/images/icons/post.png);}
.fresh .rsvp dt, .fresh .event dt {background-image: url(/plugin_assets/community_engine/images/icons/date.png);}
.fresh .comment dt {background-image: url(/community_engine/images/icons/comment.png);}
.fresh .photo dt {background-image: url(/community_engine/images/icons/picture.png);}
.fresh .clipping dt {background-image: url(/community_engine/images/icons/book.png);}
.fresh .updated_profile dt {background-image: url(/community_engine/images/icons/user_edit.png);}
.fresh .favorite dt {background-image: url(/community_engine/images/icons/heart_add.png);}
.fresh .post dt, .fresh .sb_post dt, .fresh .topic dt{background-image: url(/community_engine/images/icons/post.png);}
.fresh .rsvp dt, .fresh .event dt {background-image: url(/community_engine/images/icons/date.png);}

/* =============================================== */
/* 8. COMMUNITY FOOTER */
Expand Down Expand Up @@ -678,7 +678,7 @@ padding-left: 0;
#CommunityFooter p{
float: right;
padding: 2px 0 2px 120px;
background: url(/plugin_assets/community_engine/images/logo.gif) no-repeat left center;
background: url(/community_engine/images/logo.gif) no-repeat left center;
}

/* =============================================== */
Expand Down Expand Up @@ -968,10 +968,10 @@ ul.message_nav li {
background-repeat: no-repeat;
padding-left:20px;
}
ul.message_nav li.inbox_new {background-image: url(/plugin_assets/community_engine/images/icons/email_open.png);}
ul.message_nav li.inbox {background-image: url(/plugin_assets/community_engine/images/icons/email.png);}
ul.message_nav li.sent {background-image: url(/plugin_assets/community_engine/images/icons/email_go.png);}
li.compose {background-image: url(/plugin_assets/community_engine/images/icons/email_edit.png);}
ul.message_nav li.inbox_new {background-image: url(/community_engine/images/icons/email_open.png);}
ul.message_nav li.inbox {background-image: url(/community_engine/images/icons/email.png);}
ul.message_nav li.sent {background-image: url(/community_engine/images/icons/email_go.png);}
li.compose {background-image: url(/community_engine/images/icons/email_edit.png);}
.messages .photo a img{
float: left;
display: block;
Expand Down Expand Up @@ -1015,7 +1015,7 @@ table.poll {
table.poll td .vote {
display: block;
float: left;
background: url(/plugin_assets/community_engine/images/icons/vote.png) no-repeat left;
background: url(/community_engine/images/icons/vote.png) no-repeat left;
padding: 0 10px 0 20px;
height: 20px;
margin-right: 10px;
Expand All @@ -1040,10 +1040,10 @@ table.poll {
/* User Menu Dropdown*/
#user-menu {
padding-right: 15px;
background: url(/plugin_assets/community_engine/images/icons/bullet_arrow_down_50.png) no-repeat right;
background: url(/community_engine/images/icons/bullet_arrow_down_50.png) no-repeat right;
}
#user-menu:hover {
background: url(/plugin_assets/community_engine/images/icons/bullet_arrow_down.png) no-repeat right;
background: url(/community_engine/images/icons/bullet_arrow_down.png) no-repeat right;
}

.icon_row a {
Expand Down

0 comments on commit c0d19c7

Please sign in to comment.