=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm	2013-07-12 09:21:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm	1970-01-01 00:00:00 +0000
@@ -1,234 +0,0 @@
-<script type="text/javascript">
-	jQuery( document ).ready( function() {
-	    validation2( 'addDataElementForm', function( form )
-	    {
-	        dhis2.select.selectAll( jQuery( '#aggregationLevels' ) );
-	        form.submit();
-	    }, {
-	        'beforeValidateHandler' : function()
-	        {
-	            setFieldValue( 'submitCategoryComboId', getFieldValue( 'selectedCategoryComboId' ) );
-	            setFieldValue( 'submitValueType', getFieldValue( 'valueType' ) );
-				enable('aggregationOperatorSelect');
-				#tblDynamicAttributesJavascript()
-	        },
-	        'rules' : getValidationRules( "dataElement" )
-	    } );
-
-	    checkValueIsExist( "name", "validateDataElement.action" );
-	    checkValueIsExist( "shortName", "validateDataElement.action" );
-	    checkValueIsExist( "code", "validateDataElement.action" );
-	} );
-
-	var previousName = '';
-</script>
-
-<h3>$i18n.getString( "create_new_data_element" )</h3>
-
-<form id="addDataElementForm" action="addDataElement.action" method="POST" class="inputForm">
-<input type="hidden" id="defaultCategoryCombo" value="$defaultCategoryCombo.id"/>
-<select name="factors" id="factorsSubmit" multiple="multiple" style="display:none"></select>
-
-<table>
-	<tr>
-		<th colspan="2">$i18n.getString( "details" )</th>
-	</tr>
-	<tr>
-		<td><label for="name">$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="name" name="name" /></td>
-	</tr>
-	<tr>
-		<td><label for="shortName">$i18n.getString( "short_name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="shortName" name="shortName" /></td>
-	</tr>
-	<tr>
-		<td><label for="code">$i18n.getString( "code" )</label></td>
-		<td><input type="text" id="code" name="code" /></td>
-	</tr>
-	<tr>
-		<td><label for="description">$i18n.getString( "description" )</label></td>
-		<td><textarea id="description" name="description"></textarea></td>
-	</tr>
-	<tr>
-		<td><label for="formName">$i18n.getString( "form_name" )</label></td>
-		<td><input type="text" id="formName" name="formName" /></td>
-	</tr>
-	<tr>
-		<td><label for="domainType">$i18n.getString( "domain_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td>
-			<select id="domainType" name="domainType" onchange='domainTypeChange(this.value)'>
-				<option value="aggregate" selected="selected">$i18n.getString( "aggregate" )</option>
-				<option value="patient">$i18n.getString( "patient" )</option>				
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td><label for="valueType">$i18n.getString( "value_type" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td>
-			<select id="valueType" onchange="changeValueType( this.value )">
-				<option value="int" selected="selected">$i18n.getString( "number" )</option>
-				<option value="string">$i18n.getString( "text" )</option>
-				<option value="bool">$i18n.getString( "yes_no" )</option>
-				<option value="trueOnly">$i18n.getString( "yes_only" )</option>
-				<option value="date">$i18n.getString( "date" )</option>
-				<option value="username">$i18n.getString( "user_name" )</option>
-			</select>
-			<input type="hidden" id="submitValueType" name="valueType"/>
-		</td>
-	</tr>
-	<tr id='numberTypeTR'>
-		<td><label for="numberValueType">$i18n.getString( "number_value_type" )</label></td>
-		<td>
-			<select id="numberType" name="numberType">
-				<option value="number">$i18n.getString( "number" )</option>
-				<option value="int" >$i18n.getString( "int" )</option>
-				<option value="positiveNumber">$i18n.getString( "positiveNumber" )</option>
-				<option value="negativeNumber">$i18n.getString( "negativeNumber" )</option>
-			</select>
- 		</td>
- 	</tr>
-	<tr id='textTypeTR' style='display:none'>
-		<td><label for="textValueType">$i18n.getString( "text_type" )</label></td>
-		<td>
-			<select id="textType" name="textType" style="min-width:246px; margin: 0;" >
-				<option value="text" selected="selected">$i18n.getString( "text" )</option>
-				<option value="longText" >$i18n.getString( "long_text" )</option>
-			</select>
- 		</td>
- 	</tr>
-	<tr id="aggregationOperator">
-		<td><label for="aggregationOperatorSelect">$i18n.getString( "aggregation_operator" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td>
-			<select id="aggregationOperatorSelect" name="aggregationOperator">
-				<option value="sum" selected="selected">$i18n.getString( "sum" )</option>
-				<option value="average">$i18n.getString( "average" )</option>
-			</select>
-		</td>
-	</tr>
-    <tr>
-   		<td><label for="zeroIsSignificant">$i18n.getString( "store_zero_data_values" )</label></td>
-   		<td>
-   			<select id="zeroIsSignificant" name="zeroIsSignificant">
-   				<option value="false" selected="selected">$i18n.getString( "no" )</option>
-   				<option value="true" >$i18n.getString( "yes" )</option>
-   			</select>
-    		</td>
-    	</tr>
-    <tr>
-        <td><label for="url">$i18n.getString( "url" )</label></td>
-        <td><input type="text" id="url" name="url"/></td>
-    </tr>
-	<tr>	
-		<td><label for="selectedCategoryComboId">$i18n.getString( "category_combo" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td>
-			<select id="selectedCategoryComboId">				
-			#foreach( $dataElementCategoryCombo in $dataElementCategoryCombos )
-				<option value="$dataElementCategoryCombo.id" #if( $dataElementCategoryCombo.id == $defaultCategoryCombo.id ) selected="selected" #end>$encoder.htmlEncode( $dataElementCategoryCombo.displayName )</option>
-			#end
-			</select>
-			<input type="hidden" id="submitCategoryComboId" name="selectedCategoryComboId"/>
-		</td>
-	</tr>
-	<tr>
-		<td style="width:200px">$i18n.getString( "aggregation_levels" )</td>
-		<td><input type="checkbox" onclick="toggleById( 'aggregationLevelsContainer' )"/></td>
-	</tr>
-	<tr>
-		<td>$i18n.getString( 'option_set' )</td>			
-		<td>
-			<select id="selectedOptionSetId" name="selectedOptionSetId">
-				<option value="0">[$i18n.getString('please_select')]</option>
-				#foreach ( $optionSet in $optionSets )
-				<option value="$optionSet.id">$encoder.htmlEncode( $optionSet.displayName )</option>
-				#end
-			</select>
-		</td>
-    </tr>
-    <tr>
-        <td>$i18n.getString( 'legend_set' )</td>            
-        <td>
-            <select id="selectedLegendSetId" name="selectedLegendSetId">
-                <option value="0">[$i18n.getString('please_select')]</option>
-                #foreach ( $legendSet in $legendSets )
-                <option value="$legendSet.id">$encoder.htmlEncode( $legendSet.name )</option>
-                #end
-            </select>
-        </td>
-    </tr>
-</table>
-
-<div id="aggregationLevelsContainer" style="border:1px solid #808080; padding:10px; width:465px; display:none;">
-<table>
-	<col width="440px" />
-
-	<tr>
-		<th>$i18n.getString( "available_aggregation_levels" )</th>
-	</tr>
-
-	<tr>
-		<td>
-			<select multiple size="4" id="organisationUnitLevels" style="width:440px" ondblclick="moveSelectedById( 'organisationUnitLevels', 'aggregationLevels' )">
-			#foreach( $level in $organisationUnitLevels )
-				<option value="$level.level">$level.displayName</option>
-			#end
-			</select>
-		</td>
-    </tr>
-
-    <tr>
-    	<td>
-		    <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add' )" style="width:120px" onclick="moveSelectedById( 'organisationUnitLevels', 'aggregationLevels' )"/>
-		    <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove' )" style="width:120px" onclick="moveSelectedById( 'aggregationLevels', 'organisationUnitLevels' )"/>
-        </td>
-    </tr>
-
-    <tr>
-        <th>$i18n.getString( "selected_aggregation_levels" )</th>
-    </tr>
-
-    </tr>
-        <td>
-        	<select multiple size="4" id="aggregationLevels" name="aggregationLevels" style="width:440px" ondblclick="moveSelectedById( 'aggregationLevels', 'organisationUnitLevels' )"></select>
-        </td>
-	</tr>
-	
-</table>
-</div>
-
-#tblDynamicAttributes( { "attributes": $attributes } )
-
-#if( $groupSets.size() > 0 )
-<table>
-	<col width="200px" />
-	<col width="240px" />
-
-	<tr>
-		<td style="height:15px" colspan="2">
-	</tr>
-
-    <tr>
-		<th colspan="2">$i18n.getString( "data_element_groups" )</th>
-    </tr>
-
-	#foreach ( $groupSet in $groupSets )
-    <tr>
-		<td>$encoder.htmlEncode( $groupSet.name )</td>			
-		<td>
-			<select id="selectedGroups" name="selectedGroups">
-				<option value="-1">[ $i18n.getString( "select_group" ) ]</option>
-				#foreach ( $group in $groupSet.getSortedGroups() )
-				<option value="$group.id">$group.name</option>
-				#end
-			</select>
-		</td>
-    </tr>
-	#end
-</table>
-#end
-
-<p>
-	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em" />
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='dataElement.action'" style="width:10em" />
-</p>
-
-</form>