Skip to content

Commit 01c86cb

Browse files
author
Akshay
committed
Activity templates optimized.
1 parent 8f57309 commit 01c86cb

2 files changed

Lines changed: 50 additions & 123 deletions

File tree

‎src/github.css‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,15 @@
147147
height: 300px;
148148
overflow-y: auto;
149149
}
150+
.gt-time-cnt{
151+
position: relative;
152+
}
150153
.gt-time-str{
151-
margin: 0 5px;
152154
color: #666;
153155
font-size: 0.87rem;
156+
position: absolute;
157+
top: 5;
158+
right: 10;
154159
}
155160
.gt-activity{
156161
padding: 10px 5px;
@@ -159,26 +164,29 @@
159164
}
160165
.gt-no-activity{
161166
padding: 10px 5px;
167+
text-align: center;
162168
}
163169
.gt-activity .gt-avatar-cnt{
164170
float: left;
165171
width: 5%;
166172
min-width: 30px;
173+
padding: 5px;
167174
}
168175
.gt-activity .gt-usr-avatar{
169176
width: 30px;
170177
height: 30px;
171178
}
172-
.gt-avt-cnt{
179+
.gt-act-cnt{
173180
display: inline-block;
174181
display: -moz-inline-stack;
175182
float: left;
176-
width: 94%;
183+
width: 91%;
184+
padding: 5px;
177185
}
178186
.gt-clearfix{
179187
clear: both;
180188
}
181-
.gt-avt-cnt p{
189+
.gt-act-cnt p{
182190
margin: 2px 0px;
183191
color: #666;
184192
font-size: 0.87rem;
@@ -188,7 +196,7 @@
188196
display: block;
189197
white-space: nowrap;
190198
}
191-
.gt-avt-cnt .pull-req-info{
199+
.gt-act-cnt .pull-req-info{
192200
display: inline-block;
193201
padding: 3px 7px;
194202
margin-top: 5px;

‎src/github.js‎

Lines changed: 37 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,10 @@ var GitHub = (function () {
3434
'<span class="gt-usr-dt">Following</span>'+
3535
'</a>'+
3636
'</div>'+
37-
38-
3937
'</div>'+
4038
'</div>',
4139

4240
repoProfileTpl: '<div class="gt-usr-header gt-shadow">'+
43-
4441
'<div class="gt-usr-name">'+
4542
'<span class="user-name"><%= name%></span>'+
4643
'<a target="_blank" href="<%= owner.html_url%>">'+
@@ -69,8 +66,6 @@ var GitHub = (function () {
6966
'<span class="gt-usr-dt">Forks</span>'+
7067
'</a>'+
7168
'</div>'+
72-
73-
7469
'</div>'+
7570
'</div>',
7671

@@ -92,118 +87,40 @@ var GitHub = (function () {
9287
'<span class="gt-org-repos"> Public Repositories</span>'+
9388
'</div>'+
9489
'</div>',
95-
CommitCommentEvent: '<div class="gt-activity gt-issue-com-activity">'+
96-
'<div class="gt-avatar-cnt">'+
97-
'<img src="<%=actor.avatar_url%>" class="gt-usr-avatar">'+
98-
'</div>'+
99-
'<div class="gt-avt-cnt">'+
100-
'<%= userLink%> <span> commented on commit </span> <%= commentLink%>'+
101-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
102-
'<p><%= payload.comment.body%></p>'+
103-
'</div>'+
104-
'<div class="gt-clearfix"></div>'+
105-
'</div>',
106-
CreateEvent: '<div class="gt-activity gt-create-activity">'+
107-
'<%= userLink%> <span> created <%= payload.ref_type%> </span> <%= branchLink%> <span> at </span><%= repoLink%>'+
108-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
109-
'</div>',
110-
DeleteEvent: '<div class="gt-activity gt-delete-activity">'+
111-
'<%= userLink%> <span> deleted </span> <%= payload.ref%> <%= payload.ref_type%> <span> at </span><%= repoLink%>'+
112-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
113-
'</div>',
114-
ForkEvent: '<div class="gt-activity gt-fork-activity">'+
115-
'<%= userLink%> <span> forked </span> <%= repoLink%> <span> to </span><%= forkLink%>'+
116-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
117-
'</div>',
118-
GollumEvent: '<div class="gt-activity gt-issue-com-activity">'+
119-
'<div class="gt-avatar-cnt">'+
120-
'<img src="<%=actor.avatar_url%>" class="gt-usr-avatar">'+
121-
'</div>'+
122-
'<div class="gt-avt-cnt">'+
123-
'<%= userLink%> <span> <%= actionType%> the <%= repoLink%> wiki</span>'+
124-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
125-
'<p><%= wikiMessage%></p>'+
126-
'</div>'+
127-
'<div class="gt-clearfix"></div>'+
128-
'</div>',
129-
IssueCommentEvent: '<div class="gt-activity gt-issue-com-activity">'+
130-
'<div class="gt-avatar-cnt">'+
131-
'<img src="<%=actor.avatar_url%>" class="gt-usr-avatar">'+
132-
'</div>'+
133-
'<div class="gt-avt-cnt">'+
134-
'<%= userLink%> <span> commented on issue </span> <%= commentLink%>'+
135-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
136-
'<p><%= payload.comment.body%></p>'+
137-
'</div>'+
138-
'<div class="gt-clearfix"></div>'+
139-
'</div>',
140-
IssuesEvent: '<div class="gt-activity gt-issue-com-activity">'+
141-
'<div class="gt-avatar-cnt">'+
142-
'<img src="<%=actor.avatar_url%>" class="gt-usr-avatar">'+
143-
'</div>'+
144-
'<div class="gt-avt-cnt">'+
145-
'<%= userLink%> <span> <%= payload.action%> issue </span> <%= issueUrl%>'+
146-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
147-
'</div>'+
148-
'<div class="gt-clearfix"></div>'+
149-
'</div>',
150-
MemberEvent: '<div class="gt-activity gt-member-activity">'+
151-
'<%= userLink%> <span> added </span> <%= memberLink%> to <%= repoLink%>'+
152-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
153-
'</div>',
154-
PublicEvent: '<div class="gt-activity gt-public-activity">'+
155-
'<%= userLink%> <span> open sourced </span> <%= repoLink%>'+
156-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
157-
'</div>',
158-
PullRequestEvent: '<div class="gt-activity gt-pull-req-activity">'+
159-
'<div class="gt-avatar-cnt">'+
90+
gitActivityTpl: '<div class="gt-activity <%=type%>">'+
91+
'<div class="gt-avatar-cnt">'+
92+
'<a target="_blank" href="https://github.com/<%= actor.login%>">'+
16093
'<img src="<%=actor.avatar_url%>" class="gt-usr-avatar">'+
161-
'</div>'+
162-
'<div class="gt-avt-cnt">'+
163-
'<%= userLink%> <span> <%= payload.action%> pull request </span> <%= mergeRequestUrl%>'+
164-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
165-
'<p><%= payload.pull_request.title%></p>'+
166-
'<p class="pull-req-info"><%= payload.pull_request.commits%> commits with <%= payload.pull_request.changed_files%> files changed.</p>'+
167-
'</div>'+
168-
'<div class="gt-clearfix"></div>'+
169-
'</div>',
170-
PullRequestReviewCommentEvent: '<div class="gt-activity gt-pull-com-activity">'+
171-
'<div class="gt-avatar-cnt">'+
172-
'<img src="<%=actor.avatar_url%>" class="gt-usr-avatar">'+
173-
'</div>'+
174-
'<div class="gt-avt-cnt">'+
175-
'<%= userLink%> <span> commented on pull request </span> <%= pullCommentUrl%>'+
176-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
177-
'<p><%= payload.comment.body%></p>'+
178-
'</div>'+
179-
'<div class="gt-clearfix"></div>'+
180-
'</div>',
181-
PushEvent: '<div class="gt-activity gt-push-activity">'+
182-
'<div class="gt-avatar-cnt">'+
183-
'<img src="<%=actor.avatar_url%>" class="gt-usr-avatar">'+
184-
'</div>'+
185-
'<div class="gt-avt-cnt">'+
186-
'<%= userLink%> <span> pushed to </span> <%= branchLink%> <span> at </span> <%= repoLink%>'+
187-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
188-
'<%= commitsHtml%>'+
189-
'</div>'+
190-
'<div class="gt-clearfix"></div>'+
191-
'</div>',
192-
ReleaseEvent: '<div class="gt-activity gt-issue-com-activity">'+
193-
'<div class="gt-avatar-cnt">'+
194-
'<img src="<%=actor.avatar_url%>" class="gt-usr-avatar">'+
195-
'</div>'+
196-
'<div class="gt-avt-cnt">'+
197-
'<%= userLink%> <span> released </span> <%= tagLink%> <span> at </span> <%= repoLink%>'+
198-
'<br><%= zipLink%>'+
199-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
200-
'</div>'+
201-
'<div class="gt-clearfix"></div>'+
202-
'</div>',
203-
WatchEvent: '<div class="gt-activity gt-watch-activity">'+
204-
'<%= userLink%> <span> starred </span> <%= repoLink%>'+
205-
'<span title="<%= created_at%>" class="gt-time-str"><%= timeString%></span>'+
206-
'</div>',
94+
'</a>'+
95+
'</div>'+
96+
'<div class="gt-act-cnt">'+
97+
'<%= message%>'+
98+
'</div>'+
99+
'<div title="<%= created_at%>" class="gt-time-cnt"><div class="gt-time-str"><%= timeString%></div></div>'+
100+
'<div class="gt-clearfix"></div>'+
101+
'</div>',
102+
CommitCommentEvent:'<%= userLink%> <span> commented on commit </span> <%= commentLink%>'+
103+
'<p><%= payload.comment.body%></p>',
104+
CreateEvent: '<%= userLink%> <span> created <%= payload.ref_type%> </span> <%= branchLink%> <span> at </span><%= repoLink%>',
105+
DeleteEvent: '<%= userLink%> <span> deleted </span> <%= payload.ref%> <%= payload.ref_type%> <span> at </span><%= repoLink%>',
106+
ForkEvent: '<%= userLink%> <span> forked </span> <%= repoLink%> <span> to </span><%= forkLink%>',
107+
GollumEvent: '<%= userLink%> <span> <%= actionType%> the <%= repoLink%> wiki</span>'+
108+
'<p><%= wikiMessage%></p>',
109+
IssueCommentEvent: '<%= userLink%> <span> commented on issue </span> <%= commentLink%>'+
110+
'<p><%= payload.comment.body%></p>',
111+
IssuesEvent: '<%= userLink%> <span> <%= payload.action%> issue </span> <%= issueUrl%>',
112+
MemberEvent: '<%= userLink%> <span> added </span> <%= memberLink%> to <%= repoLink%>',
113+
PublicEvent: '<%= userLink%> <span> open sourced </span> <%= repoLink%>',
114+
PullRequestEvent: '<%= userLink%> <span> <%= payload.action%> pull request </span> <%= mergeRequestUrl%>'+
115+
'<p><%= payload.pull_request.title%></p>'+
116+
'<p class="pull-req-info"><%= payload.pull_request.commits%> commits with <%= payload.pull_request.changed_files%> files changed.</p>',
117+
PullRequestReviewCommentEvent: '<%= userLink%> <span> commented on pull request </span> <%= pullCommentUrl%>'+
118+
'<p><%= payload.comment.body%></p>',
119+
PushEvent: '<%= userLink%> <span> pushed to </span> <%= branchLink%> <span> at </span> <%= repoLink%>'+
120+
'<%= commitsHtml%>',
121+
ReleaseEvent: '<%= userLink%> <span> released </span> <%= tagLink%> <span> at </span> <%= repoLink%>'+
122+
'<br><%= zipLink%>',
123+
WatchEvent: '<%= userLink%> <span> starred </span> <%= repoLink%>',
207124
noActivityTpl: '<div class="gt-no-activity">'+
208125
'<span> There are no public events for this account in past 90 days. </span>'+
209126
'</div>'
@@ -242,7 +159,8 @@ var GitHub = (function () {
242159

243160
if (length==0) {
244161
html += gitMethods.getRenderedHTML(gitTemplates['noActivityTpl'],{});
245-
} else{
162+
}
163+
else{
246164
for(var index = 0; index < length; index++){
247165

248166
var activity = data[index];
@@ -297,7 +215,8 @@ var GitHub = (function () {
297215
break;
298216
}
299217

300-
html += gitMethods.getRenderedHTML(gitTemplates[activity.type],activity);
218+
activity.message = gitMethods.getRenderedHTML(gitTemplates[activity.type], activity);
219+
html += gitMethods.getRenderedHTML(gitTemplates['gitActivityTpl'],activity);
301220

302221
}
303222
}

0 commit comments

Comments
 (0)