Author: fredlin
Date: Thu Jan 24 00:12:30 2008
New Revision: 4035
URL: http://trac.turbogears.org/changeset/4035

Log:
toolbox2: enhance front page

Modified:
   projects/ToolBox2/trunk/ToolBox2.egg-info/PKG-INFO
   projects/ToolBox2/trunk/ToolBox2.egg-info/SOURCES.txt
   projects/ToolBox2/trunk/ToolBox2.egg-info/entry_points.txt
   projects/ToolBox2/trunk/toolbox2/controllers/root.py
   projects/ToolBox2/trunk/toolbox2/gadgets/design/design.py
   projects/ToolBox2/trunk/toolbox2/gadgets/help.py
   projects/ToolBox2/trunk/toolbox2/templates/index.html

Modified: projects/ToolBox2/trunk/ToolBox2.egg-info/PKG-INFO
==============================================================================
--- projects/ToolBox2/trunk/ToolBox2.egg-info/PKG-INFO  (original)
+++ projects/ToolBox2/trunk/ToolBox2.egg-info/PKG-INFO  Thu Jan 24 00:12:30 2008
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ToolBox2
-Version: 2.0a3dev-r4021
+Version: 2.0a3dev-r4023
 Summary: TurboGears2 Toolbox
 Home-page: http://docs.turbogears.org/2.0/ToolBox
 Author: Fred Lin

Modified: projects/ToolBox2/trunk/ToolBox2.egg-info/SOURCES.txt
==============================================================================
--- projects/ToolBox2/trunk/ToolBox2.egg-info/SOURCES.txt       (original)
+++ projects/ToolBox2/trunk/ToolBox2.egg-info/SOURCES.txt       Thu Jan 24 
00:12:30 2008
@@ -22,10 +22,10 @@
 toolbox2/config/middleware.py
 toolbox2/controllers/__init__.py
 toolbox2/controllers/error.py
-toolbox2/controllers/help.py
 toolbox2/controllers/root.py
 toolbox2/controllers/template.py
 toolbox2/gadgets/__init__.py
+toolbox2/gadgets/help.py
 toolbox2/gadgets/design/__init__.py
 toolbox2/gadgets/design/design.html
 toolbox2/gadgets/design/design.py

Modified: projects/ToolBox2/trunk/ToolBox2.egg-info/entry_points.txt
==============================================================================
--- projects/ToolBox2/trunk/ToolBox2.egg-info/entry_points.txt  (original)
+++ projects/ToolBox2/trunk/ToolBox2.egg-info/entry_points.txt  Thu Jan 24 
00:12:30 2008
@@ -13,7 +13,7 @@
     
     [turbogears2.toolboxcommand]
     info = toolbox2.gadgets.tginfo.tginfo:TurboGearsInfo
-    tgapi = toolbox2.controllers.help:TurboGearsAPI
-    tbapi = toolbox2.controllers.help:ToolBoxAPI
+    tgapi = toolbox2.gadgets.help:TurboGearsAPI
+    tbapi = toolbox2.gadgets.help:ToolBoxAPI
     design = toolbox2.gadgets.design.design:DesignMVC
     
\ No newline at end of file

Modified: projects/ToolBox2/trunk/toolbox2/controllers/root.py
==============================================================================
--- projects/ToolBox2/trunk/toolbox2/controllers/root.py        (original)
+++ projects/ToolBox2/trunk/toolbox2/controllers/root.py        Thu Jan 24 
00:12:30 2008
@@ -38,7 +38,7 @@
             args = {
                 'path': name,
                 'label': getattr(tool,'__label__',tool),
-                'description': getattr(tool,'__doc__',''),
+                'description': self.tool_discriotioin(tool),
                 'version': getattr(tool,'__version__',''),
                 'author': getattr(tool,'__author__',''),
                 'email': getattr(tool,'__email__',''),
@@ -50,6 +50,12 @@
             }
             toolbox.append(args)
         return toolbox
+        
+    def tool_discriotioin(self, tool):
+        """format descriptions"""
+        description = getattr(tool,'__doc__','')
+        if description:
+            return description.replace('\n', '<br/>')
 
     def tool_icon(self,tool):
         """set icon"""

Modified: projects/ToolBox2/trunk/toolbox2/gadgets/design/design.py
==============================================================================
--- projects/ToolBox2/trunk/toolbox2/gadgets/design/design.py   (original)
+++ projects/ToolBox2/trunk/toolbox2/gadgets/design/design.py   Thu Jan 24 
00:12:30 2008
@@ -25,7 +25,7 @@
     __copyright__ = "Copyright 2008 Fred Lin"
     __license__ = "MIT"
     __group__ = "Design"
-    __icon__ = "actions/document-open.png"
+    __icon__ = "actions/edit-paste.png"
     need_project = True
     
     statics = statics()

Modified: projects/ToolBox2/trunk/toolbox2/gadgets/help.py
==============================================================================
--- projects/ToolBox2/trunk/toolbox2/gadgets/help.py    (original)
+++ projects/ToolBox2/trunk/toolbox2/gadgets/help.py    Thu Jan 24 00:12:30 2008
@@ -3,8 +3,8 @@
 from tg import expose, redirect
 
 class ToolBoxAPI(Controller):
-    """TurboGears ToolBox API.
-       Show ToolBox API information
+    """ToolBox API.
+       Show TurboGears 2 ToolBox API information
     """
     __label__ ="ToolBox 2 API"
     __version__ = "1.0"

Modified: projects/ToolBox2/trunk/toolbox2/templates/index.html
==============================================================================
--- projects/ToolBox2/trunk/toolbox2/templates/index.html       (original)
+++ projects/ToolBox2/trunk/toolbox2/templates/index.html       Thu Jan 24 
00:12:30 2008
@@ -29,7 +29,7 @@
                 </td>
                 <td valign="top">
                 <h4><a href="${gadget['path']}/">${gadget['label']}</a> in 
${gadget['group']}</h4>
-                ${gadget['description']}
+                ${HTML(gadget['description'])}
                 </td>
                 </div>
             </tr>

Reply via email to