Commit 0bc3bfa02512d955a15e2c870729185788c7f0bc

Daniel Beames <dBsooner @dbt…nk.com>
Tue Oct 27 06:39:04 CET 2009

Tree SHA1: 33b62be
Parent SHA1: 32f02e6 (phone-disable-dialpad-tones)
raw diff | raw patch

Removed messaging-personal-avatar-left-side-v2, updated v1 to be universal.

Diff rendering mode:
inline
side by side


	1		Copyright (c) 2009 Elryon <elryon@hotmail.com>
	2
	3		Permission is hereby granted, free of charge, to any person
	4		obtaining a copy of this software and associated documentation
	5		files (the "Software"), to deal in the Software without
	6		restriction, including without limitation the rights to use,
	7		copy, modify, merge, publish, distribute, sublicense, and/or sell
	8		copies of the Software, and to permit persons to whom the
	9		Software is furnished to do so, subject to the following
	10		conditions:
	11
	12		The above copyright notice and this permission notice shall be
	13		included in all copies or substantial portions of the Software.
	14
	15		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	16		EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
	17		OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	18		NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
	19		HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
	20		WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
	21		FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	22		OTHER DEALINGS IN THE SOFTWARE.


	1		--- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
	2		+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
	3		@@ -1357,7 +1357,7 @@
	4		if (ChatFlags.isOutgoing(msg.flags)) {
	5		tmpClass.push("my-chat");
	6		// Disabling MY avatar because we are not doing this for 1.0 2008-11-05
	7		- //msg.avatar = this.myAvatar \|\| 'images/my-avatar.png';
	8		+ msg.avatar = this.myAvatar \|\| '/media/internal/my-avatar.png';
	9		} else {
	10		tmpClass.push("their-chat");
	11		msg.avatar = this.avatarHash[msg.fromAddress] \|\| this.contactAvatar \|\| "images/list-view-default-avatar.png";
	12		--- .orig/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
	13		+++ /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
	14		@@ -645,7 +645,7 @@
	15		width: 255px;
	16		}
	17		.my-chat .message-container {
	18		- width: 95%;
	19		+ width: 90%;
	20		}
	21		.chat-entry .chat-balloon {
	22		min-height: 26px;
	23		@@ -659,7 +659,11 @@
	24		font-size:14px;
	25		}
	26
	27		-.my-chat .chat-balloon-wrapper,
	28		+.my-chat .chat-balloon-wrapper {
	29		+ padding-left: 40px;
	30		+ font-size: 18px;
	31		+ word-wrap: break-word !important;
	32		+}
	33		.their-chat .chat-balloon-wrapper {
	34		padding: 1px 0;
	35		font-size: 18px;
	36		@@ -674,8 +674,16 @@
	37		}
	38
	39		/* Disabling MY avatar because we are not doing this for 1.0 2008-11-05*/
	40		-.my-chat .avatar-location,
	41		-.my-chat .avatar-overlay,
	42		+.my-chat .avatar-location {
	43		+left: 12px;
	44		+position: absolute;
	45		+margin: 13px 12px 0px 0px;
	46		+}
	47		+.my-chat .avatar-overlay {
	48		+left: 8px;
	49		+margin-top: 4px;
	50		+position: absolute;
	51		+}
	52		.my-chat .avatar-container {
	53		display: none;
	54		width: 40px;
	55		@@ -677,9 +677,11 @@
	56		.my-chat .avatar-location,
	57		.my-chat .avatar-overlay,
	58		.my-chat .avatar-container {
	59		- display: none;
	60		- width: 40px;
	61		- height: 40px;
	62		+display: inline-block;
	63		+}
	64		+.my-chat .avatar {
	65		+width: 40px;
	66		+height: 40px;
	67		}
	68
	69		.message.status-success {


1		--- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
2		+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
3		@@ -1347,7 +1347,7 @@
	1	diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
	2	index 4c7cdbe..12193e9 100644
	3	--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
	4	+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
	5	@@ -1347,7 +1347,7 @@ var ChatviewAssistant = Class.create({
4	6	if (ChatFlags.isOutgoing(msg.flags)) {
5	7	tmpClass.push("my-chat");
6	8	// Disabling MY avatar because we are not doing this for 1.0 2008-11-05
7	9	- //msg.avatar = this.myAvatar \|\| 'images/my-avatar.png';
8		+ msg.avatar = this.myAvatar \|\| 'images/my-avatar.png';
	10	+ msg.avatar = this.myAvatar \|\| '/media/internal/my-avatar.png';
9	11	} else {
10	12	tmpClass.push("their-chat");
11	13	msg.avatar = this.avatarHash[msg.fromAddress] \|\| this.contactAvatar \|\| "images/list-view-default-avatar.png";
12		--- .orig/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
13		+++ /usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
14		@@ -642,7 +642,7 @@
15		}
16
17		.their-chat .message-container {
18		- width: 255px;
	14	diff --git a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
	15	index 13251fe..68a2cfc 100644
	16	--- a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
	17	+++ b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
	18	@@ -650,6 +650,12 @@ img.avatar-overlay {
	19	.chat-entry .chat-balloon {
	20	min-height: 26px;
	21	}
	22	+.their-chat .message-container {
19	23	+ width: 91%;
20		}
21		.my-chat .message-container {
22		width: 280px;
23		@@ -645,7 +645,7 @@
24		width: 255px;
25		}
26		.my-chat .message-container {
27		- width: 280px;
	24	+}
	25	+.my-chat .message-container {
28	26	+ width: 91%;
	27	+}
	28	.chat-entry.my-chat.status-message {
	29	font-style: italic;
29	30	}
30		.chat-entry .chat-balloon {
31		min-height: 26px;
32		@@ -659,7 +659,11 @@
	31	@@ -659,14 +665,18 @@ img.avatar-overlay {
33	32	font-size:14px;
34	33	}
35	34
…	…
41	41	.their-chat .chat-balloon-wrapper {
42	42	padding: 1px 0;
43	43	font-size: 18px;
44		@@ -666,7 +666,7 @@
45	44	word-wrap: break-word !important;
46	45	}
47	46	.their-chat .chat-balloon-wrapper {
…	…
49	49	}
50	50	.their-chat .avatar {
51	51	width: 40px;
52		@@ -674,8 +674,16 @@
	52	@@ -674,12 +684,22 @@ img.avatar-overlay {
53	53	}
54	54
55	55	/* Disabling MY avatar because we are not doing this for 1.0 2008-11-05*/
…	…
65	65	+margin-top: 4px;
66	66	+position: absolute;
67	67	+}
68		.my-chat .avatar-container {
69		display: none;
70		width: 40px;
71		@@ -677,9 +677,11 @@
72		.my-chat .avatar-location,
73		.my-chat .avatar-overlay,
74	68	.my-chat .avatar-container {
75	69	- display: none;
76	70	- width: 40px;

Commit 0bc3bfa02512d955a15e2c870729185788c7f0bc

Gitorious