From 0f8c51fa9a0b0c5ae43b217241a3a1d23a21cdcb Mon Sep 17 00:00:00 2001 From: Evgeny Gryaznov Date: Tue, 13 Jan 2009 22:04:42 +0000 Subject: [PATCH] [1.5.1] update from branch git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@316 c66351dc-e62f-0410-b875-e3a5c0b9693f --- .../webim/styles/default/templates/chat.tpl | 16 +++++++--- .../styles/default/templates/chatsimple.tpl | 4 +-- .../styles/default/templates/leavemessage.tpl | 7 ++-- .../webim/styles/default/templates/mail.tpl | 2 +- .../styles/original/images/buttons/back.gif | Bin 1265 -> 0 bytes .../webim/styles/original/images/wincrnlb.gif | Bin 204 -> 0 bytes .../webim/styles/original/images/wincrnlt.gif | Bin 203 -> 0 bytes .../webim/styles/original/images/wincrnrb.gif | Bin 104 -> 0 bytes .../webim/styles/original/images/wincrnrt.gif | Bin 108 -> 0 bytes .../webim/styles/original/templates/chat.tpl | 16 +++++++--- .../styles/original/templates/chatsimple.tpl | 4 +-- .../webim/styles/original/templates/error.tpl | 23 +++++++++++--- .../original/templates/leavemessage.tpl | 2 +- .../original/templates/leavemessagesent.tpl | 23 +++++++++++--- .../webim/styles/original/templates/mail.tpl | 30 ++++++++++++++---- .../styles/original/templates/mailsent.tpl | 23 +++++++++++--- .../styles/original/templates/nochat.tpl | 23 +++++++++++--- .../styles/original/templates/redirect.tpl | 23 +++++++++++--- .../styles/original/templates/redirected.tpl | 23 +++++++++++--- 19 files changed, 165 insertions(+), 54 deletions(-) delete mode 100644 src/messenger/webim/styles/original/images/buttons/back.gif delete mode 100644 src/messenger/webim/styles/original/images/wincrnlb.gif delete mode 100644 src/messenger/webim/styles/original/images/wincrnlt.gif delete mode 100644 src/messenger/webim/styles/original/images/wincrnrb.gif delete mode 100644 src/messenger/webim/styles/original/images/wincrnrt.gif diff --git a/src/messenger/webim/styles/default/templates/chat.tpl b/src/messenger/webim/styles/default/templates/chat.tpl index 6a798038..6d35baef 100644 --- a/src/messenger/webim/styles/default/templates/chat.tpl +++ b/src/messenger/webim/styles/default/templates/chat.tpl @@ -51,6 +51,14 @@ var threadParams = { servl:"${webimroot}/thread.php",wroot:"${webimroot}",freque .isend { background-position:-120px 0px; } .iemail { background-position:0px 0px; } .iclosewin { background-position:-170px -1px; width: 15px; height: 15px; } +.tplimageloc { + background: transparent url(${webimroot}${url:image.chat.sprite}) no-repeat scroll 0px 0px; + -moz-background-clip: -moz-initial; + -moz-background-origin: -moz-initial; + -moz-background-inline-policy: -moz-initial; +} +.ilog { background-position: 0px 0px;width: 20px; height: 80px; } +.imessage { background-position: 0px -82px;width: 20px; height: 85px; } @@ -156,11 +164,11 @@ ${endif:agent} | ${if:user} - Mail  + Mail  ${endif:user} ${if:agent} ${if:canpost} - + Redirect  ${endif:canpost} ${if:historyParams} @@ -205,7 +213,7 @@ ${endif:agent} - +
@@ -232,7 +240,7 @@ ${if:canpost} - + ${if:isOpera95}
${else:isOpera95} diff --git a/src/messenger/webim/styles/default/templates/chatsimple.tpl b/src/messenger/webim/styles/default/templates/chatsimple.tpl index 5c8266de..7e3d670c 100644 --- a/src/messenger/webim/styles/default/templates/chatsimple.tpl +++ b/src/messenger/webim/styles/default/templates/chatsimple.tpl @@ -101,7 +101,7 @@ - +
HistoryHistory @@ -128,7 +128,7 @@ - +
MessageMessage diff --git a/src/messenger/webim/styles/default/templates/leavemessage.tpl b/src/messenger/webim/styles/default/templates/leavemessage.tpl index dda86421..5f8deac9 100644 --- a/src/messenger/webim/styles/default/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/default/templates/leavemessage.tpl @@ -43,6 +43,7 @@ +
@@ -104,16 +105,16 @@ ${endif:errors} - + - + diff --git a/src/messenger/webim/styles/default/templates/mail.tpl b/src/messenger/webim/styles/default/templates/mail.tpl index b12d1b1e..3d808ce9 100644 --- a/src/messenger/webim/styles/default/templates/mail.tpl +++ b/src/messenger/webim/styles/default/templates/mail.tpl @@ -32,7 +32,7 @@
${msg:form.field.email}:
${msg:form.field.name}:
${msg:form.field.message}: - +
- + diff --git a/src/messenger/webim/styles/original/images/buttons/back.gif b/src/messenger/webim/styles/original/images/buttons/back.gif deleted file mode 100644 index 80049070f6a8760763d6a8517bf497c8deb6a594..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1265 zcmVEqVmqc+)?A-aMb-<>A^{{G>k zGU~o?&ygRwfgJ3{gY4$p;Git$xMi+^E8(U(;if$0uu$o|YnXRD+nFHWqB6pmOyHj^ z_2R$Xnj++`P3E*&t%Eq&mm>G)%JSN+*{W9Ir8?M_A>yb%w1_w5vQ@>29^9HD_2a_J zjUL;YBdn2NsDC)}*{a-|B(Iok=C)wxw_)eEU*Df9?8brSwO!n!JmjuS=)7#ukst2N zk>H*wuYfD&wOin&IN_x?_2IqSnkDGEX6e6iuz@S*wq4||OX8p&GOl;p?f!>d^V(hHsrBV;jT}^haKRb zE99_H&XFSJu~FitIpV26&W|1AsX?cDD&eI$;-@{xiy!aLm))Bqx`!;qi5=_2d*-%Y z?a7Dt=*;)&&f=#!;-@?HAh{>qcP#5G0lz|z>z=SpDUbrHJ^Dl%#0Z5xn}0FR_3!-%@HMyJ*sqALOr3*OejFl_BoUkl&#(>cV&GzjEH3C*q|#=CoR^e=Ov!OXI3S z;G{S8;=c9ayz9Yt^4Y7;kRI#8c*l`4>ArF3x@YIOV&}MHyMr9Df-B~>UGmqbH9?9aznCO3;>s4}YxL2w~?)76TS) zoH%tsOf6bu{jvG90)wg!ua5XLu;l`_3Zr6(7?Cfp5O~NQq(Fd#ptca|P+aRr1jGmd zc_r;5@W22phANsJ_yr(cUT%&y5wp_!|(E zu^tAUylE`6feJCy_5=?uz~EYPPx(_v8@{kJKtmZg5XB3PxRO@^sR)w;1q^_A00SJD zk^v)&kU&j5gygkKD+nC0z#I!K0D(CPfDnNeaiBs9FoWdv!5R>_Kted+=)lAm2_zuG z3(vR#i4$Yw)k`Hn%n(E%J7D5PEG3ixKq>fe!bK=JzdK?7t~>m_m-_#9z~6i6|F1jzyW#l%h64jOp!k!8 zk%2*yK?fuWvXg<;Q=zFh#WGGJb)9&lVRmNZjL;)$x(~9&KB)T~V_d>%%yp+>%1Id? r@hctI&ZsmTS7UKso5rwa;`Yprge5{BckKM(x%u@O=75zdK?7t~>m_m-_#9z~6i6|F1jzyW#l%h64jOp!k!8 zk%2*yK?fuWvXg<;BSEe233EuW^Ca(v*oZx8ZeNZ~@?k2hPgdzTpU&7Nba=@NgFOe5 qTqi0?N`Eop%UaJ-l9_C9uslM-*|2Bh(u{>O^jUZg)o?R1SOWmD09!l& diff --git a/src/messenger/webim/styles/original/images/wincrnrb.gif b/src/messenger/webim/styles/original/images/wincrnrb.gif deleted file mode 100644 index 36b103677285d094058c914d68ebafbdfb16cece..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmZ?wbhEHb#xd^`Xg`S}T1Smaf$ooL}G~ASKLT4FK7J9!>xN diff --git a/src/messenger/webim/styles/original/images/wincrnrt.gif b/src/messenger/webim/styles/original/images/wincrnrt.gif deleted file mode 100644 index 0bcfdbea6da9d46b43f73ae3e1e64ec25fc3f4d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmZ?wbhEHba=iE6bzWy~ANk=+6>IqMhiZ%r)&OH! BB0T^A diff --git a/src/messenger/webim/styles/original/templates/chat.tpl b/src/messenger/webim/styles/original/templates/chat.tpl index 21ba45ae..626195f2 100644 --- a/src/messenger/webim/styles/original/templates/chat.tpl +++ b/src/messenger/webim/styles/original/templates/chat.tpl @@ -30,6 +30,14 @@ var threadParams = { servl:"${webimroot}/thread.php",wroot:"${webimroot}",freque .ibuttondiv { background-position:-73px -2px; width: 35px; height: 45px;} .isubmit { background-position:-108px 0px; width: 40px; height: 35px; } .isubmitrest { background-position:-139px 0px; width: 10px; height: 35px;} +.tplimageloc { + background: transparent url(${webimroot}${url:image.chat.sprite}) no-repeat scroll 0px 0px; + -moz-background-clip: -moz-initial; + -moz-background-origin: -moz-initial; + -moz-background-inline-policy: -moz-initial; +} +.ilog { background-position: 0px 0px;width: 20px; height: 80px; } +.imessage { background-position: 0px -82px;width: 20px; height: 85px; } @@ -151,11 +159,11 @@ ${endif:agent} ${if:user} - + ${endif:user} ${if:agent} ${if:canpost} - ${endif:canpost} ${if:historyParams} @@ -195,7 +203,7 @@ ${endif:agent}
Mail Mail  + Redirect 
- +
@@ -222,7 +230,7 @@ ${if:canpost} - + ${if:isOpera95}
${else:isOpera95} diff --git a/src/messenger/webim/styles/original/templates/chatsimple.tpl b/src/messenger/webim/styles/original/templates/chatsimple.tpl index ae1a349b..c56d113a 100644 --- a/src/messenger/webim/styles/original/templates/chatsimple.tpl +++ b/src/messenger/webim/styles/original/templates/chatsimple.tpl @@ -101,7 +101,7 @@ - +
HistoryHistory @@ -128,7 +128,7 @@ - +
MessageMessage diff --git a/src/messenger/webim/styles/original/templates/error.tpl b/src/messenger/webim/styles/original/templates/error.tpl index f77cd5ee..c97d7b66 100644 --- a/src/messenger/webim/styles/original/templates/error.tpl +++ b/src/messenger/webim/styles/original/templates/error.tpl @@ -5,6 +5,19 @@ +
@@ -24,9 +37,9 @@
- + - + - + - +
@@ -34,9 +47,9 @@
@@ -53,7 +66,7 @@ 		- + diff --git a/src/messenger/webim/styles/original/templates/leavemessage.tpl b/src/messenger/webim/styles/original/templates/leavemessage.tpl index 8457ab56..1dbddc26 100644 --- a/src/messenger/webim/styles/original/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/original/templates/leavemessage.tpl @@ -27,7 +27,7 @@
${msg:chat.error_page.close}
- + diff --git a/src/messenger/webim/styles/original/templates/leavemessagesent.tpl b/src/messenger/webim/styles/original/templates/leavemessagesent.tpl index b37757b4..c53f3bd3 100644 --- a/src/messenger/webim/styles/original/templates/leavemessagesent.tpl +++ b/src/messenger/webim/styles/original/templates/leavemessagesent.tpl @@ -5,6 +5,19 @@ +
@@ -25,9 +38,9 @@
- + - + @@ -40,9 +53,9 @@ - + - +
@@ -59,7 +72,7 @@ 		- + diff --git a/src/messenger/webim/styles/original/templates/mail.tpl b/src/messenger/webim/styles/original/templates/mail.tpl index fa652626..499dd036 100644 --- a/src/messenger/webim/styles/original/templates/mail.tpl +++ b/src/messenger/webim/styles/original/templates/mail.tpl @@ -5,12 +5,28 @@ +
${msg:chat.mailthread.sent.close}
@@ -62,19 +78,19 @@ ${endif:errors}
- + @@ -26,7 +42,7 @@ ${if:errors}
- +
${errors} @@ -41,13 +57,13 @@ ${endif:errors} -
+
-
${msg:mailthread.enter_email}
+
- + - +

${msg:mailthread.perform}
- + diff --git a/src/messenger/webim/styles/original/templates/mailsent.tpl b/src/messenger/webim/styles/original/templates/mailsent.tpl index f78646bd..b509892f 100644 --- a/src/messenger/webim/styles/original/templates/mailsent.tpl +++ b/src/messenger/webim/styles/original/templates/mailsent.tpl @@ -5,6 +5,19 @@ +
${msg:mailthread.close}
@@ -25,9 +38,9 @@
- + - + @@ -42,9 +55,9 @@ - + - +
@@ -61,7 +74,7 @@ 		- + diff --git a/src/messenger/webim/styles/original/templates/nochat.tpl b/src/messenger/webim/styles/original/templates/nochat.tpl index 32b076b5..58c3d0f2 100644 --- a/src/messenger/webim/styles/original/templates/nochat.tpl +++ b/src/messenger/webim/styles/original/templates/nochat.tpl @@ -5,6 +5,19 @@ +
${msg:chat.mailthread.sent.close}
@@ -23,9 +36,9 @@
- + - + - + - +
@@ -33,9 +46,9 @@ ${msg:page.chat.old_browser.list}
@@ -52,7 +65,7 @@ 		- + diff --git a/src/messenger/webim/styles/original/templates/redirect.tpl b/src/messenger/webim/styles/original/templates/redirect.tpl index 1df7ffd4..7a4f25ee 100644 --- a/src/messenger/webim/styles/original/templates/redirect.tpl +++ b/src/messenger/webim/styles/original/templates/redirect.tpl @@ -5,6 +5,19 @@ +
${msg:page.chat.old_browser.close}
@@ -34,9 +47,9 @@
- + - + @@ -60,9 +73,9 @@ - + - +
@@ -82,7 +95,7 @@ 		- + diff --git a/src/messenger/webim/styles/original/templates/redirected.tpl b/src/messenger/webim/styles/original/templates/redirected.tpl index c019b601..62ef7d35 100644 --- a/src/messenger/webim/styles/original/templates/redirected.tpl +++ b/src/messenger/webim/styles/original/templates/redirected.tpl @@ -5,6 +5,19 @@ +
${msg:chat.redirect.back}
@@ -25,9 +38,9 @@
- + - + @@ -42,9 +55,9 @@ - + - +
@@ -61,7 +74,7 @@ 		- +
${msg:chat.redirected.close}