dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11652
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-08-13 12:22:42 +0200
message:
  Removed unused template
removed:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js


--
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-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	2013-07-24 15:58:43 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-
-#macro ( linkDropDownButtonDiv $dropDownId $areaDivId )
-<div class="buttonArea">
-    <a href="javascript:showDropDown( '${dropDownId}' )">$i18n.getString( "insert" )</a>
-    <a href="javascript:hideDropDown()">$i18n.getString( "close" )</a>
-    <a href="javascript:clearArea( '${areaDivId}' )">$i18n.getString( "clear" )</a>
-</div>
-#end
-
-#macro ( chartDropDownButtonDiv $dropDownId $areaDivId $chart )
-<div class="buttonArea">
-    <a href="javascript:showDropDown( '${dropDownId}' )">$i18n.getString( "insert" )</a>
-    <a href="javascript:hideDropDown()">$i18n.getString( "close" )</a>
-    <a href="javascript:clearArea( '${areaDivId}' )">$i18n.getString( "clear" )</a>
-    #if( $chart )
-    <a href="javascript:dhis2.db.viewChart( '../api/charts/${chart.uid}/data#if( $chart.hasUserOrgUnit() )?ou=${organisationUnit.uid}#end', '${encoder.htmlEncode( $chart.name )}' )">$i18n.getString( "view_full_size" )</a>
-    <a href="javascript:dhis2.db.viewShareForm( '${chart.uid}', '${encoder.htmlEncode( $chart.name )}' )">$i18n.getString( "share" )</a>
-    #end
-</div>
-#end
-
-#macro ( linkDropDownListDiv $divId $listId $page )
-<div id="$divId" class="linkArea">
-    <div id="$listId" class="menuDropDownArea">
-        <ul class="menuDropDownBox">
-        #foreach( $provider in $providerNames )
-            <li><a href="javascript:setAreaItem( '$divId', '$provider' )">$i18n.getString( "$provider" )&nbsp;</a></li>
-        #end
-        </ul>
-    </div>
-    #if ( $page )
-        #parse( "/dhis-web-dashboard-integration/${page}.vm" )
-    #else
-        <div class="labelText">
-        	$i18n.getString( 'this_is_a_link_area' )<br><br>
-            $i18n.getString( 'click_insert_and_select_link' )
-        </div>
-    #end
-</div>
-#end
-
-#macro ( chartDropDownListDiv $divId $listId $chart )
-<div id="$divId" class="chartArea">
-    <div id="$listId" class="menuDropDownArea">
-        <ul class="menuDropDownBox">
-        #foreach( $availableChart in $charts )
-            <li><a href="javascript:setAreaItem( '${divId}', '${availableChart.id}' )">${availableChart.name}&nbsp;</a></li>
-        #end
-        </ul>
-    </div>
-    #if ( $chart )
-        <img style="cursor:pointer" src="../api/charts/${chart.uid}/data?width=405&height=300#if( $chart.hasUserOrgUnit() )&ou=${organisationUnit.uid}#end" 
-            onclick="dhis2.db.explore( '${chart.uid}' )" title="$i18n.getString( 'click_to_explore' )">
-    #else
-        <div class="labelText">
-        	$i18n.getString( 'this_is_a_chart_area' )<br><br>
-            $i18n.getString( 'click_insert_and_select_chart' )
-        </div>
-    #end
-</div>
-#end
-
-<table cellspacing="0" cellpadding="0" style="width:960px">
-<tr>
-    <td style="width:305px">        
-        #linkDropDownButtonDiv( "dropDownA" "areaA" )
-        #linkDropDownListDiv( "areaA" "dropDownA" $areaA )
-
-        #linkDropDownButtonDiv( "dropDownB" "areaB" )
-        #linkDropDownListDiv( "areaB" "dropDownB" $areaB )
-
-        #linkDropDownButtonDiv( "dropDownC" "areaC" )
-        #linkDropDownListDiv( "areaC" "dropDownC" $areaC )      
-    </td>
-	<td>
-
-<table>
-
-#set( $sizeHalf = $chartAreas.size() / 2 )
-
-#foreach( $chart in $chartAreas )
-#set( $count0 = $velocityCount - 1 )
-#set( $count1 = $velocityCount )
-#set( $startHr = ($count0 % $sizeHalf) == 0 )
-#set( $endHr =  ($count0 % $sizeHalf) == ($sizeHalf - 1) )
-
-#if( $startHr )<tr> #end
-	<td style="width:305px; padding-left: 10px;">
-		#chartDropDownButtonDiv( "chartDropDown${count1}" "chartArea${count1}" $chart )
-		#chartDropDownListDiv( "chartArea${count1}" "chartDropDown${count1}" $chart )
-	</td>
-#end
-#if( $endHr )</tr> #end
-</table>
-
-	</td>
-</tr>
-</table>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-08-12 22:04:17 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-08-13 10:22:42 +0000
@@ -458,7 +458,8 @@
             saveVal( dataElementId, optionComboId, id );
         } );
 
-        if ( formType != FORMTYPE_CUSTOM ) {
+        if ( formType != FORMTYPE_CUSTOM ) 
+        {
             $( this ).css( 'width', '80%' );
             $( this ).css( 'text-align', 'center' );
         }
@@ -1041,8 +1042,8 @@
     $( '.entrytrueonly' ).removeAttr( 'checked' );
     $( '.entryoptionset' ).val( '' );
 
-    $( '.entryfield' ).css( 'background-color', COLOR_WHITE ).css( 'border-color', COLOR_BORDER );
-    $( '.entryselect' ).css( 'background-color', COLOR_WHITE ).css( 'border-color', COLOR_BORDER );
+    $( '.entryfield' ).css( 'background-color', COLOR_WHITE ).css( 'border', '1px solid ' + COLOR_BORDER );
+    $( '.entryselect' ).css( 'background-color', COLOR_WHITE ).css( 'border', '1px solid ' + COLOR_BORDER );
     $( '.entrytrueonly' ).css( 'background-color', COLOR_WHITE );
     $( '.entryoptionset' ).css( 'background-color', COLOR_WHITE );