Changeset 1584

Timestamp:

Mar 3, 2011, 8:02:44 PM (12 years ago)

Author:

work@…

Message:

• did some more restyling of the home page (ticket #339)
  • statistics
  • introductionary texts
  • quick search

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/controllers/HomeController.groovy (modified) (2 diffs)
• grails-app/controllers/dbnp/query/SimpleQueryController.groovy (modified) (1 diff)
• grails-app/domain/dbnp/authentication/SecUser.groovy (modified) (1 diff)
• grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (4 diffs)
• grails-app/views/home/index.gsp (modified) (1 diff)
• grails-app/views/layouts/main.gsp (modified) (2 diffs)
• web-app/js/highcharts.js (added)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Mon Feb 28 11:48:03 CET 2011
+#Thu Mar 03 15:50:23 CET 2011
 app.build.display.info=0
 app.build.svn.revision=1079
@@ -13 +13 @@
 plugins.db-util=0.4
 plugins.famfamfam=1.0.1
-plugins.gdt=0.0.18
+plugins.gdt=0.0.19
 plugins.grom=0.2.2
 plugins.hibernate=1.3.7

trunk/grails-app/controllers/HomeController.groovy

@@ -1 +1 @@
 import dbnp.studycapturing.*
+import dbnp.authentication.*
 import org.codehaus.groovy.grails.commons.GrailsApplication
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
+import grails.converters.JSON
+import org.dbnp.gdt.Template
 
 /**
@@ -17 +21 @@
  */
 class HomeController {
-    def index = {
-            //if (!Template.count() && grails.util.GrailsUtil.environment != GrailsApplication.ENV_TEST && grails.util.GrailsUtil.environment != "dbnptest") {
-                //    redirect(controller:'setup',action:'index')
-            //} else {
-                    [ studyCount: dbnp.studycapturing.Study.count(), userCount: dbnp.authentication.SecUser.count(), facebookLikeUrl: '/' ]
-            //}
-    }
-    
+        def authenticationService
+        def dataSource
+        def gdtService
+
+        def index = {
+                // create sql instance for advanced queries
+                def config = ConfigurationHolder.config
+                def sql = new groovy.sql.Sql(dataSource)
+                def db  = config.dataSource.driverClassName
+
+                // get study statistics
+                def user = authenticationService.getLoggedInUser()
+                def studyCount                                          = Study.count()
+                def readableStudyCount                          = Study.countReadableStudies(user)
+                def readableAndWritableStudyCount       = Study.countReadableAndWritableStudies(user)
+                def readOnlyStudyCount                          = (readableStudyCount - readableAndWritableStudyCount)
+                def noAccessStudyCount                          = studyCount - readableAndWritableStudyCount
+                def publishedPublicStudyCount           = Study.countPublicStudies(true)
+                def unPublishedPublicStudyCount         = Study.countPublicStudies(false)
+                def publicStudyCount                            = publishedPublicStudyCount + unPublishedPublicStudyCount
+                def publishedPrivateStudyCount          = Study.countPrivateStudies(true)
+                def unPublishedPrivateStudyCount        = Study.countPrivateStudies(false)
+                def privateStudyCount                           = publishedPrivateStudyCount + unPublishedPrivateStudyCount
+
+                // daily statistics
+                def startDate, endDate, date, userTotal, studyTotal, templateTotal
+                def dailyStatistics = [:]
+                if (db == "org.postgresql.Driver") {
+                        //sql.eachRow("SELECT b.*,(select cast( now() - '120 day'::interval * random() as date) FROM Template c WHERE c.id=b.id) as newDate FROM Template b WHERE b.id IN (SELECT id FROM Template a)") {sql.execute(sprintf("UPDATE Template SET date_created='%s' WHERE id=%s", it.newDate, it.id))}
+                        def studiesPerDay       = sql.rows("SELECT DISTINCT date_trunc('day', a.date_created) as day, (SELECT count(b.*) FROM study b WHERE date_trunc('day', b.date_created) = date_trunc('day', a.date_created)) as count FROM study a ORDER BY day ASC")
+                        def usersPerDay         = sql.rows("SELECT DISTINCT date_trunc('day', a.date_created) as day, (SELECT count(b.*) FROM sec_user b WHERE date_trunc('day', b.date_created) = date_trunc('day', a.date_created)) as count FROM sec_user a ORDER BY day ASC")
+                        def templatesPerDay     = sql.rows("SELECT DISTINCT date_trunc('day', a.date_created) as day, (SELECT count(b.*) FROM template b WHERE date_trunc('day', b.date_created) = date_trunc('day', a.date_created)) as count FROM template a ORDER BY day ASC")
+
+                        // combine daily statistics
+                        dailyStatistics = [:]
+                        long oneDay             = (1 * 24 * 60 * 60 * 1000)
+                        startDate               = (usersPerDay[0].day <= studiesPerDay[0].day) ? usersPerDay[0].day : studiesPerDay[0].day
+                        startDate               = (templatesPerDay[0].day != null && templatesPerDay[0].day < startDate) ? templatesPerDay[0].day : startDate
+                        endDate                 = (usersPerDay[usersPerDay.size()-1].day >= studiesPerDay[studiesPerDay.size()-1].day) ? usersPerDay[usersPerDay.size()-1].day : studiesPerDay[studiesPerDay.size()-1].day
+                        endDate                 = (templatesPerDay[0].day != null && templatesPerDay[templatesPerDay.size()-1].day > endDate) ? templatesPerDay[templatesPerDay.size()-1].day : endDate
+                        date                    = startDate.clone()
+
+                        userTotal               = 0
+                        studyTotal              = 0
+                        templateTotal   = 0
+                        while (date <= endDate) {
+                                def userDay             = usersPerDay.find{ it.day == date }
+                                def studyDay    = studiesPerDay.find{ it.day == date }
+                                def templateDay = templatesPerDay.find{ it.day == date }
+                                def users               = (userDay) ? userDay.count : 0
+                                def studies             = (studyDay) ? studyDay.count : 0
+                                def templates   = (templateDay) ? templateDay.count : 0
+
+                                userTotal += users
+                                studyTotal += studies
+                                templateTotal += templates
+
+                                dailyStatistics[ date.clone() ] = [
+                                        users                   : users,
+                                        userTotal               : userTotal,
+                                        studies                 : studies,
+                                        studyTotal              : studyTotal,
+                                        templates               : templates,
+                                        templateTotal   : templateTotal
+                                ]
+                                date.setTime(date.getTime() + oneDay)
+                        }
+                }
+
+                [
+                        // daily statistics
+                        startDate                                       : startDate,
+                        dailyStatistics                         : dailyStatistics,
+
+                        // study
+                        studyCount                                      : studyCount,
+                        publishedPublicStudyCount       : publishedPublicStudyCount,
+                        unPublishedPublicStudyCount     : unPublishedPublicStudyCount,
+                        publicStudyCount                        : publicStudyCount,
+                        publishedPrivateStudyCount      : publishedPrivateStudyCount,
+                        unPublishedPrivateStudyCount: unPublishedPrivateStudyCount,
+                        privateStudyCount                       : privateStudyCount,
+                        readOnlyStudyCount                      : readOnlyStudyCount,
+                        readWriteStudyCount                     : readableAndWritableStudyCount,
+                        noAccessStudyCount                      : noAccessStudyCount,
+                        readableTemplates                       : org.dbnp.gdt.Template.count(),
+
+                        // miscelaneous
+                        facebookLikeUrl                         : '/'
+                ]
+        }
+
+        def ajaxQuickSearch = {
+                def query       = params.name_startsWith
+                def result      = [ total: 0, data: [] ]
+                def user        = authenticationService.getLoggedInUser()
+
+                // search studies
+                Study.createCriteria().list {
+                        or {
+                                ilike("title", "%${query}%")
+                                ilike("description", "%${query}%")
+                                eq("owner", user)
+                                writers {
+                                        eq("id", user.id)
+                                }
+                                and {
+                                        readers {
+                                                eq("id", user.id)
+                                        }
+                                        eq("published", true)
+                                }
+                        }
+                }.each { study ->
+                        result.data << [
+                                link            : createLink(controller:'study', action:'show', id:study.id),
+                            name                : "${study.title}",
+                                category        : 'Study'
+                        ]
+                }
+
+                // search templates
+                Template.createCriteria().list {
+                        or {
+                                ilike("name", "%${query}%")
+                                ilike("description", "%${query}%")
+                        }
+                }.each { template ->
+                        def entityName = template.entity.toString().split(/\./)
+                        def encodedEntity = gdtService.encryptEntity(template.entity.toString()).decodeURL()
+
+                        result.data << [
+                                link            : createLink(controller:'templateEditor', action:'template', params:[entity:encodedEntity, standalone:true, template:template.id]),
+                            name                : "${template.name}",
+                                category        : "${entityName[entityName.size()-1]} Template"
+                        ]
+                }
+
+                // set total
+                result.total = result.data.size()
+
+                // render result
+                if (params.callback) {
+                        render "${params.callback}(${result as JSON})"
+                } else {
+                        render result as JSON
+                }
+        }
 }

trunk/grails-app/controllers/dbnp/query/SimpleQueryController.groovy

@@ -16 +16 @@
 
 import dbnp.data.*
-import dbnp.studycapturing.Study
-import dbnp.studycapturing.Assay
+import dbnp.studycapturing.*
+import org.dbnp.gdt.*
 import org.compass.core.engine.SearchEngineQueryParseException
 import dbnp.rest.common.CommunicationManager

trunk/grails-app/domain/dbnp/authentication/SecUser.groovy

@@ -42 +42 @@
                 return getAuthorities().contains(SecRole.findByAuthority('ROLE_ADMIN'));
         }
