r5102 - branches/lucidity/sesame/cpp
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-10-31 20:34:08 +0000 (Mon, 31 Oct 2011)
New Revision: 5102
Modified:
branches/lucidity/sesame/cpp/configure.ac
Log:
Include explicit linker options
Modified: branches/lucidity/sesame/cpp/configure.ac
===================================================================
--- branches/lucidity/sesame/cpp/configure.ac 2011-10-31 18:37:20 UTC (rev 5101)
+++ branches/lucidity/sesame/cpp/configure.ac 2011-10-31 20:34:08 UTC (rev 5102)
@@ -91,7 +91,7 @@
QMF_GEN=$QPID_DIR/cpp/managementgen/qmf-gen
test -f $QPID_INCLUDE/qpid/agent/ManagementAgent.h || \
AC_MSG_ERROR([$QPID_DIR does not appear to be a valid qpid checkout.])
- QPID_LIBS="$QPID_SRC/libqmf.la"
+ QPID_LIBS="$QPID_SRC/libqmf.la $QPID_SRC/libqpidcommon.la $QPID_SRC/libqpidtypes.la"
QPID_CXXFLAGS="-I$QPID_SRC"
else
fail=0
@@ -103,14 +103,14 @@
# Give any/all diagnostics before failing.
test $fail = 1 &&
AC_MSG_ERROR([Missing required qpid libraries/headers. Install package qmf-devel or use --with-qpid-checkout])
- QPID_LIBS="-lqmf"
+ QPID_LIBS="-lqmf -lqpidcommon -lqpidtypes"
QPID_CXXFLAGS="-I$includedir/qpid-boost"
fi
if test x$with_qpid_build != x; then
test x$with_qpid_checkout != x || AC_MSG_ERROR([--with-qpid-build requires --with-qpid-checkout])
QPID_BLD=$with_qpid_build
- QPID_LIBS="$QPID_BLD/src/libqmf.la"
+ QPID_LIBS="$QPID_BLD/src/libqmf.la $QPID_BLD/src/libqpidcommon.la $QPID_BUILD/src/libqpidtypes.la"
QPID_CXXFLAGS="-I$QPID_DIR/cpp/include -I$QPID_SRC -I$QPID_BLD/include -I$QPID_BLD/src"
fi
@@ -136,10 +136,10 @@
AC_MSG_ERROR([db4-devel package missing. Please ensure both db4 and db4-devel are installed. (hint: "yum install db4-devel" should do it...)])
gl_saved_libs=$LIBS
-AC_SEARCH_LIBS([__db_open], [db_cxx-4.7 db_cxx-4.6 db_cxx-4.5 db_cxx-4.4 db_cxx-4.3 db_cxx-4.2],
+AC_SEARCH_LIBS([__db_open], [db_cxx-4.8 db_cxx-4.7 db_cxx-4.6 db_cxx-4.5 db_cxx-4.4 db_cxx-4.3 db_cxx-4.2],
[test "$ac_cv_search___db_open" = "none required" ||
LIB_BERKELEY_DB=$ac_cv_search___db_open],
- AC_MSG_ERROR([Couldn't find required library in range db_cxx-4.2 through db_cxx-4.6]))
+ AC_MSG_ERROR([Couldn't find required library in range db_cxx-4.2 through db_cxx-4.8]))
AC_SUBST([LIB_BERKELEY_DB])
LIBS=$gl_saved_libs
12 years, 5 months
r5101 - in trunk/sesame/cpp: etc src
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-10-31 18:37:20 +0000 (Mon, 31 Oct 2011)
New Revision: 5101
Modified:
trunk/sesame/cpp/etc/sesame.conf
trunk/sesame/cpp/src/SysAgent.cpp
Log:
Change sesame to use ANONYMOUS authentication by default. Previously
used PLAIN with "guest" user.
Modified: trunk/sesame/cpp/etc/sesame.conf
===================================================================
--- trunk/sesame/cpp/etc/sesame.conf 2011-10-31 14:04:59 UTC (rev 5100)
+++ trunk/sesame/cpp/etc/sesame.conf 2011-10-31 18:37:20 UTC (rev 5101)
@@ -30,14 +30,14 @@
##======================
##
-## Set the SASL mechanism (PLAIN by default), and the username and password
+## Set the SASL mechanism (ANONYMOUS by default), and the username and password
## to be used when authenticating to the broker. If you wish to not store
## the password in this configuration file, you may use pwd-file to point
## to an access-restricted file containing the password.
##
-#mech=PLAIN
-#uid=guest
-#pwd=guest
+#mech=ANONYMOUS
+#uid=
+#pwd=
#pwd-file=/etc/sesame/password
##==============
Modified: trunk/sesame/cpp/src/SysAgent.cpp
===================================================================
--- trunk/sesame/cpp/src/SysAgent.cpp 2011-10-31 14:04:59 UTC (rev 5100)
+++ trunk/sesame/cpp/src/SysAgent.cpp 2011-10-31 18:37:20 UTC (rev 5101)
@@ -325,9 +325,9 @@
options["host"] = Option("ADDR", "localhost", "Broker host name or IP address");
options["port"] = Option("N", "5672", "Port for broker service");
options["proto"] = Option("NAME", "tcp", "Protocol for broker communication");
- options["mech"] = Option("NAME", "", "Authentication mechanism");
- options["uid"] = Option("NAME", "guest", "Authentication user name");
- options["pwd"] = Option("PASSWORD", "guest", "Authentication password");
+ options["mech"] = Option("NAME", "ANONYMOUS", "Authentication mechanism");
+ options["uid"] = Option("NAME", "", "Authentication user name");
+ options["pwd"] = Option("PASSWORD", "", "Authentication password");
options["pwd-file"] = Option("FILE", "", "File containing password");
options["service"] = Option("NAME", "qpidd", "SASL service name");
options["min-ssf"] = Option("N", "0", "Minimum acceptable strength for SASL security layer");
12 years, 5 months
r5100 - trunk/sesame/cpp
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-10-31 14:04:59 +0000 (Mon, 31 Oct 2011)
New Revision: 5100
Modified:
trunk/sesame/cpp/configure.ac
Log:
Make linker options for libqpidcommon and libqpidtypes explicit (required
by linker changes in newer versions of Fedora)
Modified: trunk/sesame/cpp/configure.ac
===================================================================
--- trunk/sesame/cpp/configure.ac 2011-10-28 13:27:14 UTC (rev 5099)
+++ trunk/sesame/cpp/configure.ac 2011-10-31 14:04:59 UTC (rev 5100)
@@ -91,7 +91,7 @@
QMF_GEN=$QPID_DIR/cpp/managementgen/qmf-gen
test -f $QPID_INCLUDE/qpid/agent/ManagementAgent.h || \
AC_MSG_ERROR([$QPID_DIR does not appear to be a valid qpid checkout.])
- QPID_LIBS="$QPID_SRC/libqmf.la"
+ QPID_LIBS="$QPID_SRC/libqmf.la $QPID_SRC/libqpidcommon.la $QPID_SRC/libqpidtypes.la"
QPID_CXXFLAGS="-I$QPID_SRC"
else
fail=0
@@ -103,14 +103,14 @@
# Give any/all diagnostics before failing.
test $fail = 1 &&
AC_MSG_ERROR([Missing required qpid libraries/headers. Install package qmf-devel or use --with-qpid-checkout])
- QPID_LIBS="-lqmf"
+ QPID_LIBS="-lqmf -lqpidcommon -lqpidtypes"
QPID_CXXFLAGS="-I$includedir/qpid-boost"
fi
if test x$with_qpid_build != x; then
test x$with_qpid_checkout != x || AC_MSG_ERROR([--with-qpid-build requires --with-qpid-checkout])
QPID_BLD=$with_qpid_build
- QPID_LIBS="$QPID_BLD/src/libqmf.la"
+ QPID_LIBS="$QPID_BLD/src/libqmf.la $QPID_BLD/src/libqpidcommon.la $QPID_BUILD/src/libqpidtypes.la"
QPID_CXXFLAGS="-I$QPID_DIR/cpp/include -I$QPID_SRC -I$QPID_BLD/include -I$QPID_BLD/src"
fi
12 years, 5 months
r5099 - trunk/sesame/cpp
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-10-28 13:27:14 +0000 (Fri, 28 Oct 2011)
New Revision: 5099
Modified:
trunk/sesame/cpp/configure.ac
Log:
Merge revision 4462 from old repo at anonsvn.jboss.org/repos/rhmessaging/mgmt/trunk/sesame
Modified: trunk/sesame/cpp/configure.ac
===================================================================
--- trunk/sesame/cpp/configure.ac 2011-10-26 02:47:12 UTC (rev 5098)
+++ trunk/sesame/cpp/configure.ac 2011-10-28 13:27:14 UTC (rev 5099)
@@ -136,10 +136,10 @@
AC_MSG_ERROR([db4-devel package missing. Please ensure both db4 and db4-devel are installed. (hint: "yum install db4-devel" should do it...)])
gl_saved_libs=$LIBS
-AC_SEARCH_LIBS([__db_open], [db_cxx-4.7 db_cxx-4.6 db_cxx-4.5 db_cxx-4.4 db_cxx-4.3 db_cxx-4.2],
+AC_SEARCH_LIBS([__db_open], [db_cxx-4.8 db_cxx-4.7 db_cxx-4.6 db_cxx-4.5 db_cxx-4.4 db_cxx-4.3 db_cxx-4.2],
[test "$ac_cv_search___db_open" = "none required" ||
LIB_BERKELEY_DB=$ac_cv_search___db_open],
- AC_MSG_ERROR([Couldn't find required library in range db_cxx-4.2 through db_cxx-4.6]))
+ AC_MSG_ERROR([Couldn't find required library in range db_cxx-4.2 through db_cxx-4.8]))
AC_SUBST([LIB_BERKELEY_DB])
LIBS=$gl_saved_libs
12 years, 5 months
r5098 - in branches/lucidity: cumin/python/cumin cumin/python/cumin/grid cumin/resources wooly/resources
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-10-26 02:47:12 +0000 (Wed, 26 Oct 2011)
New Revision: 5098
Modified:
branches/lucidity/cumin/python/cumin/grid/negotiator.py
branches/lucidity/cumin/python/cumin/grid/tags.py
branches/lucidity/cumin/python/cumin/widgets.strings
branches/lucidity/cumin/resources/app.css
branches/lucidity/wooly/resources/mootools.js
Log:
Merge changes from trunk for the following BZs.
BZ733365
BZ748497
svn merge -r 5087:5090 svn+ssh://svn.fedorahosted.org/svn/cumin/trunk .
svn merge -r 5092:5094 svn+ssh://svn.fedorahosted.org/svn/cumin/trunk .
svn merge -c 5096 svn+ssh://svn.fedorahosted.org/svn/cumin/trunk .
Modified: branches/lucidity/cumin/python/cumin/grid/negotiator.py
===================================================================
--- branches/lucidity/cumin/python/cumin/grid/negotiator.py 2011-10-25 19:51:47 UTC (rev 5097)
+++ branches/lucidity/cumin/python/cumin/grid/negotiator.py 2011-10-26 02:47:12 UTC (rev 5098)
@@ -1,7 +1,7 @@
from wooly.util import StringCatalog, Writer
import logging
from cumin.objectframe import ObjectFrame, ObjectFrameTask,\
- ObjectFrameTaskFeedbackForm
+ ObjectFrameTaskForm
from cumin.objectselector import ObjectSelector, ObjectLinkColumn,\
MonitorSelfStatColumn, ObjectTable, MonitorSelfAgeColumn
from wooly import Widget, Attribute, Parameter
@@ -10,6 +10,7 @@
from wooly.parameters import ListParameter
from wooly.template import WidgetTemplate
from cumin.stat import StatFlashChart
+from sage.util import call_async
strings = StringCatalog(__file__)
log = logging.getLogger("cumin.grid.negotiator")
@@ -205,7 +206,7 @@
val = min(1.0, val)
return val
-class GroupForm(ObjectFrameTaskFeedbackForm):
+class GroupForm(ObjectFrameTaskForm):
def __init__(self, app, name, task):
super(GroupForm, self).__init__(app, name, task)
@@ -308,7 +309,7 @@
def render_chart_id(self, session):
return self.chart.render_id(session)
- def process_submit(self, session):
+ def _invoke_tasks(self, session):
negotiator = self.negotiator.get(session)
quotas = self.quotas.get(session)
group_names = self.group_names.get(session)
@@ -330,6 +331,8 @@
self.task.reconfig(negotiator)
self.app.model.update_negotiator_config_value(negotiator)
+ def process_submit(self, session):
+ call_async(None, self._invoke_tasks, session)
self.task.exit_with_redirect(session)
def check_quota(self, quota, original):
@@ -400,17 +403,16 @@
self.app.main_page.main.grid.view.show(session)
def do_invoke(self, invoc, negotiator, group, value):
+ try:
+ short_group = group.split("_")[-1]
+ except:
+ short_group = group
+ invoc.description = "Set %s to %s" % (short_group, value)
result = self.app.remote.set_raw_config(negotiator, group, value)
if result.error:
raise result.error
invoc.status_code = result.status
- try:
- group = group.split("_")[-1]
- invoc.description = "Set %s to %s" % (group, value)
- except:
- pass
-
invoc.end()
def reconfig(self, negotiator):
Modified: branches/lucidity/cumin/python/cumin/grid/tags.py
===================================================================
--- branches/lucidity/cumin/python/cumin/grid/tags.py 2011-10-25 19:51:47 UTC (rev 5097)
+++ branches/lucidity/cumin/python/cumin/grid/tags.py 2011-10-26 02:47:12 UTC (rev 5098)
@@ -551,7 +551,7 @@
selection = [escape_entity(id) for id in ids]
self.selection.set(session, selection)
- return selection
+ return len(selection)
def process_submit(self, session):
tags_to_kill = self.selection.get(session)
Modified: branches/lucidity/cumin/python/cumin/widgets.strings
===================================================================
--- branches/lucidity/cumin/python/cumin/widgets.strings 2011-10-25 19:51:47 UTC (rev 5097)
+++ branches/lucidity/cumin/python/cumin/widgets.strings 2011-10-26 02:47:12 UTC (rev 5098)
@@ -934,6 +934,10 @@
'setview':'total',
'listcontainer_height':'{listcontainer_height}'});
});
+ var focusElements = $$('.focusfirst');
+ if(focusElements != null) {
+ focusElements[0].focus();
+ }
});
//]]>
Modified: branches/lucidity/cumin/resources/app.css
===================================================================
--- branches/lucidity/cumin/resources/app.css 2011-10-25 19:51:47 UTC (rev 5097)
+++ branches/lucidity/cumin/resources/app.css 2011-10-26 02:47:12 UTC (rev 5098)
@@ -1,406 +1,407 @@
body {
- margin: 0;
+ margin: 0;
}
body.modal {
- background-color: #f7f7f7;
+ background-color: #f7f7f7;
}
h2 {
- margin: 0;
+ margin: 0;
}
span.none {
- font-style: italic;
- color: #999;
+ font-style: italic;
+ color: #999;
}
.oblock {
- padding: 0;
- background-color: white;
+ padding: 0;
+ background-color: white;
}
.iblock {
- margin: 1em 0;
- padding: 0 1em;
+ margin: 1em 0;
+ padding: 0 1em;
}
.notice {
- margin: 2em;
- padding: 2em;
- border: 1px dotted black;
- width: 66%;
- text-align: center;
+ margin: 2em;
+ padding: 2em;
+ border: 1px dotted black;
+ width: 66%;
+ text-align: center;
}
ul.actions {
- padding: 0;
- margin: 0 0 1em 0;
- list-style: none;
+ padding: 0;
+ margin: 0 0 1em 0;
+ list-style: none;
}
ul.actions li {
- display: inline;
+ display: inline;
}
ul.actions.disabled a {
- color: #666666;
+ color: #666666;
}
ul.actions.disabled li a.nav:before {
- color: #666666;
+ color: #666666;
}
ul.actions.disabled a:hover {
- background-color: #f7f7f7;
+ background-color: #f7f7f7;
}
a.nav:before {
- content: "\00BB \0020";
- font-weight: bold;
- color: #dc9f2e;
+ content: "\00BB \0020";
+ font-weight: bold;
+ color: #dc9f2e;
}
div.sactions {
- margin: 0;
- padding: 0.35em 0.75em;
- background-color: #e7e7f7;
+ margin: 0;
+ padding: 0.35em 0.75em;
+ background-color: #e7e7f7;
}
div.sactions h2 {
- display: inline;
- font-size: 0.9em;
- font-weight: normal;
- margin: 0 0.5em 0 0;
+ display: inline;
+ font-size: 0.9em;
+ font-weight: normal;
+ margin: 0 0.5em 0 0;
}
div.sactions select {
- margin: 0 0.5em 0 0;
+ margin: 0 0.5em 0 0;
}
div.mobject div.mactions h2 {
- display: inline;
- font-size: 0.9em;
- font-weight: normal;
- margin: 0 0.5em 0 0;
+ display: inline;
+ font-size: 0.9em;
+ font-weight: normal;
+ margin: 0 0.5em 0 0;
}
-button, ul.actions a, a.action {
- margin: 0;
- border-top: 1px solid #ddd;
- border-left: 1px solid #ddd;
- border-bottom: 1px solid #bbb;
- border-right: 1px solid #bbb;
- padding: 0.2em 0.4em;
- background: url(resource?name=button-background.png) repeat;
- color: #000;
- font-size: 0.9em;
- -moz-border-radius: 0.4em;
- -webkit-border-radius: 0.4em;
+button,ul.actions a,a.action {
+ margin: 0;
+ border-top: 1px solid #ddd;
+ border-left: 1px solid #ddd;
+ border-bottom: 1px solid #bbb;
+ border-right: 1px solid #bbb;
+ padding: 0.2em 0.4em;
+ background: url(resource?name=button-background.png) repeat;
+ color: #000;
+ font-size: 0.9em;
+ -moz-border-radius: 0.4em;
+ -webkit-border-radius: 0.4em;
}
-button:hover, ul.actions a:hover, a.action:hover {
- background-color: white;
+button:hover,ul.actions a:hover,a.action:hover {
+ background-color: white;
}
button.disabled {
- color: #bbb;
- border: 1px solid #ddd;
+ color: #bbb;
+ border: 1px solid #ddd;
}
button.disabled:hover {
- background-color: #f7f7f7;
+ background-color: #f7f7f7;
}
ul.mobjects {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
ul.mobjects li {
- margin: 0;
- border-top: 1px solid #ccc;
- padding: 0.5em 0;
+ margin: 0;
+ border-top: 1px solid #ccc;
+ padding: 0.5em 0;
}
ul.mobjects li:first-child {
- margin: 0;
- border: none;
+ margin: 0;
+ border: none;
}
ul.mobjects li a.action {
- float: right;
+ float: right;
}
ul.mobjects .flags {
- font-size: small;
- font-style: italic;
+ font-size: small;
+ font-style: italic;
}
ul.mobjects .config {
- padding: 0 0 0 2em;
+ padding: 0 0 0 2em;
}
ul.mobjects .status {
- padding: 0 0 0 2em;
- color: #936;
+ padding: 0 0 0 2em;
+ color: #936;
}
table.mobjects {
- width: 100%;
- border-collapse: collapse;
- margin: 0;
+ width: 100%;
+ border-collapse: collapse;
+ margin: 0;
}
table.mobjects tr {
- border-top: 1px dotted #ccc;
- vertical-align: top;
+ border-top: 1px dotted #ccc;
+ vertical-align: top;
}
table.mobjects td {
- padding: 0.35em 0.5em;
+ padding: 0.35em 0.5em;
}
table.mobjects th {
- padding: 0.35em 0.5em;
+ padding: 0.35em 0.5em;
}
table.mobjects th {
- text-align: left;
- font-weight: normal;
- background-color: #f7f7f7;
+ text-align: left;
+ font-weight: normal;
+ background-color: #f7f7f7;
}
form.mform {
- width: 50em;
- border: 1px solid #ddd;
- background-color: #fff;
- -moz-border-radius: 0.4em;
- -webkit-border-radius: 0.4em;
+ width: 50em;
+ border: 1px solid #ddd;
+ background-color: #fff;
+ -moz-border-radius: 0.4em;
+ -webkit-border-radius: 0.4em;
}
form.mform fieldset {
- border: none;
- padding: 0.75em;
+ border: none;
+ padding: 0.75em;
}
form.mform .legend {
- font-weight: bold;
+ font-weight: bold;
}
-form.mform .head, .mform .body, .mform .foot {
- padding: 0.5em 0.75em;
- margin: 0;
+form.mform .head,.mform .body,.mform .foot {
+ padding: 0.5em 0.75em;
+ margin: 0;
}
form.mform .head {
- font-weight: bold;
- color: white;
- background-color: #87a;
- -moz-border-radius: 0.3em 0.3em 0 0;
- -webkit-border-radius: 0.3em 0.3em 0 0;
-/* background-color: #564979; */
+ font-weight: bold;
+ color: white;
+ background-color: #87a;
+ -moz-border-radius: 0.3em 0.3em 0 0;
+ -webkit-border-radius: 0.3em 0.3em 0 0;
+ /* background-color: #564979; */
}
form.mform .head h1 {
- margin: 0;
- font-size: 1.1em;
+ margin: 0;
+ font-size: 1.1em;
}
form.mform .foot {
- text-align: right;
- border-top: 1px solid #ddd;
+ text-align: right;
+ border-top: 1px solid #ddd;
}
form.mform .field {
- margin: 0.25em 0;
+ margin: 0.25em 0;
}
form.mform .field input {
- border-style: groove;
+ border-style: groove;
}
form.mform ul.errors {
- list-style: none;
- display: block;
- float: right;
- color: red;
- padding: 0.25em 0.5em;
- border: 1px solid red;
- margin: 0 0.5em;
- max-width: 20em;
+ list-style: none;
+ display: block;
+ float: right;
+ color: red;
+ padding: 0.25em 0.5em;
+ border: 1px solid red;
+ margin: 0 0.5em;
+ max-width: 20em;
}
-form.mform button, form.mform a.help {
- margin: 0.5em;
- padding: 0.25em 0.25em 0 0.25em;
+form.mform button,form.mform a.help {
+ margin: 0.5em;
+ padding: 0.25em 0.25em 0 0.25em;
}
form.mform button.midformbutton {
- margin: 0em;
+ margin: 0em;
}
form.mform a.help {
- float: left;
- margin: 0.5em;
- padding: 0.25em 0.35em 0 0.5em;
+ float: left;
+ margin: 0.5em;
+ padding: 0.25em 0.35em 0 0.5em;
}
form.mform a.help:before {
- content: url(resource?name=help-20.png);
- padding: 0 0.25em 0 0;
- vertical-align: -35%;
+ content: url(resource?name=help-20.png);
+ padding: 0 0.25em 0 0;
+ vertical-align: -35%;
}
form.mform button.cancel:before {
- content: url(resource?name=cancel-20.png);
- padding: 0 0.25em 0 0;
- vertical-align: -35%;
+ content: url(resource?name=cancel-20.png);
+ padding: 0 0.25em 0 0;
+ vertical-align: -35%;
}
form.mform button.submit:before {
- content: url(resource?name=submit-20.png);
- padding: 0 0.25em 0 0;
- vertical-align: -35%;
+ content: url(resource?name=submit-20.png);
+ padding: 0 0.25em 0 0;
+ vertical-align: -35%;
}
form.mform td {
- vertical-align: top;
+ vertical-align: top;
}
ul.radiotabs {
- list-style: none;
- margin: 0 0 1em 0;
- padding: 0;
+ list-style: none;
+ margin: 0 0 1em 0;
+ padding: 0;
}
ul.radiotabs li {
- display: inline;
- padding: 0 0.75em 0 0;
+ display: inline;
+ padding: 0 0.75em 0 0;
}
ul.radiotabs li:last-child {
- display: inline;
- margin: 0;
+ display: inline;
+ margin: 0;
}
ul.radiotabs li a:before {
- content: url(resource?name=radio-button.png);
- margin: 0 0.5em 0 0;
- vertical-align: -15%;
+ content: url(resource?name=radio-button.png);
+ margin: 0 0.5em 0 0;
+ vertical-align: -15%;
}
ul.radiotabs li a.selected {
- color: black;
+ color: black;
}
ul.radiotabs li a.selected:before {
- content: url(resource?name=radio-button-checked.png);
+ content: url(resource?name=radio-button-checked.png);
}
ul.radiotabs li a.disabled:before {
- content: url(resource?name=radio-button.png);
+ content: url(resource?name=radio-button.png);
}
+
ul.radiotabs li a.disabled {
- color: #666666;
+ color: #666666;
}
div.statuslight {
- float: left;
- width: 1em;
- height: 1em;
- margin: 0.25em 1px 0 0;
- padding: 0.15em;
- font-size: 0.8em;
- text-align: center;
- line-height: 1.1em;
+ float: left;
+ width: 1em;
+ height: 1em;
+ margin: 0.25em 1px 0 0;
+ padding: 0.15em;
+ font-size: 0.8em;
+ text-align: center;
+ line-height: 1.1em;
}
div.statuslight.red {
- background-color: #e33;
- color: #fd3;
+ background-color: #e33;
+ color: #fd3;
}
div.statuslight.yellow {
- background-color: #fd3;
- color: #e33;
+ background-color: #fd3;
+ color: #e33;
}
div.statuslight.green {
- background-color: #9e9;
+ background-color: #9e9;
}
pre.code {
- background-color: #f7f7f7;
- padding: 1em;
- border: 1px dotted #ddd;
+ background-color: #f7f7f7;
+ padding: 1em;
+ border: 1px dotted #ddd;
}
ul.comma {
- list-style: none;
+ list-style: none;
}
ul.comma li {
- display: inline;
+ display: inline;
}
ul.comma li:after {
- content: ", ";
+ content: ", ";
}
ul.comma li:last-child:after {
- content: "";
+ content: "";
}
ul.slist {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
ul.slist a:before {
- content: url(resource?name=radio-button.png);
- vertical-align: -10%;
- margin: 0 0.5em 0 0;
+ content: url(resource?name=radio-button.png);
+ vertical-align: -10%;
+ margin: 0 0.5em 0 0;
}
ul.slist a.selected:before {
- content: url(resource?name=radio-button-checked.png);
+ content: url(resource?name=radio-button-checked.png);
}
table.twocol {
- width: 100%;
+ width: 100%;
}
-table.twocol > tbody > tr > td {
- width: 50%;
- vertical-align: top;
+table.twocol>tbody>tr>td {
+ width: 50%;
+ vertical-align: top;
}
-table.twocol > tbody > tr > td:first-child {
- padding: 0 1.5em 0 0;
+table.twocol>tbody>tr>td:first-child {
+ padding: 0 1.5em 0 0;
}
-table.twocol > tbody > tr > td:last-child {
- padding: 0 0 0 1.5em;
+table.twocol>tbody>tr>td:last-child {
+ padding: 0 0 0 1.5em;
}
-.ralign, table.mobjects .ralign, div.mstatus table .ralign {
- text-align: right;
+.ralign,table.mobjects .ralign,div.mstatus table .ralign {
+ text-align: right;
}
form.inline {
- display: inline;
+ display: inline;
}
span.count {
- font-size: 0.9em;
- color: #999;
+ font-size: 0.9em;
+ color: #999;
}
.rfloat {
- float: right;
+ float: right;
}
.lfloat {
@@ -408,295 +409,305 @@
}
.rclear {
- font-size:0.01em;
- width: 0.01px;
- clear:right;
- line-height:0.01px;
+ font-size: 0.01em;
+ width: 0.01px;
+ clear: right;
+ line-height: 0.01px;
}
-table.Editable input.edit_string,
-table.Editable textarea.edit_bigstring,
-div.inline_help span.edit_string {
- border: 1px solid #CCCCCC;
+table.Editable input.edit_string,table.Editable textarea.edit_bigstring,div.inline_help span.edit_string
+ {
+ border: 1px solid #CCCCCC;
}
-table.Editable input.edit_number,
-div.inline_help span.edit_number {
- border: 1px dashed #66CCFF;
-}
+table.Editable input.edit_number,div.inline_help span.edit_number {
+ border: 1px dashed #66CCFF;
+}
-table.Editable input.numeric_error,
-div.inline_help span.numeric_error {
- border: 1px dashed #FF0000;
+table.Editable input.numeric_error,div.inline_help span.numeric_error {
+ border: 1px dashed #FF0000;
}
table.Editable span.edit_readonly {
- background-color: #FFFFFF;
- color: #444444;
+ background-color: #FFFFFF;
+ color: #444444;
}
-table.Editable input.edit_string,
-table.Editable input.edit_number,
-table.Editable input.numeric_error {
- width: 20em;
+table.Editable input.edit_string,table.Editable input.edit_number,table.Editable input.numeric_error
+ {
+ width: 20em;
}
table.Editable textarea.edit_bigstring {
- width: 25em;
+ width: 25em;
}
table.Editable div.error {
- color: #FF0000;
- font-size: 0.9em;
+ color: #FF0000;
+ font-size: 0.9em;
}
form.editform {
- border: 0 none !important;
- width: 100% !important;
+ border: 0 none !important;
+ width: 100% !important;
}
div.inline_help {
- margin: 1em;
+ margin: 1em;
}
-div.inline_help span.edit_string,
-div.inline_help span.edit_number,
-div.inline_help span.numeric_error {
- color: #444444;
- font-weight: normal;
- margin-right: 0.5em;
- padding: 0.05em 0.2em;
+div.inline_help span.edit_string,div.inline_help span.edit_number,div.inline_help span.numeric_error
+ {
+ color: #444444;
+ font-weight: normal;
+ margin-right: 0.5em;
+ padding: 0.05em 0.2em;
}
div.inline_help h2 {
- margin-right: 1em;
+ margin-right: 1em;
}
span.prop_example {
- font-size: 0.9em;
+ font-size: 0.9em;
}
span.prop_example:before {
- content: "Example:";
- padding-right: 0.25em;
+ content: "Example:";
+ padding-right: 0.25em;
}
div.fullpageable {
- position: relative;
- background-color: transparent;
- border: 0;
- width: auto;
- height: auto;
- left: 0;
- top: 0;
+ position: relative;
+ background-color: transparent;
+ border: 0;
+ width: auto;
+ height: auto;
+ left: 0;
+ top: 0;
}
div.fullpaged {
- background-color: white;
- border: 10px solid white;
- width: 98% !important;
- position: absolute !important;
- left: 0px;
- top: 0px;
- z-index: 201;
+ background-color: white;
+ border: 10px solid white;
+ width: 98% !important;
+ position: absolute !important;
+ left: 0px;
+ top: 0px;
+ z-index: 201;
}
-p.fullpageIcon,
-p.fullpageIconOldLocation {
- background-color: white;
- border-top: 2px solid #685B8A;
- border-left: 1px solid #685B8A;
- border-bottom: 1px solid #685B8A;
- border-right: 1px solid #685B8A;
- margin: 8px 4px;
- padding: 0;
- width: 8px;
- height: 6px;
- cursor: pointer;
- float: right;
- z-index: 4;
- position: absolute;
- top: 27px;
- right: 60px;
- display: none;
+
+p.fullpageIcon,p.fullpageIconOldLocation {
+ background-color: white;
+ border-top: 2px solid #685B8A;
+ border-left: 1px solid #685B8A;
+ border-bottom: 1px solid #685B8A;
+ border-right: 1px solid #685B8A;
+ margin: 8px 4px;
+ padding: 0;
+ width: 8px;
+ height: 6px;
+ cursor: pointer;
+ float: right;
+ z-index: 4;
+ position: absolute;
+ top: 27px;
+ right: 60px;
+ display: none;
}
+
p.fullpageIconOldLocation {
- top: -2px;
- right: 14px;
+ top: -2px;
+ right: 14px;
}
-div.fullpageable:hover div.fullpageTitle,
-div.fullpageable:hover p.fullpageIcon,
-div.fullpaged div.fullpageTitle,
-div.fullpaged p.fullpageIcon,
-div.fullpaged p.fullpageIconOldLocation,
-div.fullpageable:hover p.fullpageIconOldLocation
- {
- display: block;
+
+div.fullpageable:hover div.fullpageTitle,div.fullpageable:hover p.fullpageIcon,div.fullpaged div.fullpageTitle,div.fullpaged p.fullpageIcon,div.fullpaged p.fullpageIconOldLocation,div.fullpageable:hover p.fullpageIconOldLocation
+ {
+ display: block;
}
-div.fullpaged p.fullpageIcon,
-div.fullpaged p.fullpageIconOldLocation {
- border-top: 1px solid #cbb4ff;
- border-left: 1px solid #cbb4ff;
- border-bottom: 2px solid #685B8A;
- border-right: 1px solid #cbb4ff;
+div.fullpaged p.fullpageIcon,div.fullpaged p.fullpageIconOldLocation {
+ border-top: 1px solid #cbb4ff;
+ border-left: 1px solid #cbb4ff;
+ border-bottom: 2px solid #685B8A;
+ border-right: 1px solid #cbb4ff;
}
div.fullpaged h2 {
- background-color: #E7E7F7;
- padding: 0.25em;
+ background-color: #E7E7F7;
+ padding: 0.25em;
}
div.fullpageBack {
- background-color: white;
- position: absolute;
- width: 100%;
- height: 100%;
- left: 0;
- top: 0;
- display: none;
- z-index: 199;
+ background-color: white;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ top: 0;
+ display: none;
+ z-index: 199;
}
div.imgHighlight_red {
- border: 1px solid red;
- width: 12px;
- height: 12px;
- position: absolute;
- opacity: 0.5;
- z-index: 1000;
+ border: 1px solid red;
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ opacity: 0.5;
+ z-index: 1000;
}
+
div.imgHighlight_green {
- border: 1px solid green;
- width: 12px;
- height: 12px;
- position: absolute;
- opacity: 0.5;
- z-index: 1000;
+ border: 1px solid green;
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ opacity: 0.5;
+ z-index: 1000;
}
+
div.imgHighlight_blue {
- border: 1px solid blue;
- width: 12px;
- height: 12px;
- position: absolute;
- opacity: 0.5;
- z-index: 1000;
+ border: 1px solid blue;
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ opacity: 0.5;
+ z-index: 1000;
}
+
div.imgValues_red {
- color: red;
- font-size: 0.8em;
- background-color: white;
- position: absolute;
- z-index: 1000;
+ color: red;
+ font-size: 0.8em;
+ background-color: white;
+ position: absolute;
+ z-index: 1000;
}
+
div.imgValues_green {
- color: green;
- font-size: 0.8em;
- background-color: white;
- position: absolute;
- z-index: 1000;
+ color: green;
+ font-size: 0.8em;
+ background-color: white;
+ position: absolute;
+ z-index: 1000;
}
+
div.imgValues_blue {
- color: blue;
- font-size: 0.8em;
- background-color: white;
- position: absolute;
- z-index: 1000;
+ color: blue;
+ font-size: 0.8em;
+ background-color: white;
+ position: absolute;
+ z-index: 1000;
}
table.DataTable.Cumin tr {
- border-top: 1px dotted #ccc;
+ border-top: 1px dotted #ccc;
}
-table.DataTable.Cumin td, table.DataTable.Cumin th {
- padding: 0.35em 0.5em;
+table.DataTable.Cumin td,table.DataTable.Cumin th {
+ padding: 0.35em 0.5em;
}
table.DataTable.Cumin th {
- font-weight: normal;
+ font-weight: normal;
}
-table.DataTable.Cumin td.selected, table.DataTable.Cumin th.selected {
+table.DataTable.Cumin td.selected,table.DataTable.Cumin th.selected {
+
}
-table.DataTable.Cumin thead, table.DataTable.Cumin tfoot {
- background-color: #f7f7f7;
+table.DataTable.Cumin thead,table.DataTable.Cumin tfoot {
+ background-color: #f7f7f7;
}
table.DataTable.Cumin tfoot {
- text-align: center;
- font-style: italic;
- font-size: 0.9em;
+ text-align: center;
+ font-style: italic;
+ font-size: 0.9em;
}
a.TaskLink.Cumin:before {
- content: "\00BB \0020";
- font-weight: bold;
- color: #dc9f2e;
+ content: "\00BB \0020";
+ font-weight: bold;
+ color: #dc9f2e;
}
-.autocomplete{
- cursor: pointer;
- border: 1px solid #999;
- border-top: none;
- background: #fff;
- z-index: 2;
+.autocomplete {
+ cursor: pointer;
+ border: 1px solid #999;
+ border-top: none;
+ background: #fff;
+ z-index: 2;
}
-.autocomplete div { padding: 0 0.2em; }
-.autocomplete .normal{border-top: 1px solid #fefefe;}
-.autocomplete .selected{background: #ddf;}
-.autocomplete .highlited{font-weight: bold; color: #008;}
-div.OverviewView > table {
- width: 100%;
+.autocomplete div {
+ padding: 0 0.2em;
}
-div.OverviewView > table > tbody > tr > td {
- width: 50%;
- vertical-align: top;
+.autocomplete .normal {
+ border-top: 1px solid #fefefe;
}
-div.OverviewView h2 > img {
- vertical-align: bottom;
- margin: 0 0.2em 0 0;
+.autocomplete .selected {
+ background: #ddf;
}
+.autocomplete .highlited {
+ font-weight: bold;
+ color: #008;
+}
+
+div.OverviewView>table {
+ width: 100%;
+}
+
+div.OverviewView>table>tbody>tr>td {
+ width: 50%;
+ vertical-align: top;
+}
+
+div.OverviewView h2>img {
+ vertical-align: bottom;
+ margin: 0 0.2em 0 0;
+}
+
div.OverviewView {
- clear: both;
+ clear: both;
}
.mtmultiselect {
- width:400px;
- background:#E7E7F7;
- font:12px verdana;
+ width: 400px;
+ background: #E7E7F7;
+ font: 12px verdana;
}
.mtmultiselect .selected {
- background-color:#E8F7E8;
+ background-color: #E8F7E8;
}
.mtmultiselect ol {
- background-color:#FFFFFF;
+ background-color: #FFFFFF;
}
.mtmultiselect ol .selected {
- background-color:#E8F7E8;
- background-image:url(resource?name=check-mark.png);
- background-position:left;
- background-repeat:no-repeat;
+ background-color: #E8F7E8;
+ background-image: url(resource?name=check-mark.png);
+ background-position: left;
+ background-repeat: no-repeat;
}
.mtmultiselect ul li {
- display:inline;
- padding:0px 15px 0px 15px;
+ display: inline;
+ padding: 0px 15px 0px 15px;
}
.disabled {
- color:#ccc;
+ color: #ccc;
}
.mtms_filterbox {
- float:left;
- padding:5px 5px 0px 5px;
+ float: left;
+ padding: 5px 5px 0px 5px;
}
.listcontainer {
@@ -704,101 +715,111 @@
border: none;
background-color: #FFFFFF;
padding: 0px;
+ clear:both;
}
-.mtms_filterbox input {
- background:#FFF;
- border:1px solid #141212;
+.mtms_filterbox input.textbox {
+ padding-right: 20px;
}
+.input_x {
+ cursor:pointer;
+ color:#38468F;
+ font-weight:bold;
+ position:relative;
+ height:20px;
+ left:-18px;
+}
+
+.filterbox_second_row {
+ clear:both;
+ width:100%;
+}
+
.mtms_filtercontrols {
- color:#000;
- padding:7px 0;
+ color: #000;
+ padding: 40px 0px 0px 0px;
}
.mtms_filtercontrols a,.mtms_paginator a {
- color:#000;
- padding:0 4px 0 6px;
- text-decoration:underline;
+ color: #000;
+ padding: 0 4px 0 6px;
+ text-decoration: underline;
}
.mtms_filterlabel {
- color:#000;
- padding:0 4px 0 0;
+ color: #000;
+ padding: 0 4px 0 0;
}
.mtms_paginator {
- clear:both;
- padding:5px;
+ clear: both;
+ padding: 5px;
}
-.mtms_paginator .selected, .mtms_paginator .disabled{
- text-decoration:none;
+.mtms_paginator .selected,.mtms_paginator .disabled {
+ text-decoration: none;
}
.mtmultiselect ol {
- padding:0;
+ padding: 0;
}
.mtmultiselect ol li {
- list-style-type:none;
- background-color:#FFF;
- color:#000;
- padding:1px 5px 1px 25px;
+ list-style-type: none;
+ background-color: #FFF;
+ color: #000;
+ padding: 1px 5px 1px 25px;
}
.mtmultiselect ol li:hover {
- background-color:#22BB22;
- color:#111;
+ background-color: #22BB22;
+ color: #111;
}
-
-ul.autocompleter-choices
-{
- position: absolute;
- margin: 0;
- padding: 0;
- list-style: none;
- border: 1px solid #7c7c7c;
- border-left-color: #c3c3c3;
- border-right-color: #c3c3c3;
- border-bottom-color: #ddd;
- background-color: #fff;
- text-align: left;
- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
- z-index: 50;
- background-color: #fff;
+
+ul.autocompleter-choices {
+ position: absolute;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ border: 1px solid #7c7c7c;
+ border-left-color: #c3c3c3;
+ border-right-color: #c3c3c3;
+ border-bottom-color: #ddd;
+ background-color: #fff;
+ text-align: left;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+ z-index: 50;
+ background-color: #fff;
}
-ul.autocompleter-choices li
-{
- position: relative;
- margin: -2px 0 0 0;
- padding: 0.2em 1.5em 0.2em 1em;
- display: block;
- float: none !important;
- cursor: pointer;
- font-weight: normal;
- white-space: nowrap;
- font-size: 1em;
- line-height: 1.5em;
+ul.autocompleter-choices li {
+ position: relative;
+ margin: -2px 0 0 0;
+ padding: 0.2em 1.5em 0.2em 1em;
+ display: block;
+ float: none !important;
+ cursor: pointer;
+ font-weight: normal;
+ white-space: nowrap;
+ font-size: 1em;
+ line-height: 1.5em;
}
-ul.autocompleter-choices li.autocompleter-selected
-{
- background-color: #444;
- color: #fff;
+ul.autocompleter-choices li.autocompleter-selected {
+ background-color: #444;
+ color: #fff;
}
-ul.autocompleter-choices span.autocompleter-queried
-{
- display: inline;
- float: none;
- font-weight: bold;
- margin: 0;
- padding: 0;
+ul.autocompleter-choices span.autocompleter-queried {
+ display: inline;
+ float: none;
+ font-weight: bold;
+ margin: 0;
+ padding: 0;
}
ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried
-{
- color: #9FCFFF;
-}
\ No newline at end of file
+ {
+ color: #9FCFFF;
+}
\ No newline at end of file
Modified: branches/lucidity/wooly/resources/mootools.js
===================================================================
--- branches/lucidity/wooly/resources/mootools.js 2011-10-25 19:51:47 UTC (rev 5097)
+++ branches/lucidity/wooly/resources/mootools.js 2011-10-26 02:47:12 UTC (rev 5098)
@@ -1566,6 +1566,7 @@
handleDisplayEvent: function(numselected){
this.filterform.update(numselected);
+ this.filterform.select_all.checked = false;
},
handleFilterEvent: function(list){
@@ -1725,7 +1726,7 @@
'selected': 'Selected:',
'unselected': 'Unselected:',
'selectall': 'Select all',
- 'selectedfiltered':'Select filtered',
+ 'selectedfiltered':'Select all',
'selectnone': 'Clear',
'filter': 'Filter',
'in': 'in',
@@ -1747,40 +1748,13 @@
// infofilter bar is made out of a u list
var ul = new Element('ul', {'class': 'mtms_filtercontrols'});
this.options.view.grab(ul, this.options.inputpos);
-
- this.totalbtn = this.makebtn(this.options.labels.total,
- this.showtotal,
- this.options.datasrc.getChildren().length);
- ul.grab(this.totalbtn);
-
- this.selectedbtn = this.makebtn(this.options.labels.selected,
- this.showselected,
- this.numselected);
- ul.grab(this.selectedbtn);
-
- this.unselectedbtn = this.makebtn(this.options.labels.unselected,
- this.showunselected,
- this.options.datasrc.getChildren().length - this.numselected);
- ul.grab(this.unselectedbtn);
-
- var br = new Element('br');
- ul.grab(br);
-
- this.selectFilteredBtn = this.makebtn(this.options.labels.selectedfiltered,
- this.selectFiltered,
- '');
- ul.grab(this.selectFilteredBtn);
-
- this.selectNoneBtn = this.makebtn(this.options.labels.selectnone,
- this.selectNone,
- '');
- ul.grab(this.selectNoneBtn);
-
+
// Make text field for filter
// On keyup, the displaylist.filter is called with a function
// that filters based on what's been entered in the textfield
filterbox_container = new Element('div', {'class': 'mtms_filterbox'});
this.filterbox = new Element('input', {
+ 'class':'focusfirst textbox',
'id':'filterbox',
'events': {
'keyup': function(evt){
@@ -1789,13 +1763,44 @@
} else {
filter_by_text = function(item){ return item.text.toLowerCase().contains(evt.target.value.toLowerCase()) };
}
+ this.select_all.checked = false;
this.filter(this.options.datasrc.getChildren(), filter_by_text);
}.bind(this)
}
});
+
+ // add the span that contains the x to clear the filter box (see CSS for the magic)
+ this.filter_x = new Element('span', {
+ 'class':'input_x',
+ 'html':'x',
+ 'events': {
+ 'click': function(evt){
+ if(this.filterbox.value != "") {
+ this.filterbox.value = "";
+ this.fireEvent('rebuild', [this.options.datasrc.getChildren()]);
+ this.select_all.checked = false;
+ }
+ }.bind(this)
+ }
+ });
+
+ this.select_all = new Element('input', {
+ 'type':'checkbox',
+ 'events': {
+ 'click': this.selectToggle.bind(this)
+ }
+ });
+
+ this.second_row = new Element('div', {'class':'filterbox_second_row',});
+ this.select_all_label = new Element('span', {'class':'checkboxlabel', 'html': this.options.labels.selectedfiltered,});
+ this.second_row.grab(this.select_all);
+ this.second_row.grab(this.select_all_label);
+
this.filterbox_label = new Element('span', {'html':'Filter list: ', 'class':'mtms_filterlabel'});
filterbox_container.grab(this.filterbox_label);
- filterbox_container.grab(this.filterbox);
+ filterbox_container.grab(this.filterbox);
+ filterbox_container.grab(this.filter_x);
+ filterbox_container.grab(this.second_row);
this.options.view.grab(filterbox_container, this.options.inputpos);
},
@@ -1806,8 +1811,9 @@
counts here.)
*/
- makebtn: function(label, func, prefix){
- var li = new Element('li');
+ makebtn: function(label, func, prefix, element_type){
+ element_type = typeof(element_type) != 'undefined' ? element_type : 'li';
+ var li = new Element(element_type);
var btn = new Element('a', {'html': label,
'href': '',
'events': {
@@ -1822,6 +1828,17 @@
}
return li;
},
+
+ makeformbtn: function(label, func, prefix){
+ var btn = new Element('input', {type: "submit",
+ value: label,
+ 'events': {
+ // You might have to bind this differently
+ 'click': func.bind(this)
+ }
+ });
+ return btn;
+ },
showtotal: function(){
// return true for every item in the datasrc
@@ -1842,15 +1859,6 @@
);
return false;
},
- showunselected:function(){
- this.filter(this.options.datasrc.getChildren(),
- function(item){
- return (item.selected !== true);
- },
- this.RESETINPUT
- );
- return false;
- },
selectAll:function(){
this.options.datasrc.getChildren().each(
function(item){
@@ -1895,6 +1903,14 @@
return results; //returning in the even that someone wants to do a filter(...).each()
},
+ selectToggle:function() {
+ if(arguments[0]['target'].checked) {
+ this.selectFiltered();
+ } else {
+ this.unselectFiltered();
+ }
+ },
+
selectFiltered:function() {
var filter_by_text = "";
if(this.options.case_sensitive){
@@ -1913,16 +1929,33 @@
}
);
this.fireEvent('rebuild', [results]);
- this.update(this.numselected + adds);
- return false;
+ this.update(this.numselected + adds);
+ },
+
+ unselectFiltered:function() {
+ var filter_by_text = "";
+ if(this.options.case_sensitive){
+ filter_by_text = function(item){ return item.text.contains($('filterbox').value)};
+ } else {
+ filter_by_text = function(item){ return item.text.toLowerCase().contains($('filterbox').value.toLowerCase()) };
+ }
+ results = this.filter(this.options.datasrc.getChildren(), filter_by_text, false);
+ var adds = 0;
+ results.each(
+ function(item){
+ if(item.selected) {
+ adds++; // how many more need to be counted as "selected"
+ }
+ item.selected = false;
+ }
+ );
+ this.fireEvent('rebuild', [results]);
+ this.update(this.numselected - adds);
},
update: function(numselected){
this.numselected = numselected;
var total = this.options.datasrc.getChildren().length;
- this.totalbtn.getElement('span').set('text', total);
- this.selectedbtn.getElement('span').set('text', numselected);
- this.unselectedbtn.getElement('span').set('text', total - numselected);
}
});
12 years, 5 months
r5097 - in branches/lucidity: . cumin mace/cpp mint rosemary sage sesame/cpp wooly
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-10-25 19:51:47 +0000 (Tue, 25 Oct 2011)
New Revision: 5097
Modified:
branches/lucidity/COPYING
branches/lucidity/cumin/COPYING
branches/lucidity/mace/cpp/COPYING
branches/lucidity/mint/COPYING
branches/lucidity/rosemary/COPYING
branches/lucidity/sage/COPYING
branches/lucidity/sesame/cpp/COPYING
branches/lucidity/wooly/COPYING
Log:
Update copyright notices with date ranges
Modified: branches/lucidity/COPYING
===================================================================
--- branches/lucidity/COPYING 2011-10-25 19:41:16 UTC (rev 5096)
+++ branches/lucidity/COPYING 2011-10-25 19:51:47 UTC (rev 5097)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: branches/lucidity/cumin/COPYING
===================================================================
--- branches/lucidity/cumin/COPYING 2011-10-25 19:41:16 UTC (rev 5096)
+++ branches/lucidity/cumin/COPYING 2011-10-25 19:51:47 UTC (rev 5097)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: branches/lucidity/mace/cpp/COPYING
===================================================================
--- branches/lucidity/mace/cpp/COPYING 2011-10-25 19:41:16 UTC (rev 5096)
+++ branches/lucidity/mace/cpp/COPYING 2011-10-25 19:51:47 UTC (rev 5097)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: branches/lucidity/mint/COPYING
===================================================================
--- branches/lucidity/mint/COPYING 2011-10-25 19:41:16 UTC (rev 5096)
+++ branches/lucidity/mint/COPYING 2011-10-25 19:51:47 UTC (rev 5097)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: branches/lucidity/rosemary/COPYING
===================================================================
--- branches/lucidity/rosemary/COPYING 2011-10-25 19:41:16 UTC (rev 5096)
+++ branches/lucidity/rosemary/COPYING 2011-10-25 19:51:47 UTC (rev 5097)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: branches/lucidity/sage/COPYING
===================================================================
--- branches/lucidity/sage/COPYING 2011-10-25 19:41:16 UTC (rev 5096)
+++ branches/lucidity/sage/COPYING 2011-10-25 19:51:47 UTC (rev 5097)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: branches/lucidity/sesame/cpp/COPYING
===================================================================
--- branches/lucidity/sesame/cpp/COPYING 2011-10-25 19:41:16 UTC (rev 5096)
+++ branches/lucidity/sesame/cpp/COPYING 2011-10-25 19:51:47 UTC (rev 5097)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: branches/lucidity/wooly/COPYING
===================================================================
--- branches/lucidity/wooly/COPYING 2011-10-25 19:41:16 UTC (rev 5096)
+++ branches/lucidity/wooly/COPYING 2011-10-25 19:51:47 UTC (rev 5097)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
12 years, 5 months
r5096 - trunk/cumin/python/cumin/grid
by croberts@fedoraproject.org
Author: croberts
Date: 2011-10-25 19:41:16 +0000 (Tue, 25 Oct 2011)
New Revision: 5096
Modified:
trunk/cumin/python/cumin/grid/tags.py
Log:
Fixing bug in BZ 733365 (comment 7). Choosing "Delete" with no tags selected will no longer bring up the delete form. This is consistent with the behavior on the Hold/Release/Edit jobs functionality.
Modified: trunk/cumin/python/cumin/grid/tags.py
===================================================================
--- trunk/cumin/python/cumin/grid/tags.py 2011-10-25 19:36:35 UTC (rev 5095)
+++ trunk/cumin/python/cumin/grid/tags.py 2011-10-25 19:41:16 UTC (rev 5096)
@@ -551,7 +551,7 @@
selection = [escape_entity(id) for id in ids]
self.selection.set(session, selection)
- return selection
+ return len(selection)
def process_submit(self, session):
tags_to_kill = self.selection.get(session)
12 years, 5 months
r5095 - in trunk: . cumin mace/cpp mint rosemary sage sesame/cpp wooly
by tmckay@fedoraproject.org
Author: tmckay
Date: 2011-10-25 19:36:35 +0000 (Tue, 25 Oct 2011)
New Revision: 5095
Modified:
trunk/COPYING
trunk/cumin/COPYING
trunk/mace/cpp/COPYING
trunk/mint/COPYING
trunk/rosemary/COPYING
trunk/sage/COPYING
trunk/sesame/cpp/COPYING
trunk/wooly/COPYING
Log:
Update copyright notices with date range
Modified: trunk/COPYING
===================================================================
--- trunk/COPYING 2011-10-25 19:21:34 UTC (rev 5094)
+++ trunk/COPYING 2011-10-25 19:36:35 UTC (rev 5095)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/cumin/COPYING
===================================================================
--- trunk/cumin/COPYING 2011-10-25 19:21:34 UTC (rev 5094)
+++ trunk/cumin/COPYING 2011-10-25 19:36:35 UTC (rev 5095)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/mace/cpp/COPYING
===================================================================
--- trunk/mace/cpp/COPYING 2011-10-25 19:21:34 UTC (rev 5094)
+++ trunk/mace/cpp/COPYING 2011-10-25 19:36:35 UTC (rev 5095)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/mint/COPYING
===================================================================
--- trunk/mint/COPYING 2011-10-25 19:21:34 UTC (rev 5094)
+++ trunk/mint/COPYING 2011-10-25 19:36:35 UTC (rev 5095)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/rosemary/COPYING
===================================================================
--- trunk/rosemary/COPYING 2011-10-25 19:21:34 UTC (rev 5094)
+++ trunk/rosemary/COPYING 2011-10-25 19:36:35 UTC (rev 5095)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/sage/COPYING
===================================================================
--- trunk/sage/COPYING 2011-10-25 19:21:34 UTC (rev 5094)
+++ trunk/sage/COPYING 2011-10-25 19:36:35 UTC (rev 5095)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/sesame/cpp/COPYING
===================================================================
--- trunk/sesame/cpp/COPYING 2011-10-25 19:21:34 UTC (rev 5094)
+++ trunk/sesame/cpp/COPYING 2011-10-25 19:36:35 UTC (rev 5095)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/wooly/COPYING
===================================================================
--- trunk/wooly/COPYING 2011-10-25 19:21:34 UTC (rev 5094)
+++ trunk/wooly/COPYING 2011-10-25 19:36:35 UTC (rev 5095)
@@ -1,4 +1,4 @@
-Copyright (C) 2007 Red Hat Inc.
+Copyright (C) 2007-2011 Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
12 years, 5 months
r5094 - trunk/wooly/resources
by croberts@fedoraproject.org
Author: croberts
Date: 2011-10-25 19:21:34 +0000 (Tue, 25 Oct 2011)
New Revision: 5094
Modified:
trunk/wooly/resources/mootools.js
Log:
Additional tweak for BZ 748497.
Modified: trunk/wooly/resources/mootools.js
===================================================================
--- trunk/wooly/resources/mootools.js 2011-10-25 18:51:52 UTC (rev 5093)
+++ trunk/wooly/resources/mootools.js 2011-10-25 19:21:34 UTC (rev 5094)
@@ -1774,10 +1774,12 @@
'class':'input_x',
'html':'x',
'events': {
- 'click': function(evt){
- this.filterbox.value = "";
- this.fireEvent('rebuild', [this.options.datasrc.getChildren()]);
- this.select_all.checked = false;
+ 'click': function(evt){
+ if(this.filterbox.value != "") {
+ this.filterbox.value = "";
+ this.fireEvent('rebuild', [this.options.datasrc.getChildren()]);
+ this.select_all.checked = false;
+ }
}.bind(this)
}
});
12 years, 5 months
r5093 - in trunk: cumin/resources wooly/resources
by croberts@fedoraproject.org
Author: croberts
Date: 2011-10-25 18:51:52 +0000 (Tue, 25 Oct 2011)
New Revision: 5093
Modified:
trunk/cumin/resources/app.css
trunk/wooly/resources/mootools.js
Log:
BZ 748497, Refactoring of the filtered select widget to remove unnecessary functionality and to rearrange the remaining functionality.
Modified: trunk/cumin/resources/app.css
===================================================================
--- trunk/cumin/resources/app.css 2011-10-25 16:43:40 UTC (rev 5092)
+++ trunk/cumin/resources/app.css 2011-10-25 18:51:52 UTC (rev 5093)
@@ -1,406 +1,407 @@
body {
- margin: 0;
+ margin: 0;
}
body.modal {
- background-color: #f7f7f7;
+ background-color: #f7f7f7;
}
h2 {
- margin: 0;
+ margin: 0;
}
span.none {
- font-style: italic;
- color: #999;
+ font-style: italic;
+ color: #999;
}
.oblock {
- padding: 0;
- background-color: white;
+ padding: 0;
+ background-color: white;
}
.iblock {
- margin: 1em 0;
- padding: 0 1em;
+ margin: 1em 0;
+ padding: 0 1em;
}
.notice {
- margin: 2em;
- padding: 2em;
- border: 1px dotted black;
- width: 66%;
- text-align: center;
+ margin: 2em;
+ padding: 2em;
+ border: 1px dotted black;
+ width: 66%;
+ text-align: center;
}
ul.actions {
- padding: 0;
- margin: 0 0 1em 0;
- list-style: none;
+ padding: 0;
+ margin: 0 0 1em 0;
+ list-style: none;
}
ul.actions li {
- display: inline;
+ display: inline;
}
ul.actions.disabled a {
- color: #666666;
+ color: #666666;
}
ul.actions.disabled li a.nav:before {
- color: #666666;
+ color: #666666;
}
ul.actions.disabled a:hover {
- background-color: #f7f7f7;
+ background-color: #f7f7f7;
}
a.nav:before {
- content: "\00BB \0020";
- font-weight: bold;
- color: #dc9f2e;
+ content: "\00BB \0020";
+ font-weight: bold;
+ color: #dc9f2e;
}
div.sactions {
- margin: 0;
- padding: 0.35em 0.75em;
- background-color: #e7e7f7;
+ margin: 0;
+ padding: 0.35em 0.75em;
+ background-color: #e7e7f7;
}
div.sactions h2 {
- display: inline;
- font-size: 0.9em;
- font-weight: normal;
- margin: 0 0.5em 0 0;
+ display: inline;
+ font-size: 0.9em;
+ font-weight: normal;
+ margin: 0 0.5em 0 0;
}
div.sactions select {
- margin: 0 0.5em 0 0;
+ margin: 0 0.5em 0 0;
}
div.mobject div.mactions h2 {
- display: inline;
- font-size: 0.9em;
- font-weight: normal;
- margin: 0 0.5em 0 0;
+ display: inline;
+ font-size: 0.9em;
+ font-weight: normal;
+ margin: 0 0.5em 0 0;
}
-button, ul.actions a, a.action {
- margin: 0;
- border-top: 1px solid #ddd;
- border-left: 1px solid #ddd;
- border-bottom: 1px solid #bbb;
- border-right: 1px solid #bbb;
- padding: 0.2em 0.4em;
- background: url(resource?name=button-background.png) repeat;
- color: #000;
- font-size: 0.9em;
- -moz-border-radius: 0.4em;
- -webkit-border-radius: 0.4em;
+button,ul.actions a,a.action {
+ margin: 0;
+ border-top: 1px solid #ddd;
+ border-left: 1px solid #ddd;
+ border-bottom: 1px solid #bbb;
+ border-right: 1px solid #bbb;
+ padding: 0.2em 0.4em;
+ background: url(resource?name=button-background.png) repeat;
+ color: #000;
+ font-size: 0.9em;
+ -moz-border-radius: 0.4em;
+ -webkit-border-radius: 0.4em;
}
-button:hover, ul.actions a:hover, a.action:hover {
- background-color: white;
+button:hover,ul.actions a:hover,a.action:hover {
+ background-color: white;
}
button.disabled {
- color: #bbb;
- border: 1px solid #ddd;
+ color: #bbb;
+ border: 1px solid #ddd;
}
button.disabled:hover {
- background-color: #f7f7f7;
+ background-color: #f7f7f7;
}
ul.mobjects {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
ul.mobjects li {
- margin: 0;
- border-top: 1px solid #ccc;
- padding: 0.5em 0;
+ margin: 0;
+ border-top: 1px solid #ccc;
+ padding: 0.5em 0;
}
ul.mobjects li:first-child {
- margin: 0;
- border: none;
+ margin: 0;
+ border: none;
}
ul.mobjects li a.action {
- float: right;
+ float: right;
}
ul.mobjects .flags {
- font-size: small;
- font-style: italic;
+ font-size: small;
+ font-style: italic;
}
ul.mobjects .config {
- padding: 0 0 0 2em;
+ padding: 0 0 0 2em;
}
ul.mobjects .status {
- padding: 0 0 0 2em;
- color: #936;
+ padding: 0 0 0 2em;
+ color: #936;
}
table.mobjects {
- width: 100%;
- border-collapse: collapse;
- margin: 0;
+ width: 100%;
+ border-collapse: collapse;
+ margin: 0;
}
table.mobjects tr {
- border-top: 1px dotted #ccc;
- vertical-align: top;
+ border-top: 1px dotted #ccc;
+ vertical-align: top;
}
table.mobjects td {
- padding: 0.35em 0.5em;
+ padding: 0.35em 0.5em;
}
table.mobjects th {
- padding: 0.35em 0.5em;
+ padding: 0.35em 0.5em;
}
table.mobjects th {
- text-align: left;
- font-weight: normal;
- background-color: #f7f7f7;
+ text-align: left;
+ font-weight: normal;
+ background-color: #f7f7f7;
}
form.mform {
- width: 50em;
- border: 1px solid #ddd;
- background-color: #fff;
- -moz-border-radius: 0.4em;
- -webkit-border-radius: 0.4em;
+ width: 50em;
+ border: 1px solid #ddd;
+ background-color: #fff;
+ -moz-border-radius: 0.4em;
+ -webkit-border-radius: 0.4em;
}
form.mform fieldset {
- border: none;
- padding: 0.75em;
+ border: none;
+ padding: 0.75em;
}
form.mform .legend {
- font-weight: bold;
+ font-weight: bold;
}
-form.mform .head, .mform .body, .mform .foot {
- padding: 0.5em 0.75em;
- margin: 0;
+form.mform .head,.mform .body,.mform .foot {
+ padding: 0.5em 0.75em;
+ margin: 0;
}
form.mform .head {
- font-weight: bold;
- color: white;
- background-color: #87a;
- -moz-border-radius: 0.3em 0.3em 0 0;
- -webkit-border-radius: 0.3em 0.3em 0 0;
-/* background-color: #564979; */
+ font-weight: bold;
+ color: white;
+ background-color: #87a;
+ -moz-border-radius: 0.3em 0.3em 0 0;
+ -webkit-border-radius: 0.3em 0.3em 0 0;
+ /* background-color: #564979; */
}
form.mform .head h1 {
- margin: 0;
- font-size: 1.1em;
+ margin: 0;
+ font-size: 1.1em;
}
form.mform .foot {
- text-align: right;
- border-top: 1px solid #ddd;
+ text-align: right;
+ border-top: 1px solid #ddd;
}
form.mform .field {
- margin: 0.25em 0;
+ margin: 0.25em 0;
}
form.mform .field input {
- border-style: groove;
+ border-style: groove;
}
form.mform ul.errors {
- list-style: none;
- display: block;
- float: right;
- color: red;
- padding: 0.25em 0.5em;
- border: 1px solid red;
- margin: 0 0.5em;
- max-width: 20em;
+ list-style: none;
+ display: block;
+ float: right;
+ color: red;
+ padding: 0.25em 0.5em;
+ border: 1px solid red;
+ margin: 0 0.5em;
+ max-width: 20em;
}
-form.mform button, form.mform a.help {
- margin: 0.5em;
- padding: 0.25em 0.25em 0 0.25em;
+form.mform button,form.mform a.help {
+ margin: 0.5em;
+ padding: 0.25em 0.25em 0 0.25em;
}
form.mform button.midformbutton {
- margin: 0em;
+ margin: 0em;
}
form.mform a.help {
- float: left;
- margin: 0.5em;
- padding: 0.25em 0.35em 0 0.5em;
+ float: left;
+ margin: 0.5em;
+ padding: 0.25em 0.35em 0 0.5em;
}
form.mform a.help:before {
- content: url(resource?name=help-20.png);
- padding: 0 0.25em 0 0;
- vertical-align: -35%;
+ content: url(resource?name=help-20.png);
+ padding: 0 0.25em 0 0;
+ vertical-align: -35%;
}
form.mform button.cancel:before {
- content: url(resource?name=cancel-20.png);
- padding: 0 0.25em 0 0;
- vertical-align: -35%;
+ content: url(resource?name=cancel-20.png);
+ padding: 0 0.25em 0 0;
+ vertical-align: -35%;
}
form.mform button.submit:before {
- content: url(resource?name=submit-20.png);
- padding: 0 0.25em 0 0;
- vertical-align: -35%;
+ content: url(resource?name=submit-20.png);
+ padding: 0 0.25em 0 0;
+ vertical-align: -35%;
}
form.mform td {
- vertical-align: top;
+ vertical-align: top;
}
ul.radiotabs {
- list-style: none;
- margin: 0 0 1em 0;
- padding: 0;
+ list-style: none;
+ margin: 0 0 1em 0;
+ padding: 0;
}
ul.radiotabs li {
- display: inline;
- padding: 0 0.75em 0 0;
+ display: inline;
+ padding: 0 0.75em 0 0;
}
ul.radiotabs li:last-child {
- display: inline;
- margin: 0;
+ display: inline;
+ margin: 0;
}
ul.radiotabs li a:before {
- content: url(resource?name=radio-button.png);
- margin: 0 0.5em 0 0;
- vertical-align: -15%;
+ content: url(resource?name=radio-button.png);
+ margin: 0 0.5em 0 0;
+ vertical-align: -15%;
}
ul.radiotabs li a.selected {
- color: black;
+ color: black;
}
ul.radiotabs li a.selected:before {
- content: url(resource?name=radio-button-checked.png);
+ content: url(resource?name=radio-button-checked.png);
}
ul.radiotabs li a.disabled:before {
- content: url(resource?name=radio-button.png);
+ content: url(resource?name=radio-button.png);
}
+
ul.radiotabs li a.disabled {
- color: #666666;
+ color: #666666;
}
div.statuslight {
- float: left;
- width: 1em;
- height: 1em;
- margin: 0.25em 1px 0 0;
- padding: 0.15em;
- font-size: 0.8em;
- text-align: center;
- line-height: 1.1em;
+ float: left;
+ width: 1em;
+ height: 1em;
+ margin: 0.25em 1px 0 0;
+ padding: 0.15em;
+ font-size: 0.8em;
+ text-align: center;
+ line-height: 1.1em;
}
div.statuslight.red {
- background-color: #e33;
- color: #fd3;
+ background-color: #e33;
+ color: #fd3;
}
div.statuslight.yellow {
- background-color: #fd3;
- color: #e33;
+ background-color: #fd3;
+ color: #e33;
}
div.statuslight.green {
- background-color: #9e9;
+ background-color: #9e9;
}
pre.code {
- background-color: #f7f7f7;
- padding: 1em;
- border: 1px dotted #ddd;
+ background-color: #f7f7f7;
+ padding: 1em;
+ border: 1px dotted #ddd;
}
ul.comma {
- list-style: none;
+ list-style: none;
}
ul.comma li {
- display: inline;
+ display: inline;
}
ul.comma li:after {
- content: ", ";
+ content: ", ";
}
ul.comma li:last-child:after {
- content: "";
+ content: "";
}
ul.slist {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
ul.slist a:before {
- content: url(resource?name=radio-button.png);
- vertical-align: -10%;
- margin: 0 0.5em 0 0;
+ content: url(resource?name=radio-button.png);
+ vertical-align: -10%;
+ margin: 0 0.5em 0 0;
}
ul.slist a.selected:before {
- content: url(resource?name=radio-button-checked.png);
+ content: url(resource?name=radio-button-checked.png);
}
table.twocol {
- width: 100%;
+ width: 100%;
}
-table.twocol > tbody > tr > td {
- width: 50%;
- vertical-align: top;
+table.twocol>tbody>tr>td {
+ width: 50%;
+ vertical-align: top;
}
-table.twocol > tbody > tr > td:first-child {
- padding: 0 1.5em 0 0;
+table.twocol>tbody>tr>td:first-child {
+ padding: 0 1.5em 0 0;
}
-table.twocol > tbody > tr > td:last-child {
- padding: 0 0 0 1.5em;
+table.twocol>tbody>tr>td:last-child {
+ padding: 0 0 0 1.5em;
}
-.ralign, table.mobjects .ralign, div.mstatus table .ralign {
- text-align: right;
+.ralign,table.mobjects .ralign,div.mstatus table .ralign {
+ text-align: right;
}
form.inline {
- display: inline;
+ display: inline;
}
span.count {
- font-size: 0.9em;
- color: #999;
+ font-size: 0.9em;
+ color: #999;
}
.rfloat {
- float: right;
+ float: right;
}
.lfloat {
@@ -408,295 +409,305 @@
}
.rclear {
- font-size:0.01em;
- width: 0.01px;
- clear:right;
- line-height:0.01px;
+ font-size: 0.01em;
+ width: 0.01px;
+ clear: right;
+ line-height: 0.01px;
}
-table.Editable input.edit_string,
-table.Editable textarea.edit_bigstring,
-div.inline_help span.edit_string {
- border: 1px solid #CCCCCC;
+table.Editable input.edit_string,table.Editable textarea.edit_bigstring,div.inline_help span.edit_string
+ {
+ border: 1px solid #CCCCCC;
}
-table.Editable input.edit_number,
-div.inline_help span.edit_number {
- border: 1px dashed #66CCFF;
-}
+table.Editable input.edit_number,div.inline_help span.edit_number {
+ border: 1px dashed #66CCFF;
+}
-table.Editable input.numeric_error,
-div.inline_help span.numeric_error {
- border: 1px dashed #FF0000;
+table.Editable input.numeric_error,div.inline_help span.numeric_error {
+ border: 1px dashed #FF0000;
}
table.Editable span.edit_readonly {
- background-color: #FFFFFF;
- color: #444444;
+ background-color: #FFFFFF;
+ color: #444444;
}
-table.Editable input.edit_string,
-table.Editable input.edit_number,
-table.Editable input.numeric_error {
- width: 20em;
+table.Editable input.edit_string,table.Editable input.edit_number,table.Editable input.numeric_error
+ {
+ width: 20em;
}
table.Editable textarea.edit_bigstring {
- width: 25em;
+ width: 25em;
}
table.Editable div.error {
- color: #FF0000;
- font-size: 0.9em;
+ color: #FF0000;
+ font-size: 0.9em;
}
form.editform {
- border: 0 none !important;
- width: 100% !important;
+ border: 0 none !important;
+ width: 100% !important;
}
div.inline_help {
- margin: 1em;
+ margin: 1em;
}
-div.inline_help span.edit_string,
-div.inline_help span.edit_number,
-div.inline_help span.numeric_error {
- color: #444444;
- font-weight: normal;
- margin-right: 0.5em;
- padding: 0.05em 0.2em;
+div.inline_help span.edit_string,div.inline_help span.edit_number,div.inline_help span.numeric_error
+ {
+ color: #444444;
+ font-weight: normal;
+ margin-right: 0.5em;
+ padding: 0.05em 0.2em;
}
div.inline_help h2 {
- margin-right: 1em;
+ margin-right: 1em;
}
span.prop_example {
- font-size: 0.9em;
+ font-size: 0.9em;
}
span.prop_example:before {
- content: "Example:";
- padding-right: 0.25em;
+ content: "Example:";
+ padding-right: 0.25em;
}
div.fullpageable {
- position: relative;
- background-color: transparent;
- border: 0;
- width: auto;
- height: auto;
- left: 0;
- top: 0;
+ position: relative;
+ background-color: transparent;
+ border: 0;
+ width: auto;
+ height: auto;
+ left: 0;
+ top: 0;
}
div.fullpaged {
- background-color: white;
- border: 10px solid white;
- width: 98% !important;
- position: absolute !important;
- left: 0px;
- top: 0px;
- z-index: 201;
+ background-color: white;
+ border: 10px solid white;
+ width: 98% !important;
+ position: absolute !important;
+ left: 0px;
+ top: 0px;
+ z-index: 201;
}
-p.fullpageIcon,
-p.fullpageIconOldLocation {
- background-color: white;
- border-top: 2px solid #685B8A;
- border-left: 1px solid #685B8A;
- border-bottom: 1px solid #685B8A;
- border-right: 1px solid #685B8A;
- margin: 8px 4px;
- padding: 0;
- width: 8px;
- height: 6px;
- cursor: pointer;
- float: right;
- z-index: 4;
- position: absolute;
- top: 27px;
- right: 60px;
- display: none;
+
+p.fullpageIcon,p.fullpageIconOldLocation {
+ background-color: white;
+ border-top: 2px solid #685B8A;
+ border-left: 1px solid #685B8A;
+ border-bottom: 1px solid #685B8A;
+ border-right: 1px solid #685B8A;
+ margin: 8px 4px;
+ padding: 0;
+ width: 8px;
+ height: 6px;
+ cursor: pointer;
+ float: right;
+ z-index: 4;
+ position: absolute;
+ top: 27px;
+ right: 60px;
+ display: none;
}
+
p.fullpageIconOldLocation {
- top: -2px;
- right: 14px;
+ top: -2px;
+ right: 14px;
}
-div.fullpageable:hover div.fullpageTitle,
-div.fullpageable:hover p.fullpageIcon,
-div.fullpaged div.fullpageTitle,
-div.fullpaged p.fullpageIcon,
-div.fullpaged p.fullpageIconOldLocation,
-div.fullpageable:hover p.fullpageIconOldLocation
- {
- display: block;
+
+div.fullpageable:hover div.fullpageTitle,div.fullpageable:hover p.fullpageIcon,div.fullpaged div.fullpageTitle,div.fullpaged p.fullpageIcon,div.fullpaged p.fullpageIconOldLocation,div.fullpageable:hover p.fullpageIconOldLocation
+ {
+ display: block;
}
-div.fullpaged p.fullpageIcon,
-div.fullpaged p.fullpageIconOldLocation {
- border-top: 1px solid #cbb4ff;
- border-left: 1px solid #cbb4ff;
- border-bottom: 2px solid #685B8A;
- border-right: 1px solid #cbb4ff;
+div.fullpaged p.fullpageIcon,div.fullpaged p.fullpageIconOldLocation {
+ border-top: 1px solid #cbb4ff;
+ border-left: 1px solid #cbb4ff;
+ border-bottom: 2px solid #685B8A;
+ border-right: 1px solid #cbb4ff;
}
div.fullpaged h2 {
- background-color: #E7E7F7;
- padding: 0.25em;
+ background-color: #E7E7F7;
+ padding: 0.25em;
}
div.fullpageBack {
- background-color: white;
- position: absolute;
- width: 100%;
- height: 100%;
- left: 0;
- top: 0;
- display: none;
- z-index: 199;
+ background-color: white;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ top: 0;
+ display: none;
+ z-index: 199;
}
div.imgHighlight_red {
- border: 1px solid red;
- width: 12px;
- height: 12px;
- position: absolute;
- opacity: 0.5;
- z-index: 1000;
+ border: 1px solid red;
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ opacity: 0.5;
+ z-index: 1000;
}
+
div.imgHighlight_green {
- border: 1px solid green;
- width: 12px;
- height: 12px;
- position: absolute;
- opacity: 0.5;
- z-index: 1000;
+ border: 1px solid green;
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ opacity: 0.5;
+ z-index: 1000;
}
+
div.imgHighlight_blue {
- border: 1px solid blue;
- width: 12px;
- height: 12px;
- position: absolute;
- opacity: 0.5;
- z-index: 1000;
+ border: 1px solid blue;
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ opacity: 0.5;
+ z-index: 1000;
}
+
div.imgValues_red {
- color: red;
- font-size: 0.8em;
- background-color: white;
- position: absolute;
- z-index: 1000;
+ color: red;
+ font-size: 0.8em;
+ background-color: white;
+ position: absolute;
+ z-index: 1000;
}
+
div.imgValues_green {
- color: green;
- font-size: 0.8em;
- background-color: white;
- position: absolute;
- z-index: 1000;
+ color: green;
+ font-size: 0.8em;
+ background-color: white;
+ position: absolute;
+ z-index: 1000;
}
+
div.imgValues_blue {
- color: blue;
- font-size: 0.8em;
- background-color: white;
- position: absolute;
- z-index: 1000;
+ color: blue;
+ font-size: 0.8em;
+ background-color: white;
+ position: absolute;
+ z-index: 1000;
}
table.DataTable.Cumin tr {
- border-top: 1px dotted #ccc;
+ border-top: 1px dotted #ccc;
}
-table.DataTable.Cumin td, table.DataTable.Cumin th {
- padding: 0.35em 0.5em;
+table.DataTable.Cumin td,table.DataTable.Cumin th {
+ padding: 0.35em 0.5em;
}
table.DataTable.Cumin th {
- font-weight: normal;
+ font-weight: normal;
}
-table.DataTable.Cumin td.selected, table.DataTable.Cumin th.selected {
+table.DataTable.Cumin td.selected,table.DataTable.Cumin th.selected {
+
}
-table.DataTable.Cumin thead, table.DataTable.Cumin tfoot {
- background-color: #f7f7f7;
+table.DataTable.Cumin thead,table.DataTable.Cumin tfoot {
+ background-color: #f7f7f7;
}
table.DataTable.Cumin tfoot {
- text-align: center;
- font-style: italic;
- font-size: 0.9em;
+ text-align: center;
+ font-style: italic;
+ font-size: 0.9em;
}
a.TaskLink.Cumin:before {
- content: "\00BB \0020";
- font-weight: bold;
- color: #dc9f2e;
+ content: "\00BB \0020";
+ font-weight: bold;
+ color: #dc9f2e;
}
-.autocomplete{
- cursor: pointer;
- border: 1px solid #999;
- border-top: none;
- background: #fff;
- z-index: 2;
+.autocomplete {
+ cursor: pointer;
+ border: 1px solid #999;
+ border-top: none;
+ background: #fff;
+ z-index: 2;
}
-.autocomplete div { padding: 0 0.2em; }
-.autocomplete .normal{border-top: 1px solid #fefefe;}
-.autocomplete .selected{background: #ddf;}
-.autocomplete .highlited{font-weight: bold; color: #008;}
-div.OverviewView > table {
- width: 100%;
+.autocomplete div {
+ padding: 0 0.2em;
}
-div.OverviewView > table > tbody > tr > td {
- width: 50%;
- vertical-align: top;
+.autocomplete .normal {
+ border-top: 1px solid #fefefe;
}
-div.OverviewView h2 > img {
- vertical-align: bottom;
- margin: 0 0.2em 0 0;
+.autocomplete .selected {
+ background: #ddf;
}
+.autocomplete .highlited {
+ font-weight: bold;
+ color: #008;
+}
+
+div.OverviewView>table {
+ width: 100%;
+}
+
+div.OverviewView>table>tbody>tr>td {
+ width: 50%;
+ vertical-align: top;
+}
+
+div.OverviewView h2>img {
+ vertical-align: bottom;
+ margin: 0 0.2em 0 0;
+}
+
div.OverviewView {
- clear: both;
+ clear: both;
}
.mtmultiselect {
- width:450px;
- background:#E7E7F7;
- font:12px verdana;
+ width: 400px;
+ background: #E7E7F7;
+ font: 12px verdana;
}
.mtmultiselect .selected {
- background-color:#E8F7E8;
+ background-color: #E8F7E8;
}
.mtmultiselect ol {
- background-color:#FFFFFF;
+ background-color: #FFFFFF;
}
.mtmultiselect ol .selected {
- background-color:#E8F7E8;
- background-image:url(resource?name=check-mark.png);
- background-position:left;
- background-repeat:no-repeat;
+ background-color: #E8F7E8;
+ background-image: url(resource?name=check-mark.png);
+ background-position: left;
+ background-repeat: no-repeat;
}
.mtmultiselect ul li {
- display:inline;
- padding:0px 15px 0px 15px;
+ display: inline;
+ padding: 0px 15px 0px 15px;
}
.disabled {
- color:#ccc;
+ color: #ccc;
}
.mtms_filterbox {
- float:left;
- padding:5px 5px 0px 5px;
+ float: left;
+ padding: 5px 5px 0px 5px;
}
.listcontainer {
@@ -704,99 +715,111 @@
border: none;
background-color: #FFFFFF;
padding: 0px;
+ clear:both;
}
-.mtms_filterbox input {
+.mtms_filterbox input.textbox {
+ padding-right: 20px;
}
+.input_x {
+ cursor:pointer;
+ color:#38468F;
+ font-weight:bold;
+ position:relative;
+ height:20px;
+ left:-18px;
+}
+
+.filterbox_second_row {
+ clear:both;
+ width:100%;
+}
+
.mtms_filtercontrols {
- color:#000;
- padding:40px 0px 0px 0px;
+ color: #000;
+ padding: 40px 0px 0px 0px;
}
.mtms_filtercontrols a,.mtms_paginator a {
- color:#000;
- padding:0 4px 0 6px;
- text-decoration:underline;
+ color: #000;
+ padding: 0 4px 0 6px;
+ text-decoration: underline;
}
.mtms_filterlabel {
- color:#000;
- padding:0 4px 0 0;
+ color: #000;
+ padding: 0 4px 0 0;
}
.mtms_paginator {
- clear:both;
- padding:5px;
+ clear: both;
+ padding: 5px;
}
-.mtms_paginator .selected, .mtms_paginator .disabled{
- text-decoration:none;
+.mtms_paginator .selected,.mtms_paginator .disabled {
+ text-decoration: none;
}
.mtmultiselect ol {
- padding:0;
+ padding: 0;
}
.mtmultiselect ol li {
- list-style-type:none;
- background-color:#FFF;
- color:#000;
- padding:1px 5px 1px 25px;
+ list-style-type: none;
+ background-color: #FFF;
+ color: #000;
+ padding: 1px 5px 1px 25px;
}
.mtmultiselect ol li:hover {
- background-color:#22BB22;
- color:#111;
+ background-color: #22BB22;
+ color: #111;
}
-
-ul.autocompleter-choices
-{
- position: absolute;
- margin: 0;
- padding: 0;
- list-style: none;
- border: 1px solid #7c7c7c;
- border-left-color: #c3c3c3;
- border-right-color: #c3c3c3;
- border-bottom-color: #ddd;
- background-color: #fff;
- text-align: left;
- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
- z-index: 50;
- background-color: #fff;
+
+ul.autocompleter-choices {
+ position: absolute;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ border: 1px solid #7c7c7c;
+ border-left-color: #c3c3c3;
+ border-right-color: #c3c3c3;
+ border-bottom-color: #ddd;
+ background-color: #fff;
+ text-align: left;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+ z-index: 50;
+ background-color: #fff;
}
-ul.autocompleter-choices li
-{
- position: relative;
- margin: -2px 0 0 0;
- padding: 0.2em 1.5em 0.2em 1em;
- display: block;
- float: none !important;
- cursor: pointer;
- font-weight: normal;
- white-space: nowrap;
- font-size: 1em;
- line-height: 1.5em;
+ul.autocompleter-choices li {
+ position: relative;
+ margin: -2px 0 0 0;
+ padding: 0.2em 1.5em 0.2em 1em;
+ display: block;
+ float: none !important;
+ cursor: pointer;
+ font-weight: normal;
+ white-space: nowrap;
+ font-size: 1em;
+ line-height: 1.5em;
}
-ul.autocompleter-choices li.autocompleter-selected
-{
- background-color: #444;
- color: #fff;
+ul.autocompleter-choices li.autocompleter-selected {
+ background-color: #444;
+ color: #fff;
}
-ul.autocompleter-choices span.autocompleter-queried
-{
- display: inline;
- float: none;
- font-weight: bold;
- margin: 0;
- padding: 0;
+ul.autocompleter-choices span.autocompleter-queried {
+ display: inline;
+ float: none;
+ font-weight: bold;
+ margin: 0;
+ padding: 0;
}
ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried
-{
- color: #9FCFFF;
-}
\ No newline at end of file
+ {
+ color: #9FCFFF;
+}
\ No newline at end of file
Modified: trunk/wooly/resources/mootools.js
===================================================================
--- trunk/wooly/resources/mootools.js 2011-10-25 16:43:40 UTC (rev 5092)
+++ trunk/wooly/resources/mootools.js 2011-10-25 18:51:52 UTC (rev 5093)
@@ -1566,6 +1566,7 @@
handleDisplayEvent: function(numselected){
this.filterform.update(numselected);
+ this.filterform.select_all.checked = false;
},
handleFilterEvent: function(list){
@@ -1747,31 +1748,13 @@
// infofilter bar is made out of a u list
var ul = new Element('ul', {'class': 'mtms_filtercontrols'});
this.options.view.grab(ul, this.options.inputpos);
-
- this.totalbtn = this.makebtn(this.options.labels.total,
- this.showtotal,
- this.options.datasrc.getChildren().length);
- ul.grab(this.totalbtn);
-
- this.selectedbtn = this.makebtn(this.options.labels.selected,
- this.showselected,
- this.numselected);
- ul.grab(this.selectedbtn);
-
- this.selectFilteredBtn = this.makeformbtn(this.options.labels.selectedfiltered,
- this.selectFiltered,
- '');
-
- this.selectNoneBtn = this.makeformbtn(this.options.labels.selectnone,
- this.selectNone,
- '');
-
+
// Make text field for filter
// On keyup, the displaylist.filter is called with a function
// that filters based on what's been entered in the textfield
filterbox_container = new Element('div', {'class': 'mtms_filterbox'});
this.filterbox = new Element('input', {
- 'class':'focusfirst',
+ 'class':'focusfirst textbox',
'id':'filterbox',
'events': {
'keyup': function(evt){
@@ -1780,15 +1763,42 @@
} else {
filter_by_text = function(item){ return item.text.toLowerCase().contains(evt.target.value.toLowerCase()) };
}
+ this.select_all.checked = false;
this.filter(this.options.datasrc.getChildren(), filter_by_text);
}.bind(this)
}
});
+
+ // add the span that contains the x to clear the filter box (see CSS for the magic)
+ this.filter_x = new Element('span', {
+ 'class':'input_x',
+ 'html':'x',
+ 'events': {
+ 'click': function(evt){
+ this.filterbox.value = "";
+ this.fireEvent('rebuild', [this.options.datasrc.getChildren()]);
+ this.select_all.checked = false;
+ }.bind(this)
+ }
+ });
+
+ this.select_all = new Element('input', {
+ 'type':'checkbox',
+ 'events': {
+ 'click': this.selectToggle.bind(this)
+ }
+ });
+
+ this.second_row = new Element('div', {'class':'filterbox_second_row',});
+ this.select_all_label = new Element('span', {'class':'checkboxlabel', 'html': this.options.labels.selectedfiltered,});
+ this.second_row.grab(this.select_all);
+ this.second_row.grab(this.select_all_label);
+
this.filterbox_label = new Element('span', {'html':'Filter list: ', 'class':'mtms_filterlabel'});
filterbox_container.grab(this.filterbox_label);
filterbox_container.grab(this.filterbox);
- filterbox_container.grab(this.selectNoneBtn);
- filterbox_container.grab(this.selectFilteredBtn);
+ filterbox_container.grab(this.filter_x);
+ filterbox_container.grab(this.second_row);
this.options.view.grab(filterbox_container, this.options.inputpos);
},
@@ -1891,6 +1901,14 @@
return results; //returning in the even that someone wants to do a filter(...).each()
},
+ selectToggle:function() {
+ if(arguments[0]['target'].checked) {
+ this.selectFiltered();
+ } else {
+ this.unselectFiltered();
+ }
+ },
+
selectFiltered:function() {
var filter_by_text = "";
if(this.options.case_sensitive){
@@ -1909,15 +1927,33 @@
}
);
this.fireEvent('rebuild', [results]);
- this.update(this.numselected + adds);
- return false;
+ this.update(this.numselected + adds);
+ },
+
+ unselectFiltered:function() {
+ var filter_by_text = "";
+ if(this.options.case_sensitive){
+ filter_by_text = function(item){ return item.text.contains($('filterbox').value)};
+ } else {
+ filter_by_text = function(item){ return item.text.toLowerCase().contains($('filterbox').value.toLowerCase()) };
+ }
+ results = this.filter(this.options.datasrc.getChildren(), filter_by_text, false);
+ var adds = 0;
+ results.each(
+ function(item){
+ if(item.selected) {
+ adds++; // how many more need to be counted as "selected"
+ }
+ item.selected = false;
+ }
+ );
+ this.fireEvent('rebuild', [results]);
+ this.update(this.numselected - adds);
},
update: function(numselected){
this.numselected = numselected;
var total = this.options.datasrc.getChildren().length;
- this.totalbtn.getElement('span').set('text', total);
- this.selectedbtn.getElement('span').set('text', numselected);
}
});
12 years, 5 months