dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6099
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-24 08:41:30 +0100
message:
  Unused file
removed:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm
modified:
  resources/util/remove_unused_keys.sh


--
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

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm	2011-03-28 15:28:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-<!-- The script that registeres selctions in the orgunit tree -->
-<script type="text/javascript">
-	jQuery(document).ready(function() {
-		selection.setListenerFunction( orgUnitHasBeenSelected );
-	});
-
-	function orgUnitHasBeenSelected( orgUnitIds )
-	{
-		
-		getSelectedOrgUnit( orgUnitIds );
-	}
-	
-	function getSelectedOrgUnit( orgUnitIds )
-	{
-		if( orgUnitIds != "" )
-		{
-			var requestString = 'getOrgUnitName.action?selectedOrgUnitId='+orgUnitIds;
-			var request = new Request();
-			request.setResponseTypeXML('dataelement');
-			request.setCallbackSuccess( responseGetSelectedOrgUnitName );
-			request.send(requestString);
-		}
-	}
-	
-	function responseGetSelectedOrgUnitName( dataelement )
-	{
-		var element = dataelement.getElementsByTagName("dataelement");
-		var organisationUnitIdsOptions = document.getElementById( "organisationUnitIds" ).options;
-		var flag = false;
-		var i;
-	
-		for( i = 0; i < organisationUnitIdsOptions.length; i++ )
-		{
-			if( organisationUnitIdsOptions[i].value == element[0].getElementsByTagName('organisationUnitId')[0].firstChild.nodeValue )
-			{
-				flag = true;
-				break;
-			}
-		}
-		
-		if( !flag )
-		{
-			var option = document.createElement("option");
-			option.value = element[0].getElementsByTagName('organisationUnitId')[0].firstChild.nodeValue;
-			option.text = element[0].getElementsByTagName('organisationUnitName')[0].firstChild.nodeValue;
-			option.title = element[0].getElementsByTagName('organisationUnitName')[0].firstChild.nodeValue;
-			option.ondblclick = function(){removeSelectedOrgUnitName( element[0].getElementsByTagName('organisationUnitId')[0].firstChild.nodeValue );};
-			document.getElementById( "organisationUnitIds" ).add( option, null );
-		}
-		
-		if( document.getElementById( "organisationUnitIds" ).options.length > 0 )
-           {
-			 document.getElementById( "organisationUnitIds" ).disabled=false;
-			}
-        else
-		{
-            document.getElementById( "organisationUnitIds" ).disabled=true;
-		}
-    
-	}
-	
-	function removeSelectedOrgUnitName( orgUnitId )
-	{
-		var organisationUnitIdsOptions = document.getElementById( "organisationUnitIds" ).options;
-		for( i = 0; i < organisationUnitIdsOptions.length; i++ )
-        {
-            if( organisationUnitIdsOptions[i].value == orgUnitId )
-            {
-                document.getElementById( "organisationUnitIds" ).remove(i);
-				break;
-            }
-        }
-	
-		if( document.getElementById( "organisationUnitIds" ).options.length > 0 )
-           {
-             document.getElementById( "organisationUnitIds" ).disabled=false;
-            }
-        else
-        {
-            document.getElementById( "organisationUnitIds" ).disabled=true;
-        }
-	}
-</script>
-
-<h2>Data Administration</h2>
-<ul>
-    <li>Data Administration</li>
-    <ul>
-      <li>
-            Data Locking
-        </li>
-    </ul>
-</ul>
-
-<div style=" float:right; font-size:8pt; cursor:pointer; margin-top:-15px; ">
-	<a href="index.action"><img src="images/goback.png" width="36" height="30" alt="$i18n.getString( 'go_back' )"/></a>
-</div>
-
-<br/><br/>
-
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )

=== modified file 'resources/util/remove_unused_keys.sh'
--- resources/util/remove_unused_keys.sh	2012-02-23 12:13:09 +0000
+++ resources/util/remove_unused_keys.sh	2012-02-24 07:41:30 +0000
@@ -25,8 +25,6 @@
 rm -f ${PROP_FILE}
 touch ${PROP_FILE}
 
-echo
-
 while read -r LINE
 do
   if [[ ${LINE} =~ (^.*)(=| =).* ]]; then
@@ -51,4 +49,3 @@
 
 echo "- Done investigating file ${FILENAME}"
 echo "- Ignored ${IGNORED_PROPS} unused keys and ${INVALID_LINES} invalid lines, retained ${RETAINED_PROPS} properties, looked at ${TOTAL_LINES} lines"
-echo "- Cleaned properties written to file ${PROP_FILE}"