Author: xlawrence
Date: Tue Nov 13 12:08:50 2007
New Revision: 28

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D28&repname=3D=
corporate_portal_templates_v3
Log:
make boxes work

Modified:
    trunk/src/jsp/common/box/box_declarations.jspf
    trunk/src/jsp/common/box/box_dispatcher.jsp

Modified: trunk/src/jsp/common/box/box_declarations.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/box_declarations.jspf&rev=3D28&repname=3Dcorporate_portal_templates_v3
=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
--- trunk/src/jsp/common/box/box_declarations.jspf (original)
+++ trunk/src/jsp/common/box/box_declarations.jspf Tue Nov 13 12:08:50 2007
@@ -15,46 +15,46 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%><%!
-String boxLayouts[] =3D {"left", "small", "medium", "large"};
-String boxStyles[] =3D {"", "light", "colored"};
-public String getLayoutCss (String layout, String resBundleID)
-throws JahiaException
-{
-
-    String css =3D "medium";
-    if (layout !=3D null) {
-        for (int  i =3D 0; i < boxLayouts.length; i++){
-            if ( layout.equals(ResourceBundleMarker.drawMarker(resBundleID=
,boxLayouts[i],"")) ){
-                css =3D boxLayouts[i];
-                break;
+    String boxLayouts[] =3D {"left", "small", "medium", "large"};
+    String boxStyles[] =3D {"", "light", "colored"};
+
+    public String getLayoutCss(String layout, String resBundleID)
+            throws JahiaException {
+
+        String css =3D "medium";
+        if (layout !=3D null) {
+            for (int i =3D 0; i < boxLayouts.length; i++) {
+                if (layout.equals(ResourceBundleMarker.drawMarker(resBundl=
eID, boxLayouts[i], ""))) {
+                    css =3D boxLayouts[i];
+                    break;
+                }
             }
         }
+        return css;
     }
-    return css;
-}
-public String getStyleCss (String style, String resBundleID)
-throws JahiaException
-{
-    String css =3D "";
-    if (style !=3D null) {
-        for (int  i =3D 0; i < boxStyles.length; i++){
-            if ( style.equals(ResourceBundleMarker.drawMarker(resBundleID,=
boxStyles[i],"")) ){
-                css =3D boxStyles[i];
-                break;
+
+    public String getStyleCss(String style, String resBundleID)
+            throws JahiaException {
+        String css =3D "";
+        if (style !=3D null) {
+            for (int i =3D 0; i < boxStyles.length; i++) {
+                if (style.equals(ResourceBundleMarker.drawMarker(resBundle=
ID, boxStyles[i], ""))) {
+                    css =3D boxStyles[i];
+                    break;
+                }
             }
         }
+        return css;
     }
-    return css;
-}
 %>
 <%
-//************************************************************************=
******
+    //********************************************************************=
**********
 //Define columns box type
 //************************************************************************=
******
-HashMap hashMap =3D new HashMap();
+    HashMap hashMap =3D new HashMap();
 =

 //Test all boxes
-ArrayList list =3D new ArrayList();
+    ArrayList list =3D new ArrayList();
 =

 //G=C3=A9n=C3=A9ral box
 /*list.add("files");
@@ -65,242 +65,242 @@
 =

 hashMap.put("boxTypes",list);*/
 =

-ArrayList list1 =3D new ArrayList();
-list1.add("iconLinks");
-list1.add("texts");
-hashMap.put("boxTypesHomeLeft",list1);
-
-ArrayList list2 =3D new ArrayList();
-list2.add("files");
-list2.add("links");
-list2.add("news");
-list2.add("texts");
-list2.add("products");
-list2.add("webapps");
-hashMap.put("boxTypesHomeMain",list2);
-
-ArrayList list3 =3D new ArrayList();
-list3.add("links");
-list3.add("texts");
-hashMap.put("boxTypesContentLeft",list3);
-
-ArrayList list4 =3D new ArrayList();
-list4.add("files");
-list4.add("links");
-list4.add("news");
-list4.add("texts");
-list4.add("products");
-list4.add("webapps");
-hashMap.put("boxTypesContentMain",list4);
-
-String requestedColumn =3D request.getParameter("column");
-String id =3D request.getParameter("id"); // must be different if this jsp=
 is called more than one time
-id =3D id =3D=3D null ? "" : "_" + id;
-
-ArrayList dropItemList =3D (ArrayList)hashMap.get(requestedColumn);
-String dropItem[] =3D (String[]) dropItemList.toArray(new String[0]);
-id =3D id =3D=3D null ? "" : "_" + id;
+    ArrayList list1 =3D new ArrayList();
+    list1.add("iconLinks");
+    list1.add("texts");
+    hashMap.put("boxTypesHomeLeft", list1);
+
+    ArrayList list2 =3D new ArrayList();
+    list2.add("files");
+    list2.add("links");
+    list2.add("news");
+    list2.add("texts");
+    list2.add("products");
+    list2.add("webapps");
+    hashMap.put("boxTypesHomeMain", list2);
+
+    ArrayList list3 =3D new ArrayList();
+    list3.add("links");
+    list3.add("texts");
+    hashMap.put("boxTypesContentLeft", list3);
+
+    ArrayList list4 =3D new ArrayList();
+    list4.add("files");
+    list4.add("links");
+    list4.add("news");
+    list4.add("texts");
+    list4.add("products");
+    list4.add("webapps");
+    hashMap.put("boxTypesContentMain", list4);
+
+    String requestedColumn =3D request.getParameter("column");
+    String id =3D request.getParameter("id"); // must be different if this=
 jsp is called more than one time
+    id =3D id =3D=3D null ? "" : "_" + id;
+
+    ArrayList dropItemList =3D (ArrayList) hashMap.get(requestedColumn);
+    String dropItem[] =3D (String[]) dropItemList.toArray(new String[0]);
+    id =3D id =3D=3D null ? "" : "_" + id;
 %>
 <content:declareContainerList
-    name=3D'<%=3D"boxContainer" + id%>' title=3D"Box Container"
-    titleKey=3D"boxContainer" bundleKey=3D"<%=3DresBundleID%>"
-    aliasNames=3D"boxContainer"
-    containerBeanName=3D"jahiatemplates.org.jahia.corporateportalv2.valida=
tion.beans.BoxValidationBean"
-    validatorKey=3D"boxValidationBean"
->
-  <content:declareContainer>
-    <content:declareField name=3D"<%=3D"boxTitle" + id%>"
-        title=3D"Title" type=3D"SmallText"
-        titleKey=3D"blog.title" bundleKey=3D"<%=3DresBundleID%>"
-        aliasNames=3D"boxTitle"
-    />
-    <content:declareField name=3D"<%=3D"boxType" + id%>"
-        title=3D"boxType" type=3D"SharedSmallText"
-        titleKey=3D"boxContainer.boxType" bundleKey=3D"<%=3DresBundleID%>"
-        value=3D"<%=3DgetMultivalues(resBundleID,dropItem)%>"
-        aliasNames=3D"boxType"
-    />
-    <content:declareField name=3D"<%=3D"boxLayout" + id%>"
-        title=3D"Layout" type=3D"SharedSmallText"
-        titleKey=3D"boxContainer.layout" bundleKey=3D"<%=3DresBundleID%>"
-        value=3D"<%=3DgetMultivalues(resBundleID,boxLayouts)%>"
-        aliasNames=3D"boxLayout"
-    />
-
-    <content:declareField name=3D"<%=3D"boxStyle" + id%>"
-        title=3D"Style" type=3D"SharedSmallText"
-        titleKey=3D"boxContainer.style" bundleKey=3D"<%=3DresBundleID%>"
-        value=3D"<%=3DgetMultivalues(resBundleID,boxStyles)%>"
-        aliasNames=3D"boxStyle"
-    />
-
-    <content:declareField name=3D"<%=3D"boxLink" + id%>"
-        title=3D"Link" type=3D"Page"
-        titleKey=3D"boxContainer.link" bundleKey=3D"<%=3DresBundleID%>"
-        aliasNames=3D"boxLink"
-    />
+        name=3D'<%=3D"boxContainer" + id%>' title=3D"Box Container"
+        titleKey=3D"boxContainer" bundleKey=3D"<%=3DresBundleID%>"
+        aliasNames=3D"boxContainer"
+        containerBeanName=3D"jahiatemplates.org.jahia.corporateportalv2.va=
lidation.beans.BoxValidationBean"
+        validatorKey=3D"boxValidationBean"
+        >
+<content:declareContainer>
+<content:declareField name=3D"boxTitle"
+                      title=3D"Title" type=3D"SmallText"
+                      titleKey=3D"blog.title" bundleKey=3D"<%=3DresBundleI=
D%>"
+                      aliasNames=3D"boxTitle"
+        />
+<content:declareField name=3D"boxType"
+                      title=3D"boxType" type=3D"SharedSmallText"
+                      titleKey=3D"boxContainer.boxType" bundleKey=3D"<%=3D=
resBundleID%>"
+                      value=3D"<%=3DgetMultivalues(resBundleID,dropItem)%>"
+                      aliasNames=3D"boxType"
+        />
+<content:declareField name=3D"boxLayout"
+                      title=3D"Layout" type=3D"SharedSmallText"
+                      titleKey=3D"boxContainer.layout" bundleKey=3D"<%=3Dr=
esBundleID%>"
+                      value=3D"<%=3DgetMultivalues(resBundleID,boxLayouts)=
%>"
+                      aliasNames=3D"boxLayout"
+        />
+
+<content:declareField name=3D"boxStyle"
+                      title=3D"Style" type=3D"SharedSmallText"
+                      titleKey=3D"boxContainer.style" bundleKey=3D"<%=3Dre=
sBundleID%>"
+                      value=3D"<%=3DgetMultivalues(resBundleID,boxStyles)%=
>"
+                      aliasNames=3D"boxStyle"
+        />
+
+<content:declareField name=3D"boxLink"
+                      title=3D"Link" type=3D"Page"
+                      titleKey=3D"boxContainer.link" bundleKey=3D"<%=3Dres=
BundleID%>"
+                      aliasNames=3D"boxLink"
+        />
 =

-    <%//----------------------------------------------------------------- =
%>
-    <content:declareContainerList
+<%//----------------------------------------------------------------- %>
+<content:declareContainerList
         name=3D'<%=3D"files" + id%>' title=3D"Files"
         titleKey=3D"boxContainer.filesContainer" bundleKey=3D"<%=3DresBund=
leID%>"
         aliasNames=3D"boxFiles"
-    >
-        <content:declareContainer>
-            <content:declareField name=3D"file"
-                title=3D"File" type=3D"File"
-                titleKey=3D"boxContainer.filesContainer.file" bundleKey=3D=
"<%=3DresBundleID%>"
-                aliasNames=3D"boxFile"
-            />
-            <content:declareField name=3D"fileDesc"
-                title=3D"Description" type=3D"BigText"
-                titleKey=3D"boxContainer.filesContainer.description" bundl=
eKey=3D"<%=3DresBundleID%>"
-                aliasNames=3D"boxFileDesc"
-            />
-        </content:declareContainer>
-    </content:declareContainerList>
+        >
+    <content:declareContainer>
+        <content:declareField name=3D"file"
+                              title=3D"File" type=3D"File"
+                              titleKey=3D"boxContainer.filesContainer.file=
" bundleKey=3D"<%=3DresBundleID%>"
+                              aliasNames=3D"boxFile"
+                />
+        <content:declareField name=3D"fileDesc"
+                              title=3D"Description" type=3D"BigText"
+                              titleKey=3D"boxContainer.filesContainer.desc=
ription" bundleKey=3D"<%=3DresBundleID%>"
+                              aliasNames=3D"boxFileDesc"
+                />
+    </content:declareContainer>
+</content:declareContainerList>
 =

-    <%//----------------------------------------------------------------- =
%>
-    <content:declareContainerList
+<%//----------------------------------------------------------------- %>
+<content:declareContainerList
         name=3D'<%=3D"links" + id%>' title=3D"Links only"
         titleKey=3D"boxContainer.links" bundleKey=3D"<%=3DresBundleID%>"
         aliasNames=3D"boxLinks"
-    >
-        <content:declareContainer>
-            <content:declareField name=3D'boxlink'
-                title=3D"Link" type=3D"Page"
-                titleKey=3D"boxContainer.links.link" bundleKey=3D"<%=3Dres=
BundleID%>"
-                value=3D"<jahia_linkonly>"
-                aliasNames=3D"boxLink"
-            />
-            <content:declareField name=3D'linkDesc'
-                title=3D"Description" type=3D"BigText"
-                titleKey=3D"boxContainer.links.description" bundleKey=3D"<=
%=3DresBundleID%>"
-                aliasNames=3D"boxLinkDesc"
-            />
-        </content:declareContainer>
-    </content:declareContainerList>
+        >
+    <content:declareContainer>
+        <content:declareField name=3D'boxlink'
+                              title=3D"Link" type=3D"Page"
+                              titleKey=3D"boxContainer.links.link" bundleK=
ey=3D"<%=3DresBundleID%>"
+                              value=3D"<jahia_linkonly>"
+                              aliasNames=3D"boxLink"
+                />
+        <content:declareField name=3D'linkDesc'
+                              title=3D"Description" type=3D"BigText"
+                              titleKey=3D"boxContainer.links.description" =
bundleKey=3D"<%=3DresBundleID%>"
+                              aliasNames=3D"boxLinkDesc"
+                />
+    </content:declareContainer>
+</content:declareContainerList>
 =

-    <%//----------------------------------------------------------------- =
%>
-    <content:declareContainerList
+<%//----------------------------------------------------------------- %>
+<content:declareContainerList
         name=3D'<%=3D"iconLinks" + id%>' title=3D"Links with icon"
         titleKey=3D"boxContainer.iconLinks" bundleKey=3D"<%=3DresBundleID%=
>"
         aliasNames=3D"boxLinks"
-    >
-        <content:declareContainer>
-            <content:declareField name=3D'boxlink'
-                title=3D"Link" type=3D"Page"
-                titleKey=3D"boxContainer.links.link" bundleKey=3D"<%=3Dres=
BundleID%>"
-                value=3D"<jahia_linkonly>"
-                aliasNames=3D"boxLink"
-            />
-
-            <content:declareField name=3D"linkIcon"
-              title=3D"Link icon"
-              titleKey=3D"header.linkIcon"
-              bundleKey=3D"<%=3DresBundleID%>"
-              type=3D"SharedSmallText"
-              value=3D"<%=3DgetMultivalues(resBundleID,topLinkIcons)%>"
-            />
+        >
+    <content:declareContainer>
+        <content:declareField name=3D'boxlink'
+                              title=3D"Link" type=3D"Page"
+                              titleKey=3D"boxContainer.links.link" bundleK=
ey=3D"<%=3DresBundleID%>"
+                              value=3D"<jahia_linkonly>"
+                              aliasNames=3D"boxLink"
+                />
+
+        <content:declareField name=3D"linkIcon"
+                              title=3D"Link icon"
+                              titleKey=3D"header.linkIcon"
+                              bundleKey=3D"<%=3DresBundleID%>"
+                              type=3D"SharedSmallText"
+                              value=3D"<%=3DgetMultivalues(resBundleID,top=
LinkIcons)%>"
+                />
 =

-        </content:declareContainer>
-    </content:declareContainerList>
+    </content:declareContainer>
+</content:declareContainerList>
 =

-    <%//----------------------------------------------------------------- =
%>
-    <content:declareContainerList
+<%//----------------------------------------------------------------- %>
+<content:declareContainerList
         name=3D'<%=3D"products" + id%>' title=3D"Products"
         titleKey=3D"boxContainer.products" bundleKey=3D"<%=3DresBundleID%>"
         aliasNames=3D"products"
-    >
-        <content:declareContainer>
-            <content:declareField name=3D"productName"
-                title=3D"Product name" type=3D"SmallText"
-                titleKey=3D"boxContainer.products.name" bundleKey=3D"<%=3D=
resBundleID%>"
-            />
-            <content:declareField name=3D"productImage"
-                title=3D"Product image" type=3D"File"
-                titleKey=3D"boxContainer.products.image" bundleKey=3D"<%=
=3DresBundleID%>"
-            />
-            <content:declareField name=3D"productImageLink"
-                title=3D"Product image link" type=3D"Page"
-                titleKey=3D"boxContainer.products.imageLink" bundleKey=3D"=
<%=3DresBundleID%>"
-            />
-            <content:declareField name=3D"productDesc"
-                title=3D"Product description" type=3D"BigText"
-                titleKey=3D"boxContainer.products.description" bundleKey=
=3D"<%=3DresBundleID%>"
-            />
-        </content:declareContainer>
-    </content:declareContainerList>
-
-    <content:declareContainerList name=3D'<%=3D"news" + id%>' title=3D"New=
s"
-        titleKey=3D"news" bundleKey=3D"<%=3DresBundleID%>"
-    >
-        <content:declareContainer>
-            <content:declareField name=3D"newsTitle"
-                title=3D"Title" type=3D"SmallText"
-                titleKey=3D"news.title" bundleKey=3D"<%=3DresBundleID%>"
-            />
-            <content:declareField name=3D"newsDesc"
-                title=3D"Description" type=3D"BigText"
-                titleKey=3D"news.description" bundleKey=3D"<%=3DresBundleI=
D%>"
-            />
-            <content:declareField name=3D"link"
-                title=3D"Link" type=3D"Page"
-                value=3D"<jahia_linkonly>"
-                titleKey=3D"news.link" bundleKey=3D"<%=3DresBundleID%>"
-            />
-            <content:declareField name=3D"date" title=3D"Date" type=3D"Dat=
e"
-                value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]>"
-                titleKey=3D"news.date" bundleKey=3D"<%=3DresBundleID%>"/>
-        </content:declareContainer>
-    </content:declareContainerList>
+        >
+    <content:declareContainer>
+        <content:declareField name=3D"productName"
+                              title=3D"Product name" type=3D"SmallText"
+                              titleKey=3D"boxContainer.products.name" bund=
leKey=3D"<%=3DresBundleID%>"
+                />
+        <content:declareField name=3D"productImage"
+                              title=3D"Product image" type=3D"File"
+                              titleKey=3D"boxContainer.products.image" bun=
dleKey=3D"<%=3DresBundleID%>"
+                />
+        <content:declareField name=3D"productImageLink"
+                              title=3D"Product image link" type=3D"Page"
+                              titleKey=3D"boxContainer.products.imageLink"=
 bundleKey=3D"<%=3DresBundleID%>"
+                />
+        <content:declareField name=3D"productDesc"
+                              title=3D"Product description" type=3D"BigTex=
t"
+                              titleKey=3D"boxContainer.products.descriptio=
n" bundleKey=3D"<%=3DresBundleID%>"
+                />
+    </content:declareContainer>
+</content:declareContainerList>
 =

-    <%//----------------------------------------------------------------- =
%>
-    <content:declareContainerList
+<content:declareContainerList name=3D'<%=3D"news" + id%>' title=3D"News"
+                              titleKey=3D"news" bundleKey=3D"<%=3DresBundl=
eID%>"
+        >
+    <content:declareContainer>
+        <content:declareField name=3D"newsTitle"
+                              title=3D"Title" type=3D"SmallText"
+                              titleKey=3D"news.title" bundleKey=3D"<%=3Dre=
sBundleID%>"
+                />
+        <content:declareField name=3D"newsDesc"
+                              title=3D"Description" type=3D"BigText"
+                              titleKey=3D"news.description" bundleKey=3D"<=
%=3DresBundleID%>"
+                />
+        <content:declareField name=3D"link"
+                              title=3D"Link" type=3D"Page"
+                              value=3D"<jahia_linkonly>"
+                              titleKey=3D"news.link" bundleKey=3D"<%=3Dres=
BundleID%>"
+                />
+        <content:declareField name=3D"date" title=3D"Date" type=3D"Date"
+                              value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]=
>"
+                              titleKey=3D"news.date" bundleKey=3D"<%=3Dres=
BundleID%>"/>
+    </content:declareContainer>
+</content:declareContainerList>
+
+<%//----------------------------------------------------------------- %>
+<content:declareContainerList
         name=3D'<%=3D"texts" + id%>' title=3D"Texts"
         titleKey=3D"boxContainer.texts" bundleKey=3D"<%=3DresBundleID%>"
         aliasNames=3D"boxTexts"
-    >
-        <content:declareContainer>
-            <content:declareField name=3D"text"
-                title=3D"Text" type=3D"BigText"
-                titleKey=3D"boxContainer.texts.text" bundleKey=3D"<%=3Dres=
BundleID%>"
-                aliasNames=3D"boxTextContent"
-            />
-        </content:declareContainer>
-    </content:declareContainerList>
+        >
+    <content:declareContainer>
+        <content:declareField name=3D"text"
+                              title=3D"Text" type=3D"BigText"
+                              titleKey=3D"boxContainer.texts.text" bundleK=
ey=3D"<%=3DresBundleID%>"
+                              aliasNames=3D"boxTextContent"
+                />
+    </content:declareContainer>
+</content:declareContainerList>
 =

-    <%//----------------------------------------------------------------- =
%>
-    <content:declareContainerList
+<%//----------------------------------------------------------------- %>
+<content:declareContainerList
         name=3D'<%=3D"webapps" + id%>' title=3D"Webapps"
         titleKey=3D"boxContainer.webapps" bundleKey=3D"<%=3DresBundleID%>"
         aliasNames=3D"boxWebapps"
-    >
-        <content:declareContainer>
-            <content:declareField name=3D"webapp"
-                title=3D"webapp" type=3D"Application"
-                titleKey=3D"boxContainer.webapps.webapp" bundleKey=3D"<%=
=3DresBundleID%>"
-                aliasNames=3D"boxWebapp"
-            />
-        </content:declareContainer>
-    </content:declareContainerList>
+        >
+    <content:declareContainer>
+        <content:declareField name=3D"webapp"
+                              title=3D"webapp" type=3D"Application"
+                              titleKey=3D"boxContainer.webapps.webapp" bun=
dleKey=3D"<%=3DresBundleID%>"
+                              aliasNames=3D"boxWebapp"
+                />
+    </content:declareContainer>
+</content:declareContainerList>
 =

-    <%//----------------------------------------------------------------- =
%>
-    <content:declareContainerList
+<%//----------------------------------------------------------------- %>
+<content:declareContainerList
         name=3D'<%=3D"lastNews" + id%>' title=3D"Last news"
         titleKey=3D"boxContainer.lastNews" bundleKey=3D"<%=3DresBundleID%>"
         aliasNames=3D"boxLastNews"
-    >
-        <content:declareContainer>
-            <content:declareField name=3D"max"
-                title=3D"Max news" type=3D"Integer"
-                titleKey=3D"boxContainer.lastNews.max" bundleKey=3D"<%=3Dr=
esBundleID%>"
-                value=3D"10"
-                aliasNames=3D"boxLastNewsMax"
-            />
-        </content:declareContainer>
-    </content:declareContainerList>
+        >
+    <content:declareContainer>
+        <content:declareField name=3D"max"
+                              title=3D"Max news" type=3D"Integer"
+                              titleKey=3D"boxContainer.lastNews.max" bundl=
eKey=3D"<%=3DresBundleID%>"
+                              value=3D"10"
+                              aliasNames=3D"boxLastNewsMax"
+                />
+    </content:declareContainer>
+</content:declareContainerList>
 =

-  </content:declareContainer>
+</content:declareContainer>
 </content:declareContainerList>
 =


Modified: trunk/src/jsp/common/box/box_dispatcher.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/box_dispatcher.jsp&rev=3D28&repname=3Dcorporate_portal_templates_v3
=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
--- trunk/src/jsp/common/box/box_dispatcher.jsp (original)
+++ trunk/src/jsp/common/box/box_dispatcher.jsp Tue Nov 13 12:08:50 2007
@@ -14,82 +14,100 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
---%><%@ include file=3D"../declarations.jspf"%>
-<%@ include file=3D"../common_vars.jspf"%>
+--%>
+<%@ include file=3D"../declarations.jspf" %>
+<%@ include file=3D"../common_vars.jspf" %>
 =

-<%@ include file=3D"box_declarations.jspf"%>
+<%@ include file=3D"box_declarations.jspf" %>
 =

 <content:containerList name=3D'<%=3D"boxContainer" + id%>' id=3D"boxContai=
nerList">
-  <jahiaHtml:actionMenu name=3D"boxContainerList" resourceBundle=3D"<%=3Dr=
esourceBundleName %>" useFieldSet=3D"true" namePostFix=3D".boxContainerList=
" >
-    <content:container id=3D"boxContainer">
-
-      <bean:define id=3D"files"           value=3D'<%=3DResourceBundleMark=
er.getValue(ResourceBundleMarker.drawMarker(resBundleID,"files",""),jParams=
.getLocale())%>'/>
-      <bean:define id=3D"links"           value=3D'<%=3DResourceBundleMark=
er.getValue(ResourceBundleMarker.drawMarker(resBundleID,"links",""),jParams=
.getLocale())%>'/>
-      <bean:define id=3D"iconLinks"       value=3D'<%=3DResourceBundleMark=
er.getValue(ResourceBundleMarker.drawMarker(resBundleID,"iconLinks",""),jPa=
rams.getLocale())%>'/>
-      <bean:define id=3D"webapps"         value=3D'<%=3DResourceBundleMark=
er.getValue(ResourceBundleMarker.drawMarker(resBundleID,"webapps",""),jPara=
ms.getLocale())%>'/>
-      <bean:define id=3D"news"        value=3D'<%=3DResourceBundleMarker.g=
etValue(ResourceBundleMarker.drawMarker(resBundleID,"news",""),jParams.getL=
ocale())%>'/>
-      <bean:define id=3D"texts"           value=3D'<%=3DResourceBundleMark=
er.getValue(ResourceBundleMarker.drawMarker(resBundleID,"texts",""),jParams=
.getLocale())%>'/>
-      <bean:define id=3D"products"        value=3D'<%=3DResourceBundleMark=
er.getValue(ResourceBundleMarker.drawMarker(resBundleID,"products",""),jPar=
ams.getLocale())%>'/>
-
-      <content:textField name=3D"<%=3D"boxType" + id%>" valueId=3D"boxType=
Value" display=3D"false" defaultValue=3D""/>
-      <content:textField name=3D"<%=3D"boxLayout" + id%>" valueId=3D"boxLa=
youtValue" display=3D"false" defaultValue=3D""/>
-      <content:textField name=3D"<%=3D"boxStyle" + id%>" valueId=3D"boxSty=
leValue" display=3D"false" defaultValue=3D""/>
-      <content:pageField valueId=3D"boxLink" name=3D"<%=3D"boxLink" + id%>=
" />
-
-      <bean:define id=3D"boxTypeRealValue" value=3D'<%=3DResourceBundleMar=
ker.getValue((String) pageContext.getAttribute("boxTypeValue"),jParams.getL=
ocale())%>'/>
-      <%
-      String layout =3D (String) pageContext.findAttribute("boxLayoutValue=
");
-      String style =3D getStyleCss((String) pageContext.findAttribute("box=
StyleValue"),resBundleID);
-      ContainerBean boxContainerBean =3D (ContainerBean) pageContext.findA=
ttribute("boxContainer");
-      JahiaContainer boxContainer =3D boxContainerBean.getJahiaContainer();
-      boolean isHome =3D new Boolean(request.getParameter("isHome"));
-      if(isHome && style.equals("colored")){
-      %>
-      <div class=3D"box <%=3DgetLayoutCss(layout,resBundleID)%>">
-        <div class=3D"colored">
-      <%}else{%>
-        <div class=3D"box <%=3DgetLayoutCss(layout,resBundleID)%> <%=3Dsty=
le%>">
-      <%}%>
-        <c:if test=3D"${!empty boxLink}">
-          <div class=3D"title-link">
-        </c:if>
-        <h1><content:textField name=3D"<%=3D"boxTitle" + id%>" diffActive=
=3D"true" defaultValue=3D"" valueId=3D"boxtitle"/><jahiaHtml:actionMenu nam=
ePostFix=3D".boxContainer" name=3D"boxContainer" resourceBundle=3D"<%=3Dres=
ourceBundleName %>" useFieldSet=3D"false"></jahiaHtml:actionMenu></h1>
-        <c:if test=3D"${!empty boxLink}"><a href=3D"<c:out value=3D"${boxL=
ink.url}" escapeXml=3D"false" />"><c:out value=3D"${boxLink.title}" escapeX=
ml=3D"false" /> =C2=BB</a></div></c:if>
-        <c:choose>
-          <c:when test=3D"${boxTypeRealValue =3D=3D files}">
-            <%@ include file=3D"files.jspf"%>
-          </c:when>
-          <c:when test=3D"${boxTypeRealValue =3D=3D iconLinks}">
-            <%@ include file=3D"iconLinks.jspf"%>
-          </c:when>
-          <c:when test=3D"${boxTypeRealValue =3D=3D links}">
-            <%@ include file=3D"links.jspf"%>
-          </c:when>
-          <c:when test=3D"${boxTypeRealValue =3D=3D webapps}">
-            <%@ include file=3D"webapps.jspf"%>
-          </c:when>
-          <c:when test=3D"${boxTypeRealValue =3D=3D news}">
-            <%@ include file=3D"news.jspf"%>
-          </c:when>
-          <c:when test=3D"${boxTypeRealValue =3D=3D products}">
-            <%@ include file=3D"products.jspf"%>
-          </c:when>
-          <c:otherwise>
-            <%@ include file=3D"texts.jspf"%>
-          </c:otherwise>
-        </c:choose>
-        <%if(isHome && style.equals("colored")){%>
-        </div>
-        <%}%>
-      </div>
-
-    </content:container>
+    <jahiaHtml:actionMenu name=3D"boxContainerList" resourceBundle=3D"<%=
=3DresourceBundleName%>" useFieldSet=3D"true"
+                          namePostFix=3D".boxContainerList">
+        <content:container id=3D"boxContainer">
+
+            <bean:define id=3D"files"
+                         value=3D'<%=3DResourceBundleMarker.getValue(Resou=
rceBundleMarker.drawMarker(resBundleID,"files",""),jParams.getLocale())%>'/>
+            <bean:define id=3D"links"
+                         value=3D'<%=3DResourceBundleMarker.getValue(Resou=
rceBundleMarker.drawMarker(resBundleID,"links",""),jParams.getLocale())%>'/>
+            <bean:define id=3D"iconLinks"
+                         value=3D'<%=3DResourceBundleMarker.getValue(Resou=
rceBundleMarker.drawMarker(resBundleID,"iconLinks",""),jParams.getLocale())=
%>'/>
+            <bean:define id=3D"webapps"
+                         value=3D'<%=3DResourceBundleMarker.getValue(Resou=
rceBundleMarker.drawMarker(resBundleID,"webapps",""),jParams.getLocale())%>=
'/>
+            <bean:define id=3D"news"
+                         value=3D'<%=3DResourceBundleMarker.getValue(Resou=
rceBundleMarker.drawMarker(resBundleID,"news",""),jParams.getLocale())%>'/>
+            <bean:define id=3D"texts"
+                         value=3D'<%=3DResourceBundleMarker.getValue(Resou=
rceBundleMarker.drawMarker(resBundleID,"texts",""),jParams.getLocale())%>'/>
+            <bean:define id=3D"products"
+                         value=3D'<%=3DResourceBundleMarker.getValue(Resou=
rceBundleMarker.drawMarker(resBundleID,"products",""),jParams.getLocale())%=
>'/>
+
+            <content:textField name=3D"boxType" valueId=3D"boxTypeValue" d=
isplay=3D"false" defaultValue=3D""/>
+            <content:textField name=3D"boxLayout" valueId=3D"boxLayoutValu=
e" display=3D"false" defaultValue=3D""/>
+            <content:textField name=3D"boxStyle" valueId=3D"boxStyleValue"=
 display=3D"false" defaultValue=3D""/>
