Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed trailing whitespaces and added/truncated end-of-file newlines #387

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div id="user_locations_map">
<h2> Registered Users by Sign-in Location </h2>

<!--TODO: Add map of user locations -->
<%= yield :scripts %>
</div>
4 changes: 2 additions & 2 deletions app/views/devise/menu/_login_items.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% if user_signed_in? %>
<%= link_to('Logout', destroy_user_session_path, :method => :delete) %>
<%= link_to('Logout', destroy_user_session_path, :method => :delete) %>
<% else %>
<%= link_to('Login', new_user_session_path) %>
<%= link_to('Login', new_user_session_path) %>
<% end %>
2 changes: 1 addition & 1 deletion app/views/devise/registrations/_profile.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div class="form-actions">
<%= f.button :submit, "Update my Email Preferences", :class => "tiny radius button" %>
</div>
<% end %>
<% end %>
</div>

</section>
Expand Down
12 changes: 6 additions & 6 deletions app/views/devise/registrations/_services.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
<div id="current_services">
<% if current_user.services.exists? %>
<h6>The following <%= @services.count == 1 ? 'account is' : 'services are' %> connected with your CodeMontage account:</h6>
<% @services.each do |service| %>
<div class="services_used">

<% @services.each do |service| %>
<div class="services_used">
<%= image_tag "#{service.provider}_64.png", :size => "64x64" %>
<div class = "user">
<div class="line1">Login: <%= service.ulogin.to_s != '' ? service.ulogin : 'not set' %></div>
<div class="line1">Login: <%= service.ulogin.to_s != '' ? service.ulogin : 'not set' %></div>
<div class="line2">Email: <%= service.uemail != '' ? service.uemail : 'not set' %></div>
<div class="line3">
<% @services.count == 1 ? @msg = 'Removing this service might lock you out of your account if you do not know your CodeMontage email and password' : @msg = '' %>
<%= link_to "Remove this service", service, :confirm => 'Are you sure you want to remove this authentication service? ' + @msg, :method => :delete, :class => "remove" %>
</div>
</div>
</div>
</div>
<% end %>

<% else %>
<h5>There are currently no external services connected with your CodeMontage account. We recommend adding <%= link_to "Github", "/auth/github" %>.</h5>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/registrations/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<%= f.button :submit, "Sign up", :class => "small radius button" %>
</div>
<% end %>

<%= link_to "Sign in", new_session_path(resource_name) %> | <%= link_to "Forgot your password?", new_password_path(resource_name) %>

</div>
Expand All @@ -22,4 +22,4 @@

<div class="large-6 columns">
<%= link_to '<i class="fi-social-github"></i> Sign up with GitHub'.html_safe, "/auth/github", :class => "large radius index button home-signup" %>
</div>
</div>
2 changes: 0 additions & 2 deletions app/views/devise/sessions/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,3 @@
<%= link_to '<i class="fi-social-github"></i> Sign in with GitHub'.html_safe, "/auth/github", :class => "large radius index button github-signin" %>
</div>
<br/>


2 changes: 1 addition & 1 deletion app/views/devise/shared/_links.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
<% end -%>
<% end -%>
1 change: 0 additions & 1 deletion app/views/events/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@
<%= render "check_in_prompt" %>
<% end %>
</div>

4 changes: 2 additions & 2 deletions app/views/home/about.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<h5>Our Team</h5>
<h6>Major Contributors</h6>

<div id="major_contributors">
<div class="horizontal_bios row">
<div id="vhurst_img" class="large-3 columns">
Expand Down Expand Up @@ -81,7 +81,7 @@
<li><%= link_to '<i class="fi-social-twitter"></i>&nbsp;'.html_safe + 'theresafreet', 'http://twitter.com/theresafreet', :target => '_blank' %></li>
<li><%= link_to '<i class="fi-social-github"></i>&nbsp;'.html_safe + 'tfreet', 'http://github.com/tfreet', :target => '_blank' %></li>
</ul>
</div>
</div>
<div id="nhurst_img"class="large-3 columns">
<%= link_to (image_tag "https://secure.gravatar.com/avatar/8cee3c0153dde40e14dc6794295d5ee9?s=420&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png", :alt => "Nathan Hurst", :size => "150x150"), 'http://nahurst.com', :target => '_blank' %>
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/views/home/code_good_day.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<body>
<div class="codegood twelve columns">
<h1>#CodeGoodSunday</h1>

