dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8257
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-09-25 15:56:20 +0200
message:
  Message selection, set font size and including css and js from struts.xml
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/select2/select2.css
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.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/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 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-dashboard-integration/sendMessage.vm</param>
       <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
-      <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/message.js</param>
-      <param name="stylesheets">style/dashboard.css</param>
+      <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/message.js,../dhis-web-commons/select2/select2.min.js</param>
+      <param name="stylesheets">style/dashboard.css,../dhis-web-commons/select2/select2.css</param>
       <param name="requiredAuthorities">F_SEND_MESSAGE</param>
     </action>
 

=== 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 @@
-<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/select2/select2.css" />
-<script type="text/javascript" src="../dhis-web-commons/select2/select2.min.js"></script>
-
 <script type="text/javascript">
 var i18n_enter_subject = '$encoder.jsEscape( $i18n.getString( "enter_subject" ), "'")';
 var i18n_enter_text = '$encoder.jsEscape( $i18n.getString( "enter_text" ), "'")';