Index: /trunk/application.properties =================================================================== --- /trunk/application.properties (revision 138) +++ /trunk/application.properties (revision 139) @@ -1,5 +1,6 @@ #utf-8 -#Thu Sep 17 12:53:38 EST 2009 +#Sun Sep 20 20:21:33 EST 2009 plugins.acegi=0.5.1 +plugins.navigation=1.1 app.version= plugins.class-diagram=0.3 Index: /trunk/grails-app/conf/Config.groovy =================================================================== --- /trunk/grails-app/conf/Config.groovy (revision 138) +++ /trunk/grails-app/conf/Config.groovy (revision 139) @@ -68,6 +68,73 @@ } +//log4j.logger.org.springframework.security='off,stdout' +/** Navigation plugin menu. + * The top level titles are taken from i18n message bundles. + * Subitems i18n message bundles are not currently resolving with this plugin. + */ +navigation.nav = [ + [order:10, controller:'appCore', title:'home', action:'start', + subItems: [ + [order:10, controller:'appCore', title:'Start', action:'start', isVisible: { true }], + [order:20, controller:'appCore', title:'Manager', action:'manager', isVisible: { authenticateService.ifAllGranted('ROLE_Manager') }], + [order:30, controller:'appCore', title:'Admin', action:'appAdmin', isVisible: { authenticateService.ifAllGranted('ROLE_AppAdmin') }], + [order:90, controller:'appCore', title:'Timeout', action:'changeSessionTimeout', isVisible: { params.action == 'changeSessionTimeout' }], + [order:91, controller:'appCore', title:'Password', action:'changePassword', isVisible: { params.action == 'changePassword' }], + ] + ], + [order:20, controller:'taskDetailed', title:'tasks', action:'search', + subItems: [ + [order:10, controller:'taskDetailed', title:'Search', action:'search', isVisible: { true }], + [order:20, controller:'taskDetailed', title:'Create', action:'create', isVisible: { true }], + [order:90, controller:'taskDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }], + [order:91, controller:'taskDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }] + ] + ], + [order:30, controller:'inventoryItemDetailed', title:'inventory', action:'search', + subItems: [ + [order:10, controller:'inventoryItemDetailed', title:'Search', action:'search', isVisible: { true }], + [order:20, controller:'inventoryItemDetailed', title:'Create', action:'create', isVisible: { true }], + [order:90, controller:'inventoryItemDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }], + [order:91, controller:'inventoryItemDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }] + ] + ], + [order:40, controller:'assetDetailed', title:'assets', action:'search', + subItems: [ + [order:10, controller:'assetDetailed', title:'Search', action:'search', isVisible: { true }], + [order:20, controller:'assetDetailed', title:'Create', action:'create', isVisible: { true }], + [order:90, controller:'assetDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }], + [order:91, controller:'assetDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }] + ] + ] +] - -//log4j.logger.org.springframework.security='off,stdout' +/** Class-diagram plugin overrides. + * + */ +classDiagram { + associations { + arrows { + // See http://www.graphviz.org/doc/info/arrows.html for available arrowheads and their visual appearance + references = "open" + belongsTo = "odiamond" + embedded = "diamond" + inherits = "onormal" + none = "none" + } + decorators { + // plain text to be shown on edge ends + hasOne = "1" + hasMany = "*" + none = "" + } + } + skins { + classicSpacey { + name = " Classic Spacey" + graphStyle = [bgcolor:"none", mclimit:100, nodesep:'1.5 equally', ranksep:'2 equally' ] + nodeStyle = [style:"rounded,filled", color:"blue", fillcolor:"azure2", fontname:"Verdana", fontsize:18] + edgeStyle = [color:"gray40", fontname:"Verdana", fontsize:18, labelfontsize:20, labeldistance:3.5] + } + } +} Index: /trunk/grails-app/conf/SecurityConfig.groovy =================================================================== --- /trunk/grails-app/conf/SecurityConfig.groovy (revision 138) +++ /trunk/grails-app/conf/SecurityConfig.groovy (revision 139) @@ -40,6 +40,8 @@ '/js/**': ['IS_AUTHENTICATED_ANONYMOUSLY'], '/plugins/help-balloons-1.2/**': ['IS_AUTHENTICATED_FULLY'], - '/plugins/richui-0.6/**': ['IS_AUTHENTICATED_FULLY'], - '/plugins/class-diagram-0.3/**': ['IS_AUTHENTICATED_FULLY'], + '/plugins/richui-0.6/**': ['IS_AUTHENTICATED_FULLY'], + '/plugins/navigation-1.1/**': ['IS_AUTHENTICATED_FULLY'], + '/plugins/class-diagram-0.3/**': ['IS_AUTHENTICATED_FULLY'], + '/classDiagram*': ['IS_AUTHENTICATED_FULLY'], '/classDiagram/**': ['IS_AUTHENTICATED_FULLY'], '/login*': ['IS_AUTHENTICATED_ANONYMOUSLY'], Index: /trunk/grails-app/controllers/AppCoreController.groovy =================================================================== --- /trunk/grails-app/controllers/AppCoreController.groovy (revision 138) +++ /trunk/grails-app/controllers/AppCoreController.groovy (revision 139) @@ -5,9 +5,14 @@ def authenticateService - def index = { redirect(action:home,params:params) } + def index = { redirect(action:start,params:params) } // the delete, save and update actions only accept POST requests //def allowedMethods = [delete:'POST', save:'POST', update:'POST'] + /** + * This is where we arrive after login. + * Attach the welcome flash message and redirect to where ever we want the user to start. + * e.g. redirect(controller:"taskDetailed", action:"search") + */ def welcome = { def personInstance = Person.get(authenticateService.userDomain().id) @@ -16,14 +21,8 @@ def sess = getSession() sess.setMaxInactiveInterval(personInstance.sessionTimeout) - redirect(action:home) + redirect(action:start) } - def home = { - } - - def options = { - } - - def acknowledgements = { + def start = { } @@ -35,5 +34,4 @@ if (request.method == 'POST') { def personInstance = Person.get(authenticateService.userDomain().id) -// personInstance.sessionTimeout = params.sessionTimeout.toInteger() personInstance.properties = params if (!personInstance.hasErrors() && personInstance.save()) { @@ -41,5 +39,5 @@ sess.setMaxInactiveInterval(personInstance.sessionTimeout) flash.message = "Session timeout changed." - redirect(action:options) + redirect(action:start) } else { @@ -68,5 +66,5 @@ //userCache.removeUserFromCache(personInstance.loginName) flash.message = "Password changed successfully." - redirect(action:options) + redirect(action:start) } else { Index: /trunk/grails-app/controllers/AssetDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/AssetDetailedController.groovy (revision 138) +++ /trunk/grails-app/controllers/AssetDetailedController.groovy (revision 139) @@ -3,5 +3,5 @@ class AssetDetailedController extends BaseController { - def index = { redirect(action:list,params:params) } + def index = { redirect(action:search,params:params) } // the delete, save and update actions only accept POST requests @@ -13,10 +13,20 @@ } + def search = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ assetInstanceList: Asset.list( params ), assetInstanceTotal: Asset.count() ] + } + def show = { + + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Show) + { params.action='show' } + def assetInstance = Asset.get( params.id ) if(!assetInstance) { flash.message = "Asset not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } else { return [ assetInstance : assetInstance ] } @@ -29,5 +39,5 @@ assetInstance.delete() flash.message = "Asset ${params.id} deleted" - redirect(action:list) + redirect(action:search) } catch(org.springframework.dao.DataIntegrityViolationException e) { @@ -38,14 +48,19 @@ else { flash.message = "Asset not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } } def edit = { + + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Edit) + { params.action='edit' } + def assetInstance = Asset.get( params.id ) if(!assetInstance) { flash.message = "Asset not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } else { Index: /trunk/grails-app/controllers/InventoryItemDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 138) +++ /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 139) @@ -3,5 +3,5 @@ class InventoryItemDetailedController extends BaseController { - def index = { redirect(action:list,params:params) } + def index = { redirect(action:search, params:params) } // the delete, save and update actions only accept POST requests @@ -13,10 +13,20 @@ } + def search = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ inventoryItemInstanceList: InventoryItem.list( params ), inventoryItemInstanceTotal: InventoryItem.count() ] + } + def show = { + + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Show) + { params.action='show' } + def inventoryItemInstance = InventoryItem.get( params.id ) if(!inventoryItemInstance) { flash.message = "InventoryItem not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } else { return [ inventoryItemInstance : inventoryItemInstance ] } @@ -29,5 +39,5 @@ inventoryItemInstance.delete() flash.message = "InventoryItem ${params.id} deleted" - redirect(action:list) + redirect(action:search) } catch(org.springframework.dao.DataIntegrityViolationException e) { @@ -38,14 +48,19 @@ else { flash.message = "InventoryItem not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } } def edit = { + + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Edit) + { params.action='edit' } + def inventoryItemInstance = InventoryItem.get( params.id ) if(!inventoryItemInstance) { flash.message = "InventoryItem not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } else { Index: /trunk/grails-app/controllers/TaskDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskDetailedController.groovy (revision 138) +++ /trunk/grails-app/controllers/TaskDetailedController.groovy (revision 139) @@ -2,16 +2,12 @@ class TaskDetailedController extends BaseController { - - def index = { redirect(action:list,params:params) } + + def index = { + println "index called" + redirect(action:search,params:params) + } // the delete, save and update actions only accept POST requests static allowedMethods = [delete:'POST', save:'POST', update:'POST'] - -// def list = { -// params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) -// def taskInstanceActives = Task.findAllByIsActive( true ).list( params ) -// // def taskInstanceList = taskInstanceActives.list( params ) -// return [ taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceActives.count() ] -// } def list = { @@ -20,10 +16,49 @@ } + def search = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + + if(!params.order) { + params.sort = "id" + params.order = "desc" + } + + if(params.search == "ShowAll") + { + def taskInstanceActivesList = Task.findAllByIsActive(true, params) + def taskInstanceActivesTotal = Task.countByIsActive(true) + return [taskInstanceList: taskInstanceActivesList, taskInstanceTotal: taskInstanceActivesTotal] + } + if(params.search == "ShowDeleted") + { + def taskInstanceActivesList = Task.findAllByIsActive(false, params) + def taskInstanceActivesTotal = Task.countByIsActive(false) + return [taskInstanceList: taskInstanceActivesList, taskInstanceTotal: taskInstanceActivesTotal] + } + // Default: + def taskInstanceActivesList = Task.findAllByIsActive(true, params) + def taskInstanceActivesTotal = Task.countByIsActive(true) + [taskInstanceList: taskInstanceActivesList, taskInstanceTotal: taskInstanceActivesTotal] + } + + def searchShowAll = { + redirect(action:'search', params:[search:"ShowAll"]) + } + + def searchShowDeleted = { + redirect(action:'search', params:[search:"ShowDeleted"]) + } + def show = { + + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Show) + { params.action='show' } + def taskInstance = Task.get( params.id ) if(!taskInstance) { flash.message = "Task not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } else { @@ -86,5 +121,5 @@ taskInstance.isActive = false flash.message = "Task ${params.id} has been set to inactive." - redirect(action:list) + redirect(action:search) } catch(org.springframework.dao.DataIntegrityViolationException e) { @@ -95,14 +130,19 @@ else { flash.message = "Task not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } } def edit = { + + // In the case of an actionSubmit button, rewrite action name from 'index'. + if(params._action_Edit) + { params.action='edit' } + def taskInstance = Task.get( params.id ) if(!taskInstance) { flash.message = "Task not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } else { @@ -166,5 +206,5 @@ if(!parentTaskInstance) { flash.message = "Task not found with id ${params.id}" - redirect(action:list) + redirect(action:search) } else { Index: /trunk/grails-app/domain/Person.groovy =================================================================== --- /trunk/grails-app/domain/Person.groovy (revision 138) +++ /trunk/grails-app/domain/Person.groovy (revision 139) @@ -15,5 +15,5 @@ /* Set after login by 'welcome' action, default to 12 hours, aka "sess.setMaxInactiveInterval(seconds) */ - Integer sessionTimeout = 720 + Integer sessionTimeout = 43200 /** MD5 Password */ @@ -45,5 +45,5 @@ //So we need to use pass for validation then encode it for above. pass(blank: false, minSize:4) - sessionTimeout(min:60, max:720) + sessionTimeout(min:60, max:43200) } Index: /trunk/grails-app/i18n/messages.properties =================================================================== --- /trunk/grails-app/i18n/messages.properties (revision 138) +++ /trunk/grails-app/i18n/messages.properties (revision 139) @@ -54,3 +54,18 @@ typeMismatch.java.math.BigInteger=Property {0} must be a valid number +# Navigation plugin, see conf/Config.groovy for menu's. +# Subitems are not currently resolving with this plugin. +navigation.nav.home=Home +navigation.nav.home.start=Start +navigation.nav.home.appAdmin=Admin +navigation.nav.home.manager=Manager +navigation.nav.home.changeSessionTimeout=Timeout +navigation.nav.home.changePassword=Password +navigation.nav.tasks=Tasks +navigation.nav.tasks.create=Create +navigation.nav.tasks.search=Search +navigation.nav.tasks.show=Show + +navigation.nav.inventory=Inventory +navigation.nav.assets=Assets Index: /trunk/grails-app/views/_about.gsp =================================================================== --- /trunk/grails-app/views/_about.gsp (revision 139) +++ /trunk/grails-app/views/_about.gsp (revision 139) @@ -0,0 +1,102 @@ +
+
+
+ + + + +
+ GnuMims is a powerful but simple to use Maintenance and Inventory Management + Solution with a focus on asset, task and inventory management. + Also known as a computerised maintenance management system or CMMS. + Initially designed with an engineering department and mid-size industrial production enviroment in mind. +
+
+ GnuMims is a world wide community project run from + http://www.gnumims.org + and released under the GNU AGPL open source license. +
+
+ The GNU AGPL requires you to make the source code available to your network users.
+ So how do you do this?
+ Easy, if you are running an un-modified version just leave the link to www.gnumims.org + on the header image intact. This will allow your users to find the community site and + with it the source code. If you are running a modified version you are welcome to + use our subversion repository, ask us about a custom branch or your changes + may be included in the main trunk. If you don't want to do either of those then + create a link in your modified version to your modified source, either way you are required + to make the source code available to your network users. +
+
+
+
+
+ + + + +
+ + GnuMims - A web application providing a Maintenance and Inventory Management Solution.
+ Copyright (C) 2008-2009 Gavin Kromhout
+ Copyright (C) 2008-2009 Steven Tucker
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Silk icon set acknowledgement.
Author: + Mark James - http://www.famfamfam.com/lab/icons/silk/ +
License: + http://creativecommons.org/licenses/by/3.0/ +
+
+
+
+
+ + + + +
+ The Grails web framework and the plugins used are available under + their respective licenses from http://www.grails.org +
+
Index: unk/grails-app/views/_adminmenubar.gsp =================================================================== --- /trunk/grails-app/views/_adminmenubar.gsp (revision 138) +++ (revision ) @@ -1,27 +1,0 @@ - - - - - Manager - - - - - - - AppAdmin - - - - - - Options - - - - - Log out () - - - - Index: unk/grails-app/views/appCore/acknowledgements.gsp =================================================================== --- /trunk/grails-app/views/appCore/acknowledgements.gsp (revision 138) +++ (revision ) @@ -1,52 +1,0 @@ - - - - - Acknowledgements - - -
- Home -
-
-

