Changeset c745fd in indico

Timestamp:

03/28/11 14:20:39 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

4ac79f9

Parents:

ca9b88

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (03/22/11 09:24:50)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (03/28/11 14:20:39)

Message:

[FIX] Fix ugly legend display in categOverview

• truncate category name
• display full category name in tooltip
• fixes #699

Location:

indico/MaKaC/webinterface

Files:

• pages/category.py (modified) (3 diffs)
• tpls/CategoryOverview.tpl (modified) (1 diff)

indico/MaKaC/webinterface/pages/category.py

@@ -42 +42 @@
 from MaKaC.common.timezoneUtils import DisplayTZ,nowutc
 from pytz import timezone
+from MaKaC.common.TemplateExec import truncateTitle
 
 
@@ -824 +825 @@
                 categ=cm.getById(str(icon))
                 otherOW = self._ow.getOverviewOtherCateg(categ)
-                a=(""" <a href="%s" style="font-size: 1.0em;"><img src="%s" width="16" height="16" border="0">&nbsp;%s</a>  <br/>""" %(\
-                                        vars["categOverviewURLGen"]( otherOW ),\
-                                        urlHandlers.UHCategoryIcon.getURL(categ),\
-                                        categ.getName().replace(" ","&nbsp;")))
+                a=(""" <a href="%s" style="font-size: 1.0em;" onmouseover="IndicoUI.Widgets.Generic.tooltip(this, event, '%s')"><img src="%s" width="16" height="16" border="0">&nbsp;%s</a>  <br/>""" %(
+                                        vars["categOverviewURLGen"]( otherOW ),
+                                        categ.getName(),
+                                        urlHandlers.UHCategoryIcon.getURL(categ),
+                                        truncateTitle(categ.getName(), 20)))
                 if not a in l:
                     l.append(a)
@@ -1596 +1598 @@
                 selected = "selected"
             if topcat.getId() != "0":
-                from MaKaC.common.TemplateExec import truncateTitle
                 vis.append("""<option value="%s" %s>%s</option>""" % (level, selected, truncateTitle(topcat.getName(), 70)))
             topcat = topcat.getOwner()

indico/MaKaC/webinterface/tpls/CategoryOverview.tpl

@@ -49 +49 @@
                             <% if key: %>
                                 <br><h1><%= _("Legend") %>:</h1>
-                                <div style="margin: 10px 0 30px 10px;width:180px;"><%= key %></div>
+                                <div style="margin: 10px 0 30px 10px;width:180px;overflow:hidden;white-space:nowrap;"><%= key %></div>
                             <% end %>
                         </div>