Show message count in folder list and hint when creating a subfolder

3 files changed, 35 insertions, 12 deletions

diff --git a/skins/default/common.css b/skins/default/common.css
index 308953bf5..82e1d409d 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -107,6 +107,11 @@ img
   font-size: 11px;
 }
 
+.hint
+{
+  color: #666;
+  font-size: 11px;
+}
 
 /** common user interface objects */
 
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 53e948c7e..3d182963e 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -69,8 +69,8 @@ span.tablink-selected a
 
 #folder-manager
 {
-  width: 500px;
-  bottom: 120px;
+  width: 540px;
+  bottom: 140px;
   overflow: auto;
   border: 1px solid #999999;
   height: expression((parseInt(document.documentElement.clientHeight)-215)+'px');
@@ -119,8 +119,8 @@ span.tablink-selected a
 #bottomboxes
 {
   position: absolute;
-  width: 500px;
-  height: 100px;
+  width: 540px;
+  height: 120px;
   left: 20px;
   bottom: 20px;
 }
@@ -142,7 +142,7 @@ div.boxtitle,
 
 div.settingsbox
 {
-  width: 500px;
+  width: 540px;
   margin-top: 20px;
   margin-bottom: 20px;
   border: 1px solid #999999;
@@ -157,13 +157,12 @@ div.settingspart
 #subscription-table
 {
   width: 100%;
-  table-layout: fixed;
 }
 
 #subscription-table tbody td
 {
   padding-left: 6px;
-  padding-right: 20px;
+  padding-right: 10px;
   white-space: nowrap;
   border-bottom: 1px solid #EBEBEB;
   background-color: #F9F9F9;
@@ -183,12 +182,30 @@ div.settingspart
   background-color: #FFFFA6;
 }
 
-#subscription-table td.name
+#subscription-table thead td.name
+{
+  width: 240px;
+}
+
+#subscription-table thead td.msgcount
+{
+  width: 70px;
+}
+
+#subscription-table thead td.subscribed
+{
+  width: 60px;
+}
+
+#subscription-table tbody td.msgcount,
+#subscription-table tbody td.subscribed
 {
-  width: 280px;
+  padding-left: 18px;
 }
 
-#subscription-table td.subscribed
+#subscription-table thead td.rename,
+#subscription-table thead td.delete
 {
-  width: 80px;
+  width: 20px;
+  text-align: center;
 }
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index 93f3caabb..16379723e 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -26,8 +26,9 @@
 
 <div class="settingspart">
 <roundcube:label name="foldername" />:&nbsp;
-<roundcube:object name="createfolder" form="subscriptionform" />
+<roundcube:object name="createfolder" form="subscriptionform" hintbox="rcmailaddfolderhint" />
 <roundcube:button command="create-folder" type="input" class="button" label="create" />
+<div id="rcmailaddfolderhint" class="hint" style="margin-top:1em; height:16px"></div>
 </div>
 </div>