Skip to content

Commit

Permalink
Merge branch 'master' of http://github.com/technoweenie/seinfeld
Browse files Browse the repository at this point in the history
  • Loading branch information
bhb committed Nov 8, 2010
2 parents 3a6aded + 3d3e29f commit a11aaad
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions lib/seinfeld/feed.rb
Expand Up @@ -8,7 +8,7 @@ class << self
attr_accessor :user_agent
attr_writer :connection
end
self.user_agent = 'Calendar About Nothing: http://github.com/technoweenie/seinfeld'
self.user_agent = 'Calendar About Nothing: https://github.com/technoweenie/seinfeld'

# A Array of Hashes of the parsed event JSON.
attr_reader :items
Expand Down Expand Up @@ -37,7 +37,7 @@ def self.connection
# Returns Seinfeld::Feed instance.
def self.fetch(login)
user = login.is_a?(User) ? login : User.new(:login => login.to_s)
url = "http://github.com/#{user.login}.json"
url = "https://github.com/#{user.login}.json"
resp = connection.get(url, 'If-None-Match' => user.etag)
new(login, resp, url)
rescue Yajl::ParseError, Faraday::Error::ClientError
Expand Down
2 changes: 1 addition & 1 deletion lib/seinfeld/templates/auth.mustache
Expand Up @@ -7,7 +7,7 @@
<form action="/create" method="post">
<p>
You are just <em>one step away</em> from joining an amazing community of
<a href="http://github.com">GitHub</a> open source developers. Click this,
<a href="https://github.com">GitHub</a> open source developers. Click this,
and CAN will start tracking your daily open source progress.
</p>
<p><input type="submit" value="Awesome" /></p>
Expand Down
2 changes: 1 addition & 1 deletion lib/seinfeld/templates/layout.mustache
Expand Up @@ -34,7 +34,7 @@
<a href="http://calendaraboutnothing.com">Calendar About Nothing</a>
by <a href="http://techno-weenie.net">rick</a> and
<a href="http://warpspire.com/">kyle</a> /
<a href="http://github.com">GitHub</a>
<a href="https://github.com">GitHub</a>
</div>
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion public/javascripts/widget/seinfeld-badge.js
Expand Up @@ -20,7 +20,7 @@
}).append('<img src="http://calendaraboutnothing.com/images/x_1.png" height="80%" width="50%">');
$progressed.append($x);
});
$seinfeld.append($streaks).append('<p class="pimpage"><a href="http://github.com/lachlanhardy/seinfeld-badge">Want your own badge?</a></p>');
$seinfeld.append($streaks).append('<p class="pimpage"><a href="https://github.com/lachlanhardy/seinfeld-badge">Want your own badge?</a></p>');
});
});
})();
2 changes: 1 addition & 1 deletion public/styles/widget/seinfeld-badge.css
@@ -1,6 +1,6 @@
/****
Seinfeld Badge
http://github.com/lachlanhardy/seinfeld-badge
https://github.com/lachlanhardy/seinfeld-badge
20100516
****/
Expand Down
4 changes: 2 additions & 2 deletions views/group.haml
Expand Up @@ -13,11 +13,11 @@
.subtitle
for
- for user in @users
%a{:href => "http://github.com/#{user}"}
%a{:href => "https://github.com/#{user}"}
= user
#calendar
= group_seinfeld
#main
#content.footnote
%a{:href => "http://calendaraboutnothing.com"} Calendar About Nothing
by <a href="http://techno-weenie.net">rick</a> and <a href="http://warpspire.com/">kyle</a> / <a href="http://github.com">GitHub</a>
by <a href="http://techno-weenie.net">rick</a> and <a href="http://warpspire.com/">kyle</a> / <a href="https://github.com">GitHub</a>
6 changes: 3 additions & 3 deletions views/index.haml
Expand Up @@ -13,7 +13,7 @@
The Calendar About Nothing generates a
"<a href="http://lifehacker.com/software/motivation/jerry-seinfelds-productivity-secret-281626.php">Seinfeld Calendar</a>"
from your public
"<a href="http://github.com">GitHub</a>" feed.
"<a href="https://github.com">GitHub</a>" feed.
%p
%strong Commit
to an open source project: get an
Expand All @@ -35,7 +35,7 @@
%h2 How can I help?
%p
We have the ruby source code
%a{:href => "http://github.com/technoweenie/seinfeld/tree/master"} on the githubs.
%a{:href => "https://github.com/technoweenie/seinfeld/tree/master"} on the githubs.
Join in, it's a fun little
%a{:href => "http://www.sinatrarb.com"} Sinatra
app!
Expand All @@ -56,4 +56,4 @@
#main
#content.footnote
%a{:href => "http://calendaraboutnothing.com"} Calendar About Nothing
by <a href="http://techno-weenie.net">rick</a> and <a href="http://warpspire.com/">kyle</a> / <a href="http://github.com">GitHub</a>
by <a href="http://techno-weenie.net">rick</a> and <a href="http://warpspire.com/">kyle</a> / <a href="https://github.com">GitHub</a>
4 changes: 2 additions & 2 deletions views/show.haml
Expand Up @@ -8,7 +8,7 @@
%script{:type => 'text/javascript', :src => '/javascripts/application.js'}
%body
.title
%a{:rel => "me", :href => "http://github.com/#{@user.login}"}
%a{:rel => "me", :href => "https://github.com/#{@user.login}"}
== #{@user.login}'s
Calendar
.subtitle Tracking Open Source Contributions
Expand Down Expand Up @@ -42,7 +42,7 @@
%span.desc days
#content.footnote
%a{:href => "http://calendaraboutnothing.com"} Calendar About Nothing
by <a href="http://techno-weenie.net">rick</a> and <a href="http://warpspire.com/">kyle</a> / <a href="http://github.com">GitHub</a>
by <a href="http://techno-weenie.net">rick</a> and <a href="http://warpspire.com/">kyle</a> / <a href="https://github.com">GitHub</a>
#content.footnote
Put the
%a{:href=> "/~#{@user.login}/widget"} JavaScript widget
Expand Down
10 changes: 5 additions & 5 deletions views/widget.haml
Expand Up @@ -6,15 +6,15 @@
%link{:rel => 'stylesheet', :type => 'text/css', :href => '/styles/main.css'}
%body
.title
%a{:rel => "me", :href => "http://github.com/#{@user.login}"}
%a{:rel => "me", :href => "https://github.com/#{@user.login}"}
== #{@user.login}'s
CAN Widget
%form#widget
%p
This JavaScript widget was written by
%a{:href => "http://github.com/lachlanhardy"} lachlanhardy
%a{:href => "https://github.com/lachlanhardy"} lachlanhardy
and uses jQuery. Please direct any requests or patches to the
%a{:href => "http://github.com/lachlanhardy/seinfeld-badge"} seinfeld-badge
%a{:href => "https://github.com/lachlanhardy/seinfeld-badge"} seinfeld-badge
repo so they can be pushed upstream to the CAN.
%p
%textarea
Expand All @@ -23,7 +23,7 @@

<div class="seinfeld-badge user-#{@user.login}">
<h2>I like open software</h2>
<p><a href="http://calendaraboutnothing.com/~#{@user.login}" rel="me">Calendar About Nothing</a> tracks my public contributions on <A href="http://github.com/#{@user.login}">GitHub</a>.</p>
<p><a href="http://calendaraboutnothing.com/~#{@user.login}" rel="me">Calendar About Nothing</a> tracks my public contributions on <A href="https://github.com/#{@user.login}">GitHub</a>.</p>
</div> <!-- .seinfeld-badge .user-#{@user.login} -->

<!-- Using Google's CDN for JS -->
Expand Down Expand Up @@ -53,4 +53,4 @@
%span.desc days
#content.footnote
%a{:href => "http://calendaraboutnothing.com"} Calendar About Nothing
by <a href="http://techno-weenie.net">rick</a> and <a href="http://warpspire.com/">kyle</a> / <a href="http://github.com">GitHub</a>
by <a href="http://techno-weenie.net">rick</a> and <a href="http://warpspire.com/">kyle</a> / <a href="https://github.com">GitHub</a>

0 comments on commit a11aaad

Please sign in to comment.