dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #03711
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1229: Show tooltip for combobox - Excel report
------------------------------------------------------------
revno: 1229
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-12-16 10:37:57 +0700
message:
Show tooltip for combobox - Excel report
modified:
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/commons.js
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/excelitems.js
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/individual.js
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/reportItem.js
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/sortedDataElementGroup.js
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/style/style.css
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml 2009-12-11 04:27:39 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml 2009-12-16 03:37:57 +0000
@@ -186,8 +186,17 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-excel-reporting/listDataElementGroup.vm</param>
<param name="menu">/dhis-web-excel-reporting/menu.vm</param>
- <param name="javascripts">javascript/ui.core.js,javascript/ui.sortable.js,javascript/dataElementGroup.js,javascript/commons.js</param>
- <param name="stylesheets">style/ui.theme.css,style/basic.css</param>
+ <param name="javascripts">
+ javascript/commons.js,
+ javascript/ui.core.js,
+ javascript/ui.sortable.js,
+ javascript/dataElementGroup.js
+ </param>
+ <param name="stylesheets">
+ style/ui.theme.css,
+ style/basic.css,
+ style/style.css
+ </param>
</action>
<action name="getAllDataElementGroups"
@@ -327,7 +336,7 @@
javascript/jquery.autocomplete.js,
javascript/commons.js
</param>
- <param name="stylesheets">style/jquery.autocomplete.css</param>
+ <param name="stylesheets">style/jquery.autocomplete.css, style/style.css</param>
</action>
<action name="getReportExcelItems"
@@ -797,7 +806,10 @@
<param name="page">/dhis-web-excel-reporting/excelitemgroups.vm</param>
<param name="menu">/dhis-web-excel-reporting/menu.vm</param>
<param name="menuTreeHeight">220</param>
- <param name="javascripts">javascript/excelitemgroups.js,javascript/commons.js,../dhis-web-commons/ouwt/ouwt.js</param>
+ <param name="javascripts">
+ javascript/excelitemgroups.js,
+ javascript/commons.js,
+ ../dhis-web-commons/ouwt/ouwt.js</param>
</action>
<action name="getAllExcelItemGroup"
@@ -949,7 +961,12 @@
<param name="page">/dhis-web-excel-reporting/excelitems.vm</param>
<param name="menu">/dhis-web-excel-reporting/menu.vm</param>
<param name="menuTreeHeight">220</param>
- <param name="javascripts">javascript/excelitems.js,javascript/commons.js,../dhis-web-commons/ouwt/ouwt.js</param>
+ <param name="javascripts">
+ javascript/excelitems.js,
+ javascript/commons.js,
+ ../dhis-web-commons/ouwt/ouwt.js
+ </param>
+ <param name="stylesheets">style/style.css</param>
</action>
<action name="updateExcelItem"
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm 2009-12-08 05:28:22 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm 2009-12-16 03:37:57 +0000
@@ -1,4 +1,5 @@
<h2>$!encoder.htmlEncode($!excelItemGroup.name)</h2>
+<div id="tooltip" style=" display:none; background-color:#FFFFCC; ; position:absolute;" ></div>
<table width="100%">
<tr>
<td>
@@ -110,10 +111,10 @@
<input type="button" value="<" onclick="insertDataElementId()"/>
</td>
<td>
- <select id="dataElementGroup" style="min-width:500px" onchange="getDataElementsByGroup()"></select>
- <select name="select" size="11" id="availableDataElements" style="min-width:500px">
+ <select id="dataElementGroup" style="width:500px" onchange="getDataElementsByGroup()"></select>
+ <select name="select" size="11" id="availableDataElements" style="width:500px" onMouseOut="javascript: hideToolTip();">
</select>
- <select id="optionCombos" size=4 style="min-width:500px"></select>
+ <select id="optionCombos" size=4 style="width:500px"></select>
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm 2009-12-04 09:37:23 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/individualReportExcel.vm 2009-12-16 03:37:57 +0000
@@ -1,12 +1,5 @@
-<style type="text/css">
-#tooltip {
- color:#000; font-size:11px; line-height:1.2;
- background-color:#E1E5F1; border:1px solid #667295;
- width:210px; padding:4px;
-}
-</style>
<h3>$i18n.getString( "individual_report" )</h3>
-<div id="tooltip" style=" display:none; background-color:#FFFFCC; ; position:absolute;" ></div>
+<div id="tooltip"></div>
<form id="editDataSetForm" name="editDataSetForm" method="post" onsubmit="submitForm(); return validateEditDataSet()">
<div style="display:inline">
@@ -74,7 +67,7 @@
<td>
<!-- List of all available DataElements -->
- <select size="15" onMouseOut="javascript: hideToolTip();" hideToolTip id="availableDataElements" name="availableDataElements" style="max-width:30em;min-width:30em;height:10em" onChange="getOptionCombos();">
+ <select size="15" onMouseOut="javascript: hideToolTip();" id="availableDataElements" name="availableDataElements" style="max-width:30em;min-width:30em;height:10em" onChange="getOptionCombos();">
</select>
<br><br>
<strong>$i18n.getString('category_option_combo')</strong><br>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/commons.js 2009-11-11 05:46:50 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/commons.js 2009-12-16 03:37:57 +0000
@@ -50,3 +50,45 @@
}
}
}
+
+// -----------------------------------------------------------------------------
+function showToolTip( e, value){
+
+ var tooltipDiv = byId('tooltip');
+ tooltipDiv.style.display = 'block';
+
+ var posx = 0;
+ var posy = 0;
+
+ if (!e) var e = window.event;
+ if (e.pageX || e.pageY)
+ {
+ posx = e.pageX;
+ posy = e.pageY;
+ }
+ else if (e.clientX || e.clientY)
+ {
+ posx = e.clientX;
+ posy = e.clientY;
+ }
+
+ tooltipDiv.style.left= posx + 8 + 'px';
+ tooltipDiv.style.top = posy + 8 + 'px';
+ tooltipDiv.innerHTML = " " + value;
+}
+
+function hideToolTip(){
+ byId('tooltip').style.display = 'none';
+}
+
+// ---------------------------------------------------------------------------
+
+function showText(targetListId ) {
+
+ var targetList = document.getElementById( targetListId );
+ var options = targetList.options;
+ var option = options[options.length-1];
+ option.onmousemove = function(e){
+ showToolTip( e, this.text);
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js 2009-12-11 04:27:39 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/dataElementGroup.js 2009-12-16 03:37:57 +0000
@@ -52,7 +52,12 @@
{
var id = dataElements[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
var name = dataElements[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
- listDataElement.options.add(new Option(name, id));
+ //listDataElement.options.add(new Option(name, id));
+ var option = new Option( name, id );
+ option.onmousemove = function(e){
+ showToolTip( e, this.text);
+ }
+ listDataElement.add( option, null );
}
var availableDataElements = document.getElementById('availableDataElements');
@@ -60,7 +65,7 @@
for(var i=0;i<availableDataElements.options.length;i++){
for(var j=0;j<selectedDataElements.options.length;j++){
if(availableDataElements.options[i].value==selectedDataElements.options[j].value){
- availableDataElements.options[i].style.display='none';
+ availableDataElements.options[i].style.display='none';
}
}
}
@@ -83,8 +88,8 @@
*/
function deleteDataElementOrder( id ){
+
if(window.confirm(i18n_confirm_delete)){
-
var request = new Request();
request.setResponseTypeXML( 'datalement' );
request.setCallbackSuccess( deleteDataElementOrderReceived );
@@ -120,10 +125,15 @@
byId("name").value = xmlObject.getElementsByTagName('name')[0].firstChild.nodeValue;
byId("code").value = xmlObject.getElementsByTagName('code')[0].firstChild.nodeValue;
var dataElements = xmlObject.getElementsByTagName('dataElements')[0].getElementsByTagName('dataElement');
+
for(var i=0;i<dataElements.length;i++){
var name = dataElements[i].getElementsByTagName('name')[0].firstChild.nodeValue;
var id = dataElements[i].getElementsByTagName('id')[0].firstChild.nodeValue;
- listDataElement.options.add(new Option(name, id));
+ var option = new Option( name, id );
+ option.onmousemove = function(e){
+ showToolTip( e, this.text);
+ }
+ listDataElement.options.add(option);
}
document.forms['dataElementGroups'].action = "updateDataElementGroupOrder.action";
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/excelitems.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/excelitems.js 2009-12-09 10:26:46 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/excelitems.js 2009-12-16 03:37:57 +0000
@@ -212,11 +212,11 @@
{
var id = dataelements[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
var elementName = dataelements[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
-
- var option = document.createElement( "option" );
- option.value = id ;
- option.text = elementName;
- dataElementList.add( option, null );
+ var option = new Option( elementName, id );
+ option.onmousemove = function(e){
+ showToolTip( e, this.text);
+ }
+ dataElementList.add( option, null );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/individual.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/individual.js 2009-12-04 09:37:23 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/individual.js 2009-12-16 03:37:57 +0000
@@ -73,7 +73,7 @@
var dataElements = dataElementGroup.getElementsByTagName( 'dataElements' )[0];
var dataElementList = dataElements.getElementsByTagName( 'dataElement' );
- var availableList = document.getElementById( 'availableDataElements' );
+ var availableList = byId( 'availableDataElements' );
for ( var i = 0; i < dataElementList.length; i++ )
{
@@ -280,35 +280,7 @@
deleteDivEffect();
$("#loading").hide();
}
-// -----------------------------------------------------------------------------
-function showToolTip( e, value){
-
- var tooltipDiv = byId('tooltip');
- tooltipDiv.style.display = 'block';
-
- var posx = 0;
- var posy = 0;
-
- if (!e) var e = window.event;
- if (e.pageX || e.pageY)
- {
- posx = e.pageX;
- posy = e.pageY;
- }
- else if (e.clientX || e.clientY)
- {
- posx = e.clientX;
- posy = e.clientY;
- }
-
- tooltipDiv.style.left= posx + 8 + 'px';
- tooltipDiv.style.top = posy + 8 + 'px';
- tooltipDiv.innerHTML = " " + value;
-}
-function hideToolTip(){
- byId('tooltip').style.display = 'none';
-}
function getPeriodsByPeriodTypeName() {
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/reportItem.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/reportItem.js 2009-12-09 10:26:46 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/reportItem.js 2009-12-16 03:37:57 +0000
@@ -442,7 +442,10 @@
for ( id in dataElementGroups )
{
list.add( new Option( dataElementGroups[id], id ), null );
+ //var option = new Option( dataElementGroups[id], id );
+ //list.add( option , null );
}
+
}
/**
@@ -473,10 +476,11 @@
var id = dataelements[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
var elementName = dataelements[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
- var option = document.createElement( "option" );
- option.value = id ;
- option.text = elementName;
- dataElementList.add( option, null );
+ var option = new Option( elementName, id );
+ option.onmousemove = function(e){
+ showToolTip( e, this.text);
+ }
+ dataElementList.add( option, null );
}
}
@@ -511,7 +515,7 @@
function insertDataElementId() {
- var dataElementComboId = "[" + $("#availableDataElements").val() + "." + $("#optionCombos").val() + "]";
+ var dataElementComboId = "[" + byId("availableDataElements").value + "." + byId("optionCombos").value + "]";
byId("formula").value += dataElementComboId;
}
@@ -595,7 +599,13 @@
var id = dataElementGroups.item(i).getElementsByTagName('id')[0].firstChild.nodeValue;
var name = dataElementGroups.item(i).getElementsByTagName('name')[0].firstChild.nodeValue;
- selectedDataElementGroups.options.add(new Option(name, id));
+ //selectedDataElementGroups.options.add(new Option(name, id));
+
+ var option = new Option( name, id );
+ option.onmousemove = function(e){
+ showToolTip( e, this.text);
+ }
+ selectedDataElementGroups.add(option, null);
}
getDataElementGroupOrder();
@@ -624,7 +634,7 @@
function getDataElementGroupOrderReceived( data ) {
- var availableDataElements = document.getElementById('availableDataElements_');
+ var availableDataElements = byId('availableDataElements_');
availableDataElements.options.length = 0;
var dataelEments = data.getElementsByTagName( "dataElement" );
@@ -632,7 +642,12 @@
{
var id = dataelEments[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
var name = dataelEments[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
- availableDataElements.options.add(new Option(name, id));
+ //availableDataElements.options.add(new Option(name, id));
+ var option = new Option( name, id );
+ option.onmousemove = function(e){
+ showToolTip( e, this.text);
+ }
+ availableDataElements.add(option, null);
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/sortedDataElementGroup.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/sortedDataElementGroup.js 2009-12-04 06:39:28 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/sortedDataElementGroup.js 2009-12-16 03:37:57 +0000
@@ -164,7 +164,7 @@
listDataElement.options.length = 0;
byId("name").value = getElementValue(data,'name' );//data.getElementsByTagName('name')[0].firstChild.nodeValue;
byId("code").value = getElementValue(data,'code' );// data.getElementsByTagName('code')[0].firstChild.nodeValue;
- var dataElements = getElementValue(data,'dataElements' );// data.getElementsByTagName('dataElements')[0].getElementsByTagName('dataElement');
+ var dataElements = data.getElementsByTagName('dataElements')[0].getElementsByTagName('dataElement');
for(var i=0;i<dataElements.length;i++){
var name = dataElements[i].getElementsByTagName('name')[0].firstChild.nodeValue;
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm 2009-10-01 08:28:21 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm 2009-12-16 03:37:57 +0000
@@ -1,4 +1,5 @@
<h2>$i18n.getString('dataelement_groups')</h2>
+<div id="tooltip"></div>
<p></p>
<table width="800px">
<tr>
@@ -40,7 +41,7 @@
<form name="dataElementGroups" method="post">
<input type="hidden" name="id" value="$report.id"/>
<input type="hidden" name="dataElementGroupOrderId" id="dataElementGroupOrderId"/>
-<div id="dataElementGroups" style="position:fixed;display:none;width:1000px;z-index:10001;background-color: white;border: medium solid silver;height:350px;padding:20px;">
+<div id="dataElementGroups" style="position:fixed;display:none;width:700px;z-index:10001;background-color: white;border: medium solid silver;height:310px;padding:20px;">
<div id="close" style="position:absolute;top:2px;right:2px;cursor: pointer;color:red;" onclick="hideById('dataElementGroups');deleteDivEffect();">[x]</div>
<table>
<tr>
@@ -52,27 +53,26 @@
<td><input type="text" style="width:400px" id="code" name="code"/></td>
</tr>
</table>
-
- <br/><br/>
+ <br/>
<div style="width:100%;overflow:auto">
<table width="100%">
<tr>
<td colspan="3">
- <select id="availableDataElementGroups" onchange="getDataElementsByGroup(this.value)" style="min-width:300px"></select>
+ <select id="availableDataElementGroups" onchange="getDataElementsByGroup(this.value)" style="width:300px"></select>
</td>
</tr>
<tr>
- <td>
- <select id="availableDataElements" multiple size=13 style="min-width:300px" ondblclick="moveSelectedById('availableDataElements','selectedDataElements');"></select>
+ <td width="23%">
+ <select id="availableDataElements" name="availableDataElements" multiple size=13 style="width:300px" ondblclick="moveSelectedById('availableDataElements','selectedDataElements');showText('selectedDataElements')" onMouseOut="javascript: hideToolTip();"></select>
</td>
- <td align="center">
+ <td width="17%" align="center">
<input type="button" value=">" onclick="moveSelectedById('availableDataElements','selectedDataElements');" style="width:50px"/><br>
<input type="button" value="<" onclick="moveSelectedById('selectedDataElements' , 'availableDataElements' );" style="width:50px"/><br>
<input type="button" value=">>" onclick="moveAllById('availableDataElements' , 'selectedDataElements' );" style="width:50px"/><br>
<input type="button" value="<<" onclick="moveAllById('selectedDataElements' , 'availableDataElements' );" style="width:50px"/>
</td>
- <td>
- <select id="selectedDataElements" name="dataElementIds" multiple size=13 style="min-width:300px" ondblclick="moveSelectedById('selectedDataElements' , 'availableDataElements' );" ></select>
+ <td width="60%">
+ <select id="selectedDataElements" name="selectedDataElements" multiple size=13 style="width:300px" ondblclick="moveSelectedById('selectedDataElements' , 'availableDataElements' ); showText('availableDataElements');" onMouseOut="javascript: hideToolTip();"></select>
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm 2009-12-04 05:00:32 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm 2009-12-16 03:37:57 +0000
@@ -1,5 +1,5 @@
<h2>$i18n.getString('dataelement_groups')</h2>
-<div id="tooltip" style=" display:none; background-color:#FFFFCC; ; position:absolute; z-index:100001" ></div>
+<div id="tooltip"></div>
<h4><font color="green">$!encoder.htmlEncode($!excelItemGroup.name)</font></h4>
<p></p>
<table width="800px">
@@ -42,7 +42,7 @@
<form name="dataElementGroups" method="post">
<input type="hidden" name="id" id="id" value="$excelItemGroup.id"/>
<input type="hidden" name="dataElementGroupOrderId" id="dataElementGroupOrderId"/>
-<div id="dataElementGroups" style="position:fixed;display:none;width:870px;z-index:10001;background-color: white;border: medium solid silver;height:300px;padding:20px;">
+<div id="dataElementGroups" style="position:fixed;display:none;width:680px;z-index:10001;background-color: white;border: medium solid silver;height:280px;padding:20px;">
<div id="close" style="position:absolute;top:2px;right:2px;cursor: pointer;color:red;" onclick="hideById('dataElementGroups');deleteDivEffect();">[x]</div>
<table>
<tr>
@@ -65,7 +65,7 @@
</tr>
<tr>
<td width="31%">
- <select id="availableDataElements" multiple size=10 style="width:400px" onMouseOut="javascript: hideToolTip();" ondblclick="moveSelectedById('availableDataElements','dataElementIds');"></select>
+ <select id="availableDataElements" multiple size=10 style="width:300px" onMouseOut="javascript: hideToolTip();" ondblclick="moveSelectedById('availableDataElements','dataElementIds'); showText('dataElementIds')"></select>
</td>
<td width="5%" align="center">
<input type="button" value=">" onclick="moveSelectedById('availableDataElements','dataElementIds');" style="width:50px"/><br>
@@ -74,7 +74,7 @@
<input type="button" value="<<" onclick="moveAllById('dataElementIds' , 'availableDataElements' );" style="width:50px"/>
</td>
<td width="64%">
- <select id="dataElementIds" name="dataElementIds" onMouseOut="javascript: hideToolTip();" multiple size=10 style="width:400px" ondblclick="moveSelectedById('dataElementIds' , 'availableDataElements' );" ></select>
+ <select id="dataElementIds" name="dataElementIds" onMouseOut="javascript: hideToolTip();" multiple size=10 style="width:300px" ondblclick="moveSelectedById('dataElementIds' , 'availableDataElements' ); ; showText('availableDataElements')" ></select>
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm 2009-12-08 05:28:22 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm 2009-12-16 03:37:57 +0000
@@ -1,4 +1,5 @@
<h2>$!encoder.htmlEncode($!reportExcel.name)</h2>
+<div id="tooltip"></div>
<table width="100%">
<tr style="vertical-align:bottom;">
<td>
@@ -167,9 +168,9 @@
<input type="button" value="<" onclick="insertDataElementId()"/>
</td>
<td>
- <select id="dataElementGroup" style="min-width:500px" onchange="getDataElementsByGroup()"></select>
- <select id="availableDataElements" size="11" style="min-width:500px"></select>
- <select id="optionCombos" size=4 style="min-width:500px"></select>
+ <select id="dataElementGroup" style="width:500px" onchange="getDataElementsByGroup()"></select>
+ <select id="availableDataElements" size="11" style="width:500px;" onMouseOut="javascript: hideToolTip();"></select>
+ <select id="optionCombos" size=4 style="width:500px;"></select>
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/style/style.css'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/style/style.css 2009-11-09 04:18:02 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/style/style.css 2009-12-16 03:37:57 +0000
@@ -10,6 +10,9 @@
#tooltip {
color:#000; font-size:11px; line-height:1.2;
- background-color:#E1E5F1; border:1px solid #667295;
+ background-color:#FFFFCC; border:1px solid #667295;
width:210px; padding:4px;
+ z-index: 100000;
+ display: none;
+ position:absolute;
}
\ No newline at end of file