Welcome to Acknowledgements

- -
${flash.message}
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Silk icon set:
Author: - Mark James - http://www.famfamfam.com/lab/icons/silk/ -
License: - http://creativecommons.org/licenses/by/3.0/ -
-
- -
- - Index: /trunk/grails-app/views/appCore/appAdmin.gsp =================================================================== --- /trunk/grails-app/views/appCore/appAdmin.gsp (revision 138) +++ /trunk/grails-app/views/appCore/appAdmin.gsp (revision 139) @@ -4,8 +4,9 @@ Admin +
- Home +
Index: /trunk/grails-app/views/appCore/changePassword.gsp =================================================================== --- /trunk/grails-app/views/appCore/changePassword.gsp (revision 138) +++ /trunk/grails-app/views/appCore/changePassword.gsp (revision 139) @@ -1,52 +1,52 @@ - - Change Password + + Change Password + -
- Home +
+
-
-

Change Password

- -
${flash.message}
- - -
- -
- +
+ +
${flash.message}
+ + +
+ +
+ - -
- - + +
+
+ - - - - + + + + - - - - + + + + - -
- -
+ +
- -
+ +
-
+ + +
-
- -
- +
+ +
+ -
+
Index: /trunk/grails-app/views/appCore/changeSessionTimeout.gsp =================================================================== --- /trunk/grails-app/views/appCore/changeSessionTimeout.gsp (revision 138) +++ /trunk/grails-app/views/appCore/changeSessionTimeout.gsp (revision 139) @@ -2,13 +2,13 @@ Change Session Timeout + - -
- Home + +
+
-

