[xwiki-notifications] r6667 - in xwiki-products/xwiki-enterprise: branches/xwiki-enterprise-1.2/wiki/src/main/resources/XWiki trunk/wiki/src/main/resources/XWiki

Tue, 08 Jan 2008 06:47:29 -0800 

Author: sdumitriu
Date: 2008-01-08 15:47:20 +0100 (Tue, 08 Jan 2008)
New Revision: 6667

Modified:
   
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/wiki/src/main/resources/XWiki/XWikiGroupSheet
   
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/XWikiGroupSheet
Log:
XWIKI-1989: Show the "delete" button next to members in the group only when the 
group is edited
Some blank lines caused the rendered page to be invalid.


Modified: 
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/wiki/src/main/resources/XWiki/XWikiGroupSheet
===================================================================
--- 
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/wiki/src/main/resources/XWiki/XWikiGroupSheet
 2008-01-08 14:14:26 UTC (rev 6666)
+++ 
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/wiki/src/main/resources/XWiki/XWikiGroupSheet
 2008-01-08 14:47:20 UTC (rev 6667)
@@ -51,7 +51,6 @@
 ## display the new interface
 #if($interface == "new") 
 <div id="ajax-loader">$msg.get("ui.ajaxTable.loading")<br />
-
   <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..." 
title="Loading..." />
 </div>
 <div id="showLimits"></div>
@@ -59,18 +58,15 @@
 <tr><td>
        <table class="display">
        <thead class="theader">
-
         <tr>
         <td>$msg.get("rightsmanager.members")</td>
         #if($context.action == "inline")<td 
class="hmanage">$msg.get("rightsmanager.manage")</td>#end
         </tr>
        </thead>
-
        <tbody 
id="display1"><tr><td> </td></tr></tbody>
       </table>
     </td>
     <td valign="top">
-
       <div id="scrollbar1" class="scrollbar"><div 
class="inscrollbar"> </div></div>
     </td>
 </tr>
@@ -79,29 +75,24 @@
 #if($context.database == "xwiki") #set($mainwk = true) #end
 #if($context.action == "inline")
  <div id="addNewMember">
-
      <table>
      <tr><td class="addlabel">$msg.get("rightsmanager.addnewuser") 
#if(!$mainwk)</td>
          <td><select name="wiki" onchange="changeWiki(this);">
                <option value="local" 
selected="selected">$msg.get("rightsmanager.local")</option>
-
                <option 
value="global">$msg.get("rightsmanager.global")</option>
              </select></td>
          #else <input type="hidden" name="wiki" value="local" 
/></td> #end
        <td>
-
           <input id="userSuggest" type="text" size="30" name="newMember" 
autocomplete="off" onfocus="createSuggest(this, 'user');"/>
        </td>
        <td>
           <input type="button" id="addNewUser" class="button" 
value="$msg.get('add')" onclick="addNewMember('user', 
$('userSuggest').value);"/>
        </td>
     </tr>
-
     <tr>
        <td class="addlabel">$msg.get("rightsmanager.addnewgroup") 
#if(!$mainwk)</td>
          <td><select name="wiki" onchange="changeWiki(this);">
               <option value="local" 
selected="selected">$msg.get("rightsmanager.local")</option>
-
               <option 
value="global">$msg.get("rightsmanager.global")</option>
              </select></td>
          #else <input type="hidden" name="wiki" value="local" 
/></td> #end
@@ -116,10 +107,8 @@
 </table>
 </div>
 #end
-
 #set($url = $doc.getURL("view", "xpage=getgroupmembers"))
 #set($du = $msg.get("rightsmanager.duplicateuser"))
-
 {pre}
 <script type="text/javascript"> 
 //<![CDATA[
@@ -141,7 +130,7 @@
         $('errMsg').innerHTML = "";
      return new ajaxSuggest(input, { script: suggesturl, varname:'input' } );
 }
-  
+
 window.addNewMember = function(uorg, name)
 {
      //url = adduorg

Modified: 
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/XWikiGroupSheet
===================================================================
--- 
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/XWikiGroupSheet
 2008-01-08 14:14:26 UTC (rev 6666)
+++ 
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/XWikiGroupSheet
 2008-01-08 14:47:20 UTC (rev 6667)
@@ -51,7 +51,6 @@
 ## display the new interface
 #if($interface == "new") 
 <div id="ajax-loader">$msg.get("ui.ajaxTable.loading")<br />
-
   <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..." 
title="Loading..." />
 </div>
 <div id="showLimits"></div>
@@ -59,18 +58,15 @@
 <tr><td>
        <table class="display">
        <thead class="theader">
-
         <tr>
         <td>$msg.get("rightsmanager.members")</td>
         #if($context.action == "inline")<td 
class="hmanage">$msg.get("rightsmanager.manage")</td>#end
         </tr>
        </thead>
-
        <tbody 
id="display1"><tr><td> </td></tr></tbody>
       </table>
     </td>
     <td valign="top">
-
       <div id="scrollbar1" class="scrollbar"><div 
class="inscrollbar"> </div></div>
     </td>
 </tr>
@@ -79,29 +75,24 @@
 #if($context.database == "xwiki") #set($mainwk = true) #end
 #if($context.action == "inline")
  <div id="addNewMember">
-
      <table>
      <tr><td class="addlabel">$msg.get("rightsmanager.addnewuser") 
#if(!$mainwk)</td>
          <td><select name="wiki" onchange="changeWiki(this);">
                <option value="local" 
selected="selected">$msg.get("rightsmanager.local")</option>
-
                <option 
value="global">$msg.get("rightsmanager.global")</option>
              </select></td>
          #else <input type="hidden" name="wiki" value="local" 
/></td> #end
        <td>
-
           <input id="userSuggest" type="text" size="30" name="newMember" 
autocomplete="off" onfocus="createSuggest(this, 'user');"/>
        </td>
        <td>
           <input type="button" id="addNewUser" class="button" 
value="$msg.get('add')" onclick="addNewMember('user', 
$('userSuggest').value);"/>
        </td>
     </tr>
-
     <tr>
        <td class="addlabel">$msg.get("rightsmanager.addnewgroup") 
#if(!$mainwk)</td>
          <td><select name="wiki" onchange="changeWiki(this);">
               <option value="local" 
selected="selected">$msg.get("rightsmanager.local")</option>
-
               <option 
value="global">$msg.get("rightsmanager.global")</option>
              </select></td>
          #else <input type="hidden" name="wiki" value="local" 
/></td> #end
@@ -116,10 +107,8 @@
 </table>
 </div>
 #end
-
 #set($url = $doc.getURL("view", "xpage=getgroupmembers"))
 #set($du = $msg.get("rightsmanager.duplicateuser"))
-
 {pre}
 <script type="text/javascript"> 
 //<![CDATA[
@@ -141,7 +130,7 @@
         $('errMsg').innerHTML = "";
      return new ajaxSuggest(input, { script: suggesturl, varname:'input' } );
 }
-  
+
 window.addNewMember = function(uorg, name)
 {
      //url = adduorg

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to