Changeset 1768

Timestamp:

Apr 12, 2011, 4:21:26 PM (9 years ago)

Author:

robert@…

Message:

Solved small issues with study view

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/StudyController.groovy (modified) (1 diff)
• grails-app/views/study/createTimelineBandsJs.gsp (modified) (1 diff)
• grails-app/views/study/list.gsp (modified) (1 diff)
• web-app/css/dbnp_style.css (modified) (1 diff)
• web-app/css/default_style.css (modified) (1 diff)
• web-app/css/nmcdsp_style.css (modified) (1 diff)

trunk/grails-app/controllers/dbnp/studycapturing/StudyController.groovy

@@ -335 +335 @@
                                         'durationEvent': false,
                                         'title': event.template.name,
-                                        'description': description
+                                        'description': "SampleTemplate = " + event.sampleTemplate + "<br />\n" + description
                                 ]
                         } else {

trunk/grails-app/views/study/createTimelineBandsJs.gsp

@@ -101 +101 @@
 
                 // We can only show appr. 30 characters per line and as many lines as there are events
-                def charsPerLine = 30;
-                def numEvents = eventGroup.events?.size();
+                def charsPerLine = 40;
+                def numEvents = eventGroup.events?.size() + eventGroup.samplingEvents?.size();
                 Integer maxChars = new Integer( numEvents * charsPerLine );
-
+                
                 showSubjects = Subject.trimSubjectNames( sortedGroupSubjects, maxChars );
           %>
-          
+
           bandTitleInfo[ timelineNr ][ ${bandNr} ] = {
                 title: "${eventGroup.name}",

trunk/grails-app/views/study/list.gsp

@@ -36 +36 @@
                                                 <td><g:if test="${studyInstance.canWrite(loggedInUser)}">
                                                         <g:link class="edit" title="Edit study using simple wizard" controller="simpleWizard" action="index" id="${studyInstance?.id}">
-                                                                <img src='${fam.icon(name: 'pencil')}' border="0" alt="edit study" /></g:link>
+                                                                <img src='${fam.icon(name: 'pencil')}' border="0" alt="Edit study using simple wizard" /></g:link>
                                                         </g:if><g:else><img src='${fam.icon(name: 'lock')}' border="0" alt="you have no write access to shis study" /></g:else> 
                                                 </td>
                                                 <td><g:if test="${studyInstance.canWrite(loggedInUser)}">
                                                         <g:link class="edit" title="Edit study" controller="studyWizard" params="[jump:'edit']" id="${studyInstance?.id}">
-                                                                <img src='${fam.icon(name: 'application_form_edit')}' border="0" alt="edit study" /></g:link>
+                                                                <img src='${fam.icon(name: 'application_form_edit')}' border="0" alt="Edit study" /></g:link>
                                                         </g:if><g:else><img src='${fam.icon(name: 'lock')}' border="0" alt="you have no write access to shis study" /></g:else> 
                                                 </td>

trunk/web-app/css/dbnp_style.css

@@ -8 +8 @@
 
 .container { margin: 0 auto; text-align: left; }
-.ui-widget { text-align: left; }
+.ui-widget, .simileAjax-bubble-container  { text-align: left; }
 
 /*a:link, a:visited, a:hover {

trunk/web-app/css/default_style.css

@@ -8 +8 @@
 
 .container { margin: 0 auto; text-align: left; }
-.ui-widget { text-align: left; }
+.ui-widget, .simileAjax-bubble-container { text-align: left; }
 
 /*a:link, a:visited, a:hover {

trunk/web-app/css/nmcdsp_style.css

@@ -8 +8 @@
 
 .container { margin: 0 auto; text-align: left; }
-.ui-widget { text-align: left; }
+.ui-widget, .simileAjax-bubble-container  { text-align: left; }
 
 /*a:link, a:visited, a:hover {