[rhmessaging-commits] rhmessaging commits: r2263 - mgmt/trunk/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Thu Aug 7 15:46:22 EDT 2008
Author: eallen
Date: 2008-08-07 15:46:21 -0400 (Thu, 07 Aug 2008)
New Revision: 2263
Modified:
mgmt/trunk/cumin/python/cumin/brokercluster.strings
mgmt/trunk/cumin/python/cumin/brokerprofile.strings
mgmt/trunk/cumin/python/cumin/exchange.py
mgmt/trunk/cumin/python/cumin/exchange.strings
mgmt/trunk/cumin/python/cumin/page.py
mgmt/trunk/cumin/python/cumin/page.strings
mgmt/trunk/cumin/python/cumin/queue.py
mgmt/trunk/cumin/python/cumin/stat.strings
mgmt/trunk/cumin/python/cumin/util.py
mgmt/trunk/cumin/python/cumin/widgets.py
mgmt/trunk/cumin/python/cumin/widgets.strings
Log:
Added help buttons to modal forms.
Tidied up some xhtml syntax.
Modified: mgmt/trunk/cumin/python/cumin/brokercluster.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokercluster.strings 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/brokercluster.strings 2008-08-07 19:46:21 UTC (rev 2263)
@@ -40,7 +40,7 @@
[BrokerClusterView.html]
{status}
-<h1><img src="resource?name=cluster-36.png"/>{title}</h1>
+<h1><img src="resource?name=cluster-36.png" alt="cluster" />{title}</h1>
<table class="props">
<tr><th>Name</th><td>{name}</td></tr>
@@ -91,7 +91,7 @@
{hidden_inputs}
</div>
<div class="foot">
- <a class="help action" href="{href}" target="help">Help</a>
+ {help}
{submit}
{cancel}
</div>
Modified: mgmt/trunk/cumin/python/cumin/brokerprofile.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerprofile.strings 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/brokerprofile.strings 2008-08-07 19:46:21 UTC (rev 2263)
@@ -17,7 +17,7 @@
</tr>
[BrokerProfileView.html]
-<h1><img src="resource?name=profile-36.png"/> {title}</h1>
+<h1><img src="resource?name=profile-36.png" alt="profile" /> {title}</h1>
<table class="props">
<tr><th>Name</th><td>{name}</td></tr>
@@ -87,7 +87,7 @@
{hidden_inputs}
</div>
<div class="foot">
- <a class="help action" href="{href}" target="help">Help</a>
+ {help}
{submit}
{cancel}
</div>
Modified: mgmt/trunk/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/exchange.py 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/exchange.py 2008-08-07 19:46:21 UTC (rev 2263)
@@ -36,10 +36,8 @@
def __init__(self, app, name):
super(ExchangeSet, self).__init__(app, name)
- # exchange names we don't want to allow to remove
- skips = ["", "amq.direct", "amq.topic", "amq.fanout",
- "amq.match", "amq.xml", "qpid.management"]
- self.ids = FilteredCheckboxIdColumn(app, "id", self, "name", skips)
+ self.ids = FilteredCheckboxIdColumn(app, "id", self, "name",
+ ExchangeInfo.get_builtins())
self.add_column(self.ids)
col = self.NameColumn(app, "name")
@@ -548,9 +546,12 @@
return producer.name
class ExchangeInfo(object):
- def is_builtin(self, exchange):
- return exchange.name in ["amq.direct", "amq.topic", "amq.match", "amq.fanout"]
+ @classmethod
+ def is_builtin(cls, exchange):
+ return exchange.name in ExchangeInfo.get_builtins()
- is_builtin = classmethod(is_builtin)
+ @classmethod
+ def get_builtins(cls):
+ return ["", "amq.direct", "amq.topic", "amq.match", "amq.fanout", "qpid.management"]
\ No newline at end of file
Modified: mgmt/trunk/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/exchange.strings 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/exchange.strings 2008-08-07 19:46:21 UTC (rev 2263)
@@ -116,7 +116,7 @@
{hidden_inputs}
</div>
<div class="foot">
- <div style="display: block; float: left;"><button>Help</help></div>
+ {help}
{submit}
{cancel}
</div>
@@ -124,7 +124,7 @@
<script type="text/javascript" defer="defer">
(function() {
// elements[0] is a fieldset, at least in firefox
- var elem = wooly.doc().elembyid("{id}").node.elements[1];
+ var elem = wooly.doc().elembyid("{id}").node.elements[0];
elem.focus();
elem.select();
}())
Modified: mgmt/trunk/cumin/python/cumin/page.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.py 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/page.py 2008-08-07 19:46:21 UTC (rev 2263)
@@ -50,7 +50,7 @@
return self.__frames.get(session)
def render_class(self, session):
- return self.__modal.get(session) and "modal"
+ return self.__modal.get(session) and "modal" or "modeless"
def render_title(self, session):
return "MRG Management"
@@ -206,10 +206,7 @@
class Tab(Link):
def render_class(self, session):
- if self.parent.selection.get(session) == self.name:
- return "selected"
- else:
- return "none"
+ return (self.parent.selection.get(session) == self.name) and "selected" or "not-selected"
class MessagingTab(Tab):
def render_content(self, session):
Modified: mgmt/trunk/cumin/python/cumin/page.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.strings 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/page.strings 2008-08-07 19:46:21 UTC (rev 2263)
@@ -391,6 +391,13 @@
float: right;
}
+.rclear {
+ font-size:0.01em;
+ width: 0.01px;
+ clear:right;
+ line-height:0.01px;
+}
+
[CuminPage.javascript]
var cumin;
@@ -414,7 +421,12 @@
}
}
}())
-
+function addEvent(obj, event_type, funct) {
+ if (obj.addEventListener)
+ obj.addEventListener(event_type, funct, false);
+ else if (obj.attachEvent)
+ obj.attachEvent("on"+event_type, funct);
+}
[CuminPage.html]
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -424,8 +436,8 @@
<link rel="stylesheet" type="text/css" href="cumin.css"/>
<link rel="shortcut icon" href="resource?name=favicon.ico" type="image/x-icon"/>
<!-- XXX import this via cumin.js instead -->
- <script src="resource?name=wooly.js" type="text/javascript"> </script>
- <script src="cumin.js" type="text/javascript"> </script>
+ <script src="resource?name=wooly.js" type="text/javascript"> </script>
+ <script src="cumin.js" type="text/javascript"> </script>
</head>
<body class="{class}">
{mode}
@@ -597,7 +609,7 @@
<ul id="context">{frames}</ul>
</div>
- <!-- <a id="logo" href="{href}"><img src="resource?name=rhm-32x14.png"/></a> -->
+ <!-- <a id="logo" href="{href}"><img src="resource?name=rhm-32x14.png" alt="Red Hat Messaging" /></a> -->
</div>
<div id="trans"></div>
<div id="body">{mode}</div>
@@ -616,7 +628,7 @@
wooly.setIntervalUpdate("{data_url}", updateMain, 3000);
</script>
<div class="oblock">
- <img id="msg_logo" src="resource?name=rh_messaging_logo.png"/>
+ <img id="msg_logo" src="resource?name=rh_messaging_logo.png" alt="messaging logo"/>
<ul class="TabbedModeSet tabs">{tabs}</ul>
<div class="TabbedModeSet mode">{mode}</div>
Modified: mgmt/trunk/cumin/python/cumin/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.py 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/queue.py 2008-08-07 19:46:21 UTC (rev 2263)
@@ -214,6 +214,7 @@
return self.show_mode(session, self.purge)
def show_queue_binding_add(self, session):
+ self.page.set_current_frame(session, self.queue_binding_add)
return self.show_mode(session, self.queue_binding_add)
def render_href(self, session, queue):
@@ -489,10 +490,10 @@
class SummaryProperties(CuminProperties):
def do_get_items(self, session, queue):
- return [("Name:", queue.name),
- ("Durable:", queue.durable),
- ("Exclusive:", queue.exclusive),
- ("Auto-Delete:", queue.autoDelete)]
+ return [("Name", queue.name),
+ ("Durable", queue.durable),
+ ("Exclusive", queue.exclusive),
+ ("Auto-Delete", queue.autoDelete)]
def render_inputs(self, session, *args):
writer = Writer()
Modified: mgmt/trunk/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.strings 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/stat.strings 2008-08-07 19:46:21 UTC (rev 2263)
@@ -153,7 +153,7 @@
<div class="duration">{duration}</div>
- <img id="{id}" src="{href}" height="100" width="360"/>
+ <img id="{id}" src="{href}" height="100" width="360" alt="stats" />
</div>
<script type="text/javascript">
cumin.objectListeners["{id}"] = updateChart
Modified: mgmt/trunk/cumin/python/cumin/util.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/util.py 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/util.py 2008-08-07 19:46:21 UTC (rev 2263)
@@ -1,8 +1,8 @@
from ConfigParser import SafeConfigParser
from datetime import *
from logging import getLogger
+from mx.DateTime.DateTime import mktime
from random import randint
-from time import mktime
import sys
def short_id():
Modified: mgmt/trunk/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.py 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/widgets.py 2008-08-07 19:46:21 UTC (rev 2263)
@@ -118,6 +118,10 @@
self.frame.show_remove(branch)
return branch.marshal()
+class FormHelp(FormInput):
+ def __init__(self, app, name, form):
+ super(FormHelp, self).__init__(app, name, form)
+
class CuminForm(Form):
def __init__(self, app, name):
super(CuminForm, self).__init__(app, name)
@@ -130,6 +134,9 @@
self.__submit.set_tab_index(200)
self.add_child(self.__submit)
+ self.__help = self.Help(app, "help", self)
+ self.add_child(self.__help)
+
def submit(self, session):
self.__submit.set(session, True)
@@ -159,9 +166,6 @@
def process_display(self, session, *args):
pass
- def render_help_href(self, session, *args):
- return self.render_href(self, session, *args)
-
def render_cancel_content(self, session, *args):
return "Cancel"
@@ -184,6 +188,10 @@
cargs = self.parent.get_args(session)
return self.parent.render_submit_content(session, *cargs)
+ class Help(FormHelp):
+ def render_help_href(self, session, *args):
+ return "resource?name=help.html#%s" % self.path
+
class CuminFieldForm(CuminForm, FieldForm, Frame):
def render_form_error(self, session, *args):
pass
@@ -333,7 +341,8 @@
return self.__param.get(session)
def set(self, session, value):
- return self.__param.set(session, value)
+ foo = self.__param.set(session, value)
+ return foo
def get_items(self, session):
return self.__states
@@ -541,13 +550,14 @@
def clear(self, session):
self.ids.set(session, list())
- def do_render(self, session, data):
+ def do_render(self, session, data, disabled=False):
name = self.ids.path
id = data[self.name]
attr = id in self.ids.get(session) and "checked=\"checked\"" or ""
- t = "<td><input type=\"checkbox\" name=\"%s\" value=\"%i\" %s/></td>"
+ disa = disabled and "disabled=\"disabled\"" or ""
+ t = "<td><input type=\"checkbox\" name=\"%s\" value=\"%i\" %s %s/></td>"
- return t % (name, id, attr)
+ return t % (name, id, attr, disa)
class CheckboxIdColumnHeader(ItemTableColumnHeader):
def render_form_id(self, session, *args):
@@ -565,10 +575,8 @@
self.__col_name = col_name
def do_render(self, session, data):
- if data[self.__col_name] in self.__skip_list:
- return "<td></td>"
- else:
- return super(FilteredCheckboxIdColumn, self).do_render(session, data)
+ return super(FilteredCheckboxIdColumn, self).do_render(session, data,
+ disabled=data[self.__col_name] in self.__skip_list)
class NameField(StringField):
def __init__(self, app, name, form):
Modified: mgmt/trunk/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.strings 2008-08-07 19:42:49 UTC (rev 2262)
+++ mgmt/trunk/cumin/python/cumin/widgets.strings 2008-08-07 19:46:21 UTC (rev 2263)
@@ -1,5 +1,5 @@
[CuminView.html]
-<script>
+<script type="text/javascript">
{script}
</script>
@@ -15,6 +15,7 @@
<div class="body">{fields}</div>
{form_error}
<div class="foot">
+ {help}
{submit}
{cancel}
</div>
@@ -35,7 +36,7 @@
{hidden_inputs}
</div>
</form>
-<script>
+<script type="text/javascript">
wooly.doc().elembyid("{id}").node.elements[1].focus();
</script>
@@ -53,12 +54,12 @@
{hidden_inputs}
</div>
<div class="foot">
- <div style="display: block; float: left;"><button>Help</button></div>
+ {help}
{submit}
{cancel}
</div>
</form>
-<script>
+<script type="text/javascript">
wooly.doc().elembyid("{id}").node.elements[0].focus();
</script>
@@ -79,12 +80,12 @@
{hidden_inputs}
</div>
<div class="foot">
- <div style="display: block; float: left;"><button>Help</button></div>
+ {help}
{submit}
{cancel}
</div>
</form>
-<script>
+<script type="text/javascript">
wooly.doc().elembyid("{id}").node.elements[0].focus();
</script>
@@ -235,7 +236,7 @@
[CuminSummary.html]
<div class="CuminSummary">
<h1>
- <img src="{icon_href}"/>
+ <img src="{icon_href}" alt="summary" />
{title}
</h1>
@@ -322,3 +323,23 @@
[CheckboxIdColumnHeader.html]
<th><input id="{id}" type="checkbox"
onclick="checkAll('{id}', '{form_id}', '{elem_name}')"/></th>
+
+[FormHelp.javascript]
+function help_window(href) {
+ var left = screen.availWidth / 2;
+ var height = screen.availHeight - 40;
+ var args = "width="+left+",height="+height+",top=0,left="+left+",scrollbars=1,status=1,toolbar=1";
+ hwin = window.open(href, "help", args);
+ if (hwin.focus)
+ hwin.focus();
+ return false;
+}
+function attachHelp() {
+ if (document.getElementById("help_link"))
+ document.getElementById("help_link").onclick = function() { return help_window(this.href) }
+}
+addEvent(window, "load", attachHelp);
+
+[FormHelp.html]
+ <a class="help action" id="help_link" href="{help_href}">Help</a>
+
\ No newline at end of file
More information about the rhmessaging-commits
mailing list