Author: ktlili
Date: Tue Jun 19 17:05:28 2007
New Revision: 17648

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17648&repname=
=3Djahia
Log:
- add "unselect portlet" feature (PORTAL-120, only SP)
- fix acl bug with portlet: allow a user to update portlet if he's got R/W =
acces on field (PORTAL-122)

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/application_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp&rev=
=3D17648&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp Tue Jun 19 17:05:28 2007
@@ -22,6 +22,7 @@
 <%@ page import=3D"org.jahia.gui.GuiBean" %>
 <%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle" %>
 <%@ page import=3D"org.jahia.utils.JahiaTools" %>
+<%@ page import=3D"org.jahia.resourcebundle.*" %>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%!
@@ -35,6 +36,7 @@
     int appID =3D ((Integer) engineMap.get(theField.getDefinition().getNam=
e() + "_appID")).intValue();
     String selectedEntryPointDefName =3D (String) engineMap.get(theField.g=
etDefinition().getName() + "_selectedEntryPointDefName");
     final Enumeration appList =3D (Enumeration) engineMap.get("appList");
+    boolean appListIsEmpty =3D !appList.hasMoreElements();
     final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
     EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
     if (elh !=3D null) {
@@ -147,7 +149,7 @@
         </tr>
         <%}%>
         <tr>
