* Reorder sizing of tag cloud

6 files changed, 72 insertions, 42 deletions

diff --git a/skins/deltab/rlist.tmpl b/skins/deltab/rlist.tmpl
index 9ec1f5c..7b48a2d 100644
--- a/skins/deltab/rlist.tmpl
+++ b/skins/deltab/rlist.tmpl
@@ -287,17 +287,22 @@
   <?% IF param.keywords.size > 0 && allow('rk') %?>
   <p class="section"><?% gettext("Keywords",20) %?></p>
     <p>
-        <?% total = (param.keywordsmax - param.keywordsmin) %?>
-        <?% IF total > 5 %?>
-        <?% basis = 65 %?>
-        <?% size = 50 / total %?>
+        <?% steps = 25 %?>
+        <?% range = (param.keywordsmax - param.keywordsmin) %?>
+        <?% IF range > 2 %?>
+          <?% factor = steps / range %?>
+          <?% basis = param.keywordsmin %?>
         <?% ELSE %?>
-        <?% basis = 100 %?>
-        <?% size = 0 %?>
+          <?% factor = 1 %?>
+          <?% basis = param.keywordsmin - steps %?>
+        <?% END %?>
+        <?% IF param.keywords.size <  steps %?>
+          <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
         <?% FOREACH keyword = param.keywords %?>
+              <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
-                <font style="font-size:<?% (basis + (keyword.1 * size)) div 1 %?>%"><?% keyword.0 %?></font>
+                <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
               </a>&nbsp;
         <?% END %?>
     </p>
diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl
index f41ecef..81047f1 100644
--- a/skins/deltab/tlist.tmpl
+++ b/skins/deltab/tlist.tmpl
@@ -245,17 +245,22 @@
   <?% IF param.keywords.size > 0 && allow('tk') %?>
   <p class="section"><?% gettext("Keywords",20) %?></p>
     <p>
-        <?% total = (param.keywordsmax - param.keywordsmin) %?>
-        <?% IF total > 5 %?>
-        <?% basis = 65 %?>
-        <?% size = 50 / total %?>
+        <?% steps = 25 %?>
+        <?% range = (param.keywordsmax - param.keywordsmin) %?>
+        <?% IF range > 2 %?>
+          <?% factor = steps / range %?>
+          <?% basis = param.keywordsmin %?>
         <?% ELSE %?>
-        <?% basis = 100 %?>
-        <?% size = 0 %?>
+          <?% factor = 1 %?>
+          <?% basis = param.keywordsmin - steps %?>
+        <?% END %?>
+        <?% IF param.keywords.size <  steps %?>
+          <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
         <?% FOREACH keyword = param.keywords %?>
+              <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=tk&amp;data=<?% keyword.0 %?>">
-                <font style="font-size:<?% (basis + (keyword.1 * size)) div 1 %?>%"><?% keyword.0 %?></font>
+                <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
               </a>&nbsp;
         <?% END %?>
     </p>
diff --git a/skins/stone/rlist.tmpl b/skins/stone/rlist.tmpl
index 12d0393..f9d1c50 100644
--- a/skins/stone/rlist.tmpl
+++ b/skins/stone/rlist.tmpl
@@ -355,17 +355,22 @@
     <tr><td class="sidehead"><?% gettext("Keywords",20) %?></td></tr>
     <tr>
     <td class="sidetext">
-        <?% total = (param.keywordsmax - param.keywordsmin) %?>
-        <?% IF total > 5 %?>
-        <?% basis = 65 %?>
-        <?% size = 50 / total %?>
+        <?% steps = 25 %?>
+        <?% range = (param.keywordsmax - param.keywordsmin) %?>
+        <?% IF range > 2 %?>
+          <?% factor = steps / range %?>
+          <?% basis = param.keywordsmin %?>
         <?% ELSE %?>
-        <?% basis = 100 %?>
-        <?% size = 0 %?>
+          <?% factor = 1 %?>
+          <?% basis = param.keywordsmin - steps %?>
+        <?% END %?>
+        <?% IF param.keywords.size <  steps %?>
+          <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
         <?% FOREACH keyword = param.keywords %?>
+              <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
-                <font style="font-size:<?% (basis + (keyword.1 * size)) div 1 %?>%"><?% keyword.0 %?></font>
+                <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
               </a>&nbsp;
         <?% END %?>
     </td>
