Author: ktlili
Date: Thu Jun 7 15:15:51 2007
New Revision: 17508
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17508&repname=
=3Djahia
Log:
- fix for [AHIA-1655]: =
--> add user detail when double click on a user
--> resize group home size window
--> add popup mode (name and first name ar not editable) for user detail=
view
Modified:
trunk/core/src/webapp/jsp/jahia/administration/group_management/group_e=
dit.jsp
trunk/core/src/webapp/jsp/jahia/administration/user_management/user_edi=
t.jsp
Modified: trunk/core/src/webapp/jsp/jahia/administration/group_management/g=
roup_edit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/group_management/group_edit.jsp&rev=3D17508&repna=
me=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
--- trunk/core/src/webapp/jsp/jahia/administration/group_management/group_e=
dit.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/group_management/group_e=
dit.jsp Thu Jun 7 15:15:51 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.
--%><[EMAIL PROTECTED] language =3D "java" %>
<[EMAIL PROTECTED] import=3D"java.security.Principal" %>
@@ -65,6 +65,7 @@
}
document.mainForm.selectMember.options[i] =3D new Option(text, value);
document.mainForm.selectMember.disabled =3D false;
+
}
=
function addOptionsBalance()
@@ -83,6 +84,14 @@
selectAllOptionsSelectBox(document.mainForm.selectMember);
}
=
+function openUserDetail()
+{
+ params =3D "width=3D800px,height=3D750px,resizable=3Dyes,scrollbars=3D=
yes,status=3Dno";
+ uDetailurl =3D '<%=3DJahiaAdministration.composeActionURL(request,resp=
onse,"users","&isPopup=3Dtrue&sub=3Dedit&selectedUsers=3D")%>'+document.mai=
nForm.selectMember.value;
+ //alert(uDetailurl);
+ window.open(uDetailurl,"mywindow",params);
+}
+
</script>
=
<!-- Adiministration page position -->
@@ -117,7 +126,7 @@
<td>
<b><%=3DhomePageLabel%></b>
<input type=3D"hidden" name=3D"homePageLabel" value=3D"non=
e">
- <% String homePageURL =3D "javascript:OpenJahiaScrollableW=
indow('" + JahiaAdministration.composeActionURL(request,response,"groups","=
&sub=3Dhomepage&subaction=3Ddisplay&groupname=3D"+groupName) + "','SetUserH=
omePage', 500, 580)"; %>
+ <% String homePageURL =3D "javascript:OpenJahiaScrollableW=
indow('" + JahiaAdministration.composeActionURL(request,response,"groups","=
&sub=3Dhomepage&subaction=3Ddisplay&groupname=3D"+groupName) + "','SetUserH=
omePage', 800, 580)"; %>
<div class=3D"buttonList" style=3D"padding-top: 8px; paddi=
ng-bottom: 8px; display:inline">
<div class=3D"button" title=3D"<jahia:adminResourceBundl=
e resourceName=3D'org.jahia.admin.users.ManageGroups.altSetHomePageForThisG=
roup.label'/>">
<a href=3D"<%=3DhomePageURL%>"><jahia:adminResourceBun=
dle resourceName=3D"org.jahia.admin.select.label"/></a>
@@ -160,8 +169,7 @@
<select class=3D"fontfix" name=3D"selectMember" size=3D"25=
" multiple
<%if (groupMembersSet.size() =3D=3D 0) {%>disabled=
<%}%>
<%if (providerName.equals("jahia")){%>
- ondblclick=3D"javascript:removeSelectBox(document.=
mainForm.selectMember,
- '-- - - - - <jahia:ad=
minResourceBundle resourceName=3D"org.jahia.admin.users.ManageGroups.noMore=
Members.label"/> - - - - --');"
+ ondblclick=3D"javascript:openUserDetail();"
<%}%>
>
<%
@@ -214,7 +222,7 @@
</tr>
</table>
<br>
- =
+
<table class=3D"text" border=3D"0" width=3D"100%">
<tr>
<td> <!-- Does not work with select boxes :( -->
Modified: trunk/core/src/webapp/jsp/jahia/administration/user_management/us=
er_edit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/user_management/user_edit.jsp&rev=3D17508&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
--- trunk/core/src/webapp/jsp/jahia/administration/user_management/user_edi=
t.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/user_management/user_edi=
t.jsp Thu Jun 7 15:15:51 2007
@@ -46,6 +46,8 @@
}
}
String isSuperAdminProp =3D (String)request.getAttribute("isSuperAdmin=
Prop");
+ // when isPopup =3D true, name and firts name are not editable
+ boolean isPopup =3D request.getParameter("isPopup")!=3Dnull?true:false;
%>
<%!
public String getUserProp(UserProperties userProps, String propName) {
@@ -69,6 +71,20 @@
=
<!-- For future version : <script language=3D"javascript" src=3D"../search=
_options.js"></script> -->
<script language=3D"javascript" src=3D"<%=3D URL%>../javascript/selectbox.=
js"></script>
+
+<%if(isPopup){%>
+<script type=3D"text/javascript">
+ function closeWindowAndReloadParent(){
+ //close
+ self.close();
+ // reload opener without confirm post data box
+ //window.opener.location.href =3D opener.location.href ;
+ // window.opener.document.mainForm.sub.value=3D'edit';
+ //window.opener.document.mainForm.submit();
+ }
+</script>
+<%}%>
+
<script language=3D"javascript">
window.onunload =3D closeEngineWin;
</script>
@@ -254,17 +270,23 @@
<td>
<br>
<div class=3D"buttonList" style=3D"padding-top: 8px; paddi=
ng-bottom: 8px">
- <div class=3D"button" title=3D"<jahia:adminResourceBundl=
e resourceName=3D'org.jahia.admin.users.ManageUsers.applyModif.label'/>">
- <a href=3D"javascript:document.mainForm.submit();" ><j=
ahia:adminResourceBundle resourceName=3D"org.jahia.admin.ok.label"/></a>
+ <div class=3D"button" <%if(!isPopup){%>title=3D"<jahia:a=
dminResourceBundle resourceName=3D'org.jahia.admin.users.ManageUsers.applyM=
odif.label'/>"<%}%> >
+ <a href=3D"javascript:document.mainForm.submit();<%i=
f(isPopup){%>closeWindowAndReloadParent();<%}%>" ><jahia:adminResourceBundl=
e resourceName=3D"org.jahia.admin.ok.label"/></a>
</div>
- <div class=3D"button" title=3D"<jahia:adminResourceBundl=
e resourceName=3D'org.jahia.admin.returnUserList.label'/>">
+ <div class=3D"button" <%if(!isPopup){%>title=3D"<jahia=
:adminResourceBundle resourceName=3D'org.jahia.admin.returnUserList.label'/=
>"<%}%> >
<% if (isSuperAdminProp =3D=3D null) {
String cancelURL =3D JahiaAdministration.composeAction=
URL(request,response,"users","&sub=3Ddisplay");
- %>
+ if(isPopup){
+ cancelURL =3D "javascript:window.close();";
+ }
+ %>
<a href=3D"<%=3DcancelURL%>" ><jahia:adminResourceBund=
le resourceName=3D"org.jahia.admin.cancel.label"/></a>
<% } else {
String cancelURL =3D JahiaAdministration.composeAction=
URL(request,response,"displaymenu","");
- %>
+ if(isPopup){
+ cancelURL =3D "javascript:window.close();";
+ }
+ %>
<a href=3D"<%=3DcancelURL%>" ><jahia:adminResourceBund=
le resourceName=3D"org.jahia.admin.cancel.label"/></a>
<% } %>
</div>
@@ -279,7 +301,7 @@
<%=3D userMessage%>
</p>
<!-- -->
-
+ <%if(!isPopup){%>
<div id=3D"operationMenu" style=3D"clear:both">
<div id=3D"operationMenuLabel">
<jahia:adminResourceBundle
resourceName=3D"org.jahia.admin.otherOperati=
ons.label"/> :
@@ -291,4 +313,5 @@
</ul>
</div>
=
-</div>
\ No newline at end of file
+</div>
+<%}%>
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
