2 new revisions:
Revision: c239e08595d2
Author: Mikko Korpela <[email protected]>
Date: Mon Jan 30 05:20:51 2012
Log: log.html: Enhance open close of elements
http://code.google.com/p/robotframework/source/detail?r=c239e08595d2
Revision: 8cb536b0a824
Author: Mikko Korpela <[email protected]>
Date: Mon Jan 30 05:20:57 2012
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=8cb536b0a824
==============================================================================
Revision: c239e08595d2
Author: Mikko Korpela <[email protected]>
Date: Mon Jan 30 05:20:51 2012
Log: log.html: Enhance open close of elements
http://code.google.com/p/robotframework/source/detail?r=c239e08595d2
Modified:
/src/robot/webcontent/log.css
/src/robot/webcontent/log.html
/src/robot/webcontent/log.js
=======================================
--- /src/robot/webcontent/log.css Fri Dec 2 07:47:24 2011
+++ /src/robot/webcontent/log.css Mon Jan 30 05:20:51 2012
@@ -65,7 +65,7 @@
width: 4em;
text-align: center;
}
-/* Folding buttons */
+/* Folding */
div.foldingbutton {
text-align: center;
line-height: 0.8em;
@@ -80,13 +80,16 @@
}
div.foldingbutton:hover {
background: yellow;
- cursor: pointer;
}
.expand {
float: right;
margin-right: 0.5em;
font-size: 0.8em;
}
+div.elementheader:hover {
+ cursor: pointer;
+ background: #F4F4FF;
+}
/* Test, suite and kw names */
.name {
font-weight: bold;
=======================================
--- /src/robot/webcontent/log.html Fri Jan 20 06:36:56 2012
+++ /src/robot/webcontent/log.html Mon Jan 30 05:20:51 2012
@@ -175,14 +175,11 @@
<td>
<a class="expand"
href="javascript:expandAllChildren('${id}')">Expand All</a>
- <div class="foldingbutton" id="${id}_unfoldlink"
- onclick="openSuite('${id}');"
- style="display: block;">+</div>
- <div class="foldingbutton" id="${id}_foldlink"
- onclick="closeElement('${id}');"
- style="display: none;">-</div>
- <span class="${status.toLowerCase()}">TEST SUITE:</span>
- <a class="name" title="${name}">${name}</a>
+ <div onclick="toggleSuite('${id}');" class="elementheader">
+ <div id="${id}_foldingbutton" class="foldingbutton">+</div>
+ <span class="${status.toLowerCase()}">TEST SUITE:</span>
+ <a class="name" title="${name}">${name}</a>
+ </div>
</td>
</tr>
<tr>
@@ -241,17 +238,12 @@
<td>
<a class="expand"
href="javascript:expandAllChildren('${id}')">Expand All</a>
- <div class="foldingbutton"
- id="${id}_unfoldlink"
- onclick="openTest('${id}');"
- style="display: block;">+</div>
- <div class="foldingbutton"
- id="${id}_foldlink"
- onclick="closeElement('${id}');"
- style="display: none;">-</div>
- <span class="${status.toLowerCase()}">TEST CASE: </span>
- <a class="name" title="${fullName}">${name}</a>
- {{if !isCritical}}<span> (non-critical)</span>{{/if}}
+ <div onclick="toggleTest('${id}');" class="elementheader">
+ <div id="${id}_foldingbutton" class="foldingbutton">+</div>
+ <span class="${status.toLowerCase()}">TEST CASE: </span>
+ <a class="name" title="${fullName}">${name}</a>
+ {{if !isCritical}}<span> (non-critical)</span>{{/if}}
+ </div>
</td>
</tr>
<tr>
@@ -305,17 +297,12 @@
<table class="keyword" id="${id}">
<tr>
<td>
- <div class="foldingbutton"
- id="${id}_foldlink"
- onclick="closeElement('${id}');"
- style="display: none;">-</div>
- <div class="foldingbutton"
- id="${id}_unfoldlink"
- onclick="openKeyword('${id}');"
- style="display: block;">+</div>
- <span class="${status.toLowerCase()}">${type}: </span>
- <a class="name" title="${name}">${name}</a>
- <span class="arg">${arguments}</span>
+ <div onclick="toggleKeyword('${id}');" class="elementheader">
+ <div id="${id}_foldingbutton" class="foldingbutton">+</div>
+ <span class="${status.toLowerCase()}">${type}: </span>
+ <a class="name" title="${name}">${name}</a>
+ <span class="arg">${arguments}</span>
+ </div>
</td>
</tr>
<tr>
=======================================
--- /src/robot/webcontent/log.js Wed Jan 11 23:38:11 2012
+++ /src/robot/webcontent/log.js Mon Jan 30 05:20:51 2012
@@ -1,13 +1,13 @@
-function openSuite(suiteId) {
- openElement(suiteId, ['keyword', 'suite', 'test']);
+function toggleSuite(suiteId) {
+ toggleElement(suiteId, ['keyword', 'suite', 'test']);
}
-function openTest(testId) {
- openElement(testId, ['keyword']);
+function toggleTest(testId) {
+ toggleElement(testId, ['keyword']);
}
-function openKeyword(kwId) {
- openElement(kwId, ['keyword', 'message']);
+function toggleKeyword(kwId) {
+ toggleElement(kwId, ['keyword', 'message']);
}
function addElements(elems, templateName, target){
@@ -16,18 +16,16 @@
}
}
-function openElement(elementId, childrenNames) {
- $('#'+elementId+'_unfoldlink').css("background", "yellow");
+function toggleElement(elementId, childrenNames) {
+ var foldingButton = $('#'+elementId+'_foldingbutton');
var childElement = $("#"+elementId+"_children");
- childElement.show();
+ childElement.toggle(100);
if (!childElement.hasClass("populated")) {
var element = window.testdata.find(elementId);
element.callWhenChildrenReady(drawCallback(element, childElement,
childrenNames));
childElement.addClass("populated");
}
- $('#'+elementId+'_foldlink').show();
- $('#'+elementId+'_unfoldlink').hide();
- $('#'+elementId+'_unfoldlink').css("background", "white");
+ foldingButton.text(foldingButton.text() == '+' ? '-' : '+');
}
function drawCallback(element, childElement, childrenNames) {
@@ -37,12 +35,6 @@
});
}
}
-
-function closeElement(elementId) {
- $("#"+elementId+"_children").hide();
- $('#'+elementId+'_foldlink').hide();
- $('#'+elementId+'_unfoldlink').show();
-}
function expandRecursively(){
if (!window.elementsToExpand.length)
@@ -65,7 +57,9 @@
}
function expandElement(element) {
- $("#" + element.id + "_unfoldlink").click();
+ if (!$("#" + element.id + "_children").is(":visible")) {
+ $("#" + element.id + " .elementheader").click();
+ }
}
function elementHiddenByUser(elementId) {
==============================================================================
Revision: 8cb536b0a824
Author: Mikko Korpela <[email protected]>
Date: Mon Jan 30 05:20:57 2012
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=8cb536b0a824
