add new widgets to collapse categories, unify behaviour wnen clicking on category...

diff --git a/functions.php b/functions.php
index 3c21eda847005d7afc24e653d0a55d5f930f0b7a..b616858b66222d46e2dd6e7923c3f16b97d88579 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4087,23 +4087,27 @@
 
                        $catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread";
 
-                       print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
-                               <a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>";
-
                        if ($can_browse) {
-                               print "<a href=\"#\" onclick=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">";
+                               $browse_cat_link = "onclick=\"javascript:viewCategory($cat_id)\"";
+                               $inner_title_class = "catTitle";
                        } else {
-                               print "<span id=\"FCAP-$cat_id\">";
+                               $browse_cat_link = "";
+                               $inner_title_class = "catTitleNL";
                        }
 
+                       print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
+                               <img onclick=\"toggleCollapseCat($cat_id)\"
+                                       title=\"".__('Click to collapse category')."\"
+                                       src=\"images/cat-collapse.png\"><span class=\"$inner_title_class\" 
+                                       id=\"FCATN-$cat_id\" $browse_cat_link
+                               \">$tmp_category</span>";
+
+                       print "<span id=\"FCAP-$cat_id\">";
+
                        print " <span id=\"FCATCTR-$cat_id\" 
                                class=\"$catctr_class\">($cat_unread)</span> $ellipsis";
 
-                       if ($can_browse) {
-                               print "</a>";
-                       } else {
-                               print "</span>";
-                       }
+                       print "</span>";
 
                        print "</li>";
 

diff --git a/images/cat-collapse.png b/images/cat-collapse.png
new file mode 100644 (file)
index 0000000..46152e7
Binary files /dev/null and b/images/cat-collapse.png differ

diff --git a/themes/compat/theme.css b/themes/compat/theme.css
index 7b5baef41edf031b5bd342dd6df68c02642ab4d9..fab031301d8dc8db07f22a4b08287b4e727c3fe3 100644 (file)
--- a/themes/compat/theme.css
+++ b/themes/compat/theme.css
@@ -54,14 +54,13 @@ ul.feedList li.feedCat {
        margin : 0px;
        padding : 3px 0px 3px 0px;
        color : #707070;
-       font-size : x-small;
 }
 
-ul.feedList li.feedCat a {
+ul.feedList li.feedCat span.catTitle {
        color : #707070;
 }
 
-ul.feedList li.feedCat a:hover {
+ul.feedList li.feedCat span.catTitle:hover {
        color : #5050aa;
 }
 

diff --git a/themes/graycube/theme.css b/themes/graycube/theme.css
index b7d0ac8b6c9045d4bcf8c82604edb3789b4c8c4b..11567efd38d2693e8042d8f10be3b7f41a2c596c 100644 (file)
--- a/themes/graycube/theme.css
+++ b/themes/graycube/theme.css
@@ -158,7 +158,6 @@ div.postReply > div.postHeader {
 
 ul.feedList {
        list-style-type : none;
-       margin : 5px;
        padding : 0px 0px 0px 5px;
        font-size : 9pt;
 }
@@ -174,13 +173,13 @@ ul.feedList li.feedCat {
        font-size : 9pt;
 }
 
-ul.feedList li.feedCat a:hover {
+ul.feedList li.feedCat span.catTitle:hover {
        color : black;
 }
 
 ul.feedCatList {
        list-style-type : none;
-       margin : 0px 0px 0px 10px;
+       margin : 0px 0px 0px 15px;
        padding : 0px;  
 }
 

diff --git a/tt-rss.css b/tt-rss.css
index e52d4717a7903fa91e30a0dcafdf53da6b3350ed..9e8dfb43b71ae2d6fb26eb503c07f340de2a93d3 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -74,7 +74,7 @@ div.postReply span.author {
 
 ul.feedList {
        list-style-type : none;
-       margin : 5px;
+       margin : 5px 5px 5px 0px;
        padding : 0px 0px 0px 5px;
        font-size : 12px;
        font-family : "Lucida Grande", Tahoma, Arial, sans-serif;
@@ -87,11 +87,12 @@ ul.feedList li.feedCat {
        font-size : 12px;
 }
 
-ul.feedList li.feedCat a {
+ul.feedList li.feedCat span.catTitle {
        color : #707070;
+       cursor : pointer;
 }
 
-ul.feedList li.feedCat a:hover {
+ul.feedList li.feedCat span.catTitle:hover {
        color : #4684ff;
 }
 
@@ -108,7 +109,7 @@ ul.feedList li.feedCatSelected a {
 
 ul.feedCatList {
        list-style-type : none;
-       margin : 0px 0px 0px 15px;
+       margin : 0px 0px 0px 20px;
        padding : 0px;  
 }