<div class="deck row">
<div class="eight columns">
<h2>Use your powers for good.</h2>
Expand All @@ -12,7 +12,7 @@
</div>

<section>

<h3>Join us for the #CodeGoodSunday TwitterChat and tell us about the open source projects you're excited about. Here’s how:</h3>


Expand All @@ -22,7 +22,7 @@
<li>Join us on Twitter <strong>the last Sunday of the month @ 4PM EST</strong> and use the hashtag #CodeGoodSunday to tell us what open source projects you're working on!</li>
</ol>
</section>

<section>
<h3><strong>FAQ</strong></h3>
<h3>How does a TwitterChat work?</h3>
Expand Down Expand Up @@ -50,7 +50,7 @@

<section>

<h3>For questions, tweet <a href="https://twitter.com/saronyitbarek" class="twitter">@saronyitbarek</a> or <a href="https://twitter.com/codemontage" class="twitter"> @CodeMontage </a> with the hashtag #CodeGoodSunday.</h3>
<h3>For questions, tweet <a href="https://twitter.com/saronyitbarek" class="twitter">@saronyitbarek</a> or <a href="https://twitter.com/codemontage" class="twitter"> @CodeMontage </a> with the hashtag #CodeGoodSunday.</h3>

<h3 class="signature">See you Sunday!</h3>

Expand Down
2 changes: 1 addition & 1 deletion app/views/home/code_of_conduct.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
<% end %>
<% end %>

<p><strong>If you experience or witness any harassment at these events, please contact one of the organizers listed above.</strong></p>
<p><strong>If you experience or witness any harassment at these events, please contact one of the organizers listed above.</strong></p>
2 changes: 1 addition & 1 deletion app/views/home/dashboard/_profile.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<br>
<strong>Headline: </strong> <%= current_user.headline %>
<br><br>
<strong>Skills: </strong> <%= current_user.technology_list %>
<strong>Technologies: </strong> <%= current_user.technology_list %>
<br>
<strong>Causes: </strong> <%= current_user.cause_list %>
</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/home/dashboard/_projects.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
<p>Looking for something else? Browse more <%= link_to "projects to change the world", projects_path %>.</p>
<% else %>
<p>No favorites yet? We'd recommend <%= %>. Or, browse more <%= link_to "projects to change the world", projects_path %>.</p>
<% end %>
<% end %>
</div>
4 changes: 2 additions & 2 deletions app/views/home/developers_for_good.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<body>
<h4>Developers for Good</h4>

<p><a href="http://developersforgood.org" title="Developers for Good" target="_blank">Developers for Good</a> began in January 2010 in New York City when founder <a href="http://vanessahurst.com" target="_blank">Vanessa Hurst</a> grew frustrated that her software release schedule conflicted with soup kitchen volunteer opportunities and went searching for a better way to change the world.</p>
<p>Thanks to a pilot program with <a href="http://catchafire.org" title="Catchafire" target="_blank">Catchafire</a>, a skills-based volunteering startup, she was able to volunteer her database skills. Vanessa was moved by the amount of value created - the nonprofit organization (<a href="http://theopedproject.org" title="The OpEd Project" target="_blank">The OpEd Project</a>) saved thousands of dollars, she got to practice what she loves, and the staff is now more effective thanks to better technology.</p>
<p>Technology is one of the top needs for non-profits and social mission organizations, but NGO social networks tend to have no overlap with developers and thus underfunded, accidental techies end up scraping together technical solutions.</p>
<p>Developers for Good brings motivated technologists of all skill levels together with social entrepreneurs so together they can improve the world.</p>
<p>Connect with the Developers for Good community through <a href="http://twitter.com/DevsForGood" target="_blank">Twitter</a>, <a href="http://facebook.com/pages/DevelopersForGood" target="_blank">Facebook</a>, one-on-one <a href="http://developersforgood.ohours.org" target="_blank">Ohours</a> conversations, or our monthly in-person <a href="http://meetup.developersforgood.org" target="_blank">Meetup</a>.</p>
</body>
</body>
10 changes: 5 additions & 5 deletions app/views/home/our_jobs.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<body>
<h4>Jobs</h4>

