diff options
-rw-r--r-- | program/js/app.js | 2 | ||||
-rw-r--r-- | skins/default/templates/mail.html | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js index 666726cf0..d0b3bd0ca 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1731,7 +1731,7 @@ function rcube_webmail() { var update, add_url = ''; - if (sort_col === null) + if (typeof sort_col == 'undefined') sort_col = this.env.sort_col; if (!sort_order) sort_order = this.env.sort_order; diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html index b2d51a7f0..ae3dac1d1 100644 --- a/skins/default/templates/mail.html +++ b/skins/default/templates/mail.html @@ -187,6 +187,7 @@ </ul> </fieldset> <roundcube:endif /> +<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" /> <fieldset class="thinbordered"><legend><roundcube:label name="listcolumns" /></legend> <ul class="toolbarmenu"> <li><input type="checkbox" name="list_col[]" value="threads" id="cols_threads" checked="checked" disabled="disabled" /><label for="cols_threads" class="disabled"><roundcube:label name="threads" /></label></li> @@ -200,6 +201,8 @@ <li><input type="checkbox" name="list_col[]" value="flag" id="cols_flag" /><label for="cols_flag"><roundcube:label name="flag" /></label></li> </ul> </fieldset> +<roundcube:endif /> +<roundcube:if condition="!in_array('message_sort_col', (array)config:dont_override)" /> <fieldset class="thinbordered"><legend><roundcube:label name="listsorting" /></legend> <ul class="toolbarmenu"> <li><input type="radio" name="sort_col" value="" id="sort_default" /><label for="sort_default"><roundcube:label name="nonesort" /></label></li> @@ -212,12 +215,15 @@ <li><input type="radio" name="sort_col" value="size" id="sort_size" /><label for="sort_size"><roundcube:label name="size" /></label></li> </ul> </fieldset> +<roundcube:endif /> +<roundcube:if condition="!in_array('message_sort_order', (array)config:dont_override)" /> <fieldset><legend><roundcube:label name="listorder" /></legend> <ul class="toolbarmenu"> <li><input type="radio" name="sort_ord" value="ASC" id="sort_asc" /><label for="sort_asc"><roundcube:label name="asc" /></label></li> <li><input type="radio" name="sort_ord" value="DESC" id="sort_desc" /><label for="sort_desc"><roundcube:label name="desc" /></label></li> </ul> </fieldset> +<roundcube:endif /> <div> <roundcube:button command="menu-open" id="listmenucancel" type="input" class="button" label="cancel" /> <roundcube:button command="menu-save" id="listmenusave" type="input" class="button mainaction" label="save" /> |