← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8094: minor stylechange for filter in section input box

 

------------------------------------------------------------
revno: 8094
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-09-15 14:27:54 +0700
message:
  minor stylechange for filter in section input box
modified:
  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/sectionForm.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-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	2012-09-15 05:11:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-09-15 07:27:54 +0000
@@ -117,6 +117,14 @@
     } );
 
     dhis2.availability.startAvailabilityCheck();
+
+    $( '.filterInSection' ).parent().bind('resize', function(e)
+    {
+        var $a = $( '.filterInSection');
+        var $b = $a.parent();
+
+        $a.css('width', $b.width() );
+    });
 } );
 
 function ajax_login()

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2012-09-13 06:44:04 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2012-09-15 07:27:54 +0000
@@ -31,7 +31,7 @@
     #set( $categoryOptions = $optionsMap.get( $category.id ) )
     #set( $colCount = $colCount / $categoryOptions.size() )
     <tr colspan="$colCount">
-    <td>#if( $hasFilterInSection == false )<input type="text" placeholder="$encoder.jsEscape( $i18n.getString( "filter_in_section" ) , "'")" class="reg" onkeyup="filterInSection($(this));">#set( $hasFilterInSection = true )#end</td>
+    <td>#if( $hasFilterInSection == false )<input style="width: 90%; padding: 5px; border: solid 1px #E5E5E5; outline: 0; font: normal 13px/100% Verdana, Tahoma, sans-serif; background: #FFFFFF;" type="text" class="filterInSection" placeholder="$encoder.jsEscape( $i18n.getString( "filter_in_section" ) , "'")" class="reg" onkeyup="filterInSection($(this));">#set( $hasFilterInSection = true )#end</td>
     #set( $cols = $colRepeat.get( $category.id ) )
     #foreach( $col in $cols )
     #foreach( $categoryOption in $categoryOptions )