glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

new junto images

Browse source
This commit is contained in:
Connor Turland 2016-02-09 09:14:33 +13:00
parent 987cd7f5a0
commit e29b683b38
6 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/ellipsis.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 220 B

BIN
app/assets/images/invitepeer16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 223 B

BIN
app/assets/images/junto.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
app/assets/images/junto_spinner_dark.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 32 KiB

4
app/assets/javascripts/src/views/chatView.js.erb
View file

@ -15,7 +15,7 @@ Metamaps.Views.chatView = (function () {
participantHTML: "<div class='participant participant-{{ id }}'>" + participantHTML: "<div class='participant participant-{{ id }}'>" +
"<div class='chat-participant-image'><img src='{{ image }}' style='border: 2px solid {{ color }};' /></div>" + "<div class='chat-participant-image'><img src='{{ image }}' style='border: 2px solid {{ color }};' /></div>" +
"<div class='chat-participant-name'>{{ username }}</div>" + "<div class='chat-participant-name'>{{ username }}</div>" +
"<button type='button' class='button chat-participant-invite' onclick='Metamaps.Realtime.inviteACall({{ id}});'>I</button>" + "<button type='button' class='button chat-participant-invite' onclick='Metamaps.Realtime.inviteACall({{ id}});'></button>" +
"<div class='clearfloat'></div>" + "<div class='clearfloat'></div>" +
"</div>", "</div>",
templates: function() { templates: function() {
@ -121,7 +121,7 @@ Metamaps.Views.chatView = (function () {
var date = (m.timestamp.getMonth() + 1) + '/' + m.timestamp.getDate(); var date = (m.timestamp.getMonth() + 1) + '/' + m.timestamp.getDate();
date += " " + addZero(m.timestamp.getHours()) + ":" + addZero(m.timestamp.getMinutes()); date += " " + addZero(m.timestamp.getHours()) + ":" + addZero(m.timestamp.getMinutes());
m.timestamp = date; m.timestamp = date;
m.image = m.user_image || 'http://www.hotpepper.ca/wp-content/uploads/2014/11/default_profile_1_200x200.png'; m.image = m.user_image || 'http://www.hotpepper.ca/wp-content/uploads/2014/11/default_profile_1_200x200.png'; // TODO: remove
m.message = linker.link(m.message); m.message = linker.link(m.message);
var $html = $(this.messageTemplate(m)); var $html = $(this.messageTemplate(m));
this.$messages.append($html); this.$messages.append($html);

3
app/assets/stylesheets/junto.css.erb
View file

@ -111,7 +111,7 @@
cursor: pointer; cursor: pointer;
} }
.chat-box .chat-button.active { .chat-box .chat-button.active {
background: url(<%= asset_path 'junto.gif' %>) no-repeat 2px 9px, url(<%= asset_path 'tray_tab.png' %>) no-repeat !important; background: url(<%= asset_path 'junto_spinner_dark.gif' %>) no-repeat 2px 8px, url(<%= asset_path 'tray_tab.png' %>) no-repeat !important;
} }
.chat-box .chat-button .chat-unread { .chat-box .chat-button .chat-unread {
display: none; display: none;
@ -231,6 +231,7 @@
} }
.chat-box .participants .participant .chat-participant-invite { .chat-box .participants .participant .chat-participant-invite {
float: right; float: right;
background: #4FC059 url(<%= asset_path 'invitepeer16.png' %>) no-repeat center center;
} }
.chat-box .chat-header { .chat-box .chat-header {
width: 100%; width: 100%;