Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv1469/src/webapp/editors/community

Modified Files:
        preferenceform.jsp preferencesearch.jsp 
Log Message:
CMSC-944,Create overview screen for Community Preferences


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-944


Index: preferenceform.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/preferenceform.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- preferenceform.jsp  10 Jun 2008 11:55:03 -0000      1.1
+++ preferenceform.jsp  11 Jun 2008 03:11:41 -0000      1.2
@@ -1,4 +1,12 @@
    <table border="0">
+    <mm:hasrank minvalue="administrator">
+      <tr>
+         <td style="width: 150px"></td>
+         <td><img src="../gfx/icons/new.png" title="<fmt:message 
key="community.preference.add" />"/><fmt:message key="community.preference.new" 
/>
+         <input type="submit" name="createButton" onclick="create()" 
+               value="<fmt:message key="community.preference.create" />"/></td>
+      </tr>
+   </mm:hasrank>  
       <tr>
          <td style="width: 150px"><fmt:message key="community.preference.user" 
/></td>
          <td><html:text style="width: 250px" property="userId"/></td>
@@ -18,15 +26,7 @@
       <tr>
       <td style="width: 150px"></td>
       <td><input type="submit" name="submitButton" onclick="setOffset(0);" 
-               value="<fmt:message key="community.preference.submit" 
/>"/><c:forEach var="space" begin="1" end="15" step="1">&nbsp; </c:forEach>
-                  <mm:hasrank minvalue="administrator">
-          <a href="<mm:url page="PreferenceAction.do" >
-               <mm:param name="method">addInit</mm:param>
-                </mm:url>">
-
-               <img src="../gfx/icons/new.png" title="<fmt:message 
key="community.preference.add" />"/>New 
-          </a>
-             </mm:hasrank>
+               value="<fmt:message key="community.preference.submit" />"/>   
      </td>
    </tr>
    </table>


Index: preferencesearch.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/preferencesearch.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- preferencesearch.jsp        10 Jun 2008 11:55:03 -0000      1.1
+++ preferencesearch.jsp        11 Jun 2008 03:11:41 -0000      1.2
@@ -33,8 +33,27 @@
            );
         }
 
+         function deleteInfo(number,offset,resultLength) {
+            if(confirm('<fmt:message key="community.preference.delete.conform" 
/>')) {
+               if(resultLength == "1") {
+                  offset = eval(offset -1);
+               }
+               var url = "${actionUrl}?method=delete";
+               url += "&id="+number+"&offset="+offset;
+               document.location = url;
+            }
+            
+         }
+
+        function create() {
+            // var url = "${actionUrl}?method=addInit";
+           //  document.location = url;
+           document.forms[0].method.value = "addInit";
+           document.forms[0].offset.value = 0;
+           document.forms[0].submit();
+        }
         function postUpdate() {
-           alert('<fmt:message key="community.preference.update.success" />')
+           alert('<fmt:message key="community.preference.update.success" />');
         }
 
                </script>
@@ -56,7 +75,6 @@
 
      <div class="editor" style="height:500px">
       <div class="body">
-
          <mm:import id="searchinit"><c:url 
value='/editors/community/PreferenceAction.do'/></mm:import>
          <html:form action="/editors/community/PreferenceAction" method="post">
                        <html:hidden property="method" value="list"/>
@@ -68,7 +86,6 @@
        </div>
 
 <div class="ruler_green"><div><fmt:message key="community.preference.result" 
/></div></div>
-
 <div class="body">
 <mm:import jspvar="resultCount" vartype="Integer">${totalCount}</mm:import>
 <mm:import externid="offset" jspvar="offset" 
vartype="Integer">${offset}</mm:import>
@@ -86,24 +103,22 @@
             <tbody class="hover">
                 <c:set var="useSwapStyle">true</c:set>
                 <c:forEach var="preference" items="${results}" >
-                         <tr >
+                         <tr <c:if test="${useSwapStyle}">class="swap"</c:if>>
                             <td style="white-space:nowrap;">
-                        <c:if test="${action != 'select'}">
                                                         <mm:hasrank 
minvalue="administrator">
-                                   <a href="<mm:url page="PreferenceAction.do" 
>
-                                            <mm:param 
name="method">delete</mm:param>
-                                            <mm:param 
name="id">${preference.id}</mm:param>
-                                            <mm:param 
name="offset">${offset}</mm:param>
-                                             </mm:url>">
+                                   <a 
href="javascript:deleteInfo('${preference.id}','${offset}',${fn:length(results)})">
                                            <img src="../gfx/icons/delete.png" 
title="<fmt:message key="community.preference.delete" />"/></a>
                                </mm:hasrank>
-                              </c:if>              
                          </td>
                          <td><a 
href="${userActionUrl}?authid=${preference.authenticationId}"><c:out  
value="${preference.userId}"/></a></td>
                              <td ><c:out  value="${preference.module}"/></td>
                          <td ><input type="text" name="key" 
id="key_${preference.id}"  value="<c:out  value="${preference.key}"/>"/></td>
                          <td ><input type="text" name="value" 
id="value_${preference.id}"  value="<c:out  
value="${preference.value}"/>"/></td>
-                         <td><a 
href="javascript:update('${preference.id}')"><fmt:message key="view.submit" 
/></a></td>
+                         <td>
+                          <mm:hasrank minvalue="administrator">
+                         <a 
href="javascript:update('${preference.id}')"><fmt:message key="view.submit" 
/></a>
+                          </mm:hasrank>     
+                         </td>
                          </tr>
                       <c:set var="useSwapStyle">${!useSwapStyle}</c:set>
                   </c:forEach>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to