<h5>CodeMontage is making humanitarian software development the standard in professional development for coders.</h5>

<p>We believe coders make the best superheroes, and that empowering coders to improve themselves while improving the world is as cool as it gets. If you agree, <%= mail_to "[email protected]", " drop us a line",:subject => "I want to help make superheroes!" %> and tell us about the moment you realized coders could be superheroes.</p>
<p>We're always on the lookout for <a href="http://skillcrush.com/2012/12/07/how-to-get-hired-as-a-professional-developer" target="_blank">passionate people who are smart, get things done, solve hard problems, and explain their solutions</a>.</p>

<p>Some of the specific <strong>problems we're working to solve</strong>:
<ul>
<li>Coders have a reputation for creating financial value, but not social value.</li>
Expand All @@ -15,7 +15,7 @@
<li>Social innovators have significant unrealized opportunities to increase their impact through software.</li>
</ul>
</p>

<p>Specifically, there are some <strong>roles and skill sets we'd love more of</strong>:
<ul>
<li>Project Management (Agile, mostly)</li>
Expand All @@ -26,6 +26,6 @@
<li>Software Development Mentorship</li>
<ul>
</p>

<p>Sound like a worthy way to spend your time? <%= mail_to "[email protected]", "Reach out to us",:subject => "I want to help make superheroes!" %>!</p>
</body>
4 changes: 2 additions & 2 deletions app/views/home/resources.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div>
<h5>We're not the only ones trying to change the world.</h5>

<p>CodeMontage believes in making no little plans. We help coders and social innovators build technology to improve the world. We help companies invest in what matters (people), and support important causes as they develop talent. We're ushering in a new era of diverse, collaborative coders who care about social impact.
<p>CodeMontage believes in making no little plans. We help coders and social innovators build technology to improve the world. We help companies invest in what matters (people), and support important causes as they develop talent. We're ushering in a new era of diverse, collaborative coders who care about social impact.
</br></br>
Thankfully, we're not alone. Below are some of the organizations working to address problems we care about, and we hope you'll support them, too.</p>

Expand Down Expand Up @@ -31,7 +31,7 @@
<li><%= link_to "Code for America", "http://codeforamerica.org" %></li>
<li><%= link_to "Community Corps", "http://www.thecommunitycorps.org" %></li>
<li><%= link_to "Catchafire", "http://catchafire.org" %></li>
<li><%= link_to "Random Hacks of Kindness", "http://rhok.org" %></li>
<li><%= link_to "Random Hacks of Kindness", "http://rhok.org" %></li>
<li><%= link_to "Taproot", "http://taprootfoundation.org" %></li>
<li><%= link_to "TheProBono", "http://theprobono.org" %></li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions app/views/jobs/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="row">
<div>
<h4>Jobs You've Been Looking For</h4>

<p>Wonder if you can make a difference with <em>most</em> of your time, instead of just your free time? Check out the full-time, paid opportunities below at companies that want to help you make a bigger impact on the world.</p>

<div class="jobs">
Expand All @@ -13,7 +13,7 @@
<h6><%= link_to job.title, job.apply_url %> at <%= link_to job.organization.name, job.organization.url %></h6>
</div>
<div class="job_technologies six columns">
<h6><%= "{ " + job.technology_list.to_s + " }" unless !job.technology_list.present? %></h6>
<h6><%= "{ " + job.technology_list.to_s + " }" unless !job.technology_list.present? %></h6>
</div>
</div>
<div class="job_summary row">
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_google_analytics.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script type="text/javascript">
var _gaq = _gaq || [];
var pluginUrl =
var pluginUrl =
'//www.google-analytics.com/plugins/ga/inpage_linkid.js';
_gaq.push(['_require', 'inpage_linkid', pluginUrl]);
_gaq.push(['_setAccount', '<%= GOOGLE_ANALYTICS_TRACKING_CODE %>']);
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_header.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% if user_signed_in? %>
<% if user_signed_in? %>
<div id="header" class="logged-in">
<% else %>
<div id="header" class="logged-out">
Expand Down
8 changes: 4 additions & 4 deletions app/views/organizations/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
<div class="row">
<div>
<h4>Organizations</h4>

