diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-11-05 14:53:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-11-05 14:53:45 +0000 |
| commit | d8b990820cc009712b81c70d236dbd759653e639 (patch) | |
| tree | 10790cf66236d7be6305ac427f6d767e9a7b2ee8 /phpBB/styles | |
| parent | 035ceb011926ffa84dc4d4d524c9bd8216b91df6 (diff) | |
| download | forums-d8b990820cc009712b81c70d236dbd759653e639.tar forums-d8b990820cc009712b81c70d236dbd759653e639.tar.gz forums-d8b990820cc009712b81c70d236dbd759653e639.tar.bz2 forums-d8b990820cc009712b81c70d236dbd759653e639.tar.xz forums-d8b990820cc009712b81c70d236dbd759653e639.zip | |
re-arranged the attachment display, this solves the template problems we are having since the beginning.
git-svn-id: file:///svn/phpbb/trunk@4640 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
4 files changed, 88 insertions, 75 deletions
diff --git a/phpBB/styles/subSilver/template/attachment.html b/phpBB/styles/subSilver/template/attachment.html new file mode 100644 index 0000000000..357a44bd62 --- /dev/null +++ b/phpBB/styles/subSilver/template/attachment.html @@ -0,0 +1,74 @@ +<!-- BEGIN DENIED --> + <span class="postbody">[{L_DENIED}]</span><br /><br /> +<!-- END DENIED --> + +<!-- BEGIN WM_STREAM --> + <span class="postbody">{COMMENT}</span><br /> + <object id="wmp" classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95" codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0" standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject"> + <param name="FileName" value="{U_DOWNLOAD_LINK}"> + <param name="ShowControls" value="1"> + <param name="ShowDisplay" value="0"> + <param name="ShowStatusBar" value="1"> + <param name="AutoSize" value="1"> + <param name="AutoStart" value="0"> + <param name="Visible" value="1"> + <param name="AnimationStart" value="0"> + <param name="Loop" value="0"> + <embed type="application/x-mplayer2" pluginspage="http://www.microsoft.com/windows95/downloads/contents/wurecommended/s_wufeatured/mediaplayer/default.asp" src="{U_DOWNLOAD_LINK}" name=MediaPlayer2 showcontrols=1 showdisplay=0 showstatusbar=1 autosize=1 autostart=0 visible=1 animationatstart=0 loop=0></embed> + </object> + <br /><span class="gensmall">{DOWNLOAD_NAME} - {L_DOWNLOADED_VIEWED} {L_DOWNLOAD_COUNT}</span><br /><br /> +<!-- END WM_STREAM --> + +<!-- BEGIN RM_STREAM --> + <span class="postbody">{COMMENT}</span><br /> + <object id=rmstream_{ATTACH_ID} classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="0" height="0"> + <param name="src" value="{U_FORUM}/{U_DOWNLOAD_LINK}"> + <param name="autostart" value="false"> + <param name="controls" value="ImageWindow"> + <param name="console" value="{U_DOWNLOAD_LINK}"> + <param name="prefetch" value="true"> + <embed name=rmstream_{ATTACH_ID} type="audio/x-pn-realaudio-plugin" src="{U_FORUM}/{U_DOWNLOAD_LINK}" width="0" height="0" autostart="false" controls="ImageWindow" console="video" prefetch="true"></embed> + </object> + <br /> + <object id=ctrls_{ATTACH_ID} classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="0" height="36"> + <param name="controls" value="ControlPanel"> + <param name="console" value="{U_DOWNLOAD_LINK}"> + <embed name=ctrls_{ATTACH_ID} type="audio/x-pn-realaudio-plugin" width="0" height="36" controls="ControlPanel" console="video"></embed> + </object> + + <script language="Javascript"> + <!-- + while (!document.rmstream_{ATTACH_ID}.GetClipWidth()) + { + } + + var width = document.rmstream_{ATTACH_ID}.GetClipWidth(); + var height = document.rmstream_{ATTACH_ID}.GetClipHeight(); + + document.rmstream_{ATTACH_ID}.width = width; + document.rmstream_{ATTACH_ID}.height = height; + document.ctrls_{ATTACH_ID}.width = width; + //--> + </script> + <br /><span class="gensmall">{DOWNLOAD_NAME} - {L_DOWNLOADED_VIEWED} {L_DOWNLOAD_COUNT}</span><br /><br /> +<!-- END RM_STREAM --> + +<!-- BEGIN IMAGE --> + <span class="postbody">{COMMENT}<br /> + <img src="{U_DOWNLOAD_LINK}" alt="{DOWNLOAD_NAME}" /></span> + <br /><span class="gensmall">{DOWNLOAD_NAME} - {L_DOWNLOADED_VIEWED} {L_DOWNLOAD_COUNT}</span><br /><br /> +<!-- END IMAGE --> + +<!-- BEGIN THUMBNAIL --> + <span class="postbody">{COMMENT}<br /> + <a href="{U_DOWNLOAD_LINK}" target="_blank"><img src="{THUMB_IMG}" alt="{DOWNLOAD_NAME}" border="0" /></a></span> + <br /><span class="gensmall">{DOWNLOAD_NAME} - {L_DOWNLOADED_VIEWED} {L_DOWNLOAD_COUNT}</span><br /><br /> +<!-- END THUMBNAIL --> + +<!-- BEGIN FILE --> + <span class="postbody">{COMMENT}</span><br /> + <span class="postbody">{UPLOAD_IMG} + <a href="{U_DOWNLOAD_LINK}" target="_blank">{DOWNLOAD_NAME}</a> - {FILESIZE} {SIZE_VAR}<br /></span> + <span class="gensmall">{L_DOWNLOADED_VIEWED} {L_DOWNLOAD_COUNT}</span><br /><br /> +<!-- END FILE --> + diff --git a/phpBB/styles/subSilver/template/posting_preview.html b/phpBB/styles/subSilver/template/posting_preview.html index ef2206449c..da05169026 100644 --- a/phpBB/styles/subSilver/template/posting_preview.html +++ b/phpBB/styles/subSilver/template/posting_preview.html @@ -31,8 +31,11 @@ <td class="row1"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><span class="postbody">{PREVIEW_MESSAGE}</span> - <!-- BEGIN postrow --> - <!-- IF postrow.S_HAS_ATTACHMENTS --><!-- INCLUDE viewtopic_attach_body.html --><!-- ENDIF --> + <!-- IF S_HAS_ATTACHMENTS --> + <!-- BEGIN attachment --> + <br /><br /><hr />{attachment.DISPLAY_ATTACHMENT} + <!-- END attachment --> + <!-- ENDIF --> <!-- END postrow --><!-- IF PREVIEW_SIGNATURE --><span class="postbody"><br />_________________<br />{PREVIEW_SIGNATURE}</span><!-- ENDIF --></td> </tr> </table></td> diff --git a/phpBB/styles/subSilver/template/viewtopic_attach_body.html b/phpBB/styles/subSilver/template/viewtopic_attach_body.html deleted file mode 100644 index 505c0f393f..0000000000 --- a/phpBB/styles/subSilver/template/viewtopic_attach_body.html +++ /dev/null @@ -1,70 +0,0 @@ -<br /><br /> -<!-- BEGIN attachment --> -<hr /> - <!-- IF postrow.attachment.IS_DENIED --> - <span class="postbody">[{postrow.attachment.L_DENIED}]</span><br /><br /> - <!-- ENDIF --> - <!-- IF postrow.attachment.IS_WM_STREAM --> - <span class="postbody">{postrow.attachment.COMMENT}</span><br /> - <object id="wmp" classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95" codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0" standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject"> - <param name="FileName" value="{postrow.attachment.U_DOWNLOAD_LINK}"> - <param name="ShowControls" value="1"> - <param name="ShowDisplay" value="0"> - <param name="ShowStatusBar" value="1"> - <param name="AutoSize" value="1"> - <param name="AutoStart" value="0"> - <param name="Visible" value="1"> - <param name="AnimationStart" value="0"> - <param name="Loop" value="0"> - <embed type="application/x-mplayer2" pluginspage="http://www.microsoft.com/windows95/downloads/contents/wurecommended/s_wufeatured/mediaplayer/default.asp" src="{postrow.attachment.U_DOWNLOAD_LINK}" name=MediaPlayer2 showcontrols=1 showdisplay=0 showstatusbar=1 autosize=1 autostart=0 visible=1 animationatstart=0 loop=0></embed> - </object> - <br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br /> - <!-- ELSEIF postrow.attachment.IS_RM_STREAM --> - <span class="postbody">{postrow.attachment.COMMENT}</span><br /> - - <object id=rmstream_{postrow.attachment.ATTACH_ID} classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="0" height="0"> - <param name="src" value="{postrow.attachment.U_FORUM}/{postrow.attachment.U_DOWNLOAD_LINK}"> - <param name="autostart" value="false"> - <param name="controls" value="ImageWindow"> - <param name="console" value="{postrow.attachment.U_DOWNLOAD_LINK}"> - <param name="prefetch" value="true"> - <embed name=rmstream_{postrow.attachment.ATTACH_ID} type="audio/x-pn-realaudio-plugin" src="{postrow.attachment.U_FORUM}/{postrow.attachment.U_DOWNLOAD_LINK}" width="0" height="0" autostart="false" controls="ImageWindow" console="video" prefetch="true"></embed> - </object> - <br /> - <object id=ctrls_{postrow.attachment.ATTACH_ID} classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="0" height="36"> - <param name="controls" value="ControlPanel"> - <param name="console" value="{postrow.attachment.U_DOWNLOAD_LINK}"> - <embed name=ctrls_{postrow.attachment.ATTACH_ID} type="audio/x-pn-realaudio-plugin" width="0" height="36" controls="ControlPanel" console="video"></embed> - </object> - - <script language="Javascript"> - <!-- - - while (!document.rmstream_{postrow.attachment.ATTACH_ID}.GetClipWidth()) - { - } - - var width = document.rmstream_{postrow.attachment.ATTACH_ID}.GetClipWidth(); - var height = document.rmstream_{postrow.attachment.ATTACH_ID}.GetClipHeight(); - - document.rmstream_{postrow.attachment.ATTACH_ID}.width = width; - document.rmstream_{postrow.attachment.ATTACH_ID}.height = height; - document.ctrls_{postrow.attachment.ATTACH_ID}.width = width; - //--> - </script> - <br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br /> - <!-- ELSEIF postrow.attachment.IS_IMAGE --> - <span class="postbody">{postrow.attachment.COMMENT}<br /> - <img src="{postrow.attachment.U_DOWNLOAD_LINK}" alt="{postrow.attachment.DOWNLOAD_NAME}" /></span> - <br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br /> - <!-- ELSEIF postrow.attachment.IS_THUMBNAIL --> - <span class="postbody">{postrow.attachment.COMMENT}<br /> - <a href="{postrow.attachment.U_DOWNLOAD_LINK}" target="_blank"><img src="{postrow.attachment.THUMB_IMG}" alt="{postrow.attachment.DOWNLOAD_NAME}" border="0" /></a></span> - <br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br /> - <!-- ELSE --> - <span class="postbody">{postrow.attachment.COMMENT}</span><br /> - <span class="postbody">{postrow.attachment.UPLOAD_IMG} - <a href="{postrow.attachment.U_DOWNLOAD_LINK}" target="_blank">{postrow.attachment.DOWNLOAD_NAME}</a> - {postrow.attachment.FILESIZE} {postrow.attachment.SIZE_VAR}<br /></span> - <span class="gensmall">{postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br /> - <!-- ENDIF --> -<!-- END attachment --> diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html index 3711a88d66..973b4c6944 100644 --- a/phpBB/styles/subSilver/template/viewtopic_body.html +++ b/phpBB/styles/subSilver/template/viewtopic_body.html @@ -1,3 +1,4 @@ +<!-- $Id$ --> <!-- INCLUDE overall_header.html --> <table width="95%" cellspacing="2" cellpadding="2" border="0" align="center"> @@ -158,11 +159,16 @@ <tr> <td valign="top"> <span class="postbody">{postrow.MESSAGE}</span> - <!-- IF postrow.S_HAS_ATTACHMENTS --><!-- INCLUDE viewtopic_attach_body.html --><!-- ENDIF --> + <!-- IF postrow.S_HAS_ATTACHMENTS --> + <!-- BEGIN attachment --> + <br /><br /><hr />{postrow.attachment.DISPLAY_ATTACHMENT} + <!-- END attachment --> + <!-- ENDIF --> + <!-- IF postrow.S_DISPLAY_NOTICE --><span class="gensmall" style="color:red;"><br /><br />{L_DOWNLOAD_NOTICE}</span><!-- ENDIF --> <!-- IF postrow.SIGNATURE --><span class="postbody"><br />_________________<br />{postrow.SIGNATURE}</span><!-- ENDIF --> - <span class="gensmall">{postrow.EDITED_MESSAGE}</span> - <span class="gensmall">{postrow.BUMPED_MESSAGE}</span> + <!-- IF postrow.EDITED_MESSAGE --><span class="gensmall">{postrow.EDITED_MESSAGE}</span><!-- ENDIF --> + <!-- IF postrow.BUMPED_MESSAGE --><span class="gensmall">{postrow.BUMPED_MESSAGE}</span><!-- ENDIF --> </td> </tr> <tr> |