Use treelist widget for folders list in Settings/Folders (#1489648)

3 files changed, 15 insertions, 14 deletions

diff --git a/skins/larry/settings.css b/skins/larry/settings.css
index 518c02741..0493e3018 100644
--- a/skins/larry/settings.css
+++ b/skins/larry/settings.css
@@ -244,27 +244,28 @@
 	bottom: 0;
 }
 
-#subscription-table {
-	table-layout: fixed;
-}
-
-#subscription-table tr.root td {
+#subscription-table li.root {
 	font-size: 5%;
 	line-height: 5px;
 	height: 5px;
 	padding: 2px;
 }
 
-#subscription-table td.name {
-	width: 85%;
+#subscription-table li a.name {
 	overflow: hidden;
 	text-overflow: ellipsis;
+	width: 100%;
+	float: left;
+}
+
+#subscription-table li input {
+	position: absolute;
+	right: 0;
 }
 
-#subscription-table td.subscribed {
-	min-width: 30px;
-	padding: 0 14px 0 2px;
-	text-align: right;
+html.chrome #subscription-table li input,
+html.opera #subscription-table li input {
+	margin-top: 6px;
 }
 
 .skinselection {
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index eed563133..f36479259 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -19,7 +19,7 @@
 <div id="folderslist" class="uibox listbox">
 <h2 id="folderslist-header" class="boxtitle"><span style="float:right"><roundcube:label name="subscribed" /></span><roundcube:label name="folders" /></h2>
 <div id="folderslist-content" class="scroller withfooter">
-<roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" class="listing" noheader="true" />
+	<roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" class="listing" />
 </div>
 <div id="folderslist-footer" class="boxfooter">
 	<roundcube:button command="create-folder" type="link" title="createfolder" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="createfolder" /><roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="listbutton groupactions" onclick="return UI.toggle_popup('mailboxmenu',event)" innerClass="inner" content="&#9881;" aria-haspopup="true" aria-expanded="false" aria-owns="mailboxoptionsmenu" />
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index f8c06f889..786e3546c 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -258,8 +258,6 @@ function rcube_mail_ui()
         new rcube_splitter({ id:'folderviewsplitter', p1:'#folderslist', p2:'#folder-details',
           orientation:'v', relative:true, start:266, min:180, size:12 }).init();
 
-        new rcube_scroller('#folderslist-content', '#folderslist-header', '#folderslist-footer');
-
         rcmail.addEventListener('setquota', update_quota);
       }
       else if (rcmail.env.action == 'identities') {
@@ -1136,6 +1134,8 @@ function rcube_mail_ui()
 
 /**
  * Roundcube Scroller class
+ *
+ * @deprecated Use treelist widget
  */
 function rcube_scroller(list, top, bottom)
 {