Move includes into templates directory

pull/5742/merge
Aleksander Machniak 8 years ago
parent 59951548a9
commit 9a670b9c1b

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:object name="aboutcontent" /> <roundcube:object name="aboutcontent" />
@ -17,4 +17,4 @@
</div> </div>
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,5 +1,5 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" /> <roundcube:include file="includes/menu.html" />
<h1 class="voice"><roundcube:label name="addressbook" /></h1> <h1 class="voice"><roundcube:label name="addressbook" /></h1>
@ -138,4 +138,4 @@
</ul> </ul>
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,5 +1,5 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" condition="!env:extwin && !env:framed" /> <roundcube:include file="includes/menu.html" condition="!env:extwin && !env:framed" />
<h1 class="voice"><roundcube:object name="pagetitle" /></h1> <h1 class="voice"><roundcube:object name="pagetitle" /></h1>
@ -86,50 +86,50 @@
<h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabelmessageheaders" /></h2> <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabelmessageheaders" /></h2>
<div class="compose-headers"> <div class="compose-headers">
<div id="compose_from" class="form-group row"> <div id="compose_from" class="form-group row">
<label for="_from" class="col-1 col-form-label"><roundcube:label name="from" /></label> <label for="_from" class="col-2 col-form-label"><roundcube:label name="from" /></label>
<div class="input-group col-11"> <div class="input-group col-10">
<roundcube:object name="composeHeaders" part="from" id="_from" form="form" tabindex="1" class="form-control" /> <roundcube:object name="composeHeaders" part="from" id="_from" form="form" tabindex="1" class="form-control" />
<a href="#identities" onclick="return rcmail.command('identities')" class="input-group-addon icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a> <a href="#identities" onclick="return rcmail.command('identities')" class="input-group-addon icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
</div> </div>
</div> </div>
<div id="compose_to" class="form-group row"> <div id="compose_to" class="form-group row">
<label for="_to" class="col-1 col-form-label"><roundcube:label name="to" /></label> <label for="_to" class="col-2 col-form-label"><roundcube:label name="to" /></label>
<div class="input-group col-11"> <div class="input-group col-10">
<roundcube:object name="composeHeaders" part="to" id="_to" form="form" tabindex="1" aria-required="true" data-recipient-input="true" /> <roundcube:object name="composeHeaders" part="to" id="_to" form="form" tabindex="1" aria-required="true" data-recipient-input="true" />
<a href="#add-header" data-popup="headers-menu" class="input-group-addon icon add" title="<roundcube:label name="addheader" />" tabindex="1"><span class="inner"><roundcube:label name="addheader" /></span></a> <a href="#add-header" data-popup="headers-menu" class="input-group-addon icon add" title="<roundcube:label name="addheader" />" tabindex="1"><span class="inner"><roundcube:label name="addheader" /></span></a>
</div> </div>
</div> </div>
<div id="compose_cc" class="hidden form-group row"> <div id="compose_cc" class="hidden form-group row">
<label for="_cc" class="col-1 col-form-label"><roundcube:label name="cc" /></label> <label for="_cc" class="col-2 col-form-label"><roundcube:label name="cc" /></label>
<div class="input-group col-11"> <div class="input-group col-10">
<roundcube:object name="composeHeaders" part="cc" id="_cc" form="form" tabindex="1" data-recipient-input="true" /> <roundcube:object name="composeHeaders" part="cc" id="_cc" form="form" tabindex="1" data-recipient-input="true" />
<a href="#delete" onclick="$('#_cc').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a> <a href="#delete" onclick="$('#_cc').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
</div> </div>
</div> </div>
<div id="compose_bcc" class="hidden form-group row"> <div id="compose_bcc" class="hidden form-group row">
<label for="_bcc" class="col-1 col-form-label"><roundcube:label name="bcc" /></label> <label for="_bcc" class="col-2 col-form-label"><roundcube:label name="bcc" /></label>
<div class="input-group col-11"> <div class="input-group col-10">
<roundcube:object name="composeHeaders" part="bcc" id="_bcc" form="form" tabindex="1" data-recipient-input="true" /> <roundcube:object name="composeHeaders" part="bcc" id="_bcc" form="form" tabindex="1" data-recipient-input="true" />
<a href="#delete" onclick="$('#_bcc').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a> <a href="#delete" onclick="$('#_bcc').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
</div> </div>
</div> </div>
<div id="compose_replyto" class="hidden form-group row"> <div id="compose_replyto" class="hidden form-group row">
<label for="_replyto" class="col-1 col-form-label"><roundcube:label name="replyto" /></label> <label for="_replyto" class="col-2 col-form-label"><roundcube:label name="replyto" /></label>
<div class="input-group col-11"> <div class="input-group col-10">
<roundcube:object name="composeHeaders" part="replyto" id="_replyto" form="form" tabindex="1" data-recipient-input="true" /> <roundcube:object name="composeHeaders" part="replyto" id="_replyto" form="form" tabindex="1" data-recipient-input="true" />
<a href="#delete" onclick="$('#_replyto').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a> <a href="#delete" onclick="$('#_replyto').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
</div> </div>
</div> </div>
<div id="compose_followupto" class="hidden form-group row"> <div id="compose_followupto" class="hidden form-group row">
<label for="_followupto" class="col-1 col-form-label"><roundcube:label name="followupto" /></label> <label for="_followupto" class="col-2 col-form-label"><roundcube:label name="followupto" /></label>
<div class="input-group col-11"> <div class="input-group col-10">
<roundcube:object name="composeHeaders" part="followupto" id="_followupto" form="form" tabindex="1" data-recipient-input="true" /> <roundcube:object name="composeHeaders" part="followupto" id="_followupto" form="form" tabindex="1" data-recipient-input="true" />
<a href="#delete" onclick="$('#_followupto').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a> <a href="#delete" onclick="$('#_followupto').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
</div> </div>
</div> </div>
<div id="compose_subject" class="form-group row"> <div id="compose_subject" class="form-group row">
<label for="compose-subject" class="col-1 col-form-label"><roundcube:label name="subject" /></label> <label for="compose-subject" class="col-2 col-form-label"><roundcube:label name="subject" /></label>
<roundcube:object name="composeSubject" id="_subject" form="form" tabindex="1" class="col-11 form-control" /> <roundcube:object name="composeSubject" id="_subject" form="form" tabindex="1" class="col-10 form-control" />
</div> </div>
</div> </div>
</div> </div>
@ -216,4 +216,4 @@
</ul> </ul>
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:label name="contactproperties" /></h1> <h1 class="voice"><roundcube:label name="contactproperties" /></h1>
@ -23,4 +23,4 @@
<roundcube:endif /> <roundcube:endif />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:object name="steptitle" /></h1> <h1 class="voice"><roundcube:object name="steptitle" /></h1>
@ -38,4 +38,4 @@
<roundcube:object name="photoUploadForm" id="upload-form" mode="smart" /> <roundcube:object name="photoUploadForm" id="upload-form" mode="smart" />
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="importcontacts" /></h1> <h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="importcontacts" /></h1>
@ -6,4 +6,4 @@
<roundcube:object name="importstep" class="propform" /> <roundcube:object name="importstep" class="propform" />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<div id="content" class="content" role="main"> <div id="content" class="content" role="main">
<div id="contact-details"> <div id="contact-details">
@ -11,4 +11,4 @@
</div> </div>
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="advsearch" /></h1> <h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="advsearch" /></h1>
@ -6,4 +6,4 @@
<roundcube:object name="searchform" id="advsearchform" class="tabbed" size=30 /> <roundcube:object name="searchform" id="advsearchform" class="tabbed" size=30 />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,7 +1,7 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:if condition="!env:framed && !env:extwin" /> <roundcube:if condition="!env:framed && !env:extwin" />
<roundcube:include file="/includes/menu.html" /> <roundcube:include file="includes/menu.html" />
<div id="content" class="content selected" role="main"> <div id="content" class="content selected" role="main">
<div class="header"> <div class="header">
<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a> <a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
@ -15,4 +15,4 @@ $__page_content
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:label name="folderproperties" /></h1> <h1 class="voice"><roundcube:label name="folderproperties" /></h1>
@ -10,4 +10,4 @@
<roundcube:button command="save" class="primary button save" label="save" /> <roundcube:button command="save" class="primary button save" label="save" />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,6 +1,6 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" /> <roundcube:include file="includes/menu.html" />
<roundcube:include file="/includes/settings-menu.html" /> <roundcube:include file="includes/settings-menu.html" />
<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="folders" /></h1> <h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="folders" /></h1>
@ -54,4 +54,4 @@
<roundcube:object name="folderfilter" id="folderlist-filter" class="listing" noheader="true" /> <roundcube:object name="folderfilter" id="folderlist-filter" class="listing" noheader="true" />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,6 +1,6 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" /> <roundcube:include file="includes/menu.html" />
<roundcube:include file="/includes/settings-menu.html" /> <roundcube:include file="includes/settings-menu.html" />
<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="identities" /></h1> <h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="identities" /></h1>
@ -36,4 +36,4 @@
<roundcube:object name="identityframe" id="preferences-frame" src="/watermark.html" title="arialabelidentityeditfrom" /> <roundcube:object name="identityframe" id="preferences-frame" src="/watermark.html" title="arialabelidentityeditfrom" />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:object name="steptitle" /></h1> <h1 class="voice"><roundcube:object name="steptitle" /></h1>
@ -10,4 +10,4 @@
<roundcube:button command="save" class="primary icon save" label="save" condition="!env:readonly" /> <roundcube:button command="save" class="primary icon save" label="save" condition="!env:readonly" />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:object name="productname" /> <roundcube:label name="login" /></h1> <h1 class="voice"><roundcube:object name="productname" /> <roundcube:label name="login" /></h1>
@ -19,4 +19,4 @@
<p class="noscriptwarning"><roundcube:label name="noscriptwarning" /></p> <p class="noscriptwarning"><roundcube:label name="noscriptwarning" /></p>
</noscript> </noscript>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,5 +1,5 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" /> <roundcube:include file="includes/menu.html" />
<h1 class="voice"><roundcube:label name="mail" /></h1> <h1 class="voice"><roundcube:label name="mail" /></h1>
@ -90,7 +90,7 @@
<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar"> <div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a> <a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
<span class="header-title"></span> <span class="header-title"></span>
<roundcube:include file="/includes/mail-menu.html" /> <roundcube:include file="includes/mail-menu.html" />
</div> </div>
<h2 id="aria-label-mailpreviewframe" class="voice"><roundcube:label name="arialabelmailpreviewframe" /></h2> <h2 id="aria-label-mailpreviewframe" class="voice"><roundcube:label name="arialabelmailpreviewframe" /></h2>
<roundcube:object name="messagecontentframe" <roundcube:object name="messagecontentframe"
@ -195,4 +195,4 @@
<roundcube:object name="messageimportform" id="uploadform" mode="smart" /> <roundcube:object name="messageimportform" id="uploadform" mode="smart" />
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,5 +1,5 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" condition="!env:framed && !env:extwin" /> <roundcube:include file="includes/menu.html" condition="!env:framed && !env:extwin" />
<roundcube:object name="mailboxlist" folder_filter="mail" type="js" /> <roundcube:object name="mailboxlist" folder_filter="mail" type="js" />
@ -11,7 +11,7 @@
<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar"> <div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a> <a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
<span class="header-title"></span> <span class="header-title"></span>
<roundcube:include file="/includes/mail-menu.html" /> <roundcube:include file="includes/mail-menu.html" />
</div> </div>
<roundcube:endif /> <roundcube:endif />
<div class="content" role="main"> <div class="content" role="main">
@ -53,4 +53,4 @@
</ul> </ul>
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,5 +1,5 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" condition="!env:framed && !env:extwin" /> <roundcube:include file="includes/menu.html" condition="!env:framed && !env:extwin" />
<h1 class="voice"><roundcube:label name="messageopenerror" /></h1> <h1 class="voice"><roundcube:label name="messageopenerror" /></h1>
@ -13,4 +13,4 @@
<div class="watermark"></div> <div class="watermark"></div>
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1> <h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1>
@ -84,4 +84,4 @@
</div> </div>
<roundcube:endif /> <roundcube:endif />
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<div id="content" class="content" role="main"> <div id="content" class="content" role="main">
<div id="printmessageframe"> <div id="printmessageframe">
@ -8,4 +8,4 @@
</div> </div>
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,6 +1,6 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" /> <roundcube:include file="includes/menu.html" />
<roundcube:include file="/includes/settings-menu.html" condition="env:task == 'settings'" /> <roundcube:include file="includes/settings-menu.html" condition="env:task == 'settings'" />
<div id="content" class="content selected" role="main"> <div id="content" class="content selected" role="main">
<div class="header"> <div class="header">
@ -12,4 +12,4 @@
<roundcube:object name="plugin.footer" /> <roundcube:object name="plugin.footer" />
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:object name="steptitle" /></h1> <h1 class="voice"><roundcube:object name="steptitle" /></h1>
@ -10,4 +10,4 @@
<roundcube:button command="save" class="primary button save" label="save" condition="!env:readonly" /> <roundcube:button command="save" class="primary button save" label="save" condition="!env:readonly" />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,6 +1,6 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" /> <roundcube:include file="includes/menu.html" />
<roundcube:include file="/includes/settings-menu.html" /> <roundcube:include file="includes/settings-menu.html" />
<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="responses" /></h1> <h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="responses" /></h1>
@ -36,4 +36,4 @@
<roundcube:object name="responseframe" id="preferences-frame" src="/watermark.html" title="arialabelresonseeditfrom" /> <roundcube:object name="responseframe" id="preferences-frame" src="/watermark.html" title="arialabelresonseeditfrom" />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,6 +1,6 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<roundcube:include file="/includes/menu.html" /> <roundcube:include file="includes/menu.html" />
<roundcube:include file="/includes/settings-menu.html" /> <roundcube:include file="includes/settings-menu.html" />
<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="preferences" /></h1> <h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="preferences" /></h1>
@ -24,4 +24,4 @@
<roundcube:object name="prefsframe" id="preferences-frame" src="/watermark.html" title="arialabelpreferencesform" /> <roundcube:object name="prefsframe" id="preferences-frame" src="/watermark.html" title="arialabelpreferencesform" />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

@ -1,4 +1,4 @@
<roundcube:include file="/includes/layout.html" /> <roundcube:include file="includes/layout.html" />
<h1 class="voice"><roundcube:object name="sectionname" /></h1> <h1 class="voice"><roundcube:object name="sectionname" /></h1>
@ -10,4 +10,4 @@
<roundcube:button command="save" class="primary button save" label="save" /> <roundcube:button command="save" class="primary button save" label="save" />
</div> </div>
<roundcube:include file="/includes/footer.html" /> <roundcube:include file="includes/footer.html" />

Loading…
Cancel
Save