=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/select2/select2.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/select2/select2.css 2012-09-24 06:28:31 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/select2/select2.css 2012-09-25 13:56:20 +0000 @@ -112,6 +112,7 @@ z-index: 9999; width:100%; margin-top:-1px; + font-size: 10pt; /* DHIS modification */ -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; @@ -317,20 +318,6 @@ display: list-item; } -/* -disabled look for already selected choices in the results dropdown -.select2-results .select2-disabled.select2-highlighted { - color: #666; - background: #f4f4f4; - display: list-item; - cursor: default; -} -.select2-results .select2-disabled { - background: #f4f4f4; - display: list-item; - cursor: default; -} -*/ .select2-results .select2-disabled { display: none; } @@ -359,7 +346,6 @@ border-left: 0; } - /* multiselect */ .select2-container-multi .select2-choices { @@ -475,7 +461,6 @@ left: 3px; } - .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { background-position: right -11px; } === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-09-24 06:28:31 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-09-25 13:56:20 +0000 @@ -76,8 +76,8 @@ /main.vm /dhis-web-dashboard-integration/sendMessage.vm /dhis-web-dashboard-integration/menu.vm - ../dhis-web-commons/oust/oust.js,javascript/message.js - style/dashboard.css + ../dhis-web-commons/oust/oust.js,javascript/message.js,../dhis-web-commons/select2/select2.min.js + style/dashboard.css,../dhis-web-commons/select2/select2.css F_SEND_MESSAGE === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm 2012-09-25 05:44:44 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm 2012-09-25 13:56:20 +0000 @@ -1,6 +1,3 @@ - - -