dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6985
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-05-18 14:14:16 +0200
message:
  Carousel css
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/concept/DefaultConceptService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.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-services/dhis-service-core/src/main/java/org/hisp/dhis/concept/DefaultConceptService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/concept/DefaultConceptService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/concept/DefaultConceptService.java	2012-05-18 12:14:16 +0000
@@ -90,6 +90,7 @@
     public void generateDefaultConcept()
     {
         Concept defaultConcept = new Concept( "default" );
+        
         conceptStore.save( defaultConcept );
     }
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java	2012-05-18 12:14:16 +0000
@@ -86,15 +86,13 @@
     public void execute()
         throws Exception
     {
-        String defaultConceptName = Concept.DEFAULT_CONCEPT_NAME;
-
-        Concept defaultConcept = conceptService.getConceptByName( defaultConceptName );
+        Concept defaultConcept = conceptService.getConceptByName( Concept.DEFAULT_CONCEPT_NAME );
 
         if ( defaultConcept == null )
         {
             conceptService.generateDefaultConcept();
 
-            defaultConcept = conceptService.getConceptByName( defaultConceptName );
+            defaultConcept = conceptService.getConceptByName( Concept.DEFAULT_CONCEPT_NAME );
 
             log.info( "Added default concept" );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.css	2012-05-09 13:21:28 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.css	2012-05-18 12:14:16 +0000
@@ -51,6 +51,10 @@
     background-position: 0 16px;
 }
 
+.ux-carousel-nav-next {
+    margin-right: 6px;
+}
+
 .ux-carousel-nav .ux-carousel-nav-prev {
     background-image: url('../img/prev.png');
     height: 16px;