Change Session Timeout

${flash.message}
Index: unk/grails-app/views/appCore/home.gsp =================================================================== --- /trunk/grails-app/views/appCore/home.gsp (revision 138) +++ (revision ) @@ -1,28 +1,0 @@ - - - - -Home - - -
- Tasks - Inventory - Assets - -
-
-

- -
${flash.message}
- - -
- -
- - -
- - Index: /trunk/grails-app/views/appCore/manager.gsp =================================================================== --- /trunk/grails-app/views/appCore/manager.gsp (revision 138) +++ /trunk/grails-app/views/appCore/manager.gsp (revision 139) @@ -4,16 +4,25 @@ Admin +
- Home - New Person - Person List +
-

Welcome to Manager

${flash.message}
 +
+
+ Manage application users +
+
+ View Entity Relationship Diagram: + pdf + and + legend + or + interactive.
Index: unk/grails-app/views/appCore/options.gsp =================================================================== --- /trunk/grails-app/views/appCore/options.gsp (revision 138) +++ (revision ) @@ -1,28 +1,0 @@ - - - - - Options - - -
- Home -
-
-

Welcome to Options

- -
${flash.message}
- -
-
- Change Password -
-
- Change Session Timeout -
-
- Acknowledgements -
-
- - Index: /trunk/grails-app/views/appCore/start.gsp =================================================================== --- /trunk/grails-app/views/appCore/start.gsp (revision 139) +++ /trunk/grails-app/views/appCore/start.gsp (revision 139) @@ -0,0 +1,74 @@ + + + + +Start + + + + +
+ +
+
+ +
${flash.message}
+ + +
+ +
+ + + + + + + + + + + + + + + +
+
+ Prepared quick links +
+
+ + + + + +
+
+ Static reports + + + + + +
+
+ Change Password +
+
+ Change Session Timeout + + + + + + + + + + + + +
+ + Index: /trunk/grails-app/views/assetDetailed/create.gsp =================================================================== --- /trunk/grails-app/views/assetDetailed/create.gsp (revision 138) +++ /trunk/grails-app/views/assetDetailed/create.gsp (revision 139) @@ -5,13 +5,12 @@ - Create Asset + Create Asset +
- Home - Asset List +
-

