dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33620
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17194: minor: indentation consistency (use spaces)
------------------------------------------------------------
revno: 17194
committer: Halvdan Hoem Grelland <halvdanhg@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-10-21 12:53:08 +0200
message:
minor: indentation consistency (use spaces)
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm
--
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/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2014-10-21 10:48:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2014-10-21 10:53:08 +0000
@@ -7,13 +7,13 @@
function pageInit()
{
- setTableStyles();
-
+ setTableStyles();
+
// Hover on rightbar close image
$( "#hideRightBarImg" ).mouseover( function()
{
- $( this ).attr( "src", "../images/hide_active.png" );
+ $( this ).attr( "src", "../images/hide_active.png" );
} );
$( "#hideRightBarImg" ).mouseout( function()
{
@@ -23,16 +23,16 @@
function setTableStyles()
{
- // Zebra stripes in lists
-
- $( "table.listTable tbody tr:odd" ).addClass( "listAlternateRow" );
+ // Zebra stripes in lists
+
+ $( "table.listTable tbody tr:odd" ).addClass( "listAlternateRow" );
$( "table.listTable tbody tr:even" ).addClass( "listRow" );
// Hover rows in lists
-
+
$( "table.listTable tbody tr" ).mouseover( function()
{
- $( this ).addClass( "listHoverRow" );
+ $( this ).addClass( "listHoverRow" );
} );
$( "table.listTable tbody tr" ).mouseout( function()
{
@@ -48,22 +48,22 @@
dhis2.leftBar.setLinks = function( showLeftBarLink, showExtendMenuLink )
{
- $( '#showLeftBar' ).css( 'display', ( showLeftBarLink ? 'inline' : 'none' ) );
- $( '#extendMainMenuLink' ).css( 'display', ( showExtendMenuLink ? 'inline' : 'none' ) );
+ $( '#showLeftBar' ).css( 'display', ( showLeftBarLink ? 'inline' : 'none' ) );
+ $( '#extendMainMenuLink' ).css( 'display', ( showExtendMenuLink ? 'inline' : 'none' ) );
};
dhis2.leftBar.showAnimated = function()
{
- dhis2.leftBar.setMenuVisible();
- dhis2.leftBar.setLinks( false, true );
- $( '#leftBar, #orgUnitTree' ).css( 'width', '' ).show( 'slide', { direction: 'left', duration: 200 } );
- $( '#mainPage' ).css( 'margin-left', '' );
+ dhis2.leftBar.setMenuVisible();
+ dhis2.leftBar.setLinks( false, true );
+ $( '#leftBar, #orgUnitTree' ).css( 'width', '' ).show( 'slide', { direction: 'left', duration: 200 } );
+ $( '#mainPage' ).css( 'margin-left', '' );
};
dhis2.leftBar.extendAnimated = function()
{
- dhis2.leftBar.setMenuExtended();
- dhis2.leftBar.setLinks( false, false );
+ dhis2.leftBar.setMenuExtended();
+ dhis2.leftBar.setLinks( false, false );
$( '#leftBar, #orgUnitTree' ).show().animate( { direction: 'left', width: '+=150px', duration: 20 } );
$( '#mainPage' ).animate( { direction: 'left', marginLeft: '+=150px', duration: 20 } );
$( '#hideMainMenuLink' ).attr( 'href', 'javascript:dhis2.leftBar.retract()' );
@@ -71,8 +71,8 @@
dhis2.leftBar.extend = function()
{
- dhis2.leftBar.setMenuExtended();
- dhis2.leftBar.setLinks( false, false );
+ dhis2.leftBar.setMenuExtended();
+ dhis2.leftBar.setLinks( false, false );
$( '#leftBar, #orgUnitTree' ).show().css( "width", "+=150px" );
$( '#mainPage' ).css( "margin-left", "+=150px" );
$( '#hideMainMenuLink' ).attr( 'href', 'javascript:dhis2.leftBar.retract()' );
@@ -80,8 +80,8 @@
dhis2.leftBar.retract = function()
{
- dhis2.leftBar.setMenuVisible();
- dhis2.leftBar.setLinks( false, true );
+ dhis2.leftBar.setMenuVisible();
+ dhis2.leftBar.setLinks( false, true );
$( '#leftBar, #orgUnitTree' ).show().animate( { direction: 'right', width: '-=150px', duration: 20 } );
$( '#mainPage' ).animate( { direction: 'right', marginLeft: '-=150px', duration: 20 } );
$( '#hideMainMenuLink' ).attr( 'href', 'javascript:javascript:dhis2.leftBar.hideAnimated()' );
@@ -89,16 +89,16 @@
dhis2.leftBar.hideAnimated = function()
{
- dhis2.leftBar.setMenuHidden();
- dhis2.leftBar.setLinks( true, false );
+ dhis2.leftBar.setMenuHidden();
+ dhis2.leftBar.setLinks( true, false );
$( '#leftBar' ).hide( 'slide', { direction: 'left', duration: 200 } );
$( '#mainPage' ).animate( { direction: 'right', marginLeft: '20px', duration: 200 } );
};
dhis2.leftBar.hide = function()
{
- dhis2.leftBar.setMenuHidden();
- dhis2.leftBar.setLinks( true, false );
+ dhis2.leftBar.setMenuHidden();
+ dhis2.leftBar.setLinks( true, false );
$( '#leftBar' ).hide();
$( '#mainPage' ).css( 'margin-left', '20px' );
};
@@ -121,7 +121,7 @@
dhis2.leftBar.setMenuExtended = function()
{
- $.get( '../dhis-web-commons/menu/setMenuState.action?state=EXTENDED' );
+ $.get( '../dhis-web-commons/menu/setMenuState.action?state=EXTENDED' );
};
dhis2.leftBar.setMenuHidden = function()
@@ -131,5 +131,5 @@
dhis2.leftBar.openHelpForm = function( id )
{
- window.open( "../dhis-web-commons/help/viewDynamicHelp.action?id=" + id, "Help", "width=800,height=600,scrollbars=yes" );
+ window.open( "../dhis-web-commons/help/viewDynamicHelp.action?id=" + id, "Help", "width=800,height=600,scrollbars=yes" );
};
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm 2014-10-21 10:48:08 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm 2014-10-21 10:53:08 +0000
@@ -34,12 +34,12 @@
</h3></div>
<div id="dashboardMenu" class="horizontalMenu">
- <ul>
+ <ul>
<li><a class="greyButtonLink" href="profile.action?id=${currentUser.uid}">$i18n.getString( "profile" )</a></li>
- <li><a class="greyButtonLink" href="message.action">$i18n.getString( "messages" )</a></li>
- <li><a class="greyButtonLink" href="interpretation.action">$i18n.getString( "interpretations" )</a></li>
- <li><a class="greyButtonLink" href="getAllUserGroups.action">$i18n.getString( "groups" )</a></li>
- </ul>
+ <li><a class="greyButtonLink" href="message.action">$i18n.getString( "messages" )</a></li>
+ <li><a class="greyButtonLink" href="interpretation.action">$i18n.getString( "interpretations" )</a></li>
+ <li><a class="greyButtonLink" href="getAllUserGroups.action">$i18n.getString( "groups" )</a></li>
+ </ul>
</div>
<div id="searchDiv"><input type="text" id="searchField" autocomplete="off" placeholder="$i18n.getString( 'search_for_users_charts_maps_reports' )"></div>
@@ -48,13 +48,13 @@
<div id="searchButton"><a class="blueButtonLink" href="javascript:dhis2.db.search()">$i18n.getString( "search" )</a></div>
<div id="dashboardControl" class="horizontalMenu dashboardList">
- <ul>
- <li><a class='bold' href='javascript:dhis2.db.openAddDashboardForm()'>$i18n.getString( "add" )</a></li>
- <li id="manageDashboard"><a class='bold'>$i18n.getString( "manage" )</a></li>
- <li id="manageSharing"><a class='bold'>$i18n.getString( "share" )</a></li>
- <li><a class='bold' href='javascript:dhis2.db.scrollLeft()' title='$i18n.getString( "previous" )'><</a></li>
- <li><a class='bold' href='javascript:dhis2.db.scrollRight()' title='$i18n.getString( "next" )'>></a></li>
- </ul>
+ <ul>
+ <li><a class='bold' href='javascript:dhis2.db.openAddDashboardForm()'>$i18n.getString( "add" )</a></li>
+ <li id="manageDashboard"><a class='bold'>$i18n.getString( "manage" )</a></li>
+ <li id="manageSharing"><a class='bold'>$i18n.getString( "share" )</a></li>
+ <li><a class='bold' href='javascript:dhis2.db.scrollLeft()' title='$i18n.getString( "previous" )'><</a></li>
+ <li><a class='bold' href='javascript:dhis2.db.scrollRight()' title='$i18n.getString( "next" )'>></a></li>
+ </ul>
</div>
<div id="dashboardListContainer" class="horizontalMenu">
@@ -68,37 +68,36 @@
</div>
<div id="chartView" class="page">
- <img id="chartImage" src="" style="padding: 10px;">
+ <img id="chartImage" src="" style="padding: 10px;">
</div>
<div id="reportDialogView" class="page"></div>
<div id="shareForm">
- <textarea id="interpretationArea" class="interpretationArea" placeholder="$i18n.getString( 'write_your_interpretation' )"></textarea>
- <input type="button" class="interpretationButton" value="$i18n.getString( 'share' )" onclick="dhis2.db.shareInterpretation()">
+ <textarea id="interpretationArea" class="interpretationArea" placeholder="$i18n.getString( 'write_your_interpretation' )"></textarea>
+ <input type="button" class="interpretationButton" value="$i18n.getString( 'share' )" onclick="dhis2.db.shareInterpretation()">
</div>
<div id="shareHelpForm">
- <ul>
- <li>$i18n.getString( "from" ) <a href="../dhis-web-pivot/index.html">$i18n.getString( "pivot_table" )</a>, $i18n.getString( "generate_pivot_table_click_share" )</li>
+ <ul>
+ <li>$i18n.getString( "from" ) <a href="../dhis-web-pivot/index.html">$i18n.getString( "pivot_table" )</a>, $i18n.getString( "generate_pivot_table_click_share" )</li>
<li>$i18n.getString( "from" ) <a href="../dhis-web-visualizer/index.html">$i18n.getString( "data_visualizer" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
- <li>$i18n.getString( "from" ) <a href="../dhis-web-mapping/index.html">$i18n.getString( "gis" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
- <li>$i18n.getString( "from" ) <a href="../dhis-web-reporting/showDataSetReportForm.action">$i18n.getString( "data_set_report" )</a>, $i18n.getString( "generate_data_set_report_click_share" )</li>
- </ul>
+ <li>$i18n.getString( "from" ) <a href="../dhis-web-mapping/index.html">$i18n.getString( "gis" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
+ <li>$i18n.getString( "from" ) <a href="../dhis-web-reporting/showDataSetReportForm.action">$i18n.getString( "data_set_report" )</a>, $i18n.getString( "generate_data_set_report_click_share" )</li>
+ </ul>
</div>
<div id="addDashboardForm">
- <label style="margin-right: 10px">$i18n.getString( "name" )</label><input type="text" id="dashboardName" style="width: 240px; padding: 5px; margin-right: 10px;">
+ <label style="margin-right: 10px">$i18n.getString( "name" )</label><input type="text" id="dashboardName" style="width: 240px; padding: 5px; margin-right: 10px;">
<a class="greyButtonLink" href="javascript:dhis2.db.addDashboard()" style="margin-top: 1px">$i18n.getString( 'create' )</a>
</div>
<div id="manageDashboardForm" class="page">
- <h4>$i18n.getString( "rename_current_dashboard" )</h4>
- <div><label style="margin-right: 10px">$i18n.getString( "name" )</label><input type="text" id="dashboardRename" style="width: 230px; padding: 5px; margin-right: 10px;">
+ <h4>$i18n.getString( "rename_current_dashboard" )</h4>
+ <div><label style="margin-right: 10px">$i18n.getString( "name" )</label><input type="text" id="dashboardRename" style="width: 230px; padding: 5px; margin-right: 10px;">
<a class="greyButtonLink" href="javascript:dhis2.db.renameDashboard()" style="margin-top: 1px">$i18n.getString( "rename" )</a></div>
<h4>$i18n.getString( "add_items_to_current_dashboard" )</h4>
<div><a class="greyButtonLink" href="javascript:dhis2.db.addMessagesContent()">$i18n.getString( "messages" )</a></div>
- <h4>$i18n.getString( "delete_current_dashboard" )</h4>
- <div><a class="greyButtonLink" href="javascript:dhis2.db.removeDashboard()">$i18n.getString( "delete" )</a></div>
+ <h4>$i18n.getString( "delete_current_dashboard" )</h4>
+ <div><a class="greyButtonLink" href="javascript:dhis2.db.removeDashboard()">$i18n.getString( "delete" )</a></div>
</div>
-
