r4764 - in branches/stability: cumin/python/cumin cumin/python/cumin/grid wooly/resources

Author: tmckay
Date: 2011-05-16 19:03:46 +0000 (Mon, 16 May 2011)
New Revision: 4764

Modified:
   branches/stability/cumin/python/cumin/grid/job.strings
   branches/stability/cumin/python/cumin/grid/negotiator.strings
   branches/stability/cumin/python/cumin/objectselector.strings
   branches/stability/cumin/python/cumin/objecttask.strings
   branches/stability/wooly/resources/wooly.js
Log:
Merge 4762 from trunk.
BZ704253


Modified: branches/stability/cumin/python/cumin/grid/job.strings
===================================================================
--- branches/stability/cumin/python/cumin/grid/job.strings	2011-05-13 19:50:38 UTC (rev
4763)
+++ branches/stability/cumin/python/cumin/grid/job.strings	2011-05-16 19:03:46 UTC (rev
4764)
@@ -148,7 +148,7 @@
   </div>
 </form>
 <script type="text/javascript">
-<![CDATA[
+//<![CDATA[
 (function() {
     var scrolled = false;
     if ({is_tail}) {
@@ -160,7 +160,7 @@
         } );
     }
 }())
-]]>
+//]]>
 </script>
 
 [OutputFile.html]

Modified: branches/stability/cumin/python/cumin/grid/negotiator.strings
===================================================================
--- branches/stability/cumin/python/cumin/grid/negotiator.strings	2011-05-13 19:50:38 UTC
(rev 4763)
+++ branches/stability/cumin/python/cumin/grid/negotiator.strings	2011-05-16 19:03:46 UTC
(rev 4764)
@@ -23,7 +23,7 @@
   <div>{hidden_inputs}</div>
 </form>
 <script type="text/javascript">
-<![CDATA[
+//<![CDATA[
 
 cumin.initializeGroupForm = function () {
     cumin.init_sliders("{chart_id}");
@@ -72,7 +72,7 @@
         }
     }
 }
-]]>
+//]]>
 </script>
 
 [EditDynamicQuotaForm.css]

Modified: branches/stability/cumin/python/cumin/objectselector.strings
===================================================================
--- branches/stability/cumin/python/cumin/objectselector.strings	2011-05-13 19:50:38 UTC
(rev 4763)
+++ branches/stability/cumin/python/cumin/objectselector.strings	2011-05-16 19:03:46 UTC
(rev 4764)
@@ -57,7 +57,7 @@
     <div>{hidden_inputs}</div>
   </form>
   <script type="text/javascript">
-<![CDATA[
+//<![CDATA[
     $(document.forms[0]).getElements('[type=text]').each(function(el){ new
OverText(el, {
             positionOptions: {
             offset: {
@@ -68,7 +68,7 @@
     
     }); });
     {script}
-]]>
+//]]>
   </script>
 </div>
 
@@ -139,7 +139,7 @@
     <div class="deferredSpacer">Loading...</div>
 </div>
 <script type="text/javascript">
-<![CDATA[
+//<![CDATA[
 (function() {
 
     if (typeof window.reUpdated == "undefined") {
@@ -152,7 +152,7 @@
     }
 
 }())
-]]>
+//]]>
 </script>
 
 [ObjectQmfSelector.error_html]
@@ -195,7 +195,7 @@
     <div id="{id}_details" class="Details" style="display:
{style};">{details}</div>
 </div>
 <script type="text/javascript">
-<![CDATA[
+//<![CDATA[
     function showDetails() {
         var updateUrl = wooly.branchIntervalUpdate();
         var branch = updateUrl["session"];
@@ -213,7 +213,7 @@
         }
         wooly.restartIntervalUpdate(updateUrl.marshal());
     }
-]]>
+//]]>
 </script>
 
 [ObjectTableColumn.css]

Modified: branches/stability/cumin/python/cumin/objecttask.strings
===================================================================
--- branches/stability/cumin/python/cumin/objecttask.strings	2011-05-13 19:50:38 UTC (rev
4763)
+++ branches/stability/cumin/python/cumin/objecttask.strings	2011-05-16 19:03:46 UTC (rev
4764)
@@ -1,39 +1,3 @@
-[TaskInvocationSet.css]
-div.TaskInvocationSet {
-    background-color: #fe0;
-    padding: 1em 2em;
-    -moz-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-    margin: 0.5em auto 1em auto;
-    width: 80%;
-}
-
-div.TaskInvocationSet ul {
-    margin: 0;
-    padding: 0 0 0 1em;
-}
-
-div.TaskInvocationSet a.dismiss {
-    float: right;
-    font-size: 0.9em;
-}
-
-div.TaskInvocationSet a.dismissall {
-    font-size: 0.9em;
-}
-
-[TaskInvocationSet.html]
-<div id="{id}" class="{class}">
-  <!-- <a class="dismissall" href="">Dismiss all</a>
-->
-  <ul>{items}</ul>
-</div>
-
-[TaskInvocationItem.html]
-<li>
-  <a class="dismiss" href="{dismiss_href}">Dismiss</a>
-  {message}
-</li>
-
 [SelectionList.css]
 ul.SelectionList {
     list-style: none;

Modified: branches/stability/wooly/resources/wooly.js
===================================================================
--- branches/stability/wooly/resources/wooly.js	2011-05-13 19:50:38 UTC (rev 4763)
+++ branches/stability/wooly/resources/wooly.js	2011-05-16 19:03:46 UTC (rev 4764)
@@ -203,12 +203,11 @@
     var damnyouie = /msie/i.test(navigator.userAgent) &&
!/opera/i.test(navigator.userAgent);
 
     function replaceNode(newNode, oldNode) {
-        var node = copyNode(newNode, true);
-        oldNode.parentNode.replaceChild(node, oldNode);
-
         if (document.all) {
-            // Damn you straight to hell, IE!
-            node.outerHTML = node.outerHTML;
+            oldNode.outerHTML = newNode.xml;
+        } else {
+            var node = copyNode(newNode, true);
+            oldNode.parentNode.replaceChild(node, oldNode);
         }
     }