Create Asset

${flash.message}
Index: /trunk/grails-app/views/assetDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/assetDetailed/edit.gsp (revision 138) +++ /trunk/grails-app/views/assetDetailed/edit.gsp (revision 139) @@ -6,13 +6,11 @@ Edit Asset +
- Home - Asset List - New Asset +
-

Edit Asset

${flash.message}
Index: /trunk/grails-app/views/assetDetailed/list.gsp =================================================================== --- /trunk/grails-app/views/assetDetailed/list.gsp (revision 138) +++ /trunk/grails-app/views/assetDetailed/list.gsp (revision 139) @@ -6,12 +6,11 @@ Asset List +
- Home - New Asset +
-

Asset List

${flash.message}
Index: /trunk/grails-app/views/assetDetailed/search.gsp =================================================================== --- /trunk/grails-app/views/assetDetailed/search.gsp (revision 139) +++ /trunk/grails-app/views/assetDetailed/search.gsp (revision 139) @@ -0,0 +1,67 @@ + + + + + + + Asset Search + + + +
+ +
+
+ +
${flash.message}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${fieldValue(bean:assetInstance, field:'id')}${fieldValue(bean:assetInstance, field:'name')}${fieldValue(bean:assetInstance, field:'assetType')}${fieldValue(bean:assetInstance, field:'systemSection')}${fieldValue(bean:assetInstance, field:'isActive')} + + Show + +
+
+
+ +
+
+ + Index: /trunk/grails-app/views/assetDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/assetDetailed/show.gsp (revision 138) +++ /trunk/grails-app/views/assetDetailed/show.gsp (revision 139) @@ -6,13 +6,11 @@ Show Asset +
- Home - Asset List - New Asset +
-