-
 }

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -520 +520 @@
 
         /**
+         * Returns the number of public studies
+         * @return int
+         */
+        public static countPublicStudies() { return countPublicStudies(true) }
+        public static countPublicStudies(boolean published) {
+                def c = Study.createCriteria()
+                return c.count {
+                        and {
+                                eq("published", published)
+                                eq("publicstudy", true)
+                        }
+                }
+        }
+
+        /**
+         * Returns the number of private studies
+         * @return int
+         */
+        public static countPrivateStudies() { return countPrivateStudies(false) }
+        public static countPrivateStudies(boolean published) {
+                def c = Study.createCriteria()
+                return c.count {
+                        and {
+                                eq("publicstudy", false)
+                        }
+                        or {
+                                eq("published", published)
+                                eq("publicstudy", true)
+                        }
+                }
+        }
+
+        /**
          * Returns the number of studies that are readable by the given user
          */
@@ -525 +558 @@
                 def c = Study.createCriteria()
 
-                // Administrators are allowed to read everything
+                // got a user?
                 if (user == null) {
                         return c.count {
@@ -534 +567 @@
                         }
                 } else if (user.hasAdminRights()) {
-                        return Study.count();
+                        // Administrators are allowed to read everything
+                        return Study.count()
                 } else {
                         return c.count {
@@ -554 +588 @@
 
         /**
+         * Returns the number of studies that are readable & writable by the given user
+         */
+        public static countReadableAndWritableStudies(SecUser user) {
+                def c = Study.createCriteria()
+
+                // got a user?
+                if (user == null) {
+                        return 0
+                } else if (user.hasAdminRights()) {
+                        return Study.count()
+                } else {
+                        return c.count {
+                                or {
+                                        eq("owner", user)
+                                        writers {
+                                                eq("id", user.id)
+                                        }
+                                }
+                        }
+                }
+        }
+
+        /**
          * Returns the UUID of this study and generates one if needed
          */

trunk/grails-app/views/home/index.gsp

@@ -5 +5 @@
         <meta property="og:description" content="A generic tool for planning scientific studies, and capturing study meta-data, integrating with analysis platform(s) / LIMS systems and searching relevant studies."/>
         <meta name="layout" content="main"/>
+        <script type="text/javascript" src="${resource(dir: 'js', file: 'highcharts.js')}"></script>
+        <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.ui.autocomplete.html.js', plugin: 'gdt')}"></script>
+        <script type="text/javascript">
+                Highcharts.theme = { colors: ['#4572A7'] };
+                var highchartsOptions = Highcharts.getOptions();
+                var studiesPieChart, dailyStatistics;
+
+                $(document).ready(function() {
+                        studiesPieChart = new Highcharts.Chart({
+                                chart: {
+                                        renderTo: 'studies-pie',
+                                        plotBackgroundColor: null,
+                                        plotBorderWidth: null,
+                                        plotShadow: false
+                                },
+                                title: {
+                                        text: '${studyCount} Studies'
+                                },
+                                tooltip: {
+                                        formatter: function() {
+                                                return '<b>' + this.point.name + '</b>: ' + this.y + ' ' + ((this.y == 1) ? 'study' : 'studies');
+                                        }
+                                },
+                                plotOptions: {
+                                        pie: {
+                                                allowPointSelect: true,
+                                                cursor: 'pointer',
+                                                dataLabels: {
+                                                        enabled: true,
+                                                        color: Highcharts.theme.textColor || '#000000',
+                                                        connectorColor: Highcharts.theme.textColor || '#000000',
+                                                        formatter: function() {
+                                                                return '<b>' + this.point.name + '</b>: ' + this.y + ' ' + ((this.y == 1) ? 'study' : 'studies');
+                                                        }
+                                                }
+                                        }
+                                },
+                                series: [
+                                        {
+                                                type: 'pie',
+                                                name: 'Your statistics',<sec:ifLoggedIn>
+                                                size: '45%',
+                                                innerSize: '25%',
+                                                </sec:ifLoggedIn><sec:ifNotLoggedIn>
+                                                innerSize: '45%',
+                                                </sec:ifNotLoggedIn>
+                                                data: [
+                                                        { name: 'Public', y: ${publicStudyCount}, color: '#89A54E' },
+                                                        { name: 'Private', y: ${privateStudyCount}, color: '#AA4643' }
+                                                ],
+                                                dataLabels: {
+                                                        enabled: <sec:ifLoggedIn>false</sec:ifLoggedIn><sec:ifNotLoggedIn>true</sec:ifNotLoggedIn>,
+                                                }
+                                        },
+                                        {
+                                                type: 'pie',
+                                                name: 'Your statistics',<sec:ifLoggedIn>
+                                                size: '25%',
+                                                innerSize: '10%',
+                                                </sec:ifLoggedIn><sec:ifNotLoggedIn>
+                                                size: '45%',
+                                                </sec:ifNotLoggedIn>
+                                                data: [
+                                                        { name: 'Published public', y: ${publishedPublicStudyCount}, color: '#89A54E' },
+                                                        { name: 'Unpublished Public', y: ${unPublishedPublicStudyCount}, color: '#bbc695' },
+                                                        { name: 'Published Private', y: ${publishedPrivateStudyCount}, color: '#AA4643' },
+                                                        { name: 'Unpublished Private', y: ${unPublishedPrivateStudyCount}, color: '#ae6e6c' }
+                                                ],
+                                                dataLabels: {
+                                                        enabled: false
+                                                }
+                                        }
+                                        <sec:ifLoggedIn>
+                                        ,
+                                        {
+                                                type: 'pie',
+                                                name: 'Total statistics',
+
+                                                innerSize: '45%',
+                                                data: [
+                                                        { name: 'Read only', y: ${readOnlyStudyCount}, color: '#80699B' },
+                                                        { name: 'Readable & writable', y: ${readWriteStudyCount}, color: '#89A54E' },
+                                                        { name: 'Not accessible', y: ${noAccessStudyCount}, color: '#AA4643' }
+                                                ],
+                                                dataLabels: {
+                                                        enabled: true
+                                                }
+                                        },
+                                        </sec:ifLoggedIn>
+                                ]
+                        });
+
+                        <g:if test="${startDate && dailyStatistics?.size()}">
+                        dailyStatistics = new Highcharts.Chart({
+                                chart: {
+                                        renderTo: 'daily-statistics',
+                                        zoomType: 'x',
+                                        spacingRight: 20
+                                },
+                                title: {
+                                        text: 'Users, studies and templates'
+                                },
+                                subtitle: {
+                                        text: document.ontouchstart === undefined ?
+                                                'Click and drag in the plot area to zoom in' :
+                                                'Drag your finger over the plot to zoom in'
+                                },
+                                xAxis: {
+                                        type: 'datetime',
+                                        maxZoom: 14 * 24 * 3600000, // fourteen days
+                                        title: {
+                                                text: null
+                                        }
+                                },
+                                yAxis: {
+                                        title: {
+                                                text: 'Total'
+                                        },
+                                        min: 0,
+                                        startOnTick: false,
+                                        showFirstLabel: false
+                                },
+                                tooltip: {
+                                        shared: true
+                                },
+                                legend: {
+                                        enabled: false
+                                },
+                                plotOptions: {
+                                        area: {
+
+                                                lineWidth: 1,
+                                                marker: {
+                                                        enabled: false,
+                                                        states: {
+                                                                hover: {
+                                                                        enabled: true,
+                                                                        radius: 5
+                                                                }
+                                                        }
+                                                },
+                                                shadow: false,
+                                                states: {
+                                                        hover: {
+                                                                lineWidth: 1
+                                                        }
+                                                }
+                                        }
+                                },
+
+                                series: [
+                                        {
+                                                type: 'area',
+                                                name: 'Studies',
+                                                pointInterval: 24 * 3600 * 1000,
+                                                pointStart: Date.UTC(${startDate.year+1900}, ${startDate.month}, ${startDate.date}),
+                                                data: [
+                                                        <g:each var="day" in="${dailyStatistics}">${day.value.studyTotal},</g:each>
+                                                ]
+                                        },
+                                        {
+                                                type: 'area',
+                                                name: 'Templates',
+                                                pointInterval: 24 * 3600 * 1000,
+                                                pointStart: Date.UTC(${startDate.year+1900}, ${startDate.month}, ${startDate.date}),
+                                                data: [
+                                                        <g:each var="day" in="${dailyStatistics}">${day.value.templateTotal},</g:each>
+                                                ]
+                                        },
+                                        {
+                                                type: 'area',
+                                                name: 'Users',
+                                                pointInterval: 24 * 3600 * 1000,
+                                                pointStart: Date.UTC(${startDate.year+1900}, ${startDate.month}, ${startDate.date}),
+                                                data: [
+                                                        <g:each var="day" in="${dailyStatistics}">${day.value.userTotal},</g:each>
+                                                ]
+                                        }
+                                ]
+                        });
+                        </g:if>
+
+                        $("#search_term").autocomplete({
+                                source: function(request, response) {
+                                        $.ajax({
+                                                //url: "http://ws.geonames.org/searchJSON",
+                                                url: "${createLink(action:'ajaxQuickSearch')}",
+                                                dataType: "jsonp",
+                                                data: {
+                                                        featureClass: "P",
+                                                        style: "full",
+                                                        maxRows: 12,
+                                                        name_startsWith: request.term
+                                                },
+                                                success: function(data) {
+                                                        response($.map(data.data, function(item) {
+                                                                return {
+                                                                        label           : '<span class="about">'+item.category+'</div> <span class="from">'+item.name+'</span>',
+                                                                        value           : item.link
+                                                                }
+                                                        }));
+                                                }
+                                        });
+                                },
+                                minLength: 2,
+                                select: function(event, ui) {
+                                        // redirect
+                                        window.location = ui.item.value;
+                                },
+                                open: function() {
+                                        $(this).removeClass("ui-corner-all").addClass("ui-corner-top");
+                                },
+                                close: function() {
+                                        $(this).removeClass("ui-corner-top").addClass("ui-corner-all");
+                                },
+                                html: true
+                        });
+                });
+        </script>
+        <style type="text/css">
+        #simpleQuery {
+        }
+
+        #simpleQuery .search {
+                display: block;
+                height: 30px;
+                margin-bottom: 10px;
+                zoom: 1; /* IE 6 & 7 hack */
+                *display: inline; /* IE 6 & 7 hack */
+        }
+
+        #simpleQuery .search .begin {
+                margin: 0px;
+                padding: 0px;
+                display: inline-block;
+                background-image: url(${resource(dir: 'images', file: 'simpleQuery/spotlight-begin.png')});
+                height: 30px;
+                width: 140px;
+                vertical-align: top;
+                text-align: right;
+                zoom: 1; /* IE 6 & 7 hack */
+                *display: inline; /* IE 6 & 7 hack */
+        }
+
+        #simpleQuery .search .begin .label {
+                color: #fff;
+                font-face: Arial;
+                line-height: 30px;
+                text-shadow: 0px 0px 1px #006DBA;
+                font-size: 12px;
+                margin-right: 23px;
+        }
+
+        #simpleQuery .search .middle {
+                margin: 0px 0px -20px 0px;
+                padding: 0;
+                display: inline-block;
+                background-image: url(${resource(dir: 'images', file: 'simpleQuery/spotlight-middle.png')});
+                height: 30px;
+                width: 300px;
+                vertical-align: top;
+                zoom: 1; /* IE 6 & 7 hack */
+                *display: inline; /* IE 6 & 7 hack */
+        }
+
+        #simpleQuery .search .searchfield {
+                vertical-align: middle;
+                width: 100%;
+                height: 100%;
+                color: #006DBA;
+                border-width: 0px;
+                border: none;
+                background-color: Transparent;
+                zoom: 1; /* IE 6 & 7 hack */
+                *display: inline; /* IE 6 & 7 hack */
+        }
+
+        #simpleQuery .search .end {
+                margin: 0px;
+                padding: 0px;
+                display: inline-block;
+                background-image: url(${resource(dir: 'images', file: 'simpleQuery/spotlight-end.png')});
+                height: 30px;
+                width: 28px;
+                zoom: 1; /* IE 6 & 7 hack */
+                *display: inline; /* IE 6 & 7 hack */
+        }
+
+        </style>
 </head>
 <body>
 
