Author: fredlin
Date: Tue Jan 22 01:56:26 2008
New Revision: 4023
URL: http://trac.turbogears.org/changeset/4023
Log:
toolbox2: move tginfo/help gadget into gadgets
Added:
projects/ToolBox2/trunk/toolbox2/gadgets/help.py
- copied unchanged from r3970,
/projects/ToolBox2/trunk/toolbox2/controllers/help.py
projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/
projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/__init__.py
projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/master.html
projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/tginfo.html
- copied unchanged from r3961,
/projects/ToolBox2/trunk/toolbox2/templates/tginfo.html
projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/tginfo.py
- copied, changed from r3970,
/projects/ToolBox2/trunk/toolbox2/controllers/tginfo.py
projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/tw_resources.html
Removed:
projects/ToolBox2/trunk/toolbox2/controllers/help.py
projects/ToolBox2/trunk/toolbox2/controllers/tginfo.py
projects/ToolBox2/trunk/toolbox2/templates/tginfo.html
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/setup.py
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 Tue Jan 22 01:56:26 2008
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: ToolBox2
-Version: 2.0a3dev-r4019
+Version: 2.0a3dev-r4021
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 Tue Jan 22
01:56:26 2008
@@ -25,20 +25,53 @@
toolbox2/controllers/help.py
toolbox2/controllers/root.py
toolbox2/controllers/template.py
-toolbox2/controllers/tginfo.py
toolbox2/gadgets/__init__.py
toolbox2/gadgets/design/__init__.py
toolbox2/gadgets/design/design.html
toolbox2/gadgets/design/design.py
toolbox2/gadgets/design/master.html
+toolbox2/gadgets/design/preview.html
toolbox2/gadgets/design/statics.py
toolbox2/gadgets/design/tw_resources.html
+toolbox2/gadgets/tginfo/__init__.py
+toolbox2/gadgets/tginfo/master.html
+toolbox2/gadgets/tginfo/tginfo.html
+toolbox2/gadgets/tginfo/tginfo.py
+toolbox2/gadgets/tginfo/tw_resources.html
toolbox2/lib/__init__.py
toolbox2/lib/app_globals.py
toolbox2/lib/base.py
toolbox2/lib/helpers.py
toolbox2/model/__init__.py
toolbox2/public/favicon.ico
+toolbox2/public/SyntaxHighlighter/Scripts/clipboard.swf
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushCSharp.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushCpp.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushCss.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushDelphi.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushJScript.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushJava.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushPhp.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushPython.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushRuby.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushSql.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushVb.js
+toolbox2/public/SyntaxHighlighter/Scripts/shBrushXml.js
+toolbox2/public/SyntaxHighlighter/Scripts/shCore.js
+toolbox2/public/SyntaxHighlighter/Styles/SyntaxHighlighter.css
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushCSharp.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushCpp.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushCss.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushDelphi.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushJScript.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushJava.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushPhp.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushPython.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushRuby.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushSql.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushVb.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shBrushXml.js
+toolbox2/public/SyntaxHighlighter/Uncompressed/shCore.js
toolbox2/public/css/style.css
toolbox2/public/images/header_inner.png
toolbox2/public/images/ok.png
@@ -412,7 +445,6 @@
toolbox2/templates/__init__.py
toolbox2/templates/index.html
toolbox2/templates/master.html
-toolbox2/templates/tginfo.html
toolbox2/templates/tw_resources.html
toolbox2/tests/__init__.py
toolbox2/tests/test_models.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 Tue Jan 22
01:56:26 2008
@@ -12,7 +12,7 @@
toolbox = toolbox2.command:ToolboxCommand
[turbogears2.toolboxcommand]
- info = toolbox2.controllers.tginfo:TurboGearsInfo
+ info = toolbox2.gadgets.tginfo.tginfo:TurboGearsInfo
tgapi = toolbox2.controllers.help:TurboGearsAPI
tbapi = toolbox2.controllers.help:ToolBoxAPI
design = toolbox2.gadgets.design.design:DesignMVC
Modified: projects/ToolBox2/trunk/setup.py
==============================================================================
--- projects/ToolBox2/trunk/setup.py (original)
+++ projects/ToolBox2/trunk/setup.py Tue Jan 22 01:56:26 2008
@@ -73,9 +73,9 @@
toolbox = toolbox2.command:ToolboxCommand
[turbogears2.toolboxcommand]
- info = toolbox2.controllers.tginfo:TurboGearsInfo
- tgapi = toolbox2.controllers.help:TurboGearsAPI
- tbapi = toolbox2.controllers.help:ToolBoxAPI
+ info = toolbox2.gadgets.tginfo.tginfo:TurboGearsInfo
+ tgapi = toolbox2.gadgets.help:TurboGearsAPI
+ tbapi = toolbox2.gadgets.help:ToolBoxAPI
design = toolbox2.gadgets.design.design:DesignMVC
""",
)
Added: projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/__init__.py
==============================================================================
Added: projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/master.html
==============================================================================
--- (empty file)
+++ projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/master.html Tue Jan 22
01:56:26 2008
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";
+ xmlns:py="http://genshi.edgewall.org/";
+ xmlns:xi="http://www.w3.org/2001/XInclude";
+ py:strip="">
+<?python
+import tg
+tg_flash = tg.get_flash()
+tg_status = tg.get_status()
+?>
+<xi:include href="${tg.url('tw_resources.html')}" />
+<head py:match="head" py:attrs="select('@*')">
+ <meta content="text/html; charset=UTF-8" http-equiv="content-type"
py:replace="''"/>
+ <title py:replace="''">Your title goes here</title>
+ <meta py:replace="select('*')"/>
+ <link rel="stylesheet" type="text/css" media="screen"
href="${tg.url('/css/style.css')}" />
+</head>
+
+<body py:match="body" py:attrs="select('@*')">
+ <h1 id="header" title="TurboGears 2.0"> </h1>
+
+ <div id="main_content">
+
+ <div id="${tg_status}" py:if="tg_flash" class="flash" py:content="tg_flash"
+ ></div>
+ <!-- End of status_block -->
+
+ <!-- Start of page template body -->
+ <div py:replace="select('*|text()')"/>
+ <!-- End of page template body -->
+ </div>
+ <!-- End of main_content -->
+
+ <div id="footer">
+ <img src="images/under_the_hood_blue.png" alt="TurboGears" />
+ <p>TurboGears 2 is an open source front-to-back web development
+ framework written in Python</p>
+
+ <p>Copyright © 2005-2008</p>
+ </div>
+ <!-- End of footer -->
+</body>
+
+</html>
Copied: projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/tginfo.py (from r3970,
/projects/ToolBox2/trunk/toolbox2/controllers/tginfo.py)
==============================================================================
--- /projects/ToolBox2/trunk/toolbox2/controllers/tginfo.py (original)
+++ projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/tginfo.py Tue Jan 22
01:56:26 2008
@@ -17,7 +17,7 @@
__icon__ = "categories/applications-system.png"
need_project = False
- @expose('toolbox2.templates.tginfo')
+ @expose('toolbox2.gadgets.tginfo.tginfo')
def index(self):
from tg.commands.info import retrieve_info
packages, plugins = retrieve_info()
Added: projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/tw_resources.html
==============================================================================
--- (empty file)
+++ projects/ToolBox2/trunk/toolbox2/gadgets/tginfo/tw_resources.html Tue Jan
22 01:56:26 2008
@@ -0,0 +1,20 @@
+<html xmlns="http://www.w3.org/1999/xhtml";
+ xmlns:py="http://genshi.edgewall.org/";
+ xmlns:xi="http://www.w3.org/2001/XInclude";
+ py:strip="">
+ <?python resources = context.w and context.w.retrieve_resources() or {} ?>
+ <head py:match="head" py:attrs="select('@*')">
+ <link py:for="rsrc in resources.get('head', [])"
+ py:replace="rsrc.display()" />
+ <meta py:replace="select('*|comment()|text()')" />
+ </head>
+ <body py:match="body" py:attrs="select('@*')">
+ <div py:for="rsrc in resources.get('bodytop', [])"
+ py:replace="rsrc.display()" />
+
+ <div py:replace="select('*|comment()|text()')" />
+
+ <div py:for="rsrc in resources.get('bodybottom', [])"
+ py:replace="rsrc.display()" />
+ </body>
+</html>