Show Asset

${flash.message}
Index: /trunk/grails-app/views/entryDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/entryDetailed/edit.gsp (revision 138) +++ /trunk/grails-app/views/entryDetailed/edit.gsp (revision 139) @@ -78,5 +78,5 @@ - + Index: /trunk/grails-app/views/index.gsp =================================================================== --- /trunk/grails-app/views/index.gsp (revision 138) +++ /trunk/grails-app/views/index.gsp (revision 139) @@ -1,1 +1,1 @@ -<%response.sendRedirect(request.getContextPath()+'/appCore/home')%> +<%response.sendRedirect(request.getContextPath()+'/appCore/')%> Index: /trunk/grails-app/views/inventoryItemDetailed/create.gsp =================================================================== --- /trunk/grails-app/views/inventoryItemDetailed/create.gsp (revision 138) +++ /trunk/grails-app/views/inventoryItemDetailed/create.gsp (revision 139) @@ -5,13 +5,12 @@ - Create InventoryItem + Create InventoryItem +
- Home - InventoryItem List +
-

Create InventoryItem

${flash.message}
Index: /trunk/grails-app/views/inventoryItemDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/inventoryItemDetailed/edit.gsp (revision 138) +++ /trunk/grails-app/views/inventoryItemDetailed/edit.gsp (revision 139) @@ -6,13 +6,11 @@ Edit InventoryItem +
- Home - InventoryItem List - New InventoryItem +
-

