CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2007-09-26 21:36:56
Modified files:
luci/storage : index_html
Log message:
Cleanup
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/index_html.diff?cvsroot=cluster&r1=1.13&r2=1.14
--- conga/luci/storage/index_html 2007/09/25 18:54:59 1.13
+++ conga/luci/storage/index_html 2007/09/26 21:36:56 1.14
@@ -2,183 +2,152 @@
<metal:block define-slot="top_slot" />
<metal:block use-macro="here/global_defines/macros/defines" />
-<html xmlns="http://www.w3.org/1999/xhtml";
- xml:lang="en"
- lang="en"
- tal:attributes="lang language;
- xml:lang language">
-
- <head metal:use-macro="here/header/macros/html_header">
-
- <metal:fillbase fill-slot="base">
- <metal:baseslot define-slot="base">
- <base href="" tal:attributes="href here/renderBase" />
- </metal:baseslot>
- </metal:fillbase>
-
- <metal:headslot fill-slot="head_slot"
- tal:define="lang language;
- charset
site_properties/default_charset|string:utf-8">
-
- <metal:cache use-macro="here/global_cache_settings/macros/cacheheaders">
- Get the global cache headers located in global_cache_settings.
- </metal:cache>
-
- <metal:headslot define-slot="head_slot" />
- <tal:comment replace="nothing"> A slot where you can insert elements in
the header from a template </tal:comment>
- </metal:headslot>
-
- <metal:cssslot fill-slot="css_slot">
- <tal:comment replace="nothing"> A slot where you can insert CSS in the
header from a template </tal:comment>
-
- <style type="text/css"><!-- @import url(clusterportlet.css); --></style>
- <metal:cssslot define-slot="css_slot" />
- </metal:cssslot>
-
- <metal:javascriptslot fill-slot="javascript_head_slot">
- <tal:comment replace="nothing"> A slot where you can insert javascript
in the header from a template </tal:comment>
- <metal:javascriptslot define-slot="javascript_head_slot">
- <!-- async helper functions -->
- <script type="text/javascript" src="conga.js"></script>
- <script type="text/javascript" src="storage_async.js"></script>
- </metal:javascriptslot>
- </metal:javascriptslot>
-
- </head>
-
- <body tal:attributes="class here/getSectionFromURL;
- dir python:test(isRTL, 'rtl', 'ltr')">
- <div id="visual-portal-wrapper">
-
- <div id="portal-top" i18n:domain="plone">
-
- <div id="portal-header">
- <a class="hiddenStructure"
- accesskey="2"
- tal:attributes="href string:${request/ACTUAL_URL}#documentContent"
- i18n:translate="label_skiptocontent">Skip to content.</a>
-
- <a class="hiddenStructure"
- accesskey="6"
- tal:attributes="href
string:${request/ACTUAL_URL}#portlet-navigation-tree"
- i18n:translate="label_skiptonavigation">Skip to navigation</a>
-
- <a metal:use-macro="here/global_logo/macros/portal_logo">
- The portal logo, linked to the portal root
- </a>
- <div
metal:use-macro="here/global_sections/macros/portal_tabs" tal:condition="not:
isAnon" />
- </div>
-
- <div
metal:use-macro="here/global_personalbar/macros/personal_bar">
- The personal bar. (log in, logout etc...)
- </div>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
+ tal:attributes="
+ lang language;
+ xml:lang language">
+
+<head metal:use-macro="here/header/macros/html_header">
+ <metal:fillbase fill-slot="base">
+ <metal:baseslot define-slot="base">
+ <base href="" tal:attributes="href here/renderBase" />
+ </metal:baseslot>
+ </metal:fillbase>
+
+ <metal:headslot fill-slot="head_slot"
+ tal:define="
+ lang language;
+ charset site_properties/default_charset|string:utf-8">
+
+ <metal:cache
use-macro="here/global_cache_settings/macros/cacheheaders">
+ Get the global cache headers located in
global_cache_settings.
+ </metal:cache>
+
+ <metal:headslot define-slot="head_slot" />
+ </metal:headslot>
+
+ <metal:cssslot fill-slot="css_slot">
+ <style type="text/css">
+ <!-- @import url(clusterportlet.css); -->
+ </style>
+ <metal:cssslot define-slot="css_slot" />
+ </metal:cssslot>
+
+ <metal:javascriptslot fill-slot="javascript_head_slot">
+ <metal:javascriptslot define-slot="javascript_head_slot">
+ <!-- async helper functions -->
+ <script type="text/javascript" src="conga.js"></script>
+ <script type="text/javascript"
src="storage_async.js"></script>
+ </metal:javascriptslot>
+ </metal:javascriptslot>
+</head>
+
+<body tal:attributes="
+ class here/getSectionFromURL;
+ dir python:test(isRTL, 'rtl', 'ltr')">
+
+ <div id="visual-portal-wrapper">
+ <div id="portal-top" i18n:domain="plone">
+ <div id="portal-header">
+ <a class="hiddenStructure" accesskey="2"
+ tal:attributes="href
string:${request/ACTUAL_URL}#documentContent"
+
i18n:translate="label_skiptocontent">Skip to content.</a>
+
+ <a class="hiddenStructure" accesskey="6"
+ tal:attributes="href
string:${request/ACTUAL_URL}#portlet-navigation-tree"
+
i18n:translate="label_skiptonavigation">Skip to navigation</a>
+ <a
metal:use-macro="here/global_logo/macros/portal_logo" />
- <div class="visualClear"><!-- --></div>
+ <div
metal:use-macro="here/global_sections/macros/portal_tabs" tal:condition="not:
isAnon" />
+ </div>
- <tal:comment replace="nothing">
- The wrapper table. It contains the three columns. There's a table-less
- alternative in the plone_tableless skin layer that you can use if you
- prefer layouts that don't use tables.
- </tal:comment>
- <span tal:omit-tag=""
- tal:define="global pagetype request/pagetype|nothing;
- global storagename request/storagename|nothing"/>
- <span tal:omit-tag=""
- tal:condition="not: pagetype">
- <span tal:omit-tag=""
- tal:define="global pagetype python:'0'"/>
- </span>
- <span tal:omit-tag=""
- tal:define="stosystemss context/systems/storage/objectItems;
- global allowed_systems
python:here.allowed_systems(stosystemss);
- global access_to_host_allowed
python:here.access_to_host_allowed(storagename, allowed_systems)"/>
- <span tal:omit-tag=""
- tal:define="global ricci
python:here.get_ricci_communicator(storagename, allowed_systems);
- global storage_report nothing"/>
- <span tal:omit-tag=""
- tal:condition="storagename"
- tal:define="global report_cached
python:here.is_storage_report_cached(request.SESSION, storagename)">
- <span tal:omit-tag=""
- tal:condition="report_cached">
- <span tal:omit-tag=""
- tal:define="global storage_report
python:here.get_storage_report(ricci, request.SESSION)"/>
- </span>
- </span>
-
- <table id="portal-columns">
- <tbody>
- <tr>
- <tal:comment replace="nothing"> Start of the left column
</tal:comment>
- <td id="portal-column-one"
- metal:define-slot="column_one_slot"
- tal:condition="sl">
- <div class="visualPadding">
- <metal:portlets define-slot="portlets_one_slot">
- <metal:leftportlets
use-macro="here/clu_portlet_fetcher/macros/left_column">
- This instruction gets the portlets (boxes) for the left
column.
- </metal:leftportlets>
- </metal:portlets>
-
- </div>
- </td>
- <tal:comment replace="nothing"> End of the left column
</tal:comment>
-
- <tal:comment replace="nothing"> Start of main content block
</tal:comment>
- <td id="portal-column-content">
- <metal:block define-slot="content">
- <div id="content" metal:define-macro="content">
- <div class="documentContent" id="region-content">
- <a name="documentContent"></a>
- <metal:bodytext metal:define-slot="main"
tal:content="nothing">
- Page body text
- </metal:bodytext>
- <span tal:omit-tag="" tal:condition="not: storagename">
- <h1>Welcome to Storage Configuration Interface</h1>
- </span>
- <span tal:omit-tag="" tal:condition="storagename">
- <h1 tal:content="storagename"></h1>
- </span>
- </div>
- <metal:main-form-content
use-macro="here/form-chooser/macros/main-form" />
- <div style="padding-top: 10px;"
- tal:condition="python: report_cached
and not (request.has_key('pagetype') and
request['pagetype']=='commit_changes')">
- <form>
- <input type="hidden"
name="reprobe_url"
- tal:attributes="value
-
python:'%s?%s&reprobe_storage=true' % (request['ACTUAL_URL'],
request['QUERY_STRING'])" />
- <input class="form_button"
type="button" name="reprobe"
- value="Reprobe Storage"
-
onclick="javascript:location=this.form.reprobe_url.value;" />
- </form>
- </div>
- </div>
- </metal:block>
- </td>
- <tal:comment replace="nothing"> End of main content block
</tal:comment>
- </tr>
- </tbody>
- </table>
- <tal:comment replace="nothing"> end column wrapper </tal:comment>
-
- <div class="visualClear"><!-- --></div>
-
-
- <hr class="netscape4" />
-
- <metal:block i18n:domain="plone">
-
- <metal:footer use-macro="here/footer/macros/portal_footer">
- Footer
- </metal:footer>
-
- <metal:colophon use-macro="here/colophon/macros/colophon">
- The colophon area - contains details about the production of
- the site. Typically "powered by" buttons, standards, tools used.
- </metal:colophon>
- </metal:block>
+ <div
metal:use-macro="here/global_personalbar/macros/personal_bar" />
+ <div class="visualClear"><!-- --></div>
- </div>
+ <tal:block tal:define="
+ global pagetype request/pagetype|nothing;
+ global storagename request/storagename|nothing"
/>
+
+ <tal:block tal:condition="not: pagetype">
+ <tal:block tal:define="global pagetype
python:'0'" />
+ </tal:block>
+
+ <tal:block tal:define="
+ stosystemss context/systems/storage/objectItems;
+ global allowed_systems
python:here.allowed_systems(stosystemss);
+ global access_to_host_allowed
python:here.access_to_host_allowed(storagename, allowed_systems)" />
+
+ <tal:block tal:define="
+ global ricci
python:here.get_ricci_communicator(storagename, allowed_systems);
+ global storage_report nothing" />
+
+ <tal:block tal:condition="storagename"
+ tal:define="global report_cached
python:here.is_storage_report_cached(request.SESSION, storagename)">
+ <tal:block tal:condition="report_cached">
+ <tal:block tal:define="
+ global storage_report
python:here.get_storage_report(ricci, request.SESSION)" />
+ </tal:block>
+ </tal:block>
+
+ <table id="portal-columns">
+ <tbody>
+ <tr>
+ <td tal:condition="sl"
id="portal-column-one"
+
metal:define-slot="column_one_slot">
+
+ <div class="visualPadding">
+ <metal:portlets
define-slot="portlets_one_slot">
+
<metal:leftportlets use-macro="here/clu_portlet_fetcher/macros/left_column" />
+ </metal:portlets>
+
+ </div>
+ </td>
+
+ <td id="portal-column-content">
+ <metal:block define-slot="content">
+ <div id="content"
metal:define-macro="content">
+ <div
class="documentContent" id="region-content">
+ <a
name="documentContent"></a>
+ <metal:bodytext
metal:define-slot="main" tal:content="nothing" />
+ <tal:block
tal:condition="not: storagename">
+
<h1>Welcome to the Storage Configuration Interface</h1>
+ </tal:block>
+ <tal:block
tal:condition="storagename">
+ <h1
tal:content="storagename"></h1>
+ </tal:block>
+ </div>
+
+
<metal:main-form-content use-macro="here/form-chooser/macros/main-form" />
+
+ <div
style="padding-top: 10px;"
+
tal:condition="python: report_cached and not (request.has_key('pagetype') and
request['pagetype']=='commit_changes')">
+
+ <form>
+ <input
type="hidden" name="reprobe_url"
+
tal:attributes="
+
value python:'%s?%s&reprobe_storage=true' % (request['ACTUAL_URL'],
request['QUERY_STRING'])" />
+ <input
class="form_button" type="button"
+
name="reprobe" value="Reprobe Storage"
+
onclick="javascript:location=this.form.reprobe_url.value;" />
+ </form>
+
+ </div>
+ </div>
+ </metal:block>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <div class="visualClear"><!-- --></div>
+ <hr class="netscape4" />
+
+ <metal:block i18n:domain="plone">
+ <metal:footer
use-macro="here/footer/macros/portal_footer" />
+ <metal:colophon
use-macro="here/colophon/macros/colophon" />
+ </metal:block>
+ </div>
</body>
</html>
</metal:page>
