dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08103
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2414: revert show details GUI of dataelement & program to previous version
------------------------------------------------------------
revno: 2414
committer: tranthanhtri <tranthanhtri@tranthanhtri-PC>
branch nick: trunk
timestamp: Fri 2010-10-22 14:50:47 +0700
message:
revert show details GUI of dataelement & program to previous version
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/ajax/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/ajax/htmlDataElement.vm
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery.cluetip.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm
dhis-2/dhis-web/pom.xml
--
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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2010-10-21 11:06:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2010-10-22 07:50:47 +0000
@@ -1277,25 +1277,6 @@
window.location.href = baseLink +"pageSize=" + pageSize +"¤tPage=" +currentPage;
}
-function addShowDetail( jQueryString, width, success, responseType )
-{
- if( success == undefined ) success = function(data){return data;}
- if( responseType == undefined ) responseType = 'html';
- jQuery( jQueryString ).cluetip( {
- ajaxProcess: success,
- ajaxCache: true,
- ajaxSettings: {
- dataType: responseType
- },
- activation: 'click',
- sticky: true,
- closePosition: 'title',
- closeText: '<img src="../images/hide.png" alt="" />',
- width: width,
- arrows: true
- });
-}
-
/**
* Used to export PDF file by the given type and
* the active items in table
@@ -1304,4 +1285,4 @@
{
var activeIds = getArrayIdOfActiveRows();
window.location.href = 'exportToPdf.action?type=' + type + activeIds;
-}
\ No newline at end of file
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery.cluetip.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery.cluetip.css 2010-10-20 09:27:52 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery.cluetip.css 2010-10-22 07:50:47 +0000
@@ -3,7 +3,7 @@
border: 0;
}
#cluetip-title {
- overflow: hidden;
+ overflow: hidden;
}
#cluetip-title #cluetip-close {
float: right;
@@ -47,6 +47,7 @@
font-weight: normal;
background-color: #3F5D8E;
color: #fff;
+ font-weight:bold;
}
.cluetip-default #cluetip-title a {
color: white;
@@ -227,4 +228,42 @@
.cluetip-rounded #cluetip-title,
.cluetip-rounded #cluetip-inner {
zoom: 1;
+}
+
+.cluetip-help{
+ background-color: #FFFFFF;
+}
+.cluetip-help h3#cluetip-title{
+ background-color:#377F39;
+ color:#FFFFFF;
+ font-size:9pt;
+ font-weight:normal;
+ margin:0 0 5px;
+ padding:8px 10px 4px;
+ font-weight:bold;
+
+}
+
+.cluetip-help #cluetip-outer{
+ background-color: #BEFFC0;
+ margin:0;
+}
+#cluetip-inner{
+ font-size:10pt;
+ overflow:auto;
+ max-height: 500px;
+ text-align:justify;
+ padding:10px;
+}
+#cluetip-inner p{
+ padding-left:10px;
+ padding-right:10px;
+}
+
+#cluetip-inner ul {
+ margin-left:30px;
+}
+#cluetip-inner label{
+ padding-bottom:5px;
+ font-weight:bold;
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2010-10-22 06:43:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2010-10-22 07:50:47 +0000
@@ -16,12 +16,6 @@
</action>
<!-- DataElement -->
-
- <action name="showDataElementDetails"
- class="org.hisp.dhis.dd.action.dataelement.GetDataElementAction">
- <result name="success" type="velocity">/dhis-web-maintenance-datadictionary/ajax/htmlDataElement.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
<action name="dataElement"
class="org.hisp.dhis.dd.action.dataelement.GetDataElementListAction">
@@ -205,14 +199,7 @@
<param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
</action>
- <!-- DataElementGroup -->
-
- <action name="showDataElementGroupDetails"
- class="org.hisp.dhis.dd.action.dataelementgroup.GetDataElementGroupAction">
- <result name="success" type="velocity">
- /dhis-web-maintenance-datadictionary/ajax/htmlDataElementGroup.vm
- </result>
- </action>
+ <!-- DataElementGroup -->
<action name="dataElementGroup"
class="org.hisp.dhis.dd.action.dataelementgroup.GetDataElementGroupListAction">
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/ajax'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/ajax/htmlDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/ajax/htmlDataElement.vm 2010-10-20 09:27:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/ajax/htmlDataElement.vm 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-<table>
- <tr><td><label>$i18n.getString( "name" )</label></td><td><span>$encoder.htmlEncode( $dataElement.name )</span></td></tr>
- <tr><td><label>$i18n.getString( "short_name" )</label></td><td><span>$!encoder.htmlEncode( $dataElement.shortName )</span></td></tr>
- <tr><td><label>$i18n.getString( "alternative_name" )</label></td><td><span>$!encoder.htmlEncode( $dataElement.name )</span></td></tr>
- <tr><td><label>$i18n.getString( "description" )</label></td><td><span>$!encoder.htmlEncode( $dataElement.description )</span></td></tr>
- <tr><td><label>$i18n.getString( "active" )</label></td><td><span> $dataElement.active </span></td></tr>
- <tr><td><label>$i18n.getString( "domain_type" )</label></td><td><span>$!encoder.htmlEncode( $dataElement.getDomainTypeNullSafe() )</span></td></tr>
- <tr><td><label>$i18n.getString( "value_type" )</label></td><td><span>$!encoder.htmlEncode( $dataElement.type )</span></td></tr>
- <tr><td><label>$i18n.getString( "aggregation_operator" )</label></td><td><span>$!encoder.htmlEncode( $dataElement.aggregationOperator )</span></td></tr>
- <tr><td><label>$i18n.getString( "category_combination" )</label></td><td><span>$!encoder.htmlEncode( $dataElement.categoryCombo.name )</span></td></tr>
- <tr><td><label>$i18n.getString( "url" )</label></td><td><span>$!encoder.htmlEncode( $dataElement.url )</span></td></tr>
- <tr><td><label>$i18n.getString( "last_updated" )</label></td><td><span>$!format.formatDate( $dataElement.lastUpdated )</span></td></tr>
-</table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2010-10-20 09:27:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2010-10-22 07:50:47 +0000
@@ -1,94 +1,121 @@
-<script>
-jQuery(function(){
- addShowDetail( "a.details", 500 );
-});
-</script>
+
<h3>$i18n.getString( "data_element_management" ) #openHelp( "dataElement" )</h3>
-<table width="100%">
- <tr valign="bottom">
- <td>$i18n.getString( "filter_by_name" ):
- <form style="display:inline" action="none" onsubmit="return false">
- <div style="inline"><input type="text" id='key'>
- <input type="button" value="$i18n.getString( "go" )" onclick="searchDataElementName();" />
- </div>
- </form></td>
- <td>
- $i18n.getString( "select_data_dictionary" ):
- <div style="inline">
- <select id="dataDictionaryList" name="dataDictionaryList" onchange="criteriaChanged()" style="min-width:140px">
- <option value="-1">[ $i18n.getString( "all" ) ]</option>
- #foreach( $dictionary in $dataDictionaries )
- <option value="$dictionary.id" #if ( $dictionary.id == $dataDictionaryId ) selected="selected"#end>$dictionary.name</option>
- #end
- </select>
- </div>
- </td>
- <td>
- $i18n.getString( "filter_by_group_view_all" ):
- <div style="inline">
- <select id="dataElementGroupList" name="dataElementGroupList" onchange="criteriaChanged()" style="min-width:200px">
- <option value="null">[ $i18n.getString( "all" ) ]</option>
- #foreach( $dataElementGroup in $dataElementGroups )
- <option value="$dataElementGroup.id" #if ( $dataElementGroup.id == $dataElementGroupId ) selected="selected"#end>$dataElementGroup.name</option>
- #end
- </select>
- </div>
- </td>
- <td style="text-align:right">
- <input type="button" value="$i18n.getString( 'get_pdf' )" onclick="exportPdfByType( 'dataelement' );" style="width:80px"/>
- <input type="button" value="$i18n.getString( 'sort' )" onclick="window.location.href='showSortDataElementForm.action'" style="width:80px"/>
- #if ( $dataDictionaryMode == "extended" )
- <input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddExtendedDataElementForm.action'" style="width:80px">
- #else
- <input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddDataElementForm.action'" style="width:80px"/>
- #end
- </td>
- </tr>
-</table>
-
-<table class="listTable" id="dataElementList">
- <col/>
- <col/>
- <col/>
- <col width="20"/>
- <col width="20"/>
- <col width="20"/>
- <col width="20"/>
- #if ( $forumIntegration )
- <col width="20"/>
- #end
- <thead>
- <tr>
- <th colspan="3" >$i18n.getString( "name" )</th>
- <th colspan="5" class="{sorter: false}">$i18n.getString( "operations" )</th>
- </tr>
- </thead>
- <tbody id="list">
- #foreach( $dataElement in $dataElements )
- <tr id="tr${dataElement.id}">
- <td colspan="3" onclick="showDataElementDetails( $dataElement.id )">$encoder.htmlEncode( $dataElement.name )</td>
- #if ( $dataDictionaryMode == "extended" )
- <td style="text-align:center"><a href="showUpdateExtendedDataElementForm.action?id=$dataElement.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a></td>
- #else
- <td style="text-align:center"><a href="showUpdateDataElementForm.action?id=$dataElement.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a></td>
- #end
- <td style="text-align:center"><a href="javascript:translate( 'DataElement', '$dataElement.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a></td>
- <td style="text-align:center"><a href="javascript:removeDataElement( $dataElement.id, '$encoder.jsEncode( $dataElement.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a></td>
- <td style="text-align:center">
- <a class="details" rel="showDataElementDetails.action?id=$dataElement.id" href="showDataElementDetails.action?id=$dataElement.id" title="$i18n.getString( 'show_details' )">
- <img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
- </td>
- #if ( $forumIntegration )
- <td style="text-align:center"><a href="$dataElement.url" title="$i18n.getString( 'forum' )" target="_blank"><img src="../images/forum.png" alt="$i18n.getString( 'forum' )"/></a></td>
- #end
- </tr>
- #end
- </tbody>
-</table>
-<p></p>
-<div class="paging-container">
- #parse( "/dhis-web-commons/paging/paging.vm" )
-</div>
+
+<table class="mainPageTable" >
+ <tr>
+ <td style="vertical-align:top">
+ <table width="100%">
+ <tr valign="bottom">
+ <td>$i18n.getString( "filter_by_name" ):
+ <form style="display:inline" action="none" onsubmit="return false">
+ <div style="inline"><input type="text" id='key'>
+ <input type="button" value="$i18n.getString( "go" )" onclick="searchDataElementName();" />
+ </div>
+ </form></td>
+ <td>
+ $i18n.getString( "select_data_dictionary" ):
+ <div style="inline">
+ <select id="dataDictionaryList" name="dataDictionaryList" onchange="criteriaChanged()" style="min-width:140px">
+ <option value="-1">[ $i18n.getString( "all" ) ]</option>
+ #foreach( $dictionary in $dataDictionaries )
+ <option value="$dictionary.id" #if ( $dictionary.id == $dataDictionaryId ) selected="selected"#end>$dictionary.name</option>
+ #end
+ </select>
+ </div>
+ </td>
+ <td>
+ $i18n.getString( "filter_by_group_view_all" ):
+ <div style="inline">
+ <select id="dataElementGroupList" name="dataElementGroupList" onchange="criteriaChanged()" style="min-width:200px">
+ <option value="null">[ $i18n.getString( "all" ) ]</option>
+ #foreach( $dataElementGroup in $dataElementGroups )
+ <option value="$dataElementGroup.id" #if ( $dataElementGroup.id == $dataElementGroupId ) selected="selected"#end>$dataElementGroup.name</option>
+ #end
+ </select>
+ </div>
+ </td>
+ <td style="text-align:right">
+ <input type="button" value="$i18n.getString( 'get_pdf' )" onclick="exportPdfByType( 'dataelement' );" style="width:80px"/>
+ <input type="button" value="$i18n.getString( 'sort' )" onclick="window.location.href='showSortDataElementForm.action'" style="width:80px"/>
+ #if ( $dataDictionaryMode == "extended" )
+ <input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddExtendedDataElementForm.action'" style="width:80px">
+ #else
+ <input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddDataElementForm.action'" style="width:80px"/>
+ #end
+ </td>
+ </tr>
+ </table>
+ <table class="listTable" id="dataElementList">
+ <col/>
+ <col/>
+ <col/>
+ <col width="20"/>
+ <col width="20"/>
+ <col width="20"/>
+ <col width="20"/>
+ #if ( $forumIntegration )
+ <col width="20"/>
+ #end
+ <thead>
+ <tr>
+ <th colspan="3" >$i18n.getString( "name" )</th>
+ <th colspan="5" class="{sorter: false}">$i18n.getString( "operations" )</th>
+ </tr>
+ </thead>
+ <tbody id="list">
+ #foreach( $dataElement in $dataElements )
+ <tr id="tr${dataElement.id}">
+ <td colspan="3" onclick="showDataElementDetails( $dataElement.id )">$encoder.htmlEncode( $dataElement.name )</td>
+ #if ( $dataDictionaryMode == "extended" )
+ <td style="text-align:center"><a href="showUpdateExtendedDataElementForm.action?id=$dataElement.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a></td>
+ #else
+ <td style="text-align:center"><a href="showUpdateDataElementForm.action?id=$dataElement.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a></td>
+ #end
+ <td style="text-align:center"><a href="javascript:translate( 'DataElement', '$dataElement.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a></td>
+ <td style="text-align:center"><a href="javascript:removeDataElement( $dataElement.id, '$encoder.jsEncode( $dataElement.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a></td>
+ <td style="text-align:center"><a href="javascript:showDataElementDetails( $dataElement.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a></td>
+ #if ( $forumIntegration )
+ <td style="text-align:center"><a href="$dataElement.url" title="$i18n.getString( 'forum' )" target="_blank"><img src="../images/forum.png" alt="$i18n.getString( 'forum' )"/></a></td>
+ #end
+ </tr>
+ #end
+ </tbody>
+ </table>
+ <p></p>
+ <div class="paging-container">
+ #parse( "/dhis-web-commons/paging/paging.vm" )
+ </div>
+
+ </td>
+ <td style="width:20em; padding-left:2em; vertical-align:top">
+
+ <div id="detailsArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"/></a>
+ </div>
+ <p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
+ <p><label>$i18n.getString( "short_name" ):</label><br/><span id="shortNameField"></span></p>
+ <p><label>$i18n.getString( "alternative_name" ):</label><br/><span id="alternativeNameField"></span></p>
+ <p><label>$i18n.getString( "description" ):</label><br/><span id="descriptionField"></span></p>
+ <p><label>$i18n.getString( "active" ):</label><br/><span id="activeField"></span></p>
+ <p><label>$i18n.getString( "domain_type" ):</label><br/><span id="domainTypeField"></span></p>
+ <p><label>$i18n.getString( "value_type" ):</label><br/><span id="typeField"></span></p>
+ <p><label>$i18n.getString( "aggregation_operator" ):</label><br/><span id="aggregationOperatorField"></span></p>
+ <p><label>$i18n.getString( "category_combination" ):</label><br/><span id="categoryComboField"></span></p>
+ <p><label>$i18n.getString( "url" ):</label><br/><span id="urlField"></span></p>
+ <p><label>$i18n.getString( "last_updated" ):</label><br/><span id="lastUpdatedField"></span></p>
+ </div>
+
+ <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
+ <div style="float:right">
+ <a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_warning' )"/></a>
+ </div>
+ <p><span id="warningField"></span></p>
+ </div>
+
+ </td>
+ </tr>
+</table>
<script type="text/javascript">
var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_data_element" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2010-10-20 12:11:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2010-10-22 07:50:47 +0000
@@ -4,20 +4,16 @@
function showProgramDetails( programId )
{
- var request = new Request();
- request.setResponseTypeXML( 'program' );
- request.setCallbackSuccess( programReceived );
- request.send( 'getProgram.action?id=' + programId );
-}
-
-function programReceived( programElement )
-{
- setInnerHTML( 'idField', getElementValue( programElement, 'id' ) );
- setInnerHTML( 'nameField', getElementValue( programElement, 'name' ) );
- setInnerHTML( 'descriptionField', getElementValue( programElement, 'description' ) );
- setInnerHTML( 'programStageCountField', getElementValue( programElement, 'programStageCount' ) );
+ jQuery.postJSON( "getProgram.action", {
+ id:programId
+ }, function(json){
+ setInnerHTML( 'idField', json.id );
+ setInnerHTML( 'nameField', json.name );
+ setInnerHTML( 'descriptionField', json.description );
+ setInnerHTML( 'programStageCountField', json.programStageCount );
- showDetails();
+ showDetails();
+ });
}
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2010-10-20 12:11:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2010-10-22 07:50:47 +0000
@@ -1,71 +1,76 @@
-<script>
- jQuery( function(){
- addShowDetail( "a.details", 400, function( json ){
- html = "<label>$i18n.getString( 'id' ):</label><span> " + json.id + "</span><br>";
- html += "<label>$i18n.getString( 'name' ):</label><span> " + json.name + "</span><br>";
- html += "<label>$i18n.getString( 'description' ):</label><span> " + json.description + "</span><br>";
- html += "<label>$i18n.getString( 'program_stage_count' ):</label><span> " + json.programStageCount + "</span>";
-
- return html;
- }, 'json');
- });
-</script>
-
<h3>$i18n.getString( "program_management" )</h3>
-
-<table class="listTable">
- <col>
- <col width="20">
- <col width="20">
- <col width="20">
- <col width="20">
- <col width="20">
- <col width="20">
- <col width="20">
- <tr>
- <td></td>
- <td colspan="7" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddProgramForm.action'" style="width:70px"></td>
- </tr>
- <tr>
- <th>$i18n.getString( "name" )</th>
- <th colspan="7">$i18n.getString( "operations" )</th>
- </tr>
-
- <tbody id="list">
- #foreach( $program in $programs )
- <tr id="tr${program.id}">
-
- <td>$encoder.htmlEncode( $program.name )</td>
-
- <td style="text-align:center" #alternate( $mark )>
- <a href="defineProgramAssociationsForm.action?id=$program.id" title="$i18n.getString( "define_associations" )"><img src="../images/assign.png" alt="$i18n.getString( "define_associations" )"></a>
- </td>
-
- <td style="text-align:center" #alternate( $mark )>
- <a href="defineValidationDEAssociationsForm.action?id=$program.id" title="$i18n.getString( "validationDE_associations" )"><img src="../images/assign_b.png" alt="$i18n.getString( "validationDE_associations" )"></a>
- </td>
-
- <td style="text-align:center" #alternate( $mark )>
- <a href="showUpdateProgramForm.action?id=$program.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
- </td>
-
- <td style="text-align:center" #alternate( $mark )>
- <a href="programStage.action?id=$program.id" title="$i18n.getString( "view_stage_management" )"><img src="../images/add_section.png" alt="$i18n.getString( "view_stage_management" )"></a>
- </td>
-
- <td style="text-align:center" #alternate( $mark )>
- <a href="javascript:removeProgram( '$program.id', '$encoder.jsEncode( $program.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
- </td>
-
- <td style="text-align:center" #alternate( $mark )>
- <a class="details" rel="getProgram.action?id=$program.id" href="getProgram.action?id=$program.id" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
- </td>
-
- </tr>
- #end
-
- </tbody>
-
+<table class="mainPageTable">
+ <tr>
+ <td style="vertical-align:top">
+ <table class="listTable">
+ <col>
+ <col width="20">
+ <col width="20">
+ <col width="20">
+ <col width="20">
+ <col width="20">
+ <col width="20">
+ <tr>
+ <td></td>
+ <td colspan="6" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddProgramForm.action'" style="width:70px"></td>
+ </tr>
+ <tr>
+ <th>$i18n.getString( "name" )</th>
+ <th colspan="6">$i18n.getString( "operations" )</th>
+ </tr>
+
+ <tbody id="list">
+ #foreach( $program in $programs )
+ <tr id="tr${program.id}">
+
+ <td>$encoder.htmlEncode( $program.name )</td>
+
+ <td style="text-align:center" #alternate( $mark )>
+ <a href="defineProgramAssociationsForm.action?id=$program.id" title="$i18n.getString( "define_associations" )"><img src="../images/assign.png" alt="$i18n.getString( "define_associations" )"></a>
+ </td>
+
+ <td style="text-align:center" #alternate( $mark )>
+ <a href="defineValidationDEAssociationsForm.action?id=$program.id" title="$i18n.getString( "validationDE_associations" )"><img src="../images/assign_b.png" alt="$i18n.getString( "validationDE_associations" )"></a>
+ </td>
+
+ <td style="text-align:center" #alternate( $mark )>
+ <a href="showUpdateProgramForm.action?id=$program.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
+ </td>
+
+ <td style="text-align:center" #alternate( $mark )>
+ <a href="programStage.action?id=$program.id" title="$i18n.getString( "view_stage_management" )"><img src="../images/add_section.png" alt="$i18n.getString( "view_stage_management" )"></a>
+ </td>
+
+ <td style="text-align:center" #alternate( $mark )>
+ <a href="javascript:removeProgram( '$program.id', '$encoder.jsEncode( $program.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( "remove" )"></a>
+ </td>
+
+ <td style="text-align:center" #alternate( $mark )>
+ <a href="javascript:showProgramDetails( $program.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( "show_details" )"></a>
+ </td>
+
+ </tr>
+ #end
+
+ </tbody>
+
+ </table>
+ </td>
+ <td style="width:20em; padding-left:2em; vertical-align:top">
+
+ <div id="detailsArea" style="display:none">
+ <div style="float:right">
+ <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+ </div>
+ <p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+ <p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+ <p><label>$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+ <p><label>$i18n.getString( "number_of_days" ):</label><br><span id="numberOfDaysField"></span></p>
+ <p><label>$i18n.getString( "program_stage_count" ):</label><br><span id="programStageCountField"></span></p>
+ </div>
+
+ </td>
+ </tr>
</table>
=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml 2010-09-22 07:30:22 +0000
+++ dhis-2/dhis-web/pom.xml 2010-10-22 07:50:47 +0000
@@ -22,8 +22,8 @@
<module>dhis-web-mapping</module>
<module>dhis-web-dashboard-integration</module>
<module>dhis-web-excel-reporting</module>
- <module>dhis-web-caseentry</module>
- <module>dhis-web-portal</module>
+ <module>dhis-web-caseentry</module>
+ <module>dhis-web-portal</module>
</modules>
<build>
