diff --git a/index.html b/index.html index 2e1b7c6..193ad73 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@  - + GitHub Résumé diff --git a/js/githubresume.js b/js/githubresume.js index d5dec89..3c61ab8 100644 --- a/js/githubresume.js +++ b/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, @@ -311,8 +320,8 @@ var run = function() { username: username, watchers: repo.info.watchers, forks: repo.info.forks, - watchersLabel: repo.info.watchers > 1 ? 'watchers' : 'watcher', - forksLabel: repo.info.forks > 1 ? 'forks' : 'fork', + watchersLabel: repo.info.watchers == 0 || repo.info.watchers > 1 ? 'watchers' : 'watcher', + forksLabel: repo.info.forks == 0 || repo.info.forks > 1 ? 'forks' : 'fork', }; if (itemCount == sorted.length - 1 || itemCount == maxItems - 1) { diff --git a/views/resume.html b/views/resume.html index 2161ef9..52287eb 100644 --- a/views/resume.html +++ b/views/resume.html @@ -1,6 +1,6 @@
Print - Email + Email
@@ -10,16 +10,14 @@
-
-

{{name}}

-

{{userStatus}}

-
+

{{name}}

+

{{userStatus}}

{{#gravatar_id}} - + avatar {{/gravatar_id}} {{#email}}

{{/email}}
@@ -41,7 +39,7 @@ {{#location}} based in {{location}} {{/location}} - {{#repos}}with {{repos}} public {{reposLabel}}{{/repos}}{{^repos}}without any public repository for now{{/repos}}{{#followers}} and {{followers}} {{followersLabel}}{{/followers}}. + {{#repos}}with {{repos}} public {{reposLabel}}{{/repos}}{{^repos}}without any public repository for now{{/repos}}{{#followers}} and {{followers}} {{followersLabel}}{{/followers}}. I've been using github.com since {{since}}{{#earlyAdopter}}, therefore I'm an early adopter,{{/earlyAdopter}} {{#blog}} and sometimes I blog at {{blog}}.{{/blog}}

diff --git a/views/resumeOrgs.html b/views/resumeOrgs.html index 039d805..3ca4c14 100644 --- a/views/resumeOrgs.html +++ b/views/resumeOrgs.html @@ -13,7 +13,7 @@
{{#gravatar_id}} - + avatar {{/gravatar_id}} {{#email}}

{{email}}

{{/email}}
@@ -31,12 +31,15 @@

- We are XX developers gathered in a group + We are a developers gathered in a group {{#location}} based in {{location}} {{/location}} - with {{repos}} public {{reposLabel}}. - We've created this Github group in {{since}}{{#earlyAdopter}}, therefore I'm an early adopter,{{/earlyAdopter}}{{#blog}} and you can find more informations about us at {{blog}}{{/blog}}. + {{#repos}} + with {{repos}} public {{reposLabel}} + {{/repos}} + {{#followers}} and {{followers}} {{followersLabel}}{{/followers}}. + We've created this Github group in {{since}}{{#blog}} and you can find more informations about us at {{blog}}{{/blog}}.