diff options
| author | makkalot <makkalot@gmail.com> | 2008-06-15 00:24:22 +0300 |
|---|---|---|
| committer | makkalot <makkalot@gmail.com> | 2008-06-15 00:24:22 +0300 |
| commit | 6948a2fcbeba31fff17a1f08381ff103dbe655a2 (patch) | |
| tree | 69568fd1143df803abd376737faf4856b07b2ba7 /funcweb | |
| parent | 858723f6f4f3763040e02c5e9a2fa692ad97444f (diff) | |
| download | third_party-func-6948a2fcbeba31fff17a1f08381ff103dbe655a2.tar.gz third_party-func-6948a2fcbeba31fff17a1f08381ff103dbe655a2.tar.xz third_party-func-6948a2fcbeba31fff17a1f08381ff103dbe655a2.zip | |
some html work to showup method args
Diffstat (limited to 'funcweb')
| -rw-r--r-- | funcweb/funcweb/templates/master.html | 15 | ||||
| -rw-r--r-- | funcweb/funcweb/templates/method.html | 9 | ||||
| -rw-r--r-- | funcweb/funcweb/templates/minion.html | 5 | ||||
| -rw-r--r-- | funcweb/funcweb/templates/minions.html | 6 | ||||
| -rw-r--r-- | funcweb/funcweb/templates/module.html | 2 | ||||
| -rw-r--r-- | funcweb/funcweb/templates/run.html | 5 |
6 files changed, 24 insertions, 18 deletions
diff --git a/funcweb/funcweb/templates/master.html b/funcweb/funcweb/templates/master.html index ab14ca0..33d14f9 100644 --- a/funcweb/funcweb/templates/master.html +++ b/funcweb/funcweb/templates/master.html @@ -9,9 +9,8 @@ <title py:content="'Your Title Goes Here'"></title> <script type="text/javascript" src="${tg.url('/static/javascript/jquery.js')}" /> - - <link py:for="js in tg_js_head" py:strip="">${XML(js)}</link> - <link py:for="css in tg_css" py:strip="">${XML(css)}</link> + <link py:for="js in tg_js_head" py:strip="">${ET(js.display())}</link> + <link py:for="css in tg_css" py:strip="">${ET(css.display())}</link> <link href="${tg.url('/static/images/favicon.ico')}" type="image/vnd.microsoft.icon" rel="shortcut icon" /> @@ -20,10 +19,16 @@ <style type="text/css" media="screen"> @import url("/static/css/style.css"); - </style> + </style> + + <script type="text/javascript"> + jQuery._$ = MochiKit.DOM.getElement; + var myj = jQuery.noConflict(); + </script> + </head> <body py:match="body" py:attrs="select('@*')"> - <div py:for="js in tg_js_bodytop" py:replace="XML(js.display())" /> + <div py:for="js in tg_js_bodytop" py:replace="ET(js.display())" /> <div class="wrapper"> <div class="head"> <h1><a href="http://fedorahosted.org/func">Func</a></h1> diff --git a/funcweb/funcweb/templates/method.html b/funcweb/funcweb/templates/method.html index 1f67ce9..af20d86 100644 --- a/funcweb/funcweb/templates/method.html +++ b/funcweb/funcweb/templates/method.html @@ -2,18 +2,17 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude"> + + <body> <div class="method"> ${minion}.${module}.${method} - - <form action="" method="GET" onsubmit="$('#results').hide().load('/run/${minion}/${module}/${method}/').show('slow'); return false;"> + + <form action="" method="GET" onsubmit="myj('#results').hide().load('/run/${minion}/${module}/${method}/').show('slow'); return false;"> <input type="text" name="arguments" id="methodargs" class="methodargs"/> </form> <div class="results" id="results" /> - <script type="text/javascript"> - $(document).ready($("#methodargs").focus()); - </script> </div> </body> </html> diff --git a/funcweb/funcweb/templates/minion.html b/funcweb/funcweb/templates/minion.html index f171b00..dcb5c6f 100644 --- a/funcweb/funcweb/templates/minion.html +++ b/funcweb/funcweb/templates/minion.html @@ -2,12 +2,13 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude"> + <body> - <div id="modules" class="modules"> + <div id="modules" class="modules"> <ul py:for="minion, mods in modules.items()"> <h2>${minion[:13]}</h2> <li py:for="module in mods"> - <a href="#" onclick="$('#col4').hide();$('#col3').hide().load('/minion/${minion}/${module}').show('slow');">${module}</a> + <a href="#" onclick="myj('#col4').hide();myj('#col3').hide().load('/minion/${minion}/${module}').show('slow');">${module}</a> </li> </ul> </div> diff --git a/funcweb/funcweb/templates/minions.html b/funcweb/funcweb/templates/minions.html index 94ccbc1..605080f 100644 --- a/funcweb/funcweb/templates/minions.html +++ b/funcweb/funcweb/templates/minions.html @@ -3,14 +3,14 @@ xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="master.html"/> -<head/> + <head/> <body> - <div class="col-group"> + <div class="col-group"> <div class="col" id="col1"> <ul> <li><h2>minions</h2></li> <li py:for="minion in minions"> - <a onclick="$('#col3').hide();$('#col4').hide();$('#col2').hide().load('/minion/${minion}').show('slow');" href="#">${minion}</a> + <a onclick="jQuery('#col3').hide();myj('#col4').hide();myj('#col2').hide().load('/minion/${minion}').show('slow');" href="#">${minion}</a> </li> </ul> </div> diff --git a/funcweb/funcweb/templates/module.html b/funcweb/funcweb/templates/module.html index 2d433f6..f169007 100644 --- a/funcweb/funcweb/templates/module.html +++ b/funcweb/funcweb/templates/module.html @@ -7,7 +7,7 @@ <ul py:for="minion, methods in modules.items()"> <h2>${module}</h2> <li py:for="method in methods"> - <a href="#" onclick="$('#col4').hide().load('/minion/${minion}/${module}/${method}').show('slow')">${method}</a> + <a href="#" onclick="myj('#col2').hide();myj('#col4').hide().load('/method_display/${minion}/${module}/${method}').show('slow')">${method}</a> </li> </ul> </div> diff --git a/funcweb/funcweb/templates/run.html b/funcweb/funcweb/templates/run.html index cb17cdd..7ae047b 100644 --- a/funcweb/funcweb/templates/run.html +++ b/funcweb/funcweb/templates/run.html @@ -2,7 +2,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude"> -<body> - ${results.values()[0]} + <body> + + ${results.values()[0]} </body> </html> |