Index: /trunk/application.properties =================================================================== --- /trunk/application.properties (revision 125) +++ /trunk/application.properties (revision 126) @@ -1,10 +1,11 @@ #utf-8 -#Mon May 04 14:08:06 EST 2009 +#Mon May 04 19:08:49 EST 2009 +plugins.acegi=0.5.1 +app.version= plugins.help-balloons=1.2 -app.version= -plugins.acegi=0.5.1 +plugins.quartz=0.4.1-SNAPSHOT +plugins.richui=0.6 app.servlet.version=2.4 -app.grails.version=1.1 plugins.hibernate=1.1 app.name=gnuMims -plugins.quartz=0.4.1-SNAPSHOT +app.grails.version=1.1 Index: /trunk/grails-app/conf/SecurityConfig.groovy =================================================================== --- /trunk/grails-app/conf/SecurityConfig.groovy (revision 125) +++ /trunk/grails-app/conf/SecurityConfig.groovy (revision 126) @@ -37,5 +37,6 @@ '/images/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], '/js/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], - '/plugins/help-balloons-1.2/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], + '/plugins/help-balloons-1.2/**': ['IS_AUTHENTICATED_FULLY'], + '/plugins/richui-0.6/**': ['IS_AUTHENTICATED_FULLY'], '/login*': ['IS_AUTHENTICATED_ANONYMOUSLY'], '/login/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], Index: /trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy =================================================================== --- /trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy (revision 125) +++ /trunk/grails-app/jobs/TaskRecurringScheduleJob.groovy (revision 126) @@ -1,4 +1,4 @@ -class TaskRecurringScheduleJob { +class TaskRecurringScheduleJob {/* // def timeout = 5000 // execute job once in 5 seconds def timeout = 60000 @@ -44,4 +44,4 @@ } }//recurringScheduleInstanceList.each() - } + }*/ } Index: /trunk/grails-app/views/taskDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/show.gsp (revision 125) +++ /trunk/grails-app/views/taskDetailed/show.gsp (revision 126) @@ -4,4 +4,5 @@ Show Task + @@ -12,8 +13,20 @@
-

Show Task

${flash.message}
 + + + + + + + + + + + + +
@@ -105,4 +118,179 @@ + + + + + + + + + + + + + + + + + + + + + + +
Task Group:${taskInstance?.taskGroup?.encodeAsHTML()}
Task Type:${taskInstance?.taskType?.encodeAsHTML()}
Assigned Persons: +
    + +
  • ${a?.encodeAsHTML()}
    • +     +
+
+
+ + +
+ + + + + +
+ +
+

Faults

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CommentDate DoneDurationEntered By
${entry.comment}${entry.durationHour}:${entry.durationMinute}${entry.enteredBy} + + Edit + +
+
+ +
+

Work Done

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CommentDate DoneDurationEntered By
${entry.comment}${entry.durationHour}:${entry.durationMinute}${entry.enteredBy} + + Edit + +
+
+ +
+ +
+ + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Recurring Schedule:${taskInstance.recurringSchedule?.encodeAsHTML()}
Start Date:${taskInstance.recurringSchedule?.startDate}
Next Due Date:${taskInstance.recurringSchedule?.nextDueDate}
Last Excecuted Date:${taskInstance.recurringSchedule?.lastExecutedDate}
+
+ + + + +
+ + @@ -117,29 +305,46 @@ - - - - - - - - - - - - - - - - - - - + +
Sub Tasks:
Task Group:${taskInstance?.taskGroup?.encodeAsHTML()}
Task Type:${taskInstance?.taskType?.encodeAsHTML()}
Assigned Persons: -
    - -
  • ${a?.encodeAsHTML()}
    • -     -
-
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -149,6 +354,6 @@
- - + + @@ -157,81 +362,44 @@
-

Faults

+

Maintenance Actions

Id:${taskInstance.recurringSchedule?.plannedMaintenance?.id}
Name:${taskInstance.recurringSchedule?.plannedMaintenance?.name}
Description:${taskInstance.recurringSchedule?.plannedMaintenance?.description}
Recurring Schedule:${taskInstance.recurringSchedule?.encodeAsHTML()}
Is Active:${taskInstance.recurringSchedule?.plannedMaintenance?.isActive}
- - - - + + + + + + + + - + - - - - - - - - - - - - - - - -
CommentDate DoneDurationEntered ByStepActionSystem SectionAssetAssemblyMaintenance Policy
${entry.comment}${entry.durationHour}:${entry.durationMinute}${entry.enteredBy} - - Edit - -
-
- -
-

Work Done

- - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +
CommentDate DoneDurationEntered By
${entry.comment}${entry.durationHour}:${entry.durationMinute}${entry.enteredBy} - - Edit - -
${fieldValue(bean:maintenanceAction, field:'pmStepNumber')}${maintenanceAction.maintenanceAction}${maintenanceAction.systemSection}${maintenanceAction.asset}${maintenanceAction.assembly}${maintenanceAction.maintenancePolicy} + + Edit + +
@@ -240,12 +408,20 @@
-
- - - - - - -
+ +
+ + + + + + +
+ + + + + + +
Index: /trunk/web-app/css/tabviewCustom.css =================================================================== --- /trunk/web-app/css/tabviewCustom.css (revision 126) +++ /trunk/web-app/css/tabviewCustom.css (revision 126) @@ -0,0 +1,317 @@ +/* +Copyright (c) 2008, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.6.0 +*/ +.yui-navset .yui-nav li, +.yui-navset .yui-navset-top .yui-nav li,.yui-navset .yui-navset-bottom .yui-nav li{ + margin:0 0.5em 0 0; +} + +.yui-navset-left .yui-nav li, +.yui-navset-right .yui-nav li{ + margin:0 0 0.5em; +} + +.yui-navset .yui-content .yui-hidden{ + display:none; +} + +.yui-navset .yui-navset-left .yui-nav, +.yui-navset .yui-navset-right .yui-nav, +.yui-navset-left .yui-nav, +.yui-navset-right .yui-nav{ + width:6em; +} + +.yui-navset-top .yui-nav, +.yui-navset-bottom .yui-nav{ + width:auto; +} + +.yui-navset .yui-navset-left, +.yui-navset-left{ + padding:0 0 0 6em; +} + +.yui-navset-right{ + padding:0 6em 0 0; +} + +.yui-navset-top,.yui-navset-bottom{ + padding:auto; +} + +.yui-nav, +.yui-nav li{ + margin:0; + padding:0; + list-style:none; +} + +.yui-navset li em{ + font-style:normal; +} + +.yui-navset{ + position:relative; + zoom:1; +} + +.yui-navset .yui-content{ + zoom:1; +} + +.yui-navset .yui-nav li, +.yui-navset .yui-navset-top .yui-nav li, +.yui-navset .yui-navset-bottom .yui-nav li{ + display:inline-block; + display:-moz-inline-stack; + display:inline; + vertical-align:bottom; + cursor:pointer;zoom:1; +} + +.yui-navset-left .yui-nav li, +.yui-navset-right .yui-nav li{ + display:block; +} + +.yui-navset .yui-nav a{ + position:relative; +} + +.yui-navset .yui-nav li a, +.yui-navset-top .yui-nav li a, +.yui-navset-bottom .yui-nav li a{ + display:block; + display:inline-block; + vertical-align:bottom; + zoom:1; +} + +.yui-navset-left .yui-nav li a, +.yui-navset-right .yui-nav li a{ + display:block; +} + +.yui-navset-bottom .yui-nav li a{ + vertical-align:text-top; +} + +.yui-navset .yui-nav li a em, +.yui-navset-top .yui-nav li a em, +.yui-navset-bottom .yui-nav li a em{ + display:block; +} + +.yui-navset .yui-navset-left .yui-nav, +.yui-navset .yui-navset-right .yui-nav, +.yui-navset-left .yui-nav, +.yui-navset-right .yui-nav{ + position:absolute; + z-index:1; +} + +.yui-navset-top .yui-nav, +.yui-navset-bottom .yui-nav{ + position:static; +} + +.yui-navset .yui-navset-left .yui-nav, +.yui-navset-left .yui-nav{ + left:0; + right:auto; +} + +.yui-navset .yui-navset-right .yui-nav, +.yui-navset-right .yui-nav{ + right:0; + left:auto; +} + +.yui-skin-sam .yui-navset .yui-nav, +.yui-skin-sam .yui-navset .yui-navset-top .yui-nav{/*Nav underl line*/ + border:solid #2647a0; + border-width:0 0 5px; + Xposition:relative; + zoom:1; +} + +.yui-skin-sam .yui-navset .yui-nav li, +.yui-skin-sam .yui-navset .yui-navset-top .yui-nav li{ + margin:0 0.16em 0 0; + padding:1px 0 0; + zoom:1; +} + +.yui-skin-sam .yui-navset .yui-nav .selected, +.yui-skin-sam .yui-navset .yui-navset-top .yui-nav .selected{ + margin:0 0.16em -1px 0; +} + +.yui-skin-sam .yui-navset .yui-nav a, +.yui-skin-sam .yui-navset .yui-navset-top .yui-nav a{/* tab background */ +/* background:#d8d8d8 url("../images/skin/sprite.png") repeat-x; */ + background:#d8d8d8; + border:solid #a3a3a3; + border-width:0 1px; + color:#000; + position:relative; + text-decoration:none; +} + +.yui-skin-sam .yui-navset .yui-nav a em, +.yui-skin-sam .yui-navset .yui-navset-top .yui-nav a em{ + border:solid #a3a3a3; + border-width:1px 0 0; + cursor:hand; + padding:0.25em .75em; + left:0; + right:0; + bottom:0; + top:-1px; + position:relative; +} + +.yui-skin-sam .yui-navset .yui-nav .selected a, +.yui-skin-sam .yui-navset .yui-nav .selected a:focus, +.yui-skin-sam .yui-navset .yui-nav .selected a:hover{/*selected tab background*/ +/* background:#2647a0 url("../images/skin/sprite.png") repeat-x left -1400px; */ + background:#2647a0; + color:#fff; +} + +.yui-skin-sam .yui-navset .yui-nav a:hover, +.yui-skin-sam .yui-navset .yui-nav a:focus{/*hover background*/ +/* background:#bfdaff url("../images/skin/sprite.png") repeat-x left -1300px; */ + background:#bfdaff + outline:0; +} + +.yui-skin-sam .yui-navset .yui-nav .selected a em{ + padding:0.35em 0.75em; +} + +.yui-skin-sam .yui-navset .yui-nav .selected a, +.yui-skin-sam .yui-navset .yui-nav .selected a em{ + border-color:#243356; +} + +.yui-skin-sam .yui-navset .yui-content{/* content background color */ + background: #FFFFE1; +/* background: url("../images/Contentbg.png") repeat-y scroll center; */ +} + +.yui-skin-sam .yui-navset .yui-content, +.yui-skin-sam .yui-navset .yui-navset-top .yui-content{ + border:0px solid #808080; + border-top-color:#243356; + padding:0.25em 0.5em; +} + +.yui-skin-sam .yui-navset-left .yui-nav, +.yui-skin-sam .yui-navset .yui-navset-left .yui-nav, +.yui-skin-sam .yui-navset .yui-navset-right .yui-nav, +.yui-skin-sam .yui-navset-right .yui-nav{ + border-width:0 5px 0 0; + Xposition:absolute; + top:0; + bottom:0; +} + +.yui-skin-sam .yui-navset .yui-navset-right .yui-nav, +.yui-skin-sam .yui-navset-right .yui-nav{ + border-width:0 0 0 5px; +} + +.yui-skin-sam .yui-navset-left .yui-nav li, +.yui-skin-sam .yui-navset .yui-navset-left .yui-nav li, +.yui-skin-sam .yui-navset-right .yui-nav li{ + margin:0 0 0.16em; + padding:0 0 0 1px; +} + +.yui-skin-sam .yui-navset-right .yui-nav li{ + padding:0 1px 0 0; +} + +.yui-skin-sam .yui-navset-left .yui-nav .selected, +.yui-skin-sam .yui-navset .yui-navset-left .yui-nav .selected{ + margin:0 -1px 0.16em 0; +} + +.yui-skin-sam .yui-navset-right .yui-nav .selected{ + margin:0 0 0.16em -1px; +} + +.yui-skin-sam .yui-navset-left .yui-nav a, +.yui-skin-sam .yui-navset-right .yui-nav a{ + border-width:1px 0; +} + +.yui-skin-sam .yui-navset-left .yui-nav a em, +.yui-skin-sam .yui-navset .yui-navset-left .yui-nav a em, +.yui-skin-sam .yui-navset-right .yui-nav a em{ + border-width:0 0 0 1px; + padding:0.2em .75em; + top:auto; + left:-1px; +} + +.yui-skin-sam .yui-navset-right .yui-nav a em{ + border-width:0 1px 0 0; + left:auto; + right:-1px; +} + +.yui-skin-sam .yui-navset-left .yui-nav a, +.yui-skin-sam .yui-navset-left .yui-nav .selected a, +.yui-skin-sam .yui-navset-left .yui-nav a:hover, +.yui-skin-sam .yui-navset-right .yui-nav a, +.yui-skin-sam .yui-navset-right .yui-nav .selected a, +.yui-skin-sam .yui-navset-right .yui-nav a:hover, +.yui-skin-sam .yui-navset-bottom .yui-nav a, +.yui-skin-sam .yui-navset-bottom .yui-nav .selected a, +.yui-skin-sam .yui-navset-bottom .yui-nav a:hover{ + background-image:none; +} + +.yui-skin-sam .yui-navset-left .yui-content{ + border:1px solid #808080; + border-left-color:#243356; +} + +.yui-skin-sam .yui-navset-bottom .yui-nav, +.yui-skin-sam .yui-navset .yui-navset-bottom .yui-nav{ + border-width:5px 0 0; +} + +.yui-skin-sam .yui-navset .yui-navset-bottom .yui-nav .selected, +.yui-skin-sam .yui-navset-bottom .yui-nav .selected{ + margin:-1px 0.16em 0 0; +} + +.yui-skin-sam .yui-navset .yui-navset-bottom .yui-nav li, +.yui-skin-sam .yui-navset-bottom .yui-nav li{ + padding:0 0 1px 0; + vertical-align:top; +} + +.yui-skin-sam .yui-navset .yui-navset-bottom .yui-nav li a, +.yui-skin-sam .yui-navset-bottom .yui-nav li a{ +} + +.yui-skin-sam .yui-navset .yui-navset-bottom .yui-nav a em, +.yui-skin-sam .yui-navset-bottom .yui-nav a em{ + border-width:0 0 1px; + top:auto; + bottom:-1px; +} + +.yui-skin-sam .yui-navset-bottom .yui-content, +.yui-skin-sam .yui-navset .yui-navset-bottom .yui-content{ + border:1px solid #808080; + border-bottom-color:#243356; +}