Changeset 17955 for trunk

Show
Ignore:
Timestamp:
08/28/08 13:47:15 (3 months ago)
Author:
dpatil
Message:

UI Rearrangements: few changes for strings displayed on pages.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/db/oracle/create-scripts/versions/8.5.0/update_system_properties.sql

    r17951 r17955  
    404404      p.property = 'all.global.toolbar.action.next_post'; 
    405405 
     406update pn_property p set  
     407       p.property_value = 'Manage Forms'        
     408where  
     409      p.context_id = 2000 and 
     410      p.language = 'en' and 
     411      p.property = 'prm.business.setup.formsedit.link'; 
    406412 
    407413commit; 

  • trunk/core/web/jsp/admin/portfolio/BusinessPortfolio.jsp

    r17946 r17955  
    219219  back button. 
    220220  -------------------------------------------------------------------%> 
    221 <tb:toolbar style="tooltitle" showAll="true" leftTitle="Business Portfolio"> 
     221<tb:toolbar style="tooltitle" showAll="true" leftTitle="Business Portfolio" groupTitle="Workspaces"> 
    222222    <tb:setAttribute name="leftTitle"> 
    223223        <history:history> 

  • trunk/core/web/jsp/admin/portfolio/ProjectPortfolio.jsp

    r17946 r17955  
    207207  -------------------------------------------------------------------%> 
    208208 
    209 <tb:toolbar style="tooltitle" showAll="true" leftTitle="Project List"> 
     209<tb:toolbar style="tooltitle" showAll="true" leftTitle="Project List" groupTitle="Workspaces"> 
    210210    <tb:setAttribute name="leftTitle"> 
    211211        <history:history> 

  • trunk/core/web/jsp/discussion/GroupNew.jsp

    r17954 r17955  
    120120<template:getSpaceNavBar /> 
    121121 
    122 <tb:toolbar style="tooltitle" showAll="true" groupTitle="Discussion"> 
     122<tb:toolbar style="tooltitle" showAll="true" groupTitle="Discussions"> 
    123123        <tb:setAttribute name="leftTitle"> 
    124124                <history:history> 

  • trunk/core/web/jsp/discussion/GroupProperties.jsp

    r17954 r17955  
    107107<template:getSpaceNavBar /> 
    108108 
    109 <tb:toolbar style="tooltitle" showAll="true" groupTitle="Discussion"> 
     109<tb:toolbar style="tooltitle" showAll="true" groupTitle="Discussions"> 
    110110        <tb:setAttribute name="leftTitle"> 
    111111                <history:history> 

  • trunk/core/web/jsp/discussion/Main.jsp

    r17946 r17955  
    174174  -- Draw toolbar                                                                         
    175175  -------------------------------------------------------------------------------------%> 
    176 <tb:toolbar style="tooltitle" groupTitle="Discussion"> 
     176<tb:toolbar style="tooltitle" groupTitle="Discussions"> 
    177177        <tb:setAttribute name="leftTitle"> 
    178178                <history:history> 

  • trunk/core/web/jsp/discussion/ThreadList.jsp

    r17954 r17955  
    256256 
    257257 
    258 <tb:toolbar style="tooltitle" showAll="true" groupTitle="Discussion"> 
     258<tb:toolbar style="tooltitle" showAll="true" groupTitle="Discussions"> 
    259259        <tb:setAttribute name="leftTitle"> 
    260260<%              if ((showHistory != null) && (showHistory.booleanValue() == true)) { %> 

  • trunk/core/web/jsp/document/Properties.jsp

    r17954 r17955  
    264264                </history:history> 
    265265        </tb:setAttribute> 
     266  <tb:band name="standard"> 
     267    <tb:button type="properties" label='<%= PropertyProvider.get("prm.document.tabs.properties.button.tooltip") %>' /> 
     268    <tb:button type="remove" /> 
     269  </tb:band> 
    266270        <tb:band name="trashcan"> 
    267271                <tb:button type="undo_delete" label='<%= PropertyProvider.get("prm.document.main.undodelete.button.tooltip")%>' /> 
    268272         </tb:band> 
    269         <tb:band name="standard"> 
    270                 <tb:button type="properties" label='<%= PropertyProvider.get("prm.document.tabs.properties.button.tooltip") %>' /> 
    271                 <tb:button type="remove" /> 
    272         </tb:band> 
    273273</tb:toolbar> 
    274274<%   } else { %> 
    275 <tb:toolbar style="tooltitle"> 
     275<tb:toolbar style="tooltitle"  groupTitle="Documents"> 
    276276        <tb:setAttribute name="leftTitle"> 
    277277                <history:history> 
    …… 
    282282                </history:history> 
    283283        </tb:setAttribute> 
    284         <tb:band name="document" showAll="true" enableAll="true"> 
    285                 <tb:button type="new_folder" enable="false" /> 
    286          </tb:band> 
    287         <tb:band name="standard" showAll="true"> 
    288                 <tb:button type="create" label='<%= PropertyProvider.get("prm.document.tabs.create.button.tooltip") %>' /> 
    289                 <tb:button type="modify" label='<%= PropertyProvider.get("prm.document.tabs.modify.button.tooltip") %>' /> 
    290                 <tb:button type="remove" /> 
    291                 <tb:button type="properties" label='<%= PropertyProvider.get("prm.document.tabs.properties.button.tooltip") %>' /> 
    292                 <tb:button type="workflow" /> 
    293                 <%if (!mySpace.equals(Space.PERSONAL_SPACE)) {%> 
    294                         <tb:button type="security" /> 
    295                 <%}%> 
    296         </tb:band> 
     284  <tb:band name="standard" showAll="true"> 
     285    <tb:button type="create" label='<%= PropertyProvider.get("prm.document.tabs.create.button.tooltip") %>' /> 
     286    <tb:button type="modify" label='<%= PropertyProvider.get("prm.document.tabs.modify.button.tooltip") %>' /> 
     287    <tb:button type="remove" /> 
     288    <tb:button type="properties" label='<%= PropertyProvider.get("prm.document.tabs.properties.button.tooltip") %>' /> 
     289    <tb:button type="workflow" /> 
     290    <%if (!mySpace.equals(Space.PERSONAL_SPACE)) {%> 
     291      <tb:button type="security" /> 
     292    <%}%> 
     293  </tb:band>   
     294 
    297295</tb:toolbar> 
    298296<%    } 

  • trunk/core/web/jsp/form/FormList.jsp

    r17954 r17955  
    258258                <tb:button type="workflow" /> 
    259259        </tb:band> 
     260  <tb:band name="action" groupHeading="Form">  
     261    <tb:button type="custom" label='<%=PropertyProvider.get("prm.global.form.list.import.label")%>' function='<%= SessionManager.getJSPRootURL() + "/form/CSVImport.jsp?module=" + net.project.base.Module.FORM + "&action=" + net.project.security.Action.VIEW + "&id=" + form.getID()%>'/> 
     262    <tb:button type="custom" label='<%=PropertyProvider.get("prm.global.form.list.export.label")%>' function='javascript:exportCSV();'/> 
     263  </tb:band>   
    260264</tb:toolbar> 
    261265 
    …… 
    291295--%>                     
    292296                </td> 
    293                 <td align="right" class="tableContent"> 
    294         <a href="javascript:exportCSV();"><img border="0" src="<%=SessionManager.getJSPRootURL()%>/images/appicons/excel.gif">&nbsp;<display:get name="prm.global.form.list.export.label" /></a>&nbsp;&nbsp;|&nbsp;&nbsp; 
    295                 <a href="<%= SessionManager.getJSPRootURL() %>/form/CSVImport.jsp?module=<%=net.project.base.Module.FORM%>&action=<%=net.project.security.Action.VIEW%>&id=<%=form.getID()%>"><img border="0" src="<%=SessionManager.getJSPRootURL()%>/images/appicons/excel.gif">&nbsp;<display:get name="prm.global.form.list.import.label" /></a> 
     297                <td align="right" class="tableContent">&nbsp; 
    296298                </td>    
    297299                <td>&nbsp;&nbsp;&nbsp;</td> 

  • trunk/core/web/jsp/trashcan/ViewDeletedDocuments.jsp

    r17954 r17955  
    160160                </history:history> 
    161161        </tb:setAttribute> 
    162         <tb:band name="trashcan"> 
    163                 <tb:button type="undo_delete" label='<%= PropertyProvider.get("prm.document.main.undodelete.button.tooltip") %>' /> 
    164         </tb:band> 
    165162        <tb:band name="standard"> 
    166163                <tb:button type="properties" label='<%= PropertyProvider.get("prm.document.main.properties.button.tooltip") %>'/> 
    167164                <tb:button type="remove" /> 
    168165        </tb:band> 
     166        <tb:band name="trashcan"> 
     167          <tb:button type="undo_delete" label='<%= PropertyProvider.get("prm.document.main.undodelete.button.tooltip") %>' /> 
     168        </tb:band>   
    169169</tb:toolbar> 
    170170