Skip to content

Commit

Permalink
routes and sidebar additions and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jywarren committed Mar 5, 2015
1 parent 345f9b3 commit d2c0419
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ todo.txt
passenger-standalone.json.bkp
public/pdf.js/
public/sites/
public/assets/
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ gem 'composite_primary_keys'
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'less-rails', '~> 2.6'
gem 'coffee-rails', '~> 3.2.1'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
Expand Down Expand Up @@ -60,6 +59,8 @@ gem "php-serialize", :require => "php_serialize"

gem "scrypt", "~> 1.2.1"

gem 'less-rails', '~> 2.6'

group :development, :test do
#gem 'rspec-rails'
gem 'factory_girl_rails'
Expand Down
2 changes: 1 addition & 1 deletion app/views/sidebar/_feature.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<p>Join Public Lab community members this Monday &raquo;</p>
</a>
-->
<a class="feature img inverted" href="/wiki/barnraising-northeast-2014" style="background-image:url('http://i.publiclab.org/system/images/photos/000/008/174/large/20141118_193851.jpg')">
<a class="feature img inverted" href="/wiki/openhour" style="background-image:url('http://i.publiclab.org/system/images/photos/000/008/174/large/20141118_193851.jpg')">
<h1 style="font-family:Junction;">OpenHour</h1>
<p style="padding-top:16px;">Join Public Lab community members for a monthly call &raquo;</p>
</a>
4 changes: 2 additions & 2 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

#match '', to: 'blogs#show', constraints: {subdomain: /.+/}
# or to skip www:
match "", to: 'wiki#subdomain', constraints: lambda { |r| r.subdomain.present? && r.subdomain != 'www' && r.subdomain != "i" && r.subdomain != "test" && r.subdomain != "new"}
match "*all", to: 'wiki#subdomain', constraints: lambda { |r| r.subdomain.present? && r.subdomain != 'www' && r.subdomain != "i" && r.subdomain != "test" && r.subdomain != "new"}
match "", to: 'wiki#subdomain', constraints: lambda { |r| r.subdomain.present? && r.subdomain != 'www' && r.subdomain != "i" && r.subdomain != "test" && r.subdomain != "new" && r.subdomain != "alpha"}
match "*all", to: 'wiki#subdomain', constraints: lambda { |r| r.subdomain.present? && r.subdomain != 'www' && r.subdomain != "i" && r.subdomain != "test" && r.subdomain != "new" && r.subdomain != "alpha"}

match 'ioby' => "legacy#ioby"

Expand Down
Binary file modified public/images/openhour.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/openhour.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d2c0419

Please sign in to comment.