Skip to content

Commit

Permalink
Merge pull request #330 from igas/erb-to-slim
Browse files Browse the repository at this point in the history
Change erb to slim
  • Loading branch information
schneems committed Apr 21, 2015
2 parents 7993004 + 3b1f347 commit dff9e52
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 75 deletions.
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -31,6 +31,7 @@ gem 'valid_email'
gem 'sass-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'uglifier', '>= 1.0.3'
gem 'slim-rails'

group :development do
gem 'foreman'
Expand Down
13 changes: 12 additions & 1 deletion Gemfile.lock
Expand Up @@ -93,7 +93,7 @@ GEM
dotenv-rails (0.10.0)
dotenv (= 0.10.0)
erubis (2.7.0)
excon (0.41.0)
excon (0.45.2)
execjs (2.0.2)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
Expand Down Expand Up @@ -240,6 +240,15 @@ GEM
tilt (~> 1.3, >= 1.3.4)
skylight (0.1.8)
activesupport (>= 3.0.0)
slim (3.0.3)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slim-rails (3.0.1)
actionmailer (>= 3.1, < 5.0)
actionpack (>= 3.1, < 5.0)
activesupport (>= 3.1, < 5.0)
railties (>= 3.1, < 5.0)
slim (~> 3.0)
spring (1.1.2)
sprockets (2.12.3)
hike (~> 1.2)
Expand All @@ -253,6 +262,7 @@ GEM
teaspoon (0.7.4)
phantomjs (>= 1.8.1.1)
railties (>= 3.2.5, < 5)
temple (0.7.5)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
Expand Down Expand Up @@ -324,6 +334,7 @@ DEPENDENCIES
sass-rails (~> 4.0.0)
simplecov
skylight
slim-rails
spring
teaspoon
uglifier (>= 1.0.3)
Expand Down
23 changes: 23 additions & 0 deletions app/views/application/_repos.html.slim
@@ -0,0 +1,23 @@
- lang_index = 0
.row-fluid
ul.nav.nav-tabs.nav-stacked.span4#repo-tabs data-tabs="tabs"
- repos.group_by(&:language).each do |lang, repos|
- unless lang == nil
li = link_to lang, "##{lang.parameterize}#{lang.hash}", data: { toggle: "tab" }
.tab-content.span8
- repos.group_by(&:language).each do |lang, repos|
- unless lang == nil
div class="tab-pane#{" active" if lang_index == 0}" id="#{lang.parameterize}#{lang.hash}"
ul.unstyled.repos-list = render repos
- lang_index = lang_index + 1

= link_to "Submit a Repo", new_repo_path, class: 'btn btn-success'

javascript:
$(document).ready(function(){
var hash = document.location.hash;
if (hash) {
$('.nav-tabs a[href='+hash+']').tab('show');
}
});
26 changes: 0 additions & 26 deletions app/views/pages/index.html.erb

This file was deleted.

18 changes: 18 additions & 0 deletions app/views/pages/index.html.slim
@@ -0,0 +1,18 @@
- unless user_signed_in?
.jumbotron
h1 Help your favorite open source projects
p.lead Sign up to receive a different open issue in your inbox every day from your favorite GitHub repos
= link_to'Sign up today', new_user_registration_path, class: 'btn btn-large btn-success'

.jumbotron
p.lead #{number_with_delimiter(User.count, delimiter: ',')} developers are working on #{Repo.count} open source repos
hr
- if @repos_subs.present?
h2 Repos you are currently helping
p
= render 'repo_subscriptions/list', repos_subs: @repos_subs
= link_to 'Find additional repos', repos_path, class: 'btn btn-success'
= link_to "Submit a Repo", new_repo_path, class: 'btn btn-success'
hr
h2 Repos needing the most help
= render 'repos', repos: @repos
8 changes: 0 additions & 8 deletions app/views/repos/_repo.html.erb

This file was deleted.

8 changes: 8 additions & 0 deletions app/views/repos/_repo.html.slim
@@ -0,0 +1,8 @@
li
span.label.label-info data-toggle="tooltip" title=pluralize(repo.issues_count, 'Issue') = repo.issues_count
h4
= link_to repo.name, repo
- if repo.full_name.present?
small<
| (#{repo.full_name})
p = raw repo.description
5 changes: 0 additions & 5 deletions app/views/repos/index.html.erb

This file was deleted.

3 changes: 3 additions & 0 deletions app/views/repos/index.html.slim
@@ -0,0 +1,3 @@
h2 Subscribe To a Repo on GitHub
= render 'repos', repos: @repos
= will_paginate @repos
35 changes: 0 additions & 35 deletions app/views/shared/_repos.html.erb

This file was deleted.

0 comments on commit dff9e52

Please sign in to comment.