- Make search scope selectable in UI - Disable thread mode when searching o...

Thomas Bruederli

2014-01-20 1bbf8c48868efb87baab7ae71721f2c9ad408e65

 skins/larry/templates/mail.html

@@ -5,8 +5,8 @@
<roundcube:include file="/includes/links.html" />
<style type="text/css">
<roundcube:if condition="config:preview_pane == true" />
   #mailview-top { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-48 : 276" />px; }
   #mailview-bottom { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+6 : 330" />px; height: auto; }
   #mailview-top { height: 276px; }
   #mailview-bottom { top: 330px; height: auto; display: block; }
   #mailpreviewframe { display: block; }
<roundcube:endif />
</style>
@@ -27,7 +27,6 @@
<div id="mailview-left">

<!-- folders list -->
<div id="folderlist-header"></div>
<div id="mailboxcontainer" class="uibox listbox">
<div id="folderlist-content" class="scroller withfooter">
<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing" folder_filter="mail" unreadwrap="%s" />
@@ -70,20 +69,15 @@
<div id="messagelistcontainer" class="boxlistcontent">
<roundcube:object name="messages"
   id="messagelist"
   class="records-table sortheader"
   class="records-table messagelist sortheader fixedheader"
   optionsmenuIcon="true" />
</div>

<!-- list footer -->
<div id="messagelistfooter">
   <div id="listcontrols">
      <roundcube:if condition="env:threads" />
         <a href="#list" class="iconbutton listmode" id="maillistmode" title="<roundcube:label name='list' />">List</a>
         <a href="#threads" class="iconbutton threadmode" id="mailthreadmode" title="<roundcube:label name='threads' />">Threads</a>
      <roundcube:else />
         <a href="#list" class="iconbutton listmode selected" title="<roundcube:label name='list' />" onclick="return false">List</a>
         <a href="#threads" class="iconbutton threadmode disabled" title="<roundcube:label name='threads' />" onclick="return false">Threads</a>
      <roundcube:endif />
      <roundcube:button href="#list" command="set-listmode" prop="list" class="iconbutton listmode disabled" classAct="iconbutton listmode" id="maillistmode" title="list" content="List" />
      <roundcube:button href="#threads" command="set-listmode" prop="threads" class="iconbutton threadmode disabled" classAct="iconbutton threadmode" id="mailthreadmode" title="threads" content="Threads" />
   </div>
   
   <div id="listselectors">
@@ -112,11 +106,9 @@

<div id="mailview-bottom" class="uibox">

<div id="mailpreviewframe">
<div id="mailpreviewframe" class="iframebox">
<roundcube:object name="messagecontentframe" id="messagecontframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
</div>

<roundcube:object name="message" id="message" class="statusbar" />

</div><!-- end mailview-bottom -->

@@ -124,7 +116,7 @@

</div><!-- end mainscreen -->

<div><!-- end minwidth -->
</div><!-- end minwidth -->

<div id="searchmenu" class="popupmenu">
   <ul class="toolbarmenu">
@@ -135,6 +127,10 @@
      <li><label><input type="checkbox" name="s_mods[]" value="bcc" id="s_mod_bcc" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="bcc" /></span></label></li>
      <li><label><input type="checkbox" name="s_mods[]" value="body" id="s_mod_body" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="body" /></span></label></li>
      <li><label><input type="checkbox" name="s_mods[]" value="text" id="s_mod_text" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="msgtext" /></span></label></li>
      <li class="separator" id=""><label><roundcube:label name="searchscope" /></label></li>
      <li><label><input type="radio" name="s_scope" value="base" id="s_scope_base" onclick="UI.set_searchscope(this)" /> <span><roundcube:label name="currentfolder" /></span></label></li>
      <li><label><input type="radio" name="s_scope" value="sub" id="s_scope_sub" onclick="UI.set_searchscope(this)" /> <span><roundcube:label name="subfolders" /></span></label></li>
      <li><label><input type="radio" name="s_scope" value="all" id="s_scope_all" onclick="UI.set_searchscope(this)" /> <span><roundcube:label name="allfolders" /></span></label></li>
   </ul>
</div>

@@ -228,7 +224,7 @@
</div>

<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='importmessages' />">
   <roundcube:object name="messageimportform" id="uploadform" attachmentFieldSize="40" buttons="no" />
   <roundcube:object name="messageimportform" id="uploadform" buttons="no" />
   <div class="formbuttons">
      <roundcube:button command="import-messages" type="input" class="button mainaction" label="upload" />
      <roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />