diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-10-27 16:12:37 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-10-27 16:12:37 +0200 |
| commit | ddafe4e4109a8d6d412c3c138412ee2ca3d58dbf (patch) | |
| tree | 25bf6c599459a00b75c2ce95b59520d1e7ede7ec /skins/classic/templates | |
| parent | f2d3fc1b5d66013c265d82891b8526389303eff3 (diff) | |
| parent | 033cb2105aebf06d46ba13471de5dc5dc547e7bd (diff) | |
Merge branch 'dev-compose-newwindow'
Diffstat (limited to 'skins/classic/templates')
| -rw-r--r-- | skins/classic/templates/compose.html | 10 | ||||
| -rw-r--r-- | skins/classic/templates/message.html | 7 | ||||
| -rw-r--r-- | skins/classic/templates/messagepreview.html | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html index 23998ee0f..e2164659c 100644 --- a/skins/classic/templates/compose.html +++ b/skins/classic/templates/compose.html @@ -15,15 +15,22 @@ } </style> </head> +<roundcube:if condition="env:extwin" /> +<body class="extwin" onload="rcube_init_mail_ui()"> +<roundcube:else /> <body onload="rcube_init_mail_ui()"> - <roundcube:include file="/includes/taskbar.html" /> <roundcube:include file="/includes/header.html" /> +<roundcube:endif /> <form name="form" action="./" method="post"> <div id="messagetoolbar"> +<roundcube:if condition="env:extwin" /> + <roundcube:button command="close" type="link" class="button back" classAct="button back" classSel="button backSel" title="close" content=" " /> +<roundcube:else /> <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " /> +<roundcube:endif /> <roundcube:button command="send" type="link" class="buttonPas send" classAct="button send" classSel="button sendSel" title="sendmessage" content=" " /> <roundcube:if condition="config:enable_spellcheck" /> <span class="dropbutton"> @@ -64,6 +71,7 @@ <td class="editfield formlinks"> <roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" /> <a href="#identities" onclick="return rcmail.command('identities')"><roundcube:label name="editidents" /></a> + <roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" condition="!env:extwin" /> </td> </tr><tr> <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td> diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html index c03376e4a..9b7cb9f1c 100644 --- a/skins/classic/templates/message.html +++ b/skins/classic/templates/message.html @@ -12,13 +12,19 @@ } </style> </head> +<roundcube:if condition="env:extwin" /> +<body class="extwin" onload="rcube_init_mail_ui()"> +<roundcube:else /> <body onload="rcube_init_mail_ui()"> <roundcube:include file="/includes/taskbar.html" /> <roundcube:include file="/includes/header.html" /> +<roundcube:endif /> + <roundcube:include file="/includes/messagetoolbar.html" /> <div id="mainscreen"> +<roundcube:if condition="!env:extwin" /> <div id="mailleftcontainer"> <div id="mailboxlist-container"> <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div> @@ -28,6 +34,7 @@ <div class="boxfooter"></div> </div> </div> +<roundcube:endif /> <div id="messageframe"> <div class="boxlistcontent" style="top:0; overflow-x:auto"> diff --git a/skins/classic/templates/messagepreview.html b/skins/classic/templates/messagepreview.html index a606311e1..78b2306f6 100644 --- a/skins/classic/templates/messagepreview.html +++ b/skins/classic/templates/messagepreview.html @@ -7,7 +7,7 @@ <body class="iframe"> <div class="messageheaderbox"> -<roundcube:button command="permaurl" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="messageviewlink" target="_blank" /> +<roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" /> <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" /> <roundcube:object name="messageFullHeaders" id="full-headers" /> <roundcube:object name="messageAttachments" id="attachment-list" /> |