-            <% if (!appList.hasMoreElements()) { %>
+            <% if (appListIsEmpty) { %>
             <td width=3D"100%">
                 <jahia:engineResourceBundle resourceName=3D"org.jahia.engi=
nes.shared.Application_Field.noWebApp.label"/>
             </td>
@@ -191,110 +193,124 @@
     </tbody>
 </table>
 =

-<%if (!unAuthorizedOnCurrentlySelectedWebapp) {%>
+<%
+    if (!unAuthorizedOnCurrentlySelectedWebapp && !appListIsEmpty) {
+
+%>
 <table class=3D"evenOddTable" border=3D"0" cellpadding=3D"5" cellspacing=
=3D"0" width=3D"100%">
-    <thead>
-        <th title=3D"roles">
-            <a href=3D"#roles">
-                <jahia:engineResourceBundle resourceName=3D"org.jahia.engi=
nes.shared.Application_Field.Roles"
+<thead>
+    <th title=3D"roles">
+        <a href=3D"#roles">
+            <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
shared.Application_Field.Roles"
                                         defaultValue=3D"Roles"/>
 =

-            </a>
-        </th>
-    </thead>
-    <tbody>
-        <tr class=3D"even">
-            <td>
-                <table>
-                    <%
+        </a>
+    </th>
+</thead>
+<tbody>
+    <tr class=3D"even">
+        <td>
+        <table>
+            <%
+                Vector roles =3D (Vector) engineMap.get("roles");
+                roleNb =3D roles.size();
 =

-               Vector roles =3D (Vector) engineMap.get("roles");
-               roleNb =3D roles.size();
-               if (roles.size() > 0) {
-                    %>
-                    <tr>
-                        <td colspan=3D"1">
-                            <jahia:engineResourceBundle
-                                    resourceName=3D"org.jahia.engines.shar=
ed.Application_Field.definesRoles.label"/>
-                        </td>
-                    </tr>
-                    <%
-
-                        HashMap applicationRoles =3D (HashMap) engineMap.g=
et(Application_Field.APPLICATION_ROLES);
-                        ArrayList roleMembersList =3D (ArrayList) applicat=
ionRoles.get(new Integer(appID));
-                        for (int i =3D 0; i < roles.size(); i++) {
-
-                    %>
-                    <tr>
-                        <td><br>
-                            <fieldset style=3D"padding: 5px;">
-                                <legend>
-                                    &nbsp;<b><%=3D(String) roles.get(i)%>
-                                </b>&nbsp;
-                                </legend>
-                                <%
-                                    HashSet membersSet =3D (HashSet) roleM=
embersList.get(i);
-                                    String[] textPattern =3D {"Principal",=
 "Provider, 6", "Name, " + userNameWidth, "Properties, 20"};
-                                    PrincipalViewHelper principalViewHelpe=
r =3D new PrincipalViewHelper(textPattern);
-                                %>
-                                <select class=3D"fontfix" name=3D"authMemb=
ers<%=3Di%>" size=3D"5" multiple=3D"multiple"
-                                        <%if (membersSet.size() =3D=3D 0) =
{%> disabled=3D"disabled" <%}%>>
-                                    <%
-                                        Iterator it =3D membersSet.iterato=
r();
-                                        while (it.hasNext()) {
-                                            Principal p =3D (Principal) it=
.next();
-                                    %>
-                                    <option value=3D"<%=3DprincipalViewHel=
per.getPrincipalValueOption(p)%>">
-                                        <%=3DprincipalViewHelper.getPrinci=
palTextOption(p)%>
-                                    </option>
-                                    <%
-                                        }
-                                        if (membersSet.size() =3D=3D 0) {
-                                    %>
-                                    <option value=3D"null">-- - -&nbsp;-
-                                        <jahia:engineResourceBundle
-                                                resourceName=3D"org.jahia.=
engines.shared.Application_Field.noMembersDefined.label"/>
-                                        -&nbsp;&nbsp;-&nbsp;&nbsp;- - --
-                                    </option>
-                                    <%
-                                        } %>
-                                </select>
-                            </fieldset>
-                        </td>
-                        <td>&nbsp;&nbsp;</td>
-
-                        <td>
-                            <% if (jParams.userIsAdmin() ||
-                                    theField.checkAdminAccess(jParams.getU=
ser()) ||
-                                    theField.checkWriteAccess(jParams.getU=
ser()) ||
-                                    theField.getID() < 0) { %>
-                            <a href=3D"javascript:puselectUsrGrp('<%=3Dsel=
ectUsrGrp%>', 'authMembers<%=3Di%>');">
-                                <jahia:engineResourceBundle
-                                        resourceName=3D"org.jahia.engines.=
shared.Application_Field.setUsersAndGroups.label"/>
-                            </a>
-                            <br><br>
-                            <a href=3D"javascript:removeSelectBox(document=
.mainForm.authMembers<%=3Di%>, '-- - -&nbsp;-&nbsp;&nbsp;- <jahia:engineRes=
ourceBundle resourceName=3D"org.jahia.engines.shared.Application_Field.noMo=
reMembers.label"/> -&nbsp;&nbsp;-&nbsp;&nbsp;- - --');">
+                if (roles.size() > 0) {
+
+            %>
+            <tr>
+                <td colspan=3D"1">
+                    <jahia:engineResourceBundle
+                            resourceName=3D"org.jahia.engines.shared.Appli=
cation_Field.definesRoles.label"/>
+                </td>
+            </tr>
+            <%
+
+
+                HashMap applicationRoles =3D (HashMap) engineMap.get(Appli=
cation_Field.APPLICATION_ROLES);
+                ArrayList roleMembersList =3D (ArrayList) applicationRoles=
.get(new Integer(appID));
+                for (int i =3D 0; i < roles.size(); i++) {
+
+
+            %>
+            <tr>
+                <td><br>
+                    <fieldset style=3D"padding: 5px;">
+                        <legend>
+                            &nbsp;<b><%=3D(String) roles.get(i)%>
+                        </b>&nbsp;
+                        </legend>
+                        <%
+                            HashSet membersSet =3D (HashSet) roleMembersLi=
st.get(i);
+                            String[] textPattern =3D {"Principal", "Provid=
er, 6", "Name, " + userNameWidth, "Properties, 20"};
+                            PrincipalViewHelper principalViewHelper =3D ne=
w PrincipalViewHelper(textPattern);
+                        %>
+                        <select class=3D"fontfix" name=3D"authMembers<%=3D=
i%>" size=3D"5" multiple=3D"multiple"
+                                <%if (membersSet.size() =3D=3D 0) {%> disa=
bled=3D"disabled" <%}%>>
+                            <%
+                                Iterator it =3D membersSet.iterator();
+                                while (it.hasNext()) {
+                                    Principal p =3D (Principal) it.next();
+                            %>
+                            <option value=3D"<%=3DprincipalViewHelper.getP=
rincipalValueOption(p)%>">
+                                <%=3DprincipalViewHelper.getPrincipalTextO=
ption(p)%>
+                            </option>
+                            <%
+                                }
+                                if (membersSet.size() =3D=3D 0) {
+                            %>
+                            <option value=3D"null">-- - -&nbsp;-
                                 <jahia:engineResourceBundle
-                                        resourceName=3D"org.jahia.engines.=
shared.Application_Field.removeUsersOrGroups.label"/>
-                            </a>
-                            <% } %>
-                        </td>
-                    </tr>
-                    <%
-                    }
-                } else if(counter>0) {
-                    %>
+                                        resourceName=3D"org.jahia.engines.=
shared.Application_Field.noMembersDefined.label"/>
+                                -&nbsp;&nbsp;-&nbsp;&nbsp;- - --
+                            </option>
+                            <%
+                                } %>
+                        </select>
+                    </fieldset>
+                </td>
+                <td>&nbsp;&nbsp;</td>
+
+                <td>
+                    <% if (jParams.userIsAdmin() ||
+                            theField.checkAdminAccess(jParams.getUser()) ||
+                            theField.checkWriteAccess(jParams.getUser()) ||
+                            theField.getID() < 0) { %>
+                    <a href=3D"javascript:puselectUsrGrp('<%=3DselectUsrGr=
p%>', 'authMembers<%=3Di%>');">
+                        <jahia:engineResourceBundle
+                                resourceName=3D"org.jahia.engines.shared.A=
pplication_Field.setUsersAndGroups.label"/>
+                    </a>
+                    <br><br>
+                    <a href=3D"javascript:removeSelectBox(document.mainFor=
m.authMembers<%=3Di%>, '-- - -&nbsp;-&nbsp;&nbsp;- <jahia:engineResourceBun=
dle resourceName=3D"org.jahia.engines.shared.Application_Field.noMoreMember=
s.label"/> -&nbsp;&nbsp;-&nbsp;&nbsp;- - --');">
+                        <jahia:engineResourceBundle
+                                resourceName=3D"org.jahia.engines.shared.A=
pplication_Field.removeUsersOrGroups.label"/>
+                    </a>
+                    <% } %>
+                </td>
+            </tr>
+            <%
+
+                }
+            } else if (counter > 0) {
+
+            %>
+            <tr>
+                <td colspan=3D"1">
                     <b>
                         <jahia:engineResourceBundle
                                 resourceName=3D"org.jahia.engines.shared.A=
pplication_Field.notDefineRoles.label"/>
                     </b>
+
                     <% } %>
-            </td>
-        </tr>
-    <tbody>
-</table>
+                </td>
+            </tr>
+            <tbody>
+        </table>
 </table>
-<%}%>
+<%
+    }
+
+%>
 =

 <script type=3D"text/javascript">
     <!--

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/application_field_displayTag.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/application_field_displayT=
ag.inc&rev=3D17648&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc Tue Jun 19 17:05:28 2007
@@ -1,18 +1,18 @@
 <%--
 Copyright 2002-2006 Jahia Ltd
 =

-Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L), =

-Version 1.0 (the "License"), or (at your option) any later version; you ma=
y =

-not use this file except in compliance with the License. You should have =

-received a copy of the License along with this program; if not, you may ob=
tain =

-a copy of the License at =

+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
 =

  http://www.jahia.org/license/
 =

-Unless required by applicable law or agreed to in writing, software =

-distributed under the License is distributed on an "AS IS" BASIS, =

-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =

-See the License for the specific language governing permissions and =

+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
 --%><%@ page language=3D"java" %>
 <%@ page import=3D"org.jahia.data.applications.ApplicationBean" %>
@@ -54,14 +54,14 @@
                }
                String portletSearchCastedValue =3D new 
String(portletSearchValue);
                portletSearchValue =3D portletSearchValue.toLowerCase();
-               =

+
                String portletSearchType =3D "portlet_type";
                String portletSearchTypeValue =3D 
request.getParameter(portletSearchTyp=
e);
                if(portletSearchTypeValue =3D=3D null){
                        portletSearchTypeValue =3D "all";
                }
-               =

-               =

+
+
        ArrayList resultRows =3D new ArrayList();
        Hashtable appPropsMap =3D new Hashtable();
        boolean containSelectedApp =3D false;
@@ -97,7 +97,7 @@
                                containSelectedApp =3D true;
                        }
                }
