dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #23616
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11506: Cleanup
------------------------------------------------------------
revno: 11506
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-07-24 18:25:21 +0200
message:
Cleanup
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardManager.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/manager/
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/manager/DefaultDashboardManager.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ContentProvider.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/DocumentContentProvider.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/MapViewContentProvider.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportContentProvider.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportTableContentProvider.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/RssContentProvider.java
modified:
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardContentStore.java
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.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
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardManager.java 2013-07-22 17:46:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardManager.java 1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-package org.hisp.dhis.dashboard;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.hisp.dhis.document.Document;
-import org.hisp.dhis.report.Report;
-import org.hisp.dhis.reporttable.ReportTable;
-import org.hisp.dhis.user.User;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public interface DashboardManager
-{
- final String CHART_AREA_PREFIX = "chartArea";
-
- void setAreaItem( String area, String item );
-
- void clearArea( String area );
-
- Map<String, Object> getContent();
-
- Set<String> getContentProviderNames();
-
- DashboardConfiguration getConfiguration();
-
- void saveDashboardContent( DashboardContent dashboardContent );
-
- void updateDashboardContent( DashboardContent dashboardContent );
-
- DashboardContent getDashboardContent( int id );
-
- DashboardContent getDashboardContent( User user );
-
- Collection<DashboardContent> getAllDashboardContent();
-
- void deleteDashboardContent( DashboardContent content );
-
- Collection<DashboardContent> getByDocument( Document document );
-
- Collection<DashboardContent> getByMap( org.hisp.dhis.mapping.Map map );
-
- Collection<DashboardContent> getByReport( Report report );
-
- Collection<DashboardContent> getByReportTable( ReportTable reportTable );
-}
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java 2013-07-22 17:46:51 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java 1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-package org.hisp.dhis.dashboard;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.document.Document;
-import org.hisp.dhis.mapping.Map;
-import org.hisp.dhis.report.Report;
-import org.hisp.dhis.reporttable.ReportTable;
-import org.hisp.dhis.system.deletion.DeletionHandler;
-import org.hisp.dhis.user.User;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DashboardContentDeletionHandler
- extends DeletionHandler
-{
- @Autowired
- private DashboardManager dashboardManager;
-
- // -------------------------------------------------------------------------
- // DeletionHandler implementation
- // -------------------------------------------------------------------------
-
- public String getClassName()
- {
- return DashboardContent.class.getSimpleName();
- }
-
- @Override
- public void deleteReport( Report report )
- {
- Collection<DashboardContent> contents = dashboardManager.getByReport( report );
-
- for ( DashboardContent content : contents )
- {
- content.getReports().remove( report );
- dashboardManager.updateDashboardContent( content );
- }
- }
-
- @Override
- public void deleteDocument( Document document )
- {
- Collection<DashboardContent> contents = dashboardManager.getByDocument( document );
-
- for ( DashboardContent content : contents )
- {
- content.getDocuments().remove( document );
- dashboardManager.updateDashboardContent( content );
- }
- }
-
- @Override
- public void deleteReportTable( ReportTable reportTable )
- {
- Collection<DashboardContent> contents = dashboardManager.getByReportTable( reportTable );
-
- for ( DashboardContent content : contents )
- {
- content.getReportTables().remove( reportTable );
- dashboardManager.updateDashboardContent( content );
- }
- }
-
- @Override
- public void deleteMap( Map map )
- {
- Collection<DashboardContent> contents = dashboardManager.getByMap( map );
-
- for ( DashboardContent content : contents )
- {
- content.getMaps().remove( map );
- dashboardManager.updateDashboardContent( content );
- }
- }
-
- @Override
- public void deleteUser( User user )
- {
- DashboardContent content = dashboardManager.getDashboardContent( user );
-
- dashboardManager.deleteDashboardContent( content );
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardContentStore.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardContentStore.java 2012-11-06 07:01:56 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardContentStore.java 2013-07-24 16:25:21 +0000
@@ -38,6 +38,9 @@
import org.hisp.dhis.reporttable.ReportTable;
/**
+ * This class is outdated and kept only for backwards compatibility reasons. Will
+ * be removed for 2.14.
+ *
* @author Lars Helge Overland
*/
public class HibernateDashboardContentStore
=== removed directory 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/manager'
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/manager/DefaultDashboardManager.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/manager/DefaultDashboardManager.java 2013-07-22 17:46:51 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/manager/DefaultDashboardManager.java 1970-01-01 00:00:00 +0000
@@ -1,195 +0,0 @@
-package org.hisp.dhis.dashboard.manager;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.hisp.dhis.dashboard.DashboardConfiguration;
-import org.hisp.dhis.dashboard.DashboardContent;
-import org.hisp.dhis.dashboard.DashboardContentStore;
-import org.hisp.dhis.dashboard.DashboardManager;
-import org.hisp.dhis.dashboard.provider.ContentProvider;
-import org.hisp.dhis.document.Document;
-import org.hisp.dhis.report.Report;
-import org.hisp.dhis.reporttable.ReportTable;
-import org.hisp.dhis.user.User;
-import org.hisp.dhis.user.UserSettingService;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DefaultDashboardManager
- implements DashboardManager
-{
- private static final String KEY_USERSETTING = "dashboardConfig";
-
- private Map<String, ContentProvider> contentProviders;
-
- public void setContentProviders( Map<String, ContentProvider> contentProviders )
- {
- this.contentProviders = contentProviders;
- }
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private UserSettingService userSettingService;
-
- public void setUserSettingService( UserSettingService userSettingService )
- {
- this.userSettingService = userSettingService;
- }
-
- private DashboardContentStore dashboardContentStore;
-
- public void setDashboardContentStore( DashboardContentStore dashboardContentStore )
- {
- this.dashboardContentStore = dashboardContentStore;
- }
-
- // -------------------------------------------------------------------------
- // DashboardManager implementation
- // -------------------------------------------------------------------------
-
- public void setAreaItem( String area, String item )
- {
- DashboardConfiguration config = getConfiguration();
-
- config.setAreaItem( area, item );
-
- setConfiguration( config );
- }
-
- public void clearArea( String area )
- {
- DashboardConfiguration config = getConfiguration();
-
- config.clearArea( area );
-
- setConfiguration( config );
- }
-
- public Map<String, Object> getContent()
- {
- Map<String, Object> content = new HashMap<String, Object>();
-
- DashboardConfiguration config = getConfiguration();
-
- Collection<String> items = config.getAreaItems().values();
-
- for ( String key : contentProviders.keySet() )
- {
- if ( items.contains( key ) )
- {
- content.putAll( contentProviders.get( key ).provide() );
- }
- }
-
- content.putAll( config.getAreaItems() );
-
- return content;
- }
-
- public Set<String> getContentProviderNames()
- {
- return contentProviders.keySet();
- }
-
- public DashboardConfiguration getConfiguration()
- {
- DashboardConfiguration config = (DashboardConfiguration) userSettingService.getUserSetting( KEY_USERSETTING );
-
- return config != null ? config : new DashboardConfiguration();
- }
-
- public void saveDashboardContent( DashboardContent dashboardContent )
- {
- dashboardContentStore.save( dashboardContent );
- }
-
- public void updateDashboardContent( DashboardContent dashboardContent )
- {
- dashboardContentStore.update( dashboardContent );
- }
-
- public DashboardContent getDashboardContent( int id )
- {
- return dashboardContentStore.get( id );
- }
-
- public DashboardContent getDashboardContent( User user )
- {
- DashboardContent content = dashboardContentStore.get( user.getId() );
-
- return content != null ? content : new DashboardContent( user );
- }
-
- public Collection<DashboardContent> getAllDashboardContent()
- {
- return dashboardContentStore.getAll();
- }
-
- public void deleteDashboardContent( DashboardContent content )
- {
- dashboardContentStore.delete( content );
- }
-
- public Collection<DashboardContent> getByDocument( Document document )
- {
- return dashboardContentStore.getByDocument( document );
- }
-
- public Collection<DashboardContent> getByMap( org.hisp.dhis.mapping.Map map )
- {
- return dashboardContentStore.getByMap( map );
- }
-
- public Collection<DashboardContent> getByReport( Report report )
- {
- return dashboardContentStore.getByReport( report );
- }
-
- public Collection<DashboardContent> getByReportTable( ReportTable reportTable )
- {
- return dashboardContentStore.getByReportTable( reportTable );
- }
-
- // -------------------------------------------------------------------------
- // Supportive methods
- // -------------------------------------------------------------------------
-
- private void setConfiguration( DashboardConfiguration config )
- {
- userSettingService.saveUserSetting( KEY_USERSETTING, config );
- }
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider'
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ContentProvider.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ContentProvider.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ContentProvider.java 1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-package org.hisp.dhis.dashboard.provider;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Map;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public interface ContentProvider
-{
- Map<String, Object> provide();
-}
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/DocumentContentProvider.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/DocumentContentProvider.java 2013-07-22 17:46:51 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/DocumentContentProvider.java 1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-package org.hisp.dhis.dashboard.provider;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.dashboard.DashboardContent;
-import org.hisp.dhis.dashboard.DashboardManager;
-import org.hisp.dhis.document.Document;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DocumentContentProvider
- implements ContentProvider
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CurrentUserService currentUserService;
-
- public void setCurrentUserService( CurrentUserService currentUserService )
- {
- this.currentUserService = currentUserService;
- }
-
- @Autowired
- private DashboardManager dashboardManager;
-
- private String key;
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- // -------------------------------------------------------------------------
- // ContentProvider implementation
- // -------------------------------------------------------------------------
-
- public Map<String, Object> provide()
- {
- Map<String, Object> content = new HashMap<String, Object>();
-
- User user = currentUserService.getCurrentUser();
-
- if ( user != null )
- {
- DashboardContent dashboardContent = dashboardManager.getDashboardContent( user );
-
- List<Document> documents = dashboardContent.getDocuments();
-
- Collections.sort( documents, IdentifiableObjectNameComparator.INSTANCE );
-
- content.put( key, documents );
- }
-
- return content;
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/MapViewContentProvider.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/MapViewContentProvider.java 2013-07-22 17:46:51 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/MapViewContentProvider.java 1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-package org.hisp.dhis.dashboard.provider;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.dashboard.DashboardContent;
-import org.hisp.dhis.dashboard.DashboardManager;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class MapViewContentProvider
- implements ContentProvider
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CurrentUserService currentUserService;
-
- public void setCurrentUserService( CurrentUserService currentUserService )
- {
- this.currentUserService = currentUserService;
- }
-
- @Autowired
- private DashboardManager dashboardManager;
-
- private String key;
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- // -------------------------------------------------------------------------
- // ContentProvider implementation
- // -------------------------------------------------------------------------
-
- public Map<String, Object> provide()
- {
- Map<String, Object> content = new HashMap<String, Object>();
-
- User user = currentUserService.getCurrentUser();
-
- if ( user != null )
- {
- DashboardContent dashboardContent = dashboardManager.getDashboardContent( user );
-
- List<org.hisp.dhis.mapping.Map> maps = new ArrayList<org.hisp.dhis.mapping.Map>( dashboardContent.getMaps() );
-
- Collections.sort( maps, IdentifiableObjectNameComparator.INSTANCE );
-
- content.put( key, maps );
- }
-
- return content;
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportContentProvider.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportContentProvider.java 2013-07-22 17:46:51 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportContentProvider.java 1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-package org.hisp.dhis.dashboard.provider;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.dashboard.DashboardContent;
-import org.hisp.dhis.dashboard.DashboardManager;
-import org.hisp.dhis.report.Report;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class ReportContentProvider
- implements ContentProvider
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CurrentUserService currentUserService;
-
- public void setCurrentUserService( CurrentUserService currentUserService )
- {
- this.currentUserService = currentUserService;
- }
-
- @Autowired
- private DashboardManager dashboardManager;
-
- private String key;
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- // -------------------------------------------------------------------------
- // ContentProvider implementation
- // -------------------------------------------------------------------------
-
- public Map<String, Object> provide()
- {
- Map<String, Object> content = new HashMap<String, Object>();
-
- User user = currentUserService.getCurrentUser();
-
- if ( user != null )
- {
- DashboardContent dashboardContent = dashboardManager.getDashboardContent( user );
-
- List<Report> reports = dashboardContent.getReports();
-
- Collections.sort( reports, IdentifiableObjectNameComparator.INSTANCE );
-
- content.put( key, reports );
- }
-
- return content;
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportTableContentProvider.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportTableContentProvider.java 2013-07-22 17:46:51 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportTableContentProvider.java 1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-package org.hisp.dhis.dashboard.provider;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
-import org.hisp.dhis.dashboard.DashboardContent;
-import org.hisp.dhis.dashboard.DashboardManager;
-import org.hisp.dhis.reporttable.ReportTable;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class ReportTableContentProvider
- implements ContentProvider
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private CurrentUserService currentUserService;
-
- public void setCurrentUserService( CurrentUserService currentUserService )
- {
- this.currentUserService = currentUserService;
- }
-
- @Autowired
- private DashboardManager dashboardManager;
-
- private String key;
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- // -------------------------------------------------------------------------
- // ContentProvider implementation
- // -------------------------------------------------------------------------
-
- // -------------------------------------------------------------------------
- // ContentProvider implementation
- // -------------------------------------------------------------------------
-
- public Map<String, Object> provide()
- {
- Map<String, Object> content = new HashMap<String, Object>();
-
- User user = currentUserService.getCurrentUser();
-
- if ( user != null )
- {
- DashboardContent dashboardContent = dashboardManager.getDashboardContent( user );
-
- List<ReportTable> reportTables = dashboardContent.getReportTables();
-
- Collections.sort( reportTables, IdentifiableObjectNameComparator.INSTANCE );
-
- content.put( key, reportTables );
- }
-
- return content;
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/RssContentProvider.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/RssContentProvider.java 2012-01-11 19:18:19 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/RssContentProvider.java 1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-package org.hisp.dhis.dashboard.provider;
-
-/*
- * Copyright (c) 2004-2012, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.hisp.dhis.system.util.MathUtils.getMax;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.amplecode.staxwax.factory.XMLFactory;
-import org.amplecode.staxwax.reader.XMLReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.dashboard.RssItem;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class RssContentProvider
- implements ContentProvider
-{
- private static final Log log = LogFactory.getLog( RssContentProvider.class );
-
- private static final String COLLECTION_NAME = "channel";
- private static final String ITEM_NAME = "item";
- private static final String FIELD_TITLE = "title";
- private static final String FIELD_LINK = "link";
- private static final String FIELD_DATE = "pubDate";
- private static final String FIELD_DESCRIPTION = "description";
-
- private static final int MAX_ITEMS = 4;
-
- private String url;
-
- public void setUrl( String url )
- {
- this.url = url;
- }
-
- private String key;
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- // -------------------------------------------------------------------------
- // ContentProvider implementation
- // -------------------------------------------------------------------------
-
- public Map<String, Object> provide()
- {
- Map<String, Object> content = new HashMap<String, Object>();
-
- content.put( key, getRss() );
-
- return content;
- }
-
- // -------------------------------------------------------------------------
- // Supportive methods
- // -------------------------------------------------------------------------
-
- private List<RssItem> getRss()
- {
- try
- {
- Resource resource = new UrlResource( url );
-
- XMLReader reader = XMLFactory.getXMLReader( resource.getInputStream() );
-
- List<RssItem> items = new ArrayList<RssItem>();
-
- while ( reader.moveToStartElement( ITEM_NAME, COLLECTION_NAME ) )
- {
- Map<String, String> data = reader.readElements( ITEM_NAME );
-
- RssItem item = new RssItem();
-
- item.setTitle( data.get( FIELD_TITLE ) );
- item.setLink( data.get( FIELD_LINK ) );
- item.setDate( data.get( FIELD_DATE ) );
- item.setDescription( data.get( FIELD_DESCRIPTION ) );
-
- items.add( item );
- }
-
- return items.subList( 0, getMax( items.size(), MAX_ITEMS ) );
- }
- catch ( MalformedURLException ex )
- {
- throw new RuntimeException( "Malformed RSS URL", ex );
- }
- catch ( Exception ex )
- {
- log.error( "Error while reading RSS, you are probably not connected to the internet", ex );
-
- return new ArrayList<RssItem>();
- }
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2013-07-23 17:21:14 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2013-07-24 16:25:21 +0000
@@ -142,67 +142,6 @@
<property name="dashboardStore" ref="org.hisp.dhis.dashboard.DashboardStore" />
</bean>
- <!-- Dashboard Content providers -->
-
- <bean id="reportContentProvider" class="org.hisp.dhis.dashboard.provider.ReportContentProvider">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="key" value="reports" />
- </bean>
-
- <bean id="documentContentProvider" class="org.hisp.dhis.dashboard.provider.DocumentContentProvider">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="key" value="documents" />
- </bean>
-
- <bean id="reportTableContentProvider" class="org.hisp.dhis.dashboard.provider.ReportTableContentProvider">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="key" value="reportTables" />
- </bean>
-
- <bean id="mapViewContentProvider" class="org.hisp.dhis.dashboard.provider.MapViewContentProvider">
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="key" value="maps" />
- </bean>
-
- <bean id="rssHealthContentProvider" class="org.hisp.dhis.dashboard.provider.RssContentProvider">
- <property name="url" value="http://news.yahoo.com/rss/health"; />
- <property name="key" value="healthItems" />
- </bean>
-
- <bean id="rssDiseasesContentProvider" class="org.hisp.dhis.dashboard.provider.RssContentProvider">
- <property name="url" value="http://news.yahoo.com/rss/diseases-conditions"; />
- <property name="key" value="diseasesItems" />
- </bean>
-
- <!-- Dashboard Manager -->
-
- <bean id="org.hisp.dhis.dashboard.DashboardManager" class="org.hisp.dhis.dashboard.manager.DefaultDashboardManager">
- <property name="userSettingService" ref="org.hisp.dhis.user.UserSettingService" />
- <property name="dashboardContentStore" ref="org.hisp.dhis.dashboard.DashboardContentStore" />
- <property name="contentProviders">
- <map>
- <entry key="report">
- <ref local="reportContentProvider" />
- </entry>
- <entry key="document">
- <ref local="documentContentProvider" />
- </entry>
- <entry key="report_table">
- <ref local="reportTableContentProvider" />
- </entry>
- <entry key="map_view">
- <ref local="mapViewContentProvider" />
- </entry>
- <entry key="rss_health">
- <ref local="rssHealthContentProvider" />
- </entry>
- <entry key="rss_diseases">
- <ref local="rssDiseasesContentProvider" />
- </entry>
- </map>
- </property>
- </bean>
-
<!-- Organisation Unit Distribution -->
<bean id="org.hisp.dhis.orgunitdistribution.OrgUnitDistributionService" class="org.hisp.dhis.orgunitdistribution.impl.DefaultOrgUnitDistributionService">
@@ -272,8 +211,6 @@
<property name="chartService" ref="org.hisp.dhis.chart.ChartService" />
</bean>
- <bean id="org.hisp.dhis.dashboard.DashboardContentDeletionHandler" class="org.hisp.dhis.dashboard.DashboardContentDeletionHandler" />
-
<!-- DeletionManager -->
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
@@ -285,7 +222,6 @@
<ref local="org.hisp.dhis.report.ReportDeletionHandler" />
<ref local="org.hisp.dhis.reporttable.ReportTableDeletionHandler" />
<ref local="org.hisp.dhis.chart.ChartDeletionHandler" />
- <ref local="org.hisp.dhis.dashboard.DashboardContentDeletionHandler" />
</list>
</list>
</property>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2013-07-24 15:58:43 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2013-07-24 16:25:21 +0000
@@ -3,18 +3,6 @@
/* Dashboard */
/*----------------------------------------------------------------------------*/
-.contentProviderTable
-{
- width: 295px;
-}
-
-.contentProviderTable td
-{
- padding-top: 3px;
- padding-bottom: 3px;
- border-bottom: 1px solid #cad5e5;
-}
-
#contentDiv
{
position: relative;
@@ -26,45 +14,6 @@
list-style-type: none;
}
-.removeIcon
-{
- padding: 2px 2px 1px 2px;
-}
-
-.linkArea
-{
- border: 1px solid #d0d0d0;
- padding: 1px;
- height: 196px;
- width: 295px;
- overflow: hidden;
- margin-bottom: 15px;
- border-radius: 3px;
-}
-
-.linkArea div
-{
- position: absolute;
-}
-
-.chartArea div
-{
- position: absolute;
-}
-
-.buttonArea
-{
- margin-bottom: 2px;
-}
-
-.labelText
-{
- color: #999;
- font-size: 16px;
- padding: 40px 0 0 30px;
- width: 230px;
-}
-
#dashboardMenu
{
position: absolute;
