diff options
| author | makkalot <makkalot@gmail.com> | 2008-08-06 14:16:30 +0300 |
|---|---|---|
| committer | makkalot <makkalot@gmail.com> | 2008-08-06 14:16:30 +0300 |
| commit | 1ef788ff14e84f9e8d9d92b937d9415c129bb31c (patch) | |
| tree | 9a849ee7ea01cec8016e682b8ca7cac83ba53bf7 /funcweb | |
| parent | ee6f808c97ae4336c79e34e56d7d5eca97efc0ea (diff) | |
| download | func-1ef788ff14e84f9e8d9d92b937d9415c129bb31c.tar.gz func-1ef788ff14e84f9e8d9d92b937d9415c129bb31c.tar.xz func-1ef788ff14e84f9e8d9d92b937d9415c129bb31c.zip | |
remove the js functionality and jquery things from templates
Diffstat (limited to 'funcweb')
| -rw-r--r-- | funcweb/funcweb/templates/async_table.html | 8 | ||||
| -rw-r--r-- | funcweb/funcweb/templates/list_group.html | 2 | ||||
| -rw-r--r-- | funcweb/funcweb/templates/master.html | 5 | ||||
| -rw-r--r-- | funcweb/funcweb/templates/widgets.html | 2 |
4 files changed, 6 insertions, 11 deletions
diff --git a/funcweb/funcweb/templates/async_table.html b/funcweb/funcweb/templates/async_table.html index ca8849d..0614cc2 100644 --- a/funcweb/funcweb/templates/async_table.html +++ b/funcweb/funcweb/templates/async_table.html @@ -28,10 +28,10 @@ <td class="tableboxes"> <div class="newico" id="newico" py:if="job_pack[1] == 2"></div> <div class="changedimg" id="changedimg" py:if="job_pack[1] == 1"></div> - <span py:if="job_pack[0] == 0"><a href="#resultcontent" onclick="myj('#resultcontent').hide().load('/funcweb/check_job_status/${job_id}').show('slow');">RUNNING</a></span> - <span py:if="job_pack[0] == 1"><a href="#resultcontent" onclick="myj('#resultcontent').hide().load('/funcweb/check_job_status/${job_id}').show('slow');">FINISHED</a></span> - <span py:if="job_pack[0] == 3"><a href="#resultcontent" onclick="myj('#resultcontent').hide().load('/funcweb/check_job_status/${job_id}').show('slow');">PARTIAL</a></span> - <span py:if="job_pack[0] == 4"><a href="#resultcontent" onclick="myj('#resultcontent').hide().load('/funcweb/check_job_status/${job_id}').show('slow');">ERROR</a></span> + <span py:if="job_pack[0] == 0"><a href="#resultcontent" onclick="check_async_result('${job_id}');">RUNNING</a></span> + <span py:if="job_pack[0] == 1"><a href="#resultcontent" onclick="check_async_result('${job_id}');">FINISHED</a></span> + <span py:if="job_pack[0] == 3"><a href="#resultcontent" onclick="check_async_result('${job_id}');">PARTIAL</a></span> + <span py:if="job_pack[0] == 4"><a href="#resultcontent" onclick="check_async_result('${job_id}');">ERROR</a></span> </td> </tr> diff --git a/funcweb/funcweb/templates/list_group.html b/funcweb/funcweb/templates/list_group.html index 7471e18..cea4732 100644 --- a/funcweb/funcweb/templates/list_group.html +++ b/funcweb/funcweb/templates/list_group.html @@ -4,7 +4,7 @@ <div align="center" class="graytexts">Groups</div> <span py:for="group_name in groups"> - <div class="minionstextblue" id="groupstexts"><a href="#miniongroupcontents" onclick="myj('#miniongroupcontents').hide().load('/funcweb/list_host_by_group/${group_name}').show('slow');" >${group_name}</a></div> + <div class="minionstextblue" id="groupstexts"><a href="#miniongroupcontents" onclick="get_hosts_by_group('${group_name}');">${group_name}</a></div> <form action="/funcweb/remove_group" method="post" onsubmit="return !glob_submit(this,'groupscontent');" name="remove_form"> <input type="hidden" name="group_name" value="${group_name}"/> diff --git a/funcweb/funcweb/templates/master.html b/funcweb/funcweb/templates/master.html index 270814b..51948fe 100644 --- a/funcweb/funcweb/templates/master.html +++ b/funcweb/funcweb/templates/master.html @@ -8,7 +8,6 @@ py:replace="''" /> <title py:content="'Funcweb'"></title> - <script type="text/javascript" src="${tg.url('/funcweb/static/javascript/jquery.js')}" /> <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> <script type="text/javascript" src="${tg.url('/funcweb/static/javascript/ajax.js')}" /> @@ -26,10 +25,6 @@ <script src="${tg.url('/funcweb/static/javascript/expanding_form.js')}" type="text/javascript"/> <script src="${tg.url('/funcweb/static/javascript/async_tools.js')}" type="text/javascript"/> - <script type="text/javascript"> - jQuery._$ = MochiKit.DOM.getElement; - var myj = jQuery.noConflict(); - </script> </head> <body py:match="body" py:attrs="select('@*')"> diff --git a/funcweb/funcweb/templates/widgets.html b/funcweb/funcweb/templates/widgets.html index d898134..f85dfd7 100644 --- a/funcweb/funcweb/templates/widgets.html +++ b/funcweb/funcweb/templates/widgets.html @@ -13,7 +13,7 @@ ${ET(minion_form.display(displays_on='genshi'))} </span> <span py:if="not minion_form"> - <a href="#resultcontent" onclick="myj('#resultcontent').hide().load('/funcweb/execute_link/${minion}/${module}/${method}/').show('slow');">Run Method</a> + <a href="#resultcontent" onclick="execute_link_method('${minion}','${module}','${method}');">Run Method</a> </span> </div> <div class="errorbox" id="errorbox"> |