-               =

+
                // search by name
                        else 
if(portletSearchTypeValue.equalsIgnoreCase("name")){
                        if(name.indexOf(portletSearchValue) > -1){
@@ -107,7 +107,7 @@
                                        containSelectedApp =3D true;
                                }
                        }
-               } =

+               }
                //search by description
                else if(portletSearchTypeValue.equalsIgnoreCase("description")){
                        if(desc.indexOf(portletSearchValue) > -1){
@@ -138,30 +138,30 @@
                                        }
                                }
                }
-               =

+
                // get current context
                if(appID =3D=3D entryPointDef.getApplicationID() ){
                        currentApplicationContext =3D appBean.getName();
                }
-               =

+
         }
        }
-       =

+
        // set counter value
        counter =3D resultRows.size();
-    =

-    =

+
+
     request.setAttribute( "resultRows",resultRows);
     ParamEncoder encoder =3D new ParamEncoder(tableId);
     String paramPageName =3D encoder.encodeParameterName(TableTagParameter=
s.PARAMETER_PAGE);
        String paramPageValue =3D request.getParameter(paramPageName);
-       =

+
        String paramSort =3D encoder.encodeParameterName(TableTagParameters.PAR=
AMETER_SORT);
        String paramSortValue =3D request.getParameter(paramSort);
