folderDocumentBox.jsp project.jsp

pvollenweider Tue, 16 Oct 2007 00:53:23 -0700

Author: pvollenweider
Date: Tue Oct 16 09:53:15 2007
New Revision: 810

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D810&repname=
=3Dcorporate_portal_templates_v2
Log:
Fix resource bundle path


Modified:
    branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/list.inc
    branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp
    branches/JAHIA-5-0-SP-BRANCH/src/jsp/project.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/list.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/list.inc&rev=3D810&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/list.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/list.inc Tue Oct 16 09:53:15=
 2007
@@ -45,7 +45,7 @@
             =

             if (jParams.getUser().isAdminMember( jParams.getSiteID() )) { =

                 jData.gui().html().drawBeginActionMenu(blogsBean ,
-                        null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates", null, out);            =

+                        null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates_v2", null, out);            =

             }
 =

             // get all pages with template definition name "Blog"
@@ -152,7 +152,7 @@
             <%
             if (jParams.getUser().isAdminMember( jParams.getSiteID() )) { =

                 jData.gui().html().drawEndActionMenu(blogsBean ,
-                        null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates", null, out);            =

+                        null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates_v2", null, out);            =

             }
             %>
         </content:containerList>

Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/folderDocumentBox.jsp&rev=3D810&repname=3Dcorporate_por=
tal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp (origina=
l)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp Tue Oct =
16 09:53:15 2007
@@ -179,7 +179,7 @@
 <tr><td <%if (editMode){%>class=3D"boxEPbordercolor1"<%}%>><table width=3D=
"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"2">
 <content:containerList name=3D'<%=3D"contentContainer" + id%>' id=3D"conte=
ntContainerList">
     <tr><td><table width=3D"100%" border=3D"0"><content:container id=3D"co=
ntentContainer">
-            <tr><td><jahiaHtml:actionMenu name=3D"contentContainer" namePo=
stFix=3D"" resourceBundle=3D"jahiatemplates.Corporate_portal_templates">
+            <tr><td><jahiaHtml:actionMenu name=3D"contentContainer" namePo=
stFix=3D"" resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2">
             <content:containerDiffHighlight id=3D"contentContainerHighLigh=
t" name=3D"contentContainer"/>
                        <content:textField name=3D'<%=3D"subTitle" + id%>' 
defaultValue=3D"" di=
ffActive=3D"true" display=3D"false" valueId=3D"subTitle"/>
             <logic:notEmpty name=3D"subTitle">
@@ -211,7 +211,7 @@
 =

 <content:addContainerURL id=3D"addContentContainerUrl" display=3D"none"/>
 <logic:present name=3D"addContentContainerUrl">
-    <a href=3D"<bean:write name=3D'addContentContainerUrl'/>"><img src=3D'=
<content:contextURL/>/img/add.gif' border=3D0>&nbsp;<%=3DResourceBundle.get=
Bundle("jahiatemplates.Corporate_portal_templates",jData.params().getLocale=
()).getString("addText")%></a>
+    <a href=3D"<bean:write name=3D'addContentContainerUrl'/>"><img src=3D'=
<content:contextURL/>/img/add.gif' border=3D0>&nbsp;<%=3DResourceBundle.get=
Bundle("jahiatemplates.Corporate_portal_templates_v2",jData.params().getLoc=
ale()).getString("addText")%></a>
 </logic:present>
 =

 </content:containerList><%}%>
@@ -242,7 +242,7 @@
                         <td class=3D"nowrap">&#160;<bean:write name=3D'fil=
eObject' property=3D'formatedSize' filter=3D"false"/>&#160;</td>
                         <td class=3D"nowrap">/&#160;<bean:write name=3D'fi=
leObject' property=3D'formatedLastModifDate' filter=3D"false"/>&#160;</td>
                        <logic:equal name=3D"filesContainer" property=3D"acti=
onURIsEmpty" value=3D"false">
-                        <td align=3D"right"><jahiaHtml:actionMenu name=3D"=
filesContainer" namePostFix=3D"" resourceBundle=3D"jahiatemplates.Corporate=
_portal_templates" useFieldSet=3D"false"/></td>
+                        <td align=3D"right"><jahiaHtml:actionMenu name=3D"=
filesContainer" namePostFix=3D"" resourceBundle=3D"jahiatemplates.Corporate=
_portal_templates_v2" useFieldSet=3D"false"/></td>
                        </logic:equal>
                 </tr>
                 <tr class=3D"boxEPcontentcolor1">
@@ -262,7 +262,7 @@
 </content:containerList>
 </table></td></tr></table>
 <%if (editMode){%><br><%}%>
-<jahiaHtml:actionMenu name=3D"filesContainerList" namePostFix=3D"" resourc=
eBundle=3D"jahiatemplates.Corporate_portal_templates"
+<jahiaHtml:actionMenu name=3D"filesContainerList" namePostFix=3D"" resourc=
eBundle=3D"jahiatemplates.Corporate_portal_templates_v2"
     useFieldSet=3D"false" actionIcon=3D'<%=3DcontextURL + "/img/box_upload=
.gif"%>' labelKey=3D"uploadFile">
 </jahiaHtml:actionMenu><%}%>
 <%if ((linkSize > 0) || (editMode)){
@@ -280,7 +280,7 @@
                 <td valign=3D"top" width=3D"100%"><a class=3D"box" <logic:=
equal name=3D"link" property=3D"type" value=3D"2">target=3D"_new"</logic:eq=
ual> href=3D"<bean:write name=3D'link' property=3D'url'/>">
                         <b><bean:write name=3D"link" property=3D"title" fi=
lter=3D"false"/></b></a>
                         <%=3DgetPath(linkBean.getJahiaPage(), jData)%></td>
-                        <td align=3D"right"><jahiaHtml:actionMenu name=3D"=
linksContainer" namePostFix=3D"" resourceBundle=3D"jahiatemplates.Corporate=
_portal_templates" useFieldSet=3D"false"/></td>
+                        <td align=3D"right"><jahiaHtml:actionMenu name=3D"=
linksContainer" namePostFix=3D"" resourceBundle=3D"jahiatemplates.Corporate=
_portal_templates_v2" useFieldSet=3D"false"/></td>
                </tr>
                 <content:textField valueId=3D"linkDesc" name=3D'linkDesc' =
display=3D"false" defaultValue=3D""/>
                        <logic:notEmpty name=3D"linkDesc">
@@ -292,7 +292,7 @@
                 <logic:empty name=3D"link">
                    <logic:equal name=3D"currentRequest" property=3D"editMode" 
va=
lue=3D"true">
                        <td valign=3D"top">-</td>
-                       <td valign=3D"top"><content:resourceBundle 
resourceBundle=
=3D"jahiatemplates.Corporate_portal_templates" resourceName=3D"noLink"/></t=
d></tr>
+                       <td valign=3D"top"><content:resourceBundle 
resourceBundle=
=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"noLink"/>=
</td></tr>
                    </logic:equal>
                 </logic:empty>
             </content:pageField>
@@ -305,7 +305,7 @@
 <content:containerList name=3D'<%=3D"linksContainer" + id%>'>
 <content:addContainerURL id=3D"addLinksContainerUrl" display=3D"none"/>
 <logic:present name=3D"addLinksContainerUrl">
-    <a href=3D"<bean:write name=3D'addLinksContainerUrl'/>"><img src=3D'<c=
ontent:contextURL/>/img/add.gif' border=3D0>&nbsp;<%=3DResourceBundle.getBu=
ndle("jahiatemplates.Corporate_portal_templates",jData.params().getLocale()=
).getString("addLink")%></a>
+    <a href=3D"<bean:write name=3D'addLinksContainerUrl'/>"><img src=3D'<c=
ontent:contextURL/>/img/add.gif' border=3D0>&nbsp;<%=3DResourceBundle.getBu=
ndle("jahiatemplates.Corporate_portal_templates_v2",jData.params().getLocal=
e()).getString("addLink")%></a>
 </logic:present>
 </content:containerList><%}
 if (jData.gui().isEditMode()) {%><img src=3D"<content:contextURL/>/img/pix=
.gif" alt=3D"" width=3D"147" height=3D"12"/><%}%>
\ No newline at end of file

Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/project.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/project.jsp&rev=3D810&repname=3Dcorporate_portal_templates_=
v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/project.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/project.jsp Tue Oct 16 09:53:15 20=
07
@@ -86,11 +86,11 @@
         }
         if (!jData.gui().html().drawAddContainerLauncher( linkContainerLis=
t ).equals("")) {
             %>
-            <br/><a class=3D"horizontaleline" href=3D"javascript:<%=3DjDat=
a.gui().html().drawAddContainerLauncher( linkContainerList )%>"><%=3DaddBut=
ton%>&#160;<content:resourceBundle resourceBundle=3D"jahiatemplates.Corpora=
te_portal_templates" resourceName=3D"addFolder"/></a><br/>
+            <br/><a class=3D"horizontaleline" href=3D"javascript:<%=3DjDat=
a.gui().html().drawAddContainerLauncher( linkContainerList )%>"><%=3DaddBut=
ton%>&#160;<content:resourceBundle resourceBundle=3D"jahiatemplates.Corpora=
te_portal_templates_v2" resourceName=3D"addFolder"/></a><br/>
             <%
         }
         if (!jData.gui().html().drawContainerListPropertiesLauncher( linkC=
ontainerList ).equals("")) {
-            %><a href=3D"javascript:<%=3DjData.gui().html().drawContainerL=
istPropertiesLauncher( linkContainerList )%>"><%=3DupdateButton%>&#160;<con=
tent:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templ=
ates" resourceName=3D"sortAndProperties"/></a><br/><%
+            %><a href=3D"javascript:<%=3DjData.gui().html().drawContainerL=
istPropertiesLauncher( linkContainerList )%>"><%=3DupdateButton%>&#160;<con=
tent:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templ=
ates_v2" resourceName=3D"sortAndProperties"/></a><br/><%
         }
     }
 %>

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

svn commit: [corporate_portal_templates_v2] r810 - in /branches/JAHIA-5-0-SP-BRANCH/src/jsp: blogs/list.inc doc/folderDocumentBox.jsp project.jsp

Reply via email to