[Jaffa-cvs] JaffaCore/source/html/jaffa/jsp/tiles/object_maintenance_2_0 contextNav.jsp,1.10,1.11 defaultNav.jsp,1.9,1.10

[PaulE <ut_...@us...>]

Update of /cvsroot/jaffa/JaffaCore/source/html/jaffa/jsp/tiles/object_maintenance_2_0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27378/source/html/jaffa/jsp/tiles/object_maintenance_2_0

Modified Files:
	contextNav.jsp defaultNav.jsp 
Log Message:
Added new returnStyle feature to the lookup tag and component
Added support for components as desktops
Added confirm message for cancelling in maintenance component
Added check to ignore the confirm option on the button tag, if there is no message text
Refactored some of the templates

Index: contextNav.jsp
===================================================================
RCS file: /cvsroot/jaffa/JaffaCore/source/html/jaffa/jsp/tiles/object_maintenance_2_0/contextNav.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** contextNav.jsp	2 Sep 2005 10:59:08 -0000	1.10
--- contextNav.jsp	12 Nov 2005 00:54:53 -0000	1.11
***************
*** 36,40 ****
            <td>
              <img src="jaffa/imgs/icons/cancel.gif">
!             <Portlet:Button  field='Cancel' type='link' label='[label.Jaffa.Widgets.Button.Cancel]' preprocess='false'/>
            </td>
          </tr>
--- 36,40 ----
            <td>
              <img src="jaffa/imgs/icons/cancel.gif">
!             <Portlet:Button field='Cancel' type='link' label='[label.Jaffa.Widgets.Button.Cancel]' preprocess='false' confirm='[label.Jaffa.Inquiry.cancel.confirm]'/>
            </td>
          </tr>

Index: defaultNav.jsp
===================================================================
RCS file: /cvsroot/jaffa/JaffaCore/source/html/jaffa/jsp/tiles/object_maintenance_2_0/defaultNav.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** defaultNav.jsp	2 Sep 2005 11:15:10 -0000	1.9
--- defaultNav.jsp	12 Nov 2005 00:54:53 -0000	1.10
***************
*** 26,30 ****
      <logic:equal property='previousActionAvailable' name='<%= TagHelper.getFormName(pageContext) %>' value='false'>
      <td class="backIcon"><Portlet:Button field='Cancel' image='jaffa/imgs/icons/prevArrows.gif' label='[label.Jaffa.Widgets.Button.Cancel]' preprocess='false'/></td>
!     <td class="backButton"><Portlet:Button  field='Cancel' type='link' label='[label.Jaffa.Widgets.Button.Cancel]' preprocess='false'/></td>
      </logic:equal>
      
--- 26,30 ----
      <logic:equal property='previousActionAvailable' name='<%= TagHelper.getFormName(pageContext) %>' value='false'>
      <td class="backIcon"><Portlet:Button field='Cancel' image='jaffa/imgs/icons/prevArrows.gif' label='[label.Jaffa.Widgets.Button.Cancel]' preprocess='false'/></td>
!     <td class="backButton"><Portlet:Button  field='Cancel' type='link' label='[label.Jaffa.Widgets.Button.Cancel]' preprocess='false' confirm='[label.Jaffa.Inquiry.cancel.confirm]'/></td>
      </logic:equal>