=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm	2015-07-31 10:51:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm	2015-07-31 12:46:03 +0000
@@ -5,52 +5,39 @@
 #sharingCreateNotification( "sqlView" )
 
 <form id="addSqlViewForm" action="addSqlView.action" method="post" class="inputForm">
-	<table>
-		<tr>
-			<th colspan="2">$i18n.getString( "details" )</th>
-		</tr>
-		<tr>
-			<td><label for="name">$encoder.htmlEncode( $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="description">$encoder.htmlEncode( $i18n.getString( "description" ) )</label></td>
-			<td><textarea id="description" name="description"></textarea></td>
-		</tr>
-		<tr>
-			<td><label for="type">$encoder.htmlEncode( $i18n.getString( "sql_type" ) )</label></td>
-			<td>
-				<select id="type" name="type">
-					<option value="VIEW">$i18n.getString( "sql_view_type" ) ($i18n.getString( "created_in_database" ))</option>
-					<option value="MATERIALIZED_VIEW">$i18n.getString( "materialized_sql_view_type" ) ($i18n.getString( "materialized_in_database" ))</option>
-					<option value="QUERY">$i18n.getString( "sql_query_type" ) ($i18n.getString( "allows_for_variables" ))</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="sql_statement">$encoder.htmlEncode( $i18n.getString( "sql_statement" ) ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td><textarea type="text" id="sqlquery" name="sqlquery" style="width:80em;height:20em">select </textarea></td>
-		</tr>
-		<tr>
-			<td><label>$encoder.htmlEncode( $i18n.getString( "cache_strategy" ) )</label></td>
-			<td>
-				<select id="cacheStrategy" name="cacheStrategy">
-					<option value="RESPECT_SYSTEM_SETTING" selected="selected">$i18n.getString( "respect_system_setting" )</option>
-					<option value="NO_CACHE">$i18n.getString( "no_cache" )</option>
-					<option value="CACHE_1_HOUR">$i18n.getString( "cache_for_one_hour" )</option>
-					<option value="CACHE_6AM_TOMORROW">$i18n.getString( "cache_until_6am_tomorrow" )</option>
-					<option value="CACHE_TWO_WEEKS">$i18n.getString( "cache_for_two_weeks" )</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td>
-				<input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
-				<input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='sqlView.action'" style="width:10em" />
-			</td>
-		</tr>
-	</table>
+    <table>
+        <tr>
+            <th colspan="2">$i18n.getString( "details" )</th>
+        </tr>
+        <tr>
+            <td><label for="name">$encoder.htmlEncode( $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="description">$encoder.htmlEncode( $i18n.getString( "description" ) )</label></td>
+            <td><textarea id="description" name="description"></textarea></td>
+        </tr>
+        <tr>
+            <td><label for="type">$encoder.htmlEncode( $i18n.getString( "sql_type" ) )</label></td>
+            <td>
+                <select id="type" name="type">
+                    <option value="VIEW">$i18n.getString( "sql_view_type" ) ($i18n.getString( "created_in_database" ))</option>
+                    <option value="MATERIALIZED_VIEW">$i18n.getString( "materialized_sql_view_type" ) ($i18n.getString( "materialized_in_database" ))</option>
+                    <option value="QUERY">$i18n.getString( "sql_query_type" ) ($i18n.getString( "allows_for_variables" ))</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td><label for="sql_statement">$encoder.htmlEncode( $i18n.getString( "sql_statement" ) ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+            <td><textarea type="text" id="sqlquery" name="sqlquery" style="width:80em;height:20em">select </textarea></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>
+                <input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
+                <input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='sqlView.action'" style="width:10em" />
+            </td>
+        </tr>
+    </table>
 
 </form>
-

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm	2015-07-31 10:51:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm	2015-07-31 12:46:03 +0000
@@ -10,60 +10,49 @@
 #set( $type = $i18n.getString( "sql_query_type" ) )
 #end
 
-#set( $cacheStrategy = $sqlViewObject.cacheStrategy.name() )
-
 <form id="updateSqlViewForm" action="updateSqlViewInstance.action" method="post" class="inputForm">
 
-	<div>
-		<input type="hidden" id="id" name="id" value="$!sqlViewObject.id" />
-		<input type="hidden" id="name" name="name" value="$!encoder.htmlEncode( $!sqlViewObject.name )" />
-		<input type="hidden" id="query" name="query" value="$!encoder.htmlEncode( $!sqlViewObject.query )" />
-	</div>
-
-	<table>
-		<tr>
-			<th colspan="2">$i18n.getString( "details" )</th>
-		</tr>
-		<tr>
-			<td><label for="name">$encoder.htmlEncode( $i18n.getString( "name" ) ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td>
-				<input type="text" id="name" name="name" value="$!encoder.htmlEncode( $!sqlViewObject.name )" disabled="disabled" />
-			</td>
-		</tr>
-		<tr>
-			<td><label for="description">$encoder.htmlEncode( $i18n.getString( "description" ) )</label></td>
-			<td>
-				<textarea id="description" name="description">$!encoder.htmlEncode( $!sqlViewObject.description )</textarea>
-			</td>
-		</tr>
-		<tr>
-			<td><label>$encoder.htmlEncode( $i18n.getString( "sql_type" ) )</label></td>
-			<td><input type="text" disabled="disabled" value="${type}"/></td>
-		</tr>
-		<tr>
-			<td><label for="sqlquery">$encoder.htmlEncode( $i18n.getString( "sql_statement" ) ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-			<td>
-				<textarea type="text" id="sqlquery" name="sqlquery" style="width:80em;height:20em">$!encoder.htmlEncode( $!sqlViewObject.sqlQuery )</textarea>
-			</td>
-		</tr>
-		<tr>
-			<td><label>$encoder.htmlEncode( $i18n.getString( "cache_strategy" ) )</label></td>
-			<td>
-			<select id="cacheStrategy" name="cacheStrategy">
-				<option value="RESPECT_SYSTEM_SETTING" #if( $cacheStrategy == "RESPECT_SYSTEM_SETTING" )selected="selected"#end>$i18n.getString( "respect_system_setting" )</option>
-				<option value="NO_CACHE" #if( $cacheStrategy == "NO_CACHE" )selected="selected"#end>$i18n.getString( "no_cache" )</option>
-				<option value="CACHE_1_HOUR" #if( $cacheStrategy == "CACHE_1_HOUR" )selected="selected"#end>$i18n.getString( "cache_for_one_hour" )</option>
-				<option value="CACHE_6AM_TOMORROW" #if( $cacheStrategy == "CACHE_6AM_TOMORROW" )selected="selected"#end>$i18n.getString( "cache_until_6am_tomorrow" )</option>
-				<option value="CACHE_TWO_WEEKS" #if( $cacheStrategy == "CACHE_TWO_WEEKS" )selected="selected"#end>$i18n.getString( "cache_for_two_weeks" )</option>
-			</select>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td>
-				<input type="submit" value="$i18n.getString( 'update' )" style="width:10em" />
-				<input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='sqlView.action'" style="width:10em" />
-			</td>
-		</tr>
-	</table>
+    <div>
+        <input type="hidden" id="id" name="id" value="$!sqlViewObject.id" />
+        <input type="hidden" id="name" name="name" value="$!encoder.htmlEncode( $!sqlViewObject.name )" />
+        <input type="hidden" id="query" name="query" value="$!encoder.htmlEncode( $!sqlViewObject.query )" />
+    </div>
+
+    <table>
+        <tr>
+            <th colspan="2">$i18n.getString( "details" )</th>
+        </tr>
+        <tr>
+            <td><label for="name">$encoder.htmlEncode( $i18n.getString( "name" ) ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+            <td>
+                <input type="text" id="name" name="name" value="$!encoder.htmlEncode( $!sqlViewObject.name )" disabled="disabled" />
+            </td>
+        </tr>
+        <tr>
+            <td><label for="description">$encoder.htmlEncode( $i18n.getString( "description" ) )</label></td>
+            <td>
+                <textarea id="description" name="description">$!encoder.htmlEncode( $!sqlViewObject.description )</textarea>
+            </td>
+        </tr>
+        <tr>
+            <td><label>$encoder.htmlEncode( $i18n.getString( "sql_type" ) )</label></td>
+            <td><input type="text" disabled="disabled" value="${type}"/></td>
+        </tr>
+        <tr>
+            <td><label for="sqlquery">$encoder.htmlEncode( $i18n.getString( "sql_statement" ) ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+            <td>
+                <textarea type="text" id="sqlquery" name="sqlquery" style="width:80em;height:20em">$!encoder.htmlEncode( $!sqlViewObject.sqlQuery )</textarea>
+            </td>
+        </tr>
+
+        <tr>
+            <td></td>
+            <td>
+                <input type="submit" value="$i18n.getString( 'update' )" style="width:10em" />
+                <input type="button" value="$i18n.getString( 'cancel' )" id="cancel" name="cancel" onclick="window.location.href='sqlView.action'" style="width:10em" />
+            </td>
+        </tr>
+    </table>
+
 </form>
+

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm	2015-07-31 10:51:43 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm	2015-07-31 12:46:03 +0000
@@ -1,10 +1,10 @@
 <script type="text/javascript">
-	var i18n_please_specify_file = '$encoder.jsEscape( $i18n.getString( "please_specify_file" ) , "'")';
-	var i18n_specify_name = '$encoder.jsEscape( $i18n.getString( "specify_name" ) , "'")';
+    var i18n_please_specify_file = '$encoder.jsEscape( $i18n.getString( "please_specify_file" ) , "'")';
+    var i18n_specify_name = '$encoder.jsEscape( $i18n.getString( "specify_name" ) , "'")';
 
-	jQuery( document ).ready( function() {
-		setReportType();
-	} );
+    jQuery( document ).ready( function() {
+        setReportType();
+    } );
 </script>
 
 <h3>$i18n.getString( 'create_new_report' )</h3>
@@ -17,110 +17,110 @@
 <input type="hidden" id="currentDesign" name="currentDesign" value="$!report.design" />
 
 <table>
-	<col width="120"/>
-	<col width="400"/>
-	<tr>
-		<th colspan="2">$i18n.getString( "details" )</th>
-	</tr>
-	<tr>
-		<td><label for="name">$i18n.getString( "name" )</label></td>
-		<td><input type="text" id="name" name="name" value="$!{report.name}"></td>
-	</tr>
-	<tr>
-		<td><label for="type">$i18n.getString( "type" )</label></td>
-		<td>
-			<select id="type" name="type" onchange="setReportType()">
-				<option value="jasperReportTable"#if( ${report.type} == "jasperReportTable" ) selected="selected"#end>$i18n.getString( "jasper_report_report_table_data_source" )</option>
-				<option value="jasperJdbc"#if( ${report.type} == "jasperJdbc" ) selected="selected"#end>$i18n.getString( "jasper_report_jdbc_data_source" )</option>
-				<option value="html"#if( ${report.type} == "html" ) selected="selected"#end>$i18n.getString( "html_report" )</option>
-		    </select>
-	    </td>
-	</tr>
-	<tr>
-		<td><label for="upload">$i18n.getString( "design_file" )</label></td>
-		<td><input type="file" id="upload" name="upload" size="30" /></td>
-	</tr>
-	#if( $report )
-	<tr>
-		<td></td>
-		<td>		
-			<input type="button" value="$i18n.getString( 'get_current_design' )" onclick="window.location.href='../api/reports/${report.uid}/design'">
-		</td>
-	</tr>
-	#else
-	<tr class="jasperReportTableDataSource jasperJdbcDataSource">
-		<td></td>
-		<td>
-			<input type="button" value="$i18n.getString( 'get_jasper_report_template' )" onclick="window.location.href='getReportTemplate.action?type=jasper'">
-		</td>
-	</tr>
-	<tr class="htmlDataSource">
-		<td></td>
-		<td>
-			<input type="button" value="$i18n.getString( 'get_html_report_template' )" onclick="window.location.href='getReportTemplate.action?type=html'">
-		</td>
-	</tr>
-	#end
-	<tr class="jasperReportTableDataSource">
-		<td><label for="reportTable">$i18n.getString( "report_table" )</label></td>
-		<td>
-			<select id="reportTableId" name="reportTableId">
-			<option value="0">[ $i18n.getString( "none" ) ]</option>
-			#foreach( $table in $reportTables )
-				<option value="$table.id"#if( $!report.reportTable.id == $table.id ) selected="selected"#end>$table.name</option>
-			#end
-			</select>
-		</td>
-	</tr>
-	<tr class="jasperJdbcDataSource htmlDataSource">
-		<th colspan="2">$i18n.getString( "relative_periods" )</th>
-	</tr>
-	<tr class="jasperJdbcDataSource htmlDataSource">
-		<td colspan="2">#parse( "/dhis-web-reporting/relativePeriodsInput.vm" )</td>
-	</tr>
-	<tr class="jasperJdbcDataSource htmlDataSource">
-		<td colspan="2" style="height:15px"></td>
-	</tr>
-	<tr class="jasperJdbcDataSource htmlDataSource">
-		<th colspan="2">$i18n.getString( "report_parameters" )</th>
-	</tr>
-	<tr class="jasperJdbcDataSource htmlDataSource">
-		<td colspan="2">
-			<label for="paramReportingMonth">$i18n.getString( "reporting_period" )</label>
-			<input type="checkbox" id="paramReportingMonth" name="paramReportingMonth" value="true"#if( $report.reportParams.isParamReportingMonth() ) checked#end>&nbsp;
-			<label for="paramOrganisationUnit">$i18n.getString( "organisation_unit" )</label>
-			<input type="checkbox" id="paramOrganisationUnit" name="paramOrganisationUnit" value="true"#if( $report.reportParams.isParamOrganisationUnit() ) checked#end>
-		<td>
-	</tr>
-	<tr>
-		<td colspan="2" style="height:15px"></td>
-	</tr>
-	<tr>
-		<th colspan="2">$i18n.getString( "settings" )</th>
-	</tr>
-	<tr>
-		<td>
-			<label for="cacheStrategy">$encoder.htmlEncode( $i18n.getString( "cache_strategy" ) )</label>
-		</td>
-		<td>
-			<select id="cacheStrategy" name="cacheStrategy">
-				<option value="RESPECT_SYSTEM_SETTING" #if( $!report.cacheStrategy.name() == "RESPECT_SYSTEM_SETTING" ) selected="selected" #end>$i18n.getString( "respect_system_setting" )</option>
-				<option value="NO_CACHE" #if( $!report.cacheStrategy.name() == "NO_CACHE" ) selected="selected" #end>$i18n.getString( "no_cache" )</option>
-				<option value="CACHE_1_HOUR" #if( $!report.cacheStrategy.name() == "CACHE_1_HOUR" ) selected="selected" #end>$i18n.getString( "cache_for_one_hour" )</option>
-				<option value="CACHE_6AM_TOMORROW" #if( $!report.cacheStrategy.name() == "CACHE_6AM_TOMORROW" ) selected="selected" #end>$i18n.getString( "cache_until_6am_tomorrow" )</option>
-				<option value="CACHE_TWO_WEEKS" #if( $!report.cacheStrategy.name() == "CACHE_TWO_WEEKS" ) selected="selected" #end>$i18n.getString( "cache_for_two_weeks" )</option>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2" style="height:15px"></td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<input type="button" value="$i18n.getString( 'save' )" style="width:10em" onclick="addReport()" />
-			<input type="button" value="$i18n.getString( 'cancel' )" style="width:10em" onclick="window.location.href='displayViewReportForm.action'" />
-		</td>
-	</tr>
+    <col width="120"/>
+    <col width="400"/>
+    <tr>
+        <th colspan="2">$i18n.getString( "details" )</th>
+    </tr>
+    <tr>
+        <td><label for="name">$i18n.getString( "name" )</label></td>
+        <td><input type="text" id="name" name="name" value="$!{report.name}"></td>
+    </tr>
+    <tr>
+        <td><label for="type">$i18n.getString( "type" )</label></td>
+        <td>
+            <select id="type" name="type" onchange="setReportType()">
+                <option value="jasperReportTable"#if( ${report.type} == "jasperReportTable" ) selected="selected"#end>$i18n.getString( "jasper_report_report_table_data_source" )</option>
+                <option value="jasperJdbc"#if( ${report.type} == "jasperJdbc" ) selected="selected"#end>$i18n.getString( "jasper_report_jdbc_data_source" )</option>
+                <option value="html"#if( ${report.type} == "html" ) selected="selected"#end>$i18n.getString( "html_report" )</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td><label for="upload">$i18n.getString( "design_file" )</label></td>
+        <td><input type="file" id="upload" name="upload" size="30" /></td>
+    </tr>
+    #if( $report )
+    <tr>
+        <td></td>
+        <td>
+            <input type="button" value="$i18n.getString( 'get_current_design' )" onclick="window.location.href='../api/reports/${report.uid}/design'">
+        </td>
+    </tr>
+    #else
+    <tr class="jasperReportTableDataSource jasperJdbcDataSource">
+        <td></td>
+        <td>
+            <input type="button" value="$i18n.getString( 'get_jasper_report_template' )" onclick="window.location.href='getReportTemplate.action?type=jasper'">
+        </td>
+    </tr>
+    <tr class="htmlDataSource">
+        <td></td>
+        <td>
+            <input type="button" value="$i18n.getString( 'get_html_report_template' )" onclick="window.location.href='getReportTemplate.action?type=html'">
+        </td>
+    </tr>
+    #end
+    <tr class="jasperReportTableDataSource">
+        <td><label for="reportTable">$i18n.getString( "report_table" )</label></td>
+        <td>
+            <select id="reportTableId" name="reportTableId">
+            <option value="0">[ $i18n.getString( "none" ) ]</option>
+            #foreach( $table in $reportTables )
+                <option value="$table.id"#if( $!report.reportTable.id == $table.id ) selected="selected"#end>$table.name</option>
+            #end
+            </select>
+        </td>
+    </tr>
+    <tr class="jasperJdbcDataSource htmlDataSource">
+        <th colspan="2">$i18n.getString( "relative_periods" )</th>
+    </tr>
+    <tr class="jasperJdbcDataSource htmlDataSource">
+        <td colspan="2">#parse( "/dhis-web-reporting/relativePeriodsInput.vm" )</td>
+    </tr>
+    <tr class="jasperJdbcDataSource htmlDataSource">
+        <td colspan="2" style="height:15px"></td>
+    </tr>
+    <tr class="jasperJdbcDataSource htmlDataSource">
+        <th colspan="2">$i18n.getString( "report_parameters" )</th>
+    </tr>
+    <tr class="jasperJdbcDataSource htmlDataSource">
+        <td colspan="2">
+            <label for="paramReportingMonth">$i18n.getString( "reporting_period" )</label>
+            <input type="checkbox" id="paramReportingMonth" name="paramReportingMonth" value="true"#if( $report.reportParams.isParamReportingMonth() ) checked#end>&nbsp;
+            <label for="paramOrganisationUnit">$i18n.getString( "organisation_unit" )</label>
+            <input type="checkbox" id="paramOrganisationUnit" name="paramOrganisationUnit" value="true"#if( $report.reportParams.isParamOrganisationUnit() ) checked#end>
+        <td>
+    </tr>
+    <tr>
+        <td colspan="2" style="height:15px"></td>
+    </tr>
+    <tr>
+        <th colspan="2">$i18n.getString( "settings" )</th>
+    </tr>
+    <tr>
+        <td>
+            <label for="cacheStrategy">$encoder.htmlEncode( $i18n.getString( "cache_strategy" ) )</label>
+        </td>
+        <td>
+            <select id="cacheStrategy" name="cacheStrategy">
+                <option value="RESPECT_SYSTEM_SETTING" #if( $!report.cacheStrategy.name() == "RESPECT_SYSTEM_SETTING" ) selected="selected" #end>$i18n.getString( "respect_system_setting" )</option>
+                <option value="NO_CACHE" #if( $!report.cacheStrategy.name() == "NO_CACHE" ) selected="selected" #end>$i18n.getString( "no_cache" )</option>
+                <option value="CACHE_1_HOUR" #if( $!report.cacheStrategy.name() == "CACHE_1_HOUR" ) selected="selected" #end>$i18n.getString( "cache_for_one_hour" )</option>
+                <option value="CACHE_6AM_TOMORROW" #if( $!report.cacheStrategy.name() == "CACHE_6AM_TOMORROW" ) selected="selected" #end>$i18n.getString( "cache_until_6am_tomorrow" )</option>
+                <option value="CACHE_TWO_WEEKS" #if( $!report.cacheStrategy.name() == "CACHE_TWO_WEEKS" ) selected="selected" #end>$i18n.getString( "cache_for_two_weeks" )</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="2" style="height:15px"></td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <input type="button" value="$i18n.getString( 'save' )" style="width:10em" onclick="addReport()" />
+            <input type="button" value="$i18n.getString( 'cancel' )" style="width:10em" onclick="window.location.href='displayViewReportForm.action'" />
+        </td>
+    </tr>
 </table>
 
 </form>