dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01930
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 628: update vietnamese language & gui
------------------------------------------------------------
revno: 628
committer: Tran Thanh Tri <Tran Thanh Tri@compaq>
branch nick: trunk
timestamp: Mon 2009-09-07 15:21:46 +0700
message:
update vietnamese language & gui
removed:
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewAdminOptions.vm
added:
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reportUserRoles.vm
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewAdministrator.vm
modified:
local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module.properties
local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module_vi_VN.properties
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/configuration.vm
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/menu.vm
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reports.vm
local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/jquery.autocomplete.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 'local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module.properties'
--- local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module.properties 2009-09-07 07:34:18 +0000
+++ local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module.properties 2009-09-07 08:21:46 +0000
@@ -92,4 +92,10 @@
six_monthly = Six monthly
yearly = Yearly
clean = Clean
+report_roles = Report and User Roles
+formulaexcel = Excel Formula
+icd_code = ICD codes
+serial = Serial
+jumping_step = Jumping Step
+rename = Rename
=== modified file 'local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module_vi_VN.properties'
--- local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module_vi_VN.properties 2009-09-07 07:34:18 +0000
+++ local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module_vi_VN.properties 2009-09-07 08:21:46 +0000
@@ -110,11 +110,17 @@
select_excel_file = Ch\u1ecdn t\u1eadp tin excel
upload_file = T\u1ea3i l\u00ean
view = Xem b\u00e1o c\u00e1o
-data_status = T\u00ecnh tr\u1ea1ng nh\u1eadp li\u1ec7u
-make_default = M\u1eb7c \u0111\u1ecbnh
-completed = \u0110\u00e3 n\u1ed9p
-yes = C\u00f3
-no = Kh\u00f4ng
-entried = \u0110\u00e3 nh\u1eadp
+data_status = T\u00ecnh tr\u1ea1ng nh\u1eadp li\u1ec7u
+make_default = M\u1eb7c \u0111\u1ecbnh
+completed = \u0110\u00e3 n\u1ed9p
+yes = C\u00f3
+no = Kh\u00f4ng
+entried = \u0110\u00e3 nh\u1eadp
group = Nh\u00f3m
-administration = Quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
+administration = Qu\u1ea3n tr\u1ecb
+report_roles = Quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
+formulaexcel = C\u00f4ng th\u1ee9c Excel
+icd_code = M\u00e3 ICD
+serial = S\u1ed1 th\u1ee9 t\u1ef1
+jumping_step = D\u00f2ng tr\u1ed1ng
+rename = Rename
=== modified file 'local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/configuration.vm'
--- local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/configuration.vm 2009-07-13 00:23:50 +0000
+++ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/configuration.vm 2009-09-07 08:21:46 +0000
@@ -3,5 +3,6 @@
$i18n.getString('excel_file_directory')
<input type="text" name="templateDirectory" style="width:400px" value="$templateDirectory"/>
<br><br><br>
-<input type="submit" value="$i18n.getString('ok')" />
+<input type="submit" value="$i18n.getString('ok')" style="width:100px"/>
+<input type="button" value="$i18n.getString( "cancel" )" onclick="window.location='openAdministrator.action'" style="width:100px">
</form>
\ No newline at end of file
=== modified file 'local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/menu.vm'
--- local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/menu.vm 2009-09-07 07:34:18 +0000
+++ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/menu.vm 2009-09-07 08:21:46 +0000
@@ -1,10 +1,6 @@
<h2>$i18n.getString( "report_design" )</h2>
<ul>
- <li><a href="getConfiguration.action">$i18n.getString( "configuration" ) </a></li>
- <li><a href="getAdminOptions.action">$i18n.getString( "administration" ) </a></li>
-
- <li><a href="listReportExcel.action">$i18n.getString( "reports" ) </a></li>
- <li><a href="javascript:cleanUp();">$i18n.getString( "clean_up" ) </a></li>
+ <li><a href="openAdministrator.action">$i18n.getString( "administration" ) </a></li>
</ul>
<h2>$i18n.getString( "generate_report" )</h2>
<ul>
@@ -17,37 +13,6 @@
var i18n_deleted_file = '$encoder.jsEncode( $i18n.getString( "deleted_file" ) )';
var i18n_name = '$encoder.jsEncode( $i18n.getString( "name" ) )';
var i18n_size = '$encoder.jsEncode( $i18n.getString( "size" ) )';
- var i18n_create_date = '$encoder.jsEncode( $i18n.getString( "create_date" ) )';
+ var i18n_create_date = '$encoder.jsEncode( $i18n.getString( "create_date" ) )';
- function cleanUp(){
- var request = new Request();
- request.setResponseTypeXML( 'xmlObject' );
- request.setCallbackSuccess( cleanUpCompleted );
- request.send( "cleanTempDirectory.action" );
- }
- function cleanUpCompleted( xmlObject ){
- var innerHTML = "<h3>" +i18n_deleted_file+ "</h3>";
- innerHTML += "<table width='100%'>";
- innerHTML += "<tr>";
- innerHTML += "<th>"+i18n_name+"</th>";
- innerHTML += "<th>"+i18n_create_date+"</th>";
- innerHTML += "<th>"+i18n_size+"</th>";
- innerHTML += "</tr>";
-
- var list = xmlObject.getElementsByTagName('file');
-
- for ( var i = 0; i < list.length; i++ )
- {
- var name = list.item(i).getElementsByTagName('name')[0].firstChild.nodeValue;
- var date = list.item(i).getElementsByTagName('create-date')[0].firstChild.nodeValue;
- var size = list.item(i).getElementsByTagName('size')[0].firstChild.nodeValue;
- innerHTML += "<tr>";
- innerHTML += "<td>" + name + "</td>";
- innerHTML += "<td>" + date + "</td>";
- innerHTML += "<td>" + size + "</td>";
- innerHTML += "</tr>";
- }
- innerHTML += "</table>";
- setInfo(innerHTML);
- }
</script>
=== added file 'local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reportUserRoles.vm'
--- local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reportUserRoles.vm 1970-01-01 00:00:00 +0000
+++ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reportUserRoles.vm 2009-09-07 08:21:46 +0000
@@ -0,0 +1,62 @@
+<h3>$i18n.getString( "administration" )</h3>
+
+<form id="adminForm" action="saveReportUserRoles.action" method="post">
+
+<table>
+ <tr>
+ <th style="width:250px">$i18n.getString( "reports" )</th>
+ <td style="width:60px"></td>
+ <td style="width:250px"></td>
+ </tr>
+ <tr>
+ <td>
+ <select id="reportId" name="reportId" style="width:250px" onchange="selectReportUserRoles()">
+ <option value="-1">[ $i18n.getString( "select_report" ) ]</option>
+ #foreach( $report in $reports )
+ <option value="$report.id"#if ( $reportId == $report.id ) selected="selected"#end>$encoder.htmlEncode( $report.name )</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td height="10px" colspan="3"></td>
+ </tr>
+ <tr>
+ <th>$i18n.getString( "available_user_roles" )</th>
+ <td></td>
+ <th>$i18n.getString( "selected_user_roles" )</th>
+ </tr>
+ <tr>
+ <td>
+ <select multiple id="availableUserRoleId" style="width:250px;height:250px">
+ #foreach ( $role in $availableUserRoles )
+ <option value="$role.id">$encoder.htmlEncode( $role.name )</option>
+ #end
+ </select>
+ </td>
+ <td align="center">
+ <input type="button" value=">" title="$i18n.getString('move_selected')" style="width:40px" onclick="moveSelectedById( 'availableUserRoleId', 'userRoleId' )"><br>
+ <input type="button" value="<" title="$i18n.getString('remove_selected')" style="width:40px" onclick="moveSelectedById( 'userRoleId', 'availableUserRoleId' )"><br>
+ <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:40px" onclick="moveAllById( 'availableUserRoleId', 'userRoleId' )"><br>
+ <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:40px" onclick="moveAllById( 'userRoleId', 'availableUserRoleId' )">
+ </td>
+ <td>
+ <select multiple id="userRoleId" name="userRoleId" style="width:250px;height:250px">
+ #foreach ( $role in $selectedUserRoles )
+ <option value="$role.id">$encoder.htmlEncode( $role.name )</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td><input type="button" value="$i18n.getString( "save" )" onclick="saveReportUserRoles()" style="width:100px">
+ <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location='openAdministrator.action'" style="width:100px">
+ </td>
+ <td></td>
+ <td></td>
+ </tr>
+</table>
+
+</form>
+
+<span id="message"></span>
=== modified file 'local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reports.vm'
--- local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reports.vm 2009-09-07 07:34:18 +0000
+++ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reports.vm 2009-09-07 08:21:46 +0000
@@ -1,5 +1,5 @@
<h2>$i18n.getString('reports')</h2>
-<p><input type="button" onclick="openAddReportForm()" value="$i18n.getString('add')"/></p>
+<p><input type="button" onclick="openAddReportForm()" value="$i18n.getString('add')"/><input type="button" value="$i18n.getString( "cancel" )" onclick="window.location='openAdministrator.action'" style="width:100px"></p>
<table width="100%">
<tr>
@@ -131,7 +131,7 @@
}
</script>
-<div id="report" style="position:fixed;display:none;width:450px;z-index:1;background-color: white;border: medium solid silver;height:250px;padding:20px;">
+<div id="report" style="position:fixed;display:none;width:450px;z-index:11;background-color: white;border: medium solid silver;height:250px;padding:20px;">
<div id="close" style="position:absolute;top:2px;right:2px;cursor: pointer;color:red;" onclick="hideById('report');deleteDivEffect();">[x]</div>
<input type="hidden" value="" id="id"/>
<table>
=== modified file 'local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/jquery.autocomplete.css'
--- local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/jquery.autocomplete.css 2009-09-07 07:34:18 +0000
+++ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/jquery.autocomplete.css 2009-09-07 08:21:46 +0000
@@ -3,7 +3,7 @@
border: 1px solid #7FB7FB;
overflow: hidden;
background-color: #AFD2FD;
- z-index:1000;
+ z-index:1000000;
}
.ac_results ul {
=== removed file 'local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewAdminOptions.vm'
--- local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewAdminOptions.vm 2009-09-02 10:16:58 +0000
+++ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewAdminOptions.vm 1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-<h3>$i18n.getString( "administration" )</h3>
-
-<form id="adminForm" action="saveReportUserRoles.action" method="post">
-
-<table>
- <tr>
- <th style="width:250px">$i18n.getString( "reports" )</th>
- <td style="width:60px"></td>
- <td style="width:250px"></td>
- </tr>
- <tr>
- <td>
- <select id="reportId" name="reportId" style="width:250px" onchange="selectReportUserRoles()">
- <option value="-1">[ $i18n.getString( "select_report" ) ]</option>
- #foreach( $report in $reports )
- <option value="$report.id"#if ( $reportId == $report.id ) selected="selected"#end>$encoder.htmlEncode( $report.name )</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td height="10px" colspan="3"></td>
- </tr>
- <tr>
- <th>$i18n.getString( "available_user_roles" )</th>
- <td></td>
- <th>$i18n.getString( "selected_user_roles" )</th>
- </tr>
- <tr>
- <td>
- <select multiple id="availableUserRoleId" style="width:250px;height:250px">
- #foreach ( $role in $availableUserRoles )
- <option value="$role.id">$encoder.htmlEncode( $role.name )</option>
- #end
- </select>
- </td>
- <td align="center">
- <input type="button" value=">" title="$i18n.getString('move_selected')" style="width:40px" onclick="moveSelectedById( 'availableUserRoleId', 'userRoleId' )"><br>
- <input type="button" value="<" title="$i18n.getString('remove_selected')" style="width:40px" onclick="moveSelectedById( 'userRoleId', 'availableUserRoleId' )"><br>
- <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:40px" onclick="moveAllById( 'availableUserRoleId', 'userRoleId' )"><br>
- <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:40px" onclick="moveAllById( 'userRoleId', 'availableUserRoleId' )">
- </td>
- <td>
- <select multiple id="userRoleId" name="userRoleId" style="width:250px;height:250px">
- #foreach ( $role in $selectedUserRoles )
- <option value="$role.id">$encoder.htmlEncode( $role.name )</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td><input type="button" value="$i18n.getString( "save" )" onclick="saveReportUserRoles()" style="width:100px"></td>
- <td></td>
- <td></td>
- </tr>
-</table>
-
-</form>
-
-<span id="message"></span>
=== added file 'local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewAdministrator.vm'
--- local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewAdministrator.vm 1970-01-01 00:00:00 +0000
+++ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewAdministrator.vm 2009-09-07 08:21:46 +0000
@@ -0,0 +1,21 @@
+<h3>$i18n.getString( "administration" )</h3>
+<input type="button" value="$i18n.getString( "configuration" )" onclick="go('getConfiguration.action')" style="width:100px"/>
+<input type="button" value="$i18n.getString( "report_roles" )" onclick="go('getAdminOptions.action')" style="width:100px"/>
+<input type="button" value="$i18n.getString( "reports" )" onclick="go('listReportExcel.action')" style="width:100px"/>
+<input type="button" value="$i18n.getString( "clean_up" )" onclick="cleanUp()" style="width:100px"/>
+
+<script>
+ function go(action){
+ window.location = action;
+ }
+ function cleanUp(){
+ var request = new Request();
+ request.setResponseTypeXML( 'xmlObject' );
+ request.setCallbackSuccess( cleanUpCompleted );
+ request.send( 'cleanTempDirectory.action' );
+ }
+
+ function cleanUpCompleted( xmlObject ){
+ alert("Clean up");
+ }
+</script>
\ No newline at end of file