<p>These organizations are trailblazing social good technology with open source, community-driven projects that help the world. Check them out and contribute however you'd like.</p>

<div class="organizations row">
<!-- split organizations to display into groups based on three column design -->
<% @featured_split = (@featured_orgs.count / 3) + 1 %>
<% @featured_split = (@featured_orgs.count / 3) + 1 %>

<% @featured_orgs.in_groups_of(@featured_split, false).each do |featured_array| %>
<div class="large-4 columns">
<% featured_array.each do |featured| %>
<h5><strong>
<h5><strong>
<% if featured.image_url? %>
<%= link_to (image_tag featured.image_url, :width => "150px"), organization_path(featured) %>
<% else %>
<%= link_to featured.name, organization_path(featured) %>
<% end %>
<strong></h5>
<% end %>

a
</div>
<% end %>
</div>
Expand Down
10 changes: 5 additions & 5 deletions app/views/organizations/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<body>

<h2>Submit a Project</h2>

<%= simple_form_for @organization, :validate => true do |f| %>
<%= simple_form_for @organization, :validate => true do |f| %>
<div class="form-inputs">
<%= f.simple_fields_for :projects do |project| %>
<div class="row">
<%= project.input :name, :label => 'Project Name', wrapper_html: { class: "large-6 columns" }, error_html: { class: "error"} %>
<%= project.input :github_repo, :label => 'GitHub Repository', :placeholder => 'Just the repo name, please...', wrapper_html: { class: 'large-6 columns' }, error_html: { class: "error"} %>
</div>
</div>
<%= project.input :url, :label => 'Project Website' %>
<%= project.input :description, :placeholder => 'What does your project do?' %>
<% end %>
Expand All @@ -17,12 +17,12 @@
<div class="row">
<%= f.input :github_org, :label => 'Organization GitHub Username', :required => true, wrapper_html: { class: 'large-6 columns'}, error_html: { class: "error"} %>
<%= f.input :url, :label => 'Organization Website', :required => false, :as => :url, wrapper_html: { class: 'large-6 columns'} %>
</div>
</div>
<div class="row">
<%= f.input :contact_name, :label => 'Contact Name', :placeholder => 'Who should we talk to for more info?', wrapper_html: { class: 'large-4 columns' } %>
<%= f.input :contact_role, :label => 'Contact Title', :placeholder => 'What do they do at the org?', wrapper_html: { class: 'large-4 columns'} %>
<%= f.input :contact_email, :label => 'Contact Email', :as => :email, wrapper_html: { class: 'large-4 columns'} %>
</div>
</div>
</div>

<div class="form-actions">
Expand Down
2 changes: 1 addition & 1 deletion app/views/organizations/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<h6><%= link_to job.title, job.apply_url %> at <%= link_to job.organization.name, job.organization.url %></h6>
</div>
<div class="job_technologies large-6 columns">
<h6><%= "{ " + job.technology_list.to_s + " }" unless !job.technology_list.present? %></h6>
<h6><%= "{ " + job.technology_list.to_s + " }" unless !job.technology_list.present? %></h6>
</div>
</div>
<div class="job_summary row">
Expand Down
4 changes: 2 additions & 2 deletions app/views/users/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<body>

<h1>Join CodeMontage</h1>

<%= simple_form_for @user do |f| %>
<%= simple_form_for @user do |f| %>
<%= f.input :email, :placeholder => '[email protected]' %>
<%= f.input :password %>
<%= f.button :submit %>
Expand Down