Edit InventoryItem

${flash.message}
Index: /trunk/grails-app/views/inventoryItemDetailed/list.gsp =================================================================== --- /trunk/grails-app/views/inventoryItemDetailed/list.gsp (revision 138) +++ /trunk/grails-app/views/inventoryItemDetailed/list.gsp (revision 139) @@ -6,12 +6,11 @@ InventoryItem List +
- Home - New InventoryItem +
-

InventoryItem List

${flash.message}
Index: /trunk/grails-app/views/inventoryItemDetailed/search.gsp =================================================================== --- /trunk/grails-app/views/inventoryItemDetailed/search.gsp (revision 139) +++ /trunk/grails-app/views/inventoryItemDetailed/search.gsp (revision 139) @@ -0,0 +1,72 @@ + + + + + + + InventoryItem Search + + + + +
+ +
+
+ +
${flash.message}
+ + Search +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${fieldValue(bean:inventoryItemInstance, field:'id')}${fieldValue(bean:inventoryItemInstance, field:'name')}${fieldValue(bean:inventoryItemInstance, field:'description')}${fieldValue(bean:inventoryItemInstance, field:'enableReorder')}${fieldValue(bean:inventoryItemInstance, field:'isActive')} + + Show + +
+
+
+ +
+
+ + Index: /trunk/grails-app/views/inventoryItemDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/inventoryItemDetailed/show.gsp (revision 138) +++ /trunk/grails-app/views/inventoryItemDetailed/show.gsp (revision 139) @@ -6,13 +6,11 @@ Show InventoryItem +
- Home - InventoryItem List - New InventoryItem +
-

Show InventoryItem

${flash.message}
Index: /trunk/grails-app/views/layouts/main.gsp =================================================================== --- /trunk/grails-app/views/layouts/main.gsp (revision 138) +++ /trunk/grails-app/views/layouts/main.gsp (revision 139) @@ -6,4 +6,5 @@ + @@ -21,14 +22,24 @@
+
- + + + + Log out () + + + +
- + -
+
-
+
Index: /trunk/grails-app/views/login/auth.gsp =================================================================== --- /trunk/grails-app/views/login/auth.gsp (revision 138) +++ /trunk/grails-app/views/login/auth.gsp (revision 139) @@ -31,4 +31,11 @@ width: 120px; } +#login .inner .cssform input[type='submit']:link { +} +#login .inner .cssform input[type='submit']:visited { +} +#login .inner .cssform input[type='submit']:hover { + background:#bfdaff; +} #login .inner .cssform label { font-weight: bold; @@ -56,5 +63,5 @@

- +

Index: /trunk/grails-app/views/taskDetailed/create.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/create.gsp (revision 138) +++ /trunk/grails-app/views/taskDetailed/create.gsp (revision 139) @@ -1,17 +1,14 @@ - - - Create Task + Create Task +

- Home - Task List +
-

Create Task

${flash.message}
Index: /trunk/grails-app/views/taskDetailed/edit.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/edit.gsp (revision 138) +++ /trunk/grails-app/views/taskDetailed/edit.gsp (revision 139) @@ -6,13 +6,11 @@ Edit Task +
- Home - Task List - New Task +
-

Edit Task

