Author: tmortagne
Date: 2007-11-07 17:31:40 +0100 (Wed, 07 Nov 2007)
New Revision: 5699
Modified:
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1/
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1/src/main/resources/Panels/GlobalRightsEditorWelcome
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1/src/main/resources/Panels/RightsEditorWelcome
Log:
XWIKI-1780: Improve rights management
* remove "Add right" button from right panel when in "new" rights management ui.
Property changes on:
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1
___________________________________________________________________
Name: svn:ignore
- *.iml
target
.project
*.ipr
*.iws
+ *.iml
target
.project
*.ipr
*.iws
.classpath
Modified:
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1/src/main/resources/Panels/GlobalRightsEditorWelcome
===================================================================
---
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1/src/main/resources/Panels/GlobalRightsEditorWelcome
2007-11-07 16:03:58 UTC (rev 5698)
+++
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1/src/main/resources/Panels/GlobalRightsEditorWelcome
2007-11-07 16:31:40 UTC (rev 5699)
@@ -12,13 +12,14 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1164621584000</creationDate>
-<date>1166177444000</date>
-<contentUpdateDate>1169801141000</contentUpdateDate>
-<version>1.11</version>
+<date>1194360373000</date>
+<contentUpdateDate>1194360373000</contentUpdateDate>
+<version>1.2</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
+<comment></comment>
<object>
<class>
<name>Panels.PanelClass</name>
@@ -29,91 +30,128 @@
<defaultWeb></defaultWeb>
<nameField></nameField>
<validationScript></validationScript>
-<type>
-<name>type</name>
-<prettyName>Panel type</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
+<category>
+<cache>0</cache>
<displayType>select</displayType>
<multiSelect>0</multiSelect>
-<size>1</size>
-<separator> </separator>
-<separators> ,|</separators>
-<values>view|edit</values>
-<number>2</number>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</type>
-<category>
<name>category</name>
+<number>5</number>
<prettyName>Category</prettyName>
-<unmodifiable>0</unmodifiable>
<relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<size>1</size>
<separator> </separator>
<separators> ,|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
<values>Information|Navigation|Tools|Administration|Other</values>
-<number>5</number>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</category>
+<content>
+<editor>Text</editor>
+<name>content</name>
+<number>4</number>
+<prettyName>Content</prettyName>
+<rows>25</rows>
+<size>60</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+</content>
<description>
+<editor>Text</editor>
<name>description</name>
+<number>3</number>
<prettyName>Description</prettyName>
+<rows>5</rows>
+<size>40</size>
<unmodifiable>0</unmodifiable>
-<size>40</size>
-<rows>5</rows>
-<number>3</number>
-<editor>Text</editor>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</description>
-<content>
-<name>content</name>
-<prettyName>Content</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
-<rows>25</rows>
-<number>4</number>
-<editor>Text</editor>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</content>
<name>
<name>name</name>
+<number>1</number>
<prettyName>Name</prettyName>
+<size>40</size>
<unmodifiable>0</unmodifiable>
-<size>40</size>
-<number>1</number>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</name>
+<type>
+<cache>0</cache>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>type</name>
+<number>2</number>
+<prettyName>Panel type</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
+<values>view|edit</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</type>
</class>
<name>Panels.GlobalRightsEditorWelcome</name>
<number>0</number>
<className>Panels.PanelClass</className>
<property>
-<type>edit</type>
+<category>Information</category>
</property>
<property>
+<content>#largepanelheader($msg.get("welcome"))
+<div>Welcome to the global rights editor.</div>
+<div>Rights applied to a space replace rights applied to the whole
wiki.</div>
+<div><strong>Warning</strong>: Without any authentication
forcing and any rights specified a Wiki is public for viewing and editing by
default.</div>
+#if($xwiki.rightsmanager.defaultUi == "stable")
+<form id="objectadd" method="post" action="$doc.getURL("objectadd")"
onsubmit="cancelCancelEdit()">
+<div class="centered padded">
+<input type="hidden" name="xredirect" value="$xwiki.requestURL"/>
+<input type="hidden" name="classname" value="XWiki.XWikiGlobalRights"/>
+<input type="submit" value="$msg.get("addrightentry")" class="button"/>
+</div>
+</form>
+#end
+#panelfooter()</content>
+</property>
+<property>
<description>Global Rights Panel</description>
</property>
<property>
-<category>Information</category>
+<name>GlobalRightsEditorWelcome</name>
</property>
<property>
-<content>#largepanelheader($msg.get("welcome"))
-<div>Welcome to the global rights editor.</div>
-<div>Rights applied to a space replace rights applied to the whole
wiki.</div>
-<div><strong>Warning</strong>: Without any authentication
forcing and any rights specified a Wiki is public for viewing and editing by
default.</div>
-<form id="objectadd" method="post" action="$doc.getURL("objectadd")"
onsubmit="cancelCancelEdit()">
-<div class="centered padded">
-<input type="hidden" name="xredirect" value="$xwiki.requestURL"/>
-<input type="hidden" name="classname" value="XWiki.XWikiGlobalRights"/>
-<input type="submit" value="$msg.get("addrightentry")" class="button"/>
-</div>
-</form>
-#panelfooter()</content>
+<type>edit</type>
</property>
+</object>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>Panels.GlobalRightsEditorWelcome</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
<property>
-<name>GlobalRightsEditorWelcome</name>
+<tags/>
</property>
</object>
<content>#includeForm("Panels.PanelSheet")</content>
Modified:
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1/src/main/resources/Panels/RightsEditorWelcome
===================================================================
---
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1/src/main/resources/Panels/RightsEditorWelcome
2007-11-07 16:03:58 UTC (rev 5698)
+++
xwiki-platform/xwiki-applications/branches/xwiki-application-panels-1.1/src/main/resources/Panels/RightsEditorWelcome
2007-11-07 16:31:40 UTC (rev 5699)
@@ -12,13 +12,14 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1154255594000</creationDate>
-<date>1166177445000</date>
-<contentUpdateDate>1169801141000</contentUpdateDate>
-<version>1.18</version>
+<date>1194360323000</date>
+<contentUpdateDate>1194360323000</contentUpdateDate>
+<version>1.3</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
+<comment></comment>
<object>
<class>
<name>Panels.PanelClass</name>
@@ -29,91 +30,128 @@
<defaultWeb></defaultWeb>
<nameField></nameField>
<validationScript></validationScript>
-<type>
-<name>type</name>
-<prettyName>Panel type</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
+<category>
+<cache>0</cache>
<displayType>select</displayType>
<multiSelect>0</multiSelect>
-<size>1</size>
-<separator> </separator>
-<separators> ,|</separators>
-<values>view|edit</values>
-<number>2</number>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</type>
-<category>
<name>category</name>
+<number>5</number>
<prettyName>Category</prettyName>
-<unmodifiable>0</unmodifiable>
<relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<size>1</size>
<separator> </separator>
<separators> ,|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
<values>Information|Navigation|Tools|Administration|Other</values>
-<number>5</number>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</category>
+<content>
+<editor>Text</editor>
+<name>content</name>
+<number>4</number>
+<prettyName>Content</prettyName>
+<rows>25</rows>
+<size>60</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+</content>
<description>
+<editor>Text</editor>
<name>description</name>
+<number>3</number>
<prettyName>Description</prettyName>
+<rows>5</rows>
+<size>40</size>
<unmodifiable>0</unmodifiable>
-<size>40</size>
-<rows>5</rows>
-<number>3</number>
-<editor>Text</editor>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</description>
-<content>
-<name>content</name>
-<prettyName>Content</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
-<rows>25</rows>
-<number>4</number>
-<editor>Text</editor>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</content>
<name>
<name>name</name>
+<number>1</number>
<prettyName>Name</prettyName>
+<size>40</size>
<unmodifiable>0</unmodifiable>
-<size>40</size>
-<number>1</number>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</name>
+<type>
+<cache>0</cache>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>type</name>
+<number>2</number>
+<prettyName>Panel type</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>1</size>
+<unmodifiable>0</unmodifiable>
+<values>view|edit</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</type>
</class>
<name>Panels.RightsEditorWelcome</name>
<number>0</number>
<className>Panels.PanelClass</className>
<property>
-<type>edit</type>
+<category>Information</category>
</property>
<property>
+<content>#largepanelheader($msg.get("welcome"))
+<div>Welcome to the rights editor.</div>
+<div>Rights applied to a document replace rights applied to a space and
rights applied to the whole wiki.</div>
+<div><strong>Warning</strong>: Without any authentication
forcing and any rights specified a Wiki is public for viewing and editing by
default.</div>
+#if($xwiki.rightsmanager.defaultUi == "stable")
+<form id="objectadd" method="post" action="$doc.getURL("objectadd")"
onsubmit="cancelCancelEdit()">
+<div class="centered padded">
+<input type="hidden" name="xredirect" value="$doc.getURL("edit",
"editor=rights")"/>
+<input type="hidden" name="classname" value="$class.name"/>
+<input type="submit" value="$msg.get("addrightentry")" class="button"/>
+</div>
+</form>
+#end
+#panelfooter()</content>
+</property>
+<property>
<description>Rights Editor Welcome message and brief information.</description>
</property>
<property>
-<category>Information</category>
+<name>Rights Editor Welcome</name>
</property>
<property>
-<content>#largepanelheader($msg.get("welcome"))
-<div>Welcome to the rights editor.</div>
-<div>Rights applied to a document replace rights applied to a space and
rights applied to the whole wiki.</div>
-<div><strong>Warning</strong>: Without any authentication
forcing and any rights specified a Wiki is public for viewing and editing by
default.</div>
-<form id="objectadd" method="post" action="$doc.getURL("objectadd")"
onsubmit="cancelCancelEdit()">
-<div class="centered padded">
-<input type="hidden" name="xredirect" value="$doc.getURL("edit",
"editor=rights")"/>
-<input type="hidden" name="classname" value="$class.name"/>
-<input type="submit" value="$msg.get("addrightentry")" class="button"/>
-</div>
-</form>
-#panelfooter()</content>
+<type>edit</type>
</property>
+</object>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>Panels.RightsEditorWelcome</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
<property>
-<name>Rights Editor Welcome</name>
+<tags/>
</property>
</object>
<content>#includeForm("Panels.PanelSheet")</content>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
