adium 4054:8e8002f5f5b8: minimal_mod: fix to keep filetransfer m...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/8e8002f5f5b8
revision:	4054:8e8002f5f5b8
branch:		(none)
author:		mathuaerknedam
date:		Sat Jul 16 16:27:27 2011 -0500

minimal_mod: fix to keep filetransfer messages from breaking the chat window in the SenderColor SingleLine variant, in the process improving the filetransfer message in all variants.
(transplanted from 2882f49b4ad177d76c665a9bba26867f8decc6bb)

diffs (121 lines):

diff -r d6352e6b2024 -r 8e8002f5f5b8 Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/FileTransferRequest.html
--- a/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/FileTransferRequest.html	Thu Jul 14 23:42:49 2011 +0200
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/FileTransferRequest.html	Sat Jul 16 16:27:27 2011 -0500
@@ -1,8 +1,13 @@
-<div class="x-container %messageClasses%">
-	<span class="x-message">
-		<b>%sender%</b> is attempting to send you <b>%fileName%</b><br /><br />
-		<input type="button" onclick="%saveFileHandler%" value="Accept File"></input>
-		<input type="button" onclick="%cancelRequestHandler%" value="Cancel File"></input>
-	</span>
+<div class="x-container x-filetransfer %messageClasses% %userIcons%" style="background-color:%textbackgroundcolor{.75}%;" src="%userIconPath%">
+	<img class="x-buddyicon" src="%userIconPath%" />
+	<div class="x-time" title="%time{dd MMM yyyy}%">%time%</div>
+	<div class="x-sender" style="color: %senderColor%;" title="%senderPrefix% %senderScreenName%">%sender%</div>
+	<div class="x-message" title="%service% %time%">
+		is attempting to send you <b>%fileName%</b>
+		<div class="x-buttons"
+			<input type="button" onclick="%saveFileHandler%" value="Accept File"></input>
+			<input type="button" onclick="%cancelRequestHandler%" value="Cancel File"></input>
+		</div>
+	</div>
 </div>
 <span id="insert"></span>
diff -r d6352e6b2024 -r 8e8002f5f5b8 Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html	Thu Jul 14 23:42:49 2011 +0200
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html	Sat Jul 16 16:27:27 2011 -0500
@@ -42,6 +42,19 @@
 	<div class="x-sender" style="color: indigo;" title=" Zemfira">Zemfira</div>
 	<div class="x-message" title="Jabber 08:46:43">Lёlya*: привет *CHERRY* </div>
 </div>
+<div class="x-container x-filetransfer incoming message showIcons"  style="background-color:%textbackgroundcolor{.75}%;" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
+	<img class="x-buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
+	<div class="x-time" title="16 Feb 2011">09:28:05</div>
+	<div class="x-sender" style="color: indigo;" title=" ">Zemfira</div>
+	<div class="x-message">
+		is attempting to send you <b>привет.rar</b>
+		<div class="x-buttons"
+			<input type="button" onclick="client.handleFileTransfer('Save', 'FileTransfer-1')" value="Accept File">
+			<input type="button" onclick="client.handleFileTransfer('Cancel', 'FileTransfer-1')" value="Cancel File">
+		</div>
+	</div>
+</div>
+
 <div class="x-container date_separator event showIcons" style="background-color:%textbackgroundcolor{.75}%;" src="Incoming/buddy_icon.png">
 	<img class="x-buddyicon" src="Incoming/buddy_icon.png">
 	<div class="x-time" title="16 Feb 2011">09:28:05</div>
@@ -186,7 +199,7 @@
 	<div class="x-time" title="16 Feb 2011">09:28:21</div>
 	<div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
 	<div class="x-message" title="IRC 09:28:15">
-		<span class="actionMessageUserName">mathuaerknedam</span>
+		<span class="actionMessageUserName">LuX</span>
 		<span class="actionMessageBody">moos.</span>
 	</div>
 </div>
diff -r d6352e6b2024 -r 8e8002f5f5b8 Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Variants/SenderColor SingleLine.css
--- a/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Variants/SenderColor SingleLine.css	Thu Jul 14 23:42:49 2011 +0200
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Variants/SenderColor SingleLine.css	Sat Jul 16 16:27:27 2011 -0500
@@ -108,7 +108,8 @@
 	background: rgba(240, 240, 240, .5);
 }
 
-.action .x-sender
+.action .x-sender,
+.x-filetransfer .x-sender
 {
 	text-align: right;
 }
diff -r d6352e6b2024 -r 8e8002f5f5b8 Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css
--- a/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css	Thu Jul 14 23:42:49 2011 +0200
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css	Sat Jul 16 16:27:27 2011 -0500
@@ -155,9 +155,9 @@
 	color: #9F9F9F;
 }
 
-.message:not([src*="buddy_icon.png"]) .x-time,
-.message:not([src*="buddy_icon.png"]) .x-sender,
-.message:not([src*="buddy_icon.png"]) .x-message
+.message:not(.hideIcons):not([src*="buddy_icon.png"]) .x-time,
+.message:not(.hideIcons):not([src*="buddy_icon.png"]) .x-sender,
+.message:not(.hideIcons):not([src*="buddy_icon.png"]) .x-message
 {
 	margin-left: 30px;
 }
@@ -292,13 +292,16 @@
 
 /* ACTION */
 
-.showIcons.x-container.action:not([src*="buddy_icon.png"])
+.showIcons.x-container.action:not([src*="buddy_icon.png"]),
+.showIcons.x-container.x-filetransfer:not([src*="buddy_icon.png"])
 {
 	padding-left: 46px;
 }
 
 .action .x-sender,
-.action .x-message
+.action .x-message,
+.x-filetransfer .x-sender,
+.x-filetransfer .x-message
 {
 	display: inline;
 	font-style: italic !important;
@@ -325,8 +328,14 @@
 	content: "";
 }
 
-.action .x-sender,
-.action .x-message
+.x-filetransfer .x-sender,
+.x-filetransfer .x-message
 {
-	font-style: italic !important;
+	display: inline;
 }
+
+.x-filetransfer .x-buttons
+{
+	padding-top: 4px;
+}
+