diff --git a/skins/stone/tlist.tmpl b/skins/stone/tlist.tmpl
index c1983ce..e260dfc 100644
--- a/skins/stone/tlist.tmpl
+++ b/skins/stone/tlist.tmpl
@@ -273,17 +273,22 @@
     <tr><td class="sidehead"><?% gettext("Keywords",20) %?></td></tr>
     <tr>
     <td class="sidetext">
-        <?% total = (param.keywordsmax - param.keywordsmin) %?>
-        <?% IF total > 5 %?>
-        <?% basis = 65 %?>
-        <?% size = 50 / total %?>
+        <?% steps = 25 %?>
+        <?% range = (param.keywordsmax - param.keywordsmin) %?>
+        <?% IF range > 2 %?>
+          <?% factor = steps / range %?>
+          <?% basis = param.keywordsmin %?>
         <?% ELSE %?>
-        <?% basis = 100 %?>
-        <?% size = 0 %?>
+          <?% factor = 1 %?>
+          <?% basis = param.keywordsmin - steps %?>
+        <?% END %?>
+        <?% IF param.keywords.size <  steps %?>
+          <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
         <?% FOREACH keyword = param.keywords %?>
+              <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=tk&amp;data=<?% keyword.0 %?>">
-                <font style="font-size:<?% (basis + (keyword.1 * size)) div 1 %?>%"><?% keyword.0 %?></font>
+                <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
               </a>&nbsp;
         <?% END %?>
     </td>
diff --git a/skins/stone_flat/rlist.tmpl b/skins/stone_flat/rlist.tmpl
index 5948f11..7d731be 100644
--- a/skins/stone_flat/rlist.tmpl
+++ b/skins/stone_flat/rlist.tmpl
@@ -318,17 +318,22 @@
     <tr><td class="sidehead"><?% gettext("Keywords",20) %?></td></tr>
     <tr>
     <td class="sidetext">
-        <?% total = (param.keywordsmax - param.keywordsmin) %?>
-        <?% IF total > 5 %?>
-        <?% basis = 65 %?>
-        <?% size = 50 / total %?>
+        <?% steps = 25 %?>
+        <?% range = (param.keywordsmax - param.keywordsmin) %?>
+        <?% IF range > 2 %?>
+          <?% factor = steps / range %?>
+          <?% basis = param.keywordsmin %?>
         <?% ELSE %?>
-        <?% basis = 100 %?>
-        <?% size = 0 %?>
+          <?% factor = 1 %?>
+          <?% basis = param.keywordsmin - steps %?>
+        <?% END %?>
+        <?% IF param.keywords.size <  steps %?>
+          <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
         <?% FOREACH keyword = param.keywords %?>
+              <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=rk&amp;data=<?% keyword.0 %?>">
-                <font style="font-size:<?% (basis + (keyword.1 * size)) div 1 %?>%"><?% keyword.0 %?></font>
+                <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
               </a>&nbsp;
         <?% END %?>
     </td>
diff --git a/skins/stone_flat/tlist.tmpl b/skins/stone_flat/tlist.tmpl
index c21bee3..598f733 100644
--- a/skins/stone_flat/tlist.tmpl
+++ b/skins/stone_flat/tlist.tmpl
@@ -272,17 +272,22 @@
     <tr><td class="sidehead"><?% gettext("Keywords",20) %?></td></tr>
     <tr>
     <td class="sidetext">
-        <?% total = (param.keywordsmax - param.keywordsmin) %?>
-        <?% IF total > 5 %?>
-        <?% basis = 65 %?>
-        <?% size = 50 / total %?>
+        <?% steps = 25 %?>
+        <?% range = (param.keywordsmax - param.keywordsmin) %?>
+        <?% IF range > 2 %?>
+          <?% factor = steps / range %?>
+          <?% basis = param.keywordsmin %?>
         <?% ELSE %?>
-        <?% basis = 100 %?>
-        <?% size = 0 %?>
+          <?% factor = 1 %?>
+          <?% basis = param.keywordsmin - steps %?>
+        <?% END %?>
+        <?% IF param.keywords.size <  steps %?>
+          <?% factor = factor * (param.keywords.size /  steps) %?>
         <?% END %?>
         <?% FOREACH keyword = param.keywords %?>
+              <?% level = 80 + (3*(((keyword.1 - basis) * factor) div 1)) %?>
               <a href="?cmd=tk&amp;data=<?% keyword.0 %?>">
-                <font style="font-size:<?% (basis + (keyword.1 * size)) div 1 %?>%"><?% keyword.0 %?></font>
+                <font style="font-size:<?% level %?>%"><?% keyword.0 %?></font>
               </a>&nbsp;
         <?% END %?>
     </td>