${flash.message}
Index: /trunk/grails-app/views/taskDetailed/list.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/list.gsp (revision 138) +++ /trunk/grails-app/views/taskDetailed/list.gsp (revision 139) @@ -4,12 +4,11 @@ Task List +
- Home - New Task +
-

Task List

${flash.message}
@@ -19,19 +18,19 @@ - - - - - - - - - + + + + + + + + + - + - + @@ -41,13 +40,13 @@ ${fieldValue(bean:taskInstance, field:'id')} - - - + + + ${fieldValue(bean:taskInstance, field:'description')} - + ${fieldValue(bean:taskInstance, field:'leadPerson')} - + ${fieldValue(bean:taskInstance, field:'taskPriority')} - + ${fieldValue(bean:taskInstance, field:'taskStatus')} @@ -57,5 +56,5 @@ - + Index: /trunk/grails-app/views/taskDetailed/listSubTasks.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/listSubTasks.gsp (revision 138) +++ /trunk/grails-app/views/taskDetailed/listSubTasks.gsp (revision 139) @@ -4,9 +4,9 @@ Task List +
- Home - New Task +
@@ -43,5 +43,5 @@ ${fieldValue(bean:taskInstance, field:'id')} - + ${fieldValue(bean:taskInstance, field:'description')} Index: /trunk/grails-app/views/taskDetailed/search.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/search.gsp (revision 139) +++ /trunk/grails-app/views/taskDetailed/search.gsp (revision 139) @@ -0,0 +1,124 @@ + + + + + Task Search + + + + +
+ +
+ +
+ +
${flash.message}
+ + +
+ +
+ + + + + + + + + + + + + + +
+
+ + Task ID: + + + +
+
+ Show: + Active + / + Inactive + + + + + +
+
+ + + + + + +
+
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${fieldValue(bean:taskInstance, field:'id')}${fieldValue(bean:taskInstance, field:'description')}${fieldValue(bean:taskInstance, field:'leadPerson')}${fieldValue(bean:taskInstance, field:'taskPriority')}${fieldValue(bean:taskInstance, field:'taskStatus')} + + Show + +
+
+
+ +
+ +
+ + Index: /trunk/grails-app/views/taskDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/taskDetailed/show.gsp (revision 138) +++ /trunk/grails-app/views/taskDetailed/show.gsp (revision 139) @@ -4,11 +4,10 @@ Show Task +
- Home - Task List - New Task +
@@ -66,5 +65,5 @@ Target Start Date: - + @@ -73,5 +72,5 @@ Target Completion Date: - + @@ -189,5 +188,5 @@ ${entry.comment} - + ${entry.durationHour}:${entry.durationMinute} ${entry.enteredBy} @@ -228,5 +227,5 @@ ${entry.comment} - + ${entry.durationHour}:${entry.durationMinute} ${entry.enteredBy} @@ -393,5 +392,5 @@ - + @@ -434,5 +433,5 @@ - + @@ -443,5 +442,5 @@ - + @@ -452,5 +451,5 @@ - + @@ -460,5 +459,5 @@ - + @@ -524,5 +523,5 @@ ${fieldValue(bean:subTaskInstance, field:'id')} - + ${subTaskInstance.description} Index: /trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp =================================================================== --- /trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 138) +++ /trunk/grails-app/views/taskRecurringScheduleDetailed/show.gsp (revision 139) @@ -42,5 +42,5 @@ - + @@ -87,5 +87,5 @@ - + @@ -96,5 +96,5 @@ - + @@ -105,5 +105,5 @@ - + @@ -113,5 +113,5 @@ - + Index: /trunk/web-app/css/main.css =================================================================== --- /trunk/web-app/css/main.css (revision 138) +++ /trunk/web-app/css/main.css (revision 139) @@ -44,4 +44,5 @@ width: 980px; height: 160px; + /*border: 1px solid;*/ } #HeaderLink{ @@ -49,4 +50,9 @@ width: 650px; height: 160px; +} + +/* Navigation plugin, top level. */ +#menu { + float: left; } @@ -83,7 +89,7 @@ } textarea { - width: 450px; - height: 150px; - vertical-align: top; + width: 450px; + height: 150px; + vertical-align: top; } @@ -97,17 +103,35 @@ } -/* Login/out and Admin*/ +/* Login/out and Admin */ .appcontrol { - text-align: right; - padding: 5px 160px 5px 5px -} - -.appcontrolButton { - font-size: 14px; - padding: 5px 5px; -} - -/* NAVIGATION MENU */ + width: 980px; + height: 2em; +/* text-align: right; */ +/* padding: 0px 160px 70px 5px; */ +/* padding: 0.5em 0px 0.5em 0px; */ + /*border: 1px solid blue;*/ + /*border-style: solid solid solid solid;*/ + /*overflow: hidden;*/ /* Clearing floats */ +} + +.appcontrolButton a { + padding: 0.3em 165px 0em 5px; +/* width: 980px; */ + float: right; + font-size: 14px; +/* padding: 0.5em 5px ; */ + text-decoration: none; + display: block; + /*overflow: hidden;*/ /* Clearing floats */ +} + +.appcontrolButton a:hover { + color: red; + margin: 0.2em 0 0 0; + /*padding: 0.8em 5px;*/ +} + +/* ORIGINAL NAVIGATION MENU */ .nav { @@ -116,16 +140,9 @@ /*border: 1px solid #ccc; border-style: solid none solid none;*/ - padding: 15px 0px 0px 0px; + padding: 10px 0px 0px 0px; width: 980px; height: 40px; -} - -/*.nav a{ - background: url("../images/linkPanel.png") no-repeat top; - display: inline-block; - width: 140px; - height: 40px; - text-decoration: none; -}*/ + /*border: 1px solid;*/ +} .menuButton { @@ -375,2 +392,106 @@ height: 100px; } + + /* Navigation Plugin Override */ +.navigation { + padding: 0px 0px 0px 165px; + list-style-type: none; + clear: both; + font-size: 14px; + overflow: hidden; /* Clearing floats */ +} + +.navigation li { + float: left; + /*border: 0px*/ + /* border: 1px solid #888; */ + /*border-left-color: #bbb;*/ /* Highlight border-color */ +} + +.navigation li.navigation_first { + /*border-left-color: #888; */ +} + +.navigation li.navigation_active { + /*border-left-color: #555;*/ /* Highlight border-color of active item */ +} + +.navigation li a { + /* color: #fff; */ + /* background-color: #aaa; */ + padding: 0.3em 0.75em; + display: block; + text-decoration: none; +} + +.navigation li a:hover { + color: red; + /* background-color: #999; */ +/* font-weight: normal; */ +/* font-size: 14px; */ + margin: 0.2em 0 0 0; + /*cursor: default;*/ +} + +.navigation li.navigation_active a { + /* background-color: #555; */ +/* color: #fff;*/ + color: #006dba; + /*color: black;*/ + font-weight: bold; + font-size: 17px; + margin: 0 0 0 0; + /*cursor: default;*/ +} + +.navigation li.navigation_active a:hover { + color: #006dba; + font-weight: bold; + font-size: 17px; + margin: 0 0 0 0; + /*background-color: #555;*/ +} + +/* Sub navigation */ +.subnavigation { + /*padding: 0px 0px 0px 165px;*/ + padding: 0px 0px 0px 220px; + list-style-type: none; + clear: both; + overflow: hidden; /* Clearing floats */ +} +.subnavigation li { + float: left; + /* background-color: #555; */ + padding: 0em 0.75em; + border-width: 0px 0; +} +.subnavigation li a { + color: #006dba; + font-weight: bold; + font-size: 17px; + display: block; + /*padding: 0px 0;*/ + /* border-color: #555; */ + border-style: solid; + border-width: 0px 0; + text-decoration: none; + /*margin: 0 0 0 0;*/ + /*cursor: default;*/ +} + +.subnavigation li a:visited { + color: #006dba; +} + +.subnavigation li a:hover { + /*color: red;*/ + /*border-color: black;*/ + border-width: 1px 0; +} +.subnavigation li.subnavigation_active a { + /*color: #e0e0e0; */ + /*cursor: default;*/ + /*border-color: #e0e0e0;*/ + border-width: 1px 0; +} Index: /trunk/web-app/css/tabviewCustom.css =================================================================== --- /trunk/web-app/css/tabviewCustom.css (revision 138) +++ /trunk/web-app/css/tabviewCustom.css (revision 139) @@ -187,5 +187,5 @@ .yui-skin-sam .yui-navset .yui-nav a:focus{/*hover background*/ /* background:#bfdaff url("../images/skin/sprite.png") repeat-x left -1300px; */ - background:#bfdaff + background:#bfdaff; outline:0; }