dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25499
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12670: Minor
------------------------------------------------------------
revno: 12670
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-15 13:12:30 +0200
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css
--
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-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-10-15 11:08:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-10-15 11:12:30 +0000
@@ -70,7 +70,8 @@
function removeAttributeOption( rowId )
{
jQuery( '#' + rowId ).remove();
- if( jQuery( '#advancedSearchTB tr' ).length == 2 ){
+
+ if( jQuery( '#advancedSearchTB tr' ).length <= 1 ){
jQuery('#advancedSearchTB [name=clearSearchBtn]').attr('disabled', true);
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2013-10-15 11:08:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2013-10-15 11:12:30 +0000
@@ -161,12 +161,12 @@
</td>
<td>
<input type="text" id="searchText" name="searchText" class="searchInput" value="$!searchText" onkeyup='searchPatientsOnKeyUp( event );'>
- <input type="button" class='normal-button' name="clearSearchBtn" value='$i18n.getString( "clear" )' disabled onclick="removeAttributeOption('advSearchBox0');" align='bottom'>
+ <input type="button" class='normal-button' name="clearSearchBtn" value='$i18n.getString( "clear" )' disabled onclick="removeAttributeOption('advSearchBox0');">
</td>
</tr>
</tbody>
</table>
- <div style="padding: 15px 3px">
+ <div style="padding: 10px 0 15px 3px">
<input type="button" class='large-button' value='$i18n.getString( "add_filter" )' onclick='addAttributeOption();'>
<input type="button" class='large-button' value='$i18n.getString( "search" )' onclick='validateAdvancedSearch();' id='searchPatientBtn'>
<input type="button" class='large-button hidden' id='sendSmsToListBtn' value="$i18n.getString('sms')" onclick="setFieldValue('sendToList', true);showSendSmsForm();">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2013-10-15 11:08:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2013-10-15 11:12:30 +0000
@@ -68,7 +68,8 @@
font-weight: bold;
}
-.img-button{
+.img-button
+{
width:20px;
cursor:pointer;
}
@@ -129,7 +130,7 @@
padding-left: 20px;
margin-bottom: 15px;
border-radius: 3px;
- max-width: 620px;
+ max-width: 570px;
}
#minimized-advanced-search
@@ -251,14 +252,16 @@
// Dashboard
// -------------------------------------------------------------- */
-div.dashboard-area {
+div.dashboard-area
+{
list-style: none inside;
margin: 50px 50px;
margin: 0;
padding: 0;
}
-p.header{
+p.header
+{
background-color:#CBDDEB;
background-repeat:repeat-x;
border:1px solid #C8DBEA;
@@ -371,12 +374,14 @@
background-color: #f8f8f8;
}
-.tooltip {
+.tooltip
+{
border-bottom: dashed 1px #aaa;
text-decoration: none;
cursor: help;
text-align: left;
}
+
.tooltip-target {
width: 250px;
top: 29px;