Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: resume/resume.github.com
base: fa489d157f
...
head fork: resume/resume.github.com
compare: c26a474616
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 2 contributors
Commits on Sep 27, 2012
@Adman Adman href to user's followers 786715e
@Adman Adman organizations 3012f7a
Commits on Oct 25, 2012
David Coallier Merge pull request #53 from Adman/master
Added href to user's followers, modified organizations
c26a474
Showing with 17 additions and 5 deletions.
  1. +10 −1 js/githubresume.js
  2. +1 −1  views/resume.html
  3. +6 −3 views/resumeOrgs.html
View
11 js/githubresume.js
@@ -110,13 +110,21 @@ var run = function() {
name = data.name;
}
+ var avatar = '';
+ if (data.type == 'Organization'){
+ avatar = data.avatar_url.match(/https:\/\/secure.gravatar.com\/avatar\/[0-9a-z]+/)[0];
+ avatar += '?s=140&d=https://github.com/images/gravatars/gravatar-140.png';
+ }
+
var view = {
name: name,
+ type: data.type,
email: data.email,
created_at: data.created_at,
earlyAdopter: 0,
location: data.location,
gravatar_id: data.gravatar_id,
+ avatar_url: avatar,
repos: data.public_repos,
reposLabel: data.public_repos > 1 ? 'repositories' : 'repository',
followers: data.followers,
@@ -184,8 +192,9 @@ var run = function() {
view.blog = addHttp + data.blog;
}
+ var resume = (data.type == 'User' ? 'views/resume.html' : 'views/resumeOrgs.html');
$.ajax({
- url: 'views/resume.html',
+ url: resume,
dataType: 'html',
success: function(data) {
var template = data,
View
2  views/resume.html
@@ -41,7 +41,7 @@ <h1 class="fn">{{name}}</h1>
{{#location}}
based in <span class="adr locality">{{location}}</span>
{{/location}}
- {{#repos}}with <a href="https://github.com/{{{username}}}">{{repos}} public {{reposLabel}}</a>{{/repos}}{{^repos}}without any public repository for now{{/repos}}{{#followers}}&nbsp;and {{followers}} {{followersLabel}}{{/followers}}.
+ {{#repos}}with <a href="https://github.com/{{{username}}}">{{repos}} public {{reposLabel}}</a>{{/repos}}{{^repos}}without any public repository for now{{/repos}}{{#followers}}&nbsp;and <a href="https://github.com/{{{username}}}/followers">{{followers}} {{followersLabel}}</a> {{/followers}}.
I've been using github.com since {{since}}{{#earlyAdopter}}, therefore I'm an early adopter,{{/earlyAdopter}}
{{#blog}}&nbsp;and sometimes I blog at <a href="{{blog}}" id="myblog" title="my blog">{{blog}}</a>.{{/blog}}
</p>
View
9 views/resumeOrgs.html
@@ -13,7 +13,7 @@
<div class="yui-u">
<div class="contact-info">
{{#gravatar_id}}
- <img src="https://secure.gravatar.com/avatar/{{gravatar_id}}?s=140&amp;d=https://github.com/images/gravatars/gravatar-140.png" alt=""/>
+ <img src="{{avatar_url}}" alt="" class="photo"/>
{{/gravatar_id}}
{{#email}}<h3><a href="mailto:{{email}}">{{email}}</a></h3>{{/email}}
</div><!--// .contact-info -->
@@ -31,11 +31,14 @@
</div>
<div class="yui-u">
<p class="enlarge">
- We are XX developers gathered in a group
+ We are a developers gathered in a group
{{#location}}
based in {{location}}
{{/location}}
- with <a href="https://github.com/{{{username}}}">{{repos}} public {{reposLabel}}</a>.
+ {{#repos}}
+ with <a href="https://github.com/{{{username}}}">{{repos}} public {{reposLabel}}</a>
+ {{/repos}}
+ {{#followers}}&nbsp;and <a href="https://github.com/{{{username}}}/followers">{{followers}} {{followersLabel}}</a>{{/followers}}.
We've created this Github group in {{since}}{{#earlyAdopter}}, therefore I'm an early adopter,{{/earlyAdopter}}{{#blog}}&nbsp;and you can find more informations about us at <a href="{{blog}}" id="myblog" title="my blog">{{blog}}</a>{{/blog}}.
</p>
<p id="languages" class="enlarge"></p>

No commit comments for this range

Something went wrong with that request. Please try again.