-<g:if env="dbnpdemo"><g:render template="/common/demo_intro"/></g:if>
+<div style="clear:both;display:block;padding-top:10px;">
+        <div style="margin:2px;width:476px;display:inline-block;float:left;zoom:1;*display:inline;">
+                <h1>Lorem ipsum 1</h1>
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut tincidunt auctor suscipit. Nam ultricies condimentum pulvinar. In magna orci, eleifend sit amet tincidunt eget, ultricies a justo. Vestibulum purus lorem, laoreet sit amet rutrum et, sollicitudin eget augue. Nulla consequat, mauris eget ornare fringilla, arcu enim mattis odio, rhoncus rutrum ante turpis vitae nulla. Sed et turpis vel urna venenatis sagittis. Sed sagittis vestibulum felis, vel ultricies tellus dictum ac. Nunc non massa et ligula gravida rutrum. Fusce porttitor, eros ac dictum suscipit, risus lacus aliquam justo, ut lobortis erat nulla sit amet risus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse fermentum ultricies ipsum, at consequat elit pharetra auctor.
+        </div>
+        <div style="">
+                <h1>Quicksearch</h1>
+                <div id="simpleQuery" class="simplequery">
+                <g:form action="pages" name="simpleQueryForm" id="simpleQueryForm">
+                        <g:if test="${search_term}"><g:set var="preterm" value="${search_term}"/></g:if>
+                        <div class="searchContainer">
+                                <div class="search">
+                                        <div class="begin"><span class="label">Search term</span></div><div class="middle"><g:textField name="search_term" id="search_term" class="searchfield" value="${preterm}"/></div><div class="end"><a onClick="$('#search_term').val('');"><img src="${resource(dir: 'images', file: 'simpleQuery/spotlight-end.png')}" value="Reset" alt="Reset" border="0"></a></div>
+                                </div>
+                        </div>
+                        </g:form>
+                        <h1>Lorem ipsum 2</h1>
+                        Vivamus varius ullamcorper neque, sit amet mollis lacus accumsan vel. Pellentesque in augue a arcu pretium egestas vel at elit. Duis nunc odio, mollis et faucibus vel, aliquam vel quam. Sed laoreet pharetra urna, venenatis porttitor neque sagittis et. Aenean at nisl nunc, in mattis mauris. Proin iaculis nunc in erat rhoncus consectetur. Nullam sit amet risus vitae eros condimentum pellentesque. Vestibulum sollicitudin turpis id felis viverra a bibendum magna varius. Ut tristique pellentesque convallis. Maecenas id sollicitudin lacus.
+                </div>
+        </div>
+</div>
+
+
+<div style="clear:both;display:block;padding-top:10px;">
+        <h1>Usage Statistics</h1>
+        <div id="graphs" style="display:block;border:1px solid #6c6f70;width:100%;height:300px;">
+                <div id="studies-pie" style="margin:2px;width:476px;height:296px;display:inline-block;float:left;zoom:1;*display:inline;"></div>
+                <div id="daily-statistics" style="margin:2px;width:476px;height:296px;display:inline-block;float:left;zoom:1;*display:inline;"></div>
+        </div>
+</div>
 
 </body>

trunk/grails-app/views/layouts/main.gsp

@@ -20 +20 @@
         <script type="text/javascript" src="${resource(dir: 'js', file: 'login_panel.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'topnav.js')}"></script>
-        <g:if env="development"><script type="text/javascript" src="${resource(dir: 'js', file: 'development.js')}"></script></g:if>
+        <!--<g:if env="development"><script type="text/javascript" src="${resource(dir: 'js', file: 'development.js')}"></script></g:if>//-->
 
         <!--  Scripts for pagination using dataTables -->
@@ -45 +45 @@
         <div id="footer">
                 Copyright © 2008 - <g:formatDate format="yyyy" date="${new Date()}"/> NuGO, NMC and NBIC. All rights reserved. For more information go to <a href="http://dbnp.org">http://dbnp.org</a>.
-                <g:if env="development">( style: <%=session.style%> )</g:if>
         </div>
-        <img src="${resource(dir: 'images', file: 'beta-stamp.png')}" alt="beta">
 </div>
 </body>