-       =

+
        String paramOrder =3D encoder.encodeParameterName(TableTagParameters.PA=
RAMETER_ORDER);
        String paramOrderValue =3D request.getParameter(paramOrder);
-       =

+
        String selectedName =3D "";
                String selectedContextName =3D "";
                String selectedDescription =3D "";
@@ -173,9 +173,9 @@
 <input type=3D"hidden" name=3D"<%=3DparamPageName%>" value=3D"<%=3DparamPa=
geValue%>"/>
 <input type=3D"hidden" name=3D"<%=3DparamSort%>" value=3D"<%=3DparamSortVa=
lue%>"/>
 <input type=3D"hidden" name=3D"<%=3DparamOrder%>" value=3D"<%=3DparamOrder=
Value%>"/>
-<% if(!unAuthorizedOnCurrentlySelectedWebapp) {%>
+<% if(!appListIsEmpty) {%>
 <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.shared.Appli=
cation_Field_displyTag.search.label"/>
-<input onkeyup=3D"javascript:doSeachOnEnterClick(event);"; id=3D"<%=3Dport=
letSearchName%>" name=3D"<%=3DportletSearchName%>" value=3D"<%=3DportletSea=
rchCastedValue%>"/>
+<input onkeyup=3D"javascript:doSeachOnEnterClick(event);" id=3D"<%=3Dportl=
etSearchName%>" name=3D"<%=3DportletSearchName%>" value=3D"<%=3DportletSear=
chCastedValue%>"/>
 <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.shared.Appli=
cation_Field_displyTag.searchBy.label"/>
 <select id=3D"<%=3DportletSearchType%>" name=3D"<%=3DportletSearchType%>" =
value=3D"<%=3DportletSearchTypeValue%>">
        <option value=3D"name" 
<%if(portletSearchTypeValue.equalsIgnoreCase("name=
")){%>selected <%}%>><%=3DtitleNameColumn%></option>
@@ -194,13 +194,13 @@
                        if(epDef !=3D null){
                                name =3D epDef.getName();
                                id =3D ""+epDef.getApplicationID();
-                       =

+
                                String currentFieldId =3D id+"_"+name;
                                ApplicationBean currentAppBean =3D 
(ApplicationBean)appPropsMap.get(id=
);
-                       =

+
                                // get description
                                String description =3D currentAppBean.getdesc();
-                               =

+
                                // check if portlet has a defnition. If it's 
the case, replace webapp =
definition by portlet definition
                                if(epDef instanceof 
PortletEntryPointDefinition){
                                        PortletDefinition curDef =3D 
((PortletEntryPointDefinition)epDef).get=
PortletDefinition();
@@ -210,39 +210,39 @@
                                                description =3D 
portletDesc.getDescription();
                                        }
                                }
-                               =

+
                                if(description =3D=3D null || 
description.equals("")){
                                                description =3D 
JahiaResourceBundle.getEngineResource("org.jahia.eng=
ines.shared.Application_Field_displyTag.portletNoDescription.label",jData.g=
etProcessingContext(),jData.getProcessingContext().getLocale());;
                                }
                                String contextName =3D currentAppBean.getName();
                                boolean isSelected =3D (appID =3D=3D 
currentAppBean.getID() && name.eq=
uals(selectedEntryPointDefName)) || (appID =3D=3D -1 && counter =3D=3D 0);
                                String selectedStyle =3D "";
-       =

+
                                if(isSelected){
                                        selectedStyle =3D "color:#5F77B0; 
font-weight: bold;";
                                        selectedName =3D name;
                                        selectedContextName =3D contextName;
                                        selectedDescription =3D description;
                                        selectedFieldId =3D currentFieldId;
-                               }       =

-   %>          =

+                               }
+   %>
        <%/* name  */%>
                <display:column  style=3D"<%=3DselectedStyle%>"  
title=3D"<%=3DtitleNam=
eColumn%>" sortable=3D"true" sortProperty=3D"name" headerClass=3D"sortable"=
 sortName=3D"page">
                        <div id=3D"name_<%=3DcurrentFieldId%>" 
onmouseover=3D"onmouseoverWebap=
p('<%=3DcurrentFieldId%>');" onmouseout=3D"onmouseoutWebapp('<%=3DcurrentFi=
eldId%>')" style=3D"cursor: pointer;"onclick=3D"javascript:changeSelectedWe=
bapp('<%=3DcurrentFieldId%>');">
                                <%=3Dname%>
-                       </div>                  =

+                       </div>
                </display:column>
-               =

+
                <display:column style=3D"<%=3DselectedStyle%>"  
title=3D"<%=3DtitleCont=
extColumn%>" sortable=3D"true" sortProperty=3D"name" headerClass=3D"sortabl=
e" sortName=3D"page">
                        <div id=3D"contextName_<%=3DcurrentFieldId%>" 
onmouseover=3D"onmouseov=
erWebapp('<%=3DcurrentFieldId%>');" onmouseout=3D"onmouseoutWebapp('<%=3Dcu=
rrentFieldId%>')"  style=3D"cursor: pointer;" onclick=3D"javascript:changeS=
electedWebapp('<%=3DcurrentFieldId%>');">
                                <%=3DcontextName%>
-                       </div>                  =

-                       <input style=3D"display:none;" 
id=3D"<%=3DcurrentFieldId%>" name=3D"_<=
%=3DtheField.getID()%>"  value=3D"<%=3DcurrentFieldId%>" type=3D"radio" onc=
hange=3D"javascript:check();javascript:handleActionChange('edit');" <%if(is=
Selected){%> checked <%}%>/>     =

+                       </div>
+                       <input  style=3D"display:none;" 
id=3D"<%=3DcurrentFieldId%>" name=3D"_=
<%=3DtheField.getID()%>"  value=3D"<%=3DcurrentFieldId%>" type=3D"radio" on=
change=3D"javascript:check();javascript:handleActionChange('edit');" <%if(i=
sSelected){%> checked <%}%>/>
                </display:column>
-               =

+
     <%/* description  */%>
     <display:column style=3D"<%=3DselectedStyle%>" title=3D"<%=3DtitleDesc=
riptionColumn%>" sortable=3D"true" headerClass=3D"sortable" maxLength=3D"25=
"><div id=3D"description_<%=3DcurrentFieldId%>" onmouseover=3D"onmouseoverW=
ebapp('<%=3DcurrentFieldId%>');" onmouseout=3D"onmouseoutWebapp('<%=3Dcurre=
ntFieldId%>')"  style=3D"cursor: pointer;"onclick=3D"javascript:changeSelec=
tedWebapp('<%=3DcurrentFieldId%>');"><%=3Ddescription%></div></display:colu=
mn>
-               =

+
                <display:footer>
                <tr>
                        <td><input style=3D"display:none;" 
id=3D"<%=3DselectedFieldId%>" name=
=3D"_<%=3DtheField.getID()%>"  value=3D"<%=3DselectedFieldId%>" type=3D"rad=
io" onchange=3D"javascript:check();javascript:handleActionChange('edit');" =
checked />       </td>
@@ -250,7 +250,7 @@
                        <td></td>
                <tr>
        </display:footer>
-               =

+
                <%/* porperties */%>
                <display:setProperty name=3D"paging.banner.placement" 
value=3D"bottom"/>
                <%}%>
@@ -258,10 +258,15 @@
 <%}%>
 <br/>
 <b>
-    <%if(selectedEntryPointDefName!=3Dnull){%>
+    <%if(selectedEntryPointDefName!=3Dnull && !selectedEntryPointDefName.e=
qualsIgnoreCase("")){%>
         <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.shar=
ed.Application_Field_displyTag.selectedPortlet.label"/>
-        <a href=3D"javascript:searchSelectedWebapp();"> \<%=3DcurrentAppli=
cationContext%>\<%=3DselectedEntryPointDefName%> </a> .
+        <a href=3D"javascript:searchSelectedWebapp();"><%=3DselectedEntryP=
ointDefName%> </a> .
+        <a title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.shared.Application_Field_displyTag.unselectedPortlet.label"/>" href=
=3D"javascript:changeSelectedWebapp('no_webapp');">
+            <img src=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/images/i=
cons/delete3.gif" alt=3D"search"  border=3D"0"/>
+        </a>
     <%}%>
+    <input style=3D"display:none;" id=3D"no_webapp" name=3D"_<%=3DtheField=
.getID()%>"  value=3D"-1" type=3D"radio" onchange=3D"javascript:check();jav=
ascript:handleActionChange('edit');" <%if(appID =3D=3D -1){%> checked <%}%>=
/>
+
 </b>
 <script type=3D"text/javascript">
     <!--
@@ -270,7 +275,15 @@
        check();
        handleActionChange('edit');
        return true;
-       =

+
+}
+
+function unselectedWebapp() {
+       document.getElementById('<%=3DappID%>').click();
+       check();
+       handleActionChange('edit');
+       return true;
+
 }
 =

 function searchSelectedWebapp() {
@@ -279,7 +292,7 @@
        check();
        handleActionChange('edit');
        return true;
-       =

+
 }
 =

 function onmouseoverWebapp(fieldId) {
@@ -294,11 +307,11 @@
        eleNameStyle =3D document.getElementById('name_'.concat(fieldId)).style;
        contextNameStyle =3D 
document.getElementById('contextName_'.concat(fieldI=
d)).style;
        descNameStyle =3D 
document.getElementById('description_'.concat(fieldId))=
.style;
-       =

+
        eleNameStyle.background =3D colorB;
        contextNameStyle.background =3D colorB;
        descNameStyle.background =3D colorB;
-       =

+
        eleNameStyle.color =3D colorT;
        contextNameStyle.color =3D colorT;
        descNameStyle.color =3D colorT;

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

Reply via email to