+            <content:pageField valueId=3D"boxLink" name=3D"boxLink"/>
+
+            <bean:define id=3D"boxTypeRealValue"
+                         value=3D'<%=3DResourceBundleMarker.getValue((Stri=
ng) pageContext.getAttribute("boxTypeValue"),jParams.getLocale())%>'/>
+            <%
+                String layout =3D (String) pageContext.findAttribute("boxL=
ayoutValue");
+                String style =3D getStyleCss((String) pageContext.findAttr=
ibute("boxStyleValue"), resBundleID);
+                ContainerBean boxContainerBean =3D (ContainerBean) pageCon=
text.findAttribute("boxContainer");
+                JahiaContainer boxContainer =3D boxContainerBean.getJahiaC=
ontainer();
+                boolean isHome =3D new Boolean(request.getParameter("isHom=
e"));
+                if (isHome && style.equals("colored")) {
+            %>
+            <div class=3D"box <%=3DgetLayoutCss(layout, resBundleID)%>">
+            <div class=3D"colored">
+                <%} else {%>
+                <div class=3D"box <%=3DgetLayoutCss(layout,resBundleID)%> =
<%=3Dstyle%>">
+                    <%}%>
+                    <c:if test=3D"${!empty boxLink}">
+                    <div class=3D"title-link">
+                        </c:if>
+                        <h1><content:textField name=3D"boxTitle" diffActiv=
e=3D"true" defaultValue=3D""
+                                               valueId=3D"boxtitle"/><jahi=
aHtml:actionMenu namePostFix=3D".boxContainer"
+                                                                          =
               name=3D"boxContainer"
+                                                                          =
               resourceBundle=3D"<%=3DresourceBundleName %>"
+                                                                          =
               useFieldSet=3D"false"></jahiaHtml:actionMenu></h1>
+                        <c:if test=3D"${!empty boxLink}"><a
+                            href=3D"<c:out value=3D"${boxLink.url}" escape=
Xml=3D"false" />"><c:out value=3D"${boxLink.title}"
+                                                                          =
                   escapeXml=3D"false"/> =C2=BB</a>
+                    </div>
+                    </c:if>
+                    <c:choose>
+                        <c:when test=3D"${boxTypeRealValue =3D=3D files}">
+                            <%@ include file=3D"files.jspf" %>
+                        </c:when>
+                        <c:when test=3D"${boxTypeRealValue =3D=3D iconLink=
s}">
+                            <%@ include file=3D"iconLinks.jspf" %>
+                        </c:when>
+                        <c:when test=3D"${boxTypeRealValue =3D=3D links}">
+                            <%@ include file=3D"links.jspf" %>
+                        </c:when>
+                        <c:when test=3D"${boxTypeRealValue =3D=3D webapps}=
">
+                            <%@ include file=3D"webapps.jspf" %>
+                        </c:when>
+                        <c:when test=3D"${boxTypeRealValue =3D=3D news}">
+                            <%@ include file=3D"news.jspf" %>
+                        </c:when>
+                        <c:when test=3D"${boxTypeRealValue =3D=3D products=
}">
+                            <%@ include file=3D"products.jspf" %>
+                        </c:when>
+                        <c:otherwise>
+                            <%@ include file=3D"texts.jspf" %>
+                        </c:otherwise>
+                    </c:choose>
+                    <%if (isHome && style.equals("colored")) {%>
+                </div>
+                <%}%>
+            </div>
+        </content:container>
     </jahiaHtml:actionMenu>
     <content:addContainerURL id=3D"addBoxContainerURL" display=3D"false"/>
     <c:if test=3D"${!empty addBoxContainerURL}">
-      <br />
-      <a href=3D"<bean:write name=3D'addBoxContainerURL'/>">
-        <img src=3D"<content:contextURL/>/images/actions/component_add.gif=
" width=3D"16" height=3D"16" alt=3D"+" border=3D"0"/>&nbsp;&nbsp;<content:r=
esourceBundle resourceBundle=3D"jahiatemplates.default_v3_lang" resourceNam=
e=3D"action.boxContainers.add"/></a>
+        <br/>
+        <a href=3D"<bean:write name=3D'addBoxContainerURL'/>">
+            <img src=3D"<content:contextURL/>/images/actions/component_add=
.gif" width=3D"16" height=3D"16" alt=3D"+"
+                 border=3D"0"/>&nbsp;&nbsp;<content:resourceBundle resourc=
eBundle=3D"jahiatemplates.default_v3_lang"
+                                                                 resourceN=
ame=3D"action.boxContainers.add"/></a>
     </c:if>
-
 </content:containerList>
\ No newline at end of file

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

Reply via email to