gatein SVN: r2066 - in portal/trunk/web/portal/src/main/webapp/templates: skin/webui/component/UIHomePagePortlet and 1 other directory.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-03-09 21:44:31 -0500 (Tue, 09 Mar 2010)
New Revision: 2066
Modified:
portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css
Log:
GTNPORTAL-806: Links on Home page
Modified: portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2010-03-10 00:30:47 UTC (rev 2065)
+++ portal/trunk/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2010-03-10 02:44:31 UTC (rev 2066)
@@ -2,10 +2,10 @@
<div class="TRContainer">
<div class="PortletDecoration">
<div class="GuideText"><%=_ctx.appRes("UIHomePagePortlet.Label.IntroText")%></div>
- <div class="VersionIcon"><span></span></div>
+ <a class="VersionIcon" href="http://www.jboss.org/gatein/" target="_blank"></a>
<div class="DotLine"><span></span></div>
<div class="GuideText"><%=_ctx.appRes("UIHomePagePortlet.Label.GuideText")%></div>
- <div class="ContactIcon"><span></span></div>
+ <a class="ContactIcon" href="http://community.jboss.org/en/gatein?view=discussions" target="_blank"></a>
</div>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css 2010-03-10 00:30:47 UTC (rev 2065)
+++ portal/trunk/web/portal/src/main/webapp/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css 2010-03-10 02:44:31 UTC (rev 2066)
@@ -63,7 +63,8 @@
height: 65px;
width: 80px;
margin: 20px auto;
- cursor: pointer;
+ cursor: pointer;
+ display: block;
}
.UIHomePagePortlet .TRContainer .ContactIcon {
@@ -71,7 +72,8 @@
height: 70px;
width: 80px;
margin: 20px auto;
- cursor: pointer;
+ cursor: pointer;
+ display: block;
}
.UIHomePagePortlet .TLContainer {
16 years, 1 month
- 1
- 0
gatein SVN: r2065 - in components/common/trunk/common/src: main/java/org/gatein/common/util and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-09 19:30:47 -0500 (Tue, 09 Mar 2010)
New Revision: 2065
Modified:
components/common/trunk/common/src/main/java/org/gatein/common/text/TextTools.java
components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java
components/common/trunk/common/src/test/java/org/gatein/common/StringTestCase.java
Log:
- Moved String manipulation methods to TextTools.
- Added possibility to generate a replacement via a StringReplacementGenerator implementation passed to replaceBoundedString methods.
Modified: components/common/trunk/common/src/main/java/org/gatein/common/text/TextTools.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/text/TextTools.java 2010-03-09 20:30:52 UTC (rev 2064)
+++ components/common/trunk/common/src/main/java/org/gatein/common/text/TextTools.java 2010-03-10 00:30:47 UTC (rev 2065)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.gatein.common.text;
+import org.gatein.common.util.ParameterValidation;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
@@ -30,8 +32,8 @@
{
/**
- * Returns true if the char c is alpha numeric i.e it belongs to one of the following ranges [0,9], [A,Z] or
- * [a,z]
+ * Returns true if the char c is alpha numeric i.e it belongs to one of the following ranges [0,9], [A,Z] or [a,z]
+ *
* @param c the char to test
* @return true if c is alpha numeric
*/
@@ -42,6 +44,7 @@
/**
* Returns the hexadecimal value of the provided numeric value.
+ *
* @param z the numeric value to convert
* @return the hexadecimal char
* @throws IllegalArgumentException if the value is not between 0 and 15
@@ -61,4 +64,139 @@
throw new IllegalArgumentException("Wrong character");
}
}
+
+ /**
+ * Replace occurence in a string.
+ *
+ * @param string the source string
+ * @param pattern the replaced pattern
+ * @param replacement the replacement text
+ * @return the new string
+ */
+ public static String replace(String string, String pattern, String replacement)
+ {
+ StringBuffer buffer = new StringBuffer(string.length());
+ int previous = 0;
+ int current = string.indexOf(pattern);
+ while (current != -1)
+ {
+ buffer.append(string.substring(previous, current));
+ buffer.append(replacement);
+ previous = current + pattern.length();
+ current = string.indexOf(pattern, previous);
+ }
+ buffer.append(string.substring(previous));
+ return buffer.toString();
+ }
+
+ /**
+ * Same as replaceBoundedString(initial, prefix, suffix, replacement, true, false).
+ *
+ * @param initial
+ * @param prefix
+ * @param suffix
+ * @param replacement
+ * @return
+ */
+ public static String replaceAllInstancesOfBoundedString(String initial, String prefix, String suffix, String replacement)
+ {
+ return replaceBoundedString(initial, prefix, suffix, replacement, true, false);
+ }
+
+ public static String replaceBoundedString(String initial, String prefix, String suffix, String replacement,
+ boolean replaceIfBoundedStringEmpty, boolean keepBoundaries)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(replacement, "replacement");
+ return replaceBoundedString(initial, prefix, suffix, new ConstantStringReplacementGenerator(replacement),
+ replaceIfBoundedStringEmpty, keepBoundaries);
+ }
+
+ /**
+ * Replace instances of Strings delimited by the given prefix and suffix (hence, bounded) by a replacement String
+ * computed by the specified StringReplacementGenerator based on the current bounded String match. It is possible to
+ * specify whether the substitution will happen only if the delimited String is non-empty by setting
+ * <code>replaceIfBoundedStringEmpty</code> to <code>false</code>. It is also possible to keep the boundaries (prefix
+ * and suffix) after the substitution by setting <code>keepBoundaries</code> to <code>true</code>.
+ * <p/>
+ * See org.gatein.common.StringTestCase.testReplaceBoundedString() for usage details.
+ *
+ * @param initial the String in which we want to replace bounded Strings
+ * @param prefix the prefix used identify the beginning of the String targeted for replacement
+ * @param suffix the suffix used to identify the end of the String targeted for replacement
+ * @param generator the StringReplacementGeneraot generating replacements based on the current
+ * bounded String match
+ * @param replaceIfBoundedStringEmpty <code>true</code> to allow replacement of empty Strings (in essence, insertion
+ * of the replacement String between the prefix and suffix)
+ * @param keepBoundaries <code>true</code> to keep the prefix and suffix markers in the resulting
+ * String
+ * @return a String where the Strings marked by prefix and suffix have been replaced by replacement
+ */
+ public static String replaceBoundedString(String initial, String prefix, String suffix, StringReplacementGenerator generator,
+ boolean replaceIfBoundedStringEmpty, boolean keepBoundaries)
+ {
+ if (ParameterValidation.isNullOrEmpty(initial))
+ {
+ return initial;
+ }
+
+ ParameterValidation.throwIllegalArgExceptionIfNull(generator, "StringReplacementGenerator");
+
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(prefix, "prefix", "Tools.replaceBoundedString");
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(suffix, "suffix", "Tools.replaceBoundedString");
+
+ StringBuffer tmp = new StringBuffer(initial);
+ int prefixIndex = tmp.indexOf(prefix);
+ int suffixLength = suffix.length();
+ int prefixLength = prefix.length();
+
+ while (prefixIndex != -1)
+ {
+ int suffixIndex = tmp.indexOf(suffix, prefixIndex);
+
+ if (suffixIndex != -1)
+ {
+ // we don't care about empty bounded strings or prefix and suffix don't delimit an empty String => replace!
+ if (replaceIfBoundedStringEmpty || suffixIndex != prefixIndex + prefixLength)
+ {
+ String match;
+ if (keepBoundaries)
+ {
+ match = tmp.substring(prefixIndex + prefixLength, suffixIndex);
+ tmp.delete(prefixIndex + prefixLength, suffixIndex);
+ tmp.insert(prefixIndex + prefixLength, generator.getReplacementFor(match));
+ }
+ else
+ {
+ match = tmp.substring(prefixIndex, suffixIndex + suffixLength);
+ tmp.delete(prefixIndex, suffixIndex + suffixLength);
+ tmp.insert(prefixIndex, generator.getReplacementFor(match));
+ }
+ }
+ }
+
+ prefixIndex = tmp.indexOf(prefix, prefixIndex + prefixLength);
+ }
+
+ return tmp.toString();
+ }
+
+ public static interface StringReplacementGenerator
+ {
+ String getReplacementFor(String match);
+ }
+
+ public static class ConstantStringReplacementGenerator implements StringReplacementGenerator
+ {
+ private String replacement;
+
+ public ConstantStringReplacementGenerator(String replacement)
+ {
+ this.replacement = replacement;
+ }
+
+ public String getReplacementFor(String match)
+ {
+ return replacement;
+ }
+ }
}
Modified: components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java 2010-03-09 20:30:52 UTC (rev 2064)
+++ components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java 2010-03-10 00:30:47 UTC (rev 2065)
@@ -22,6 +22,9 @@
******************************************************************************/
package org.gatein.common.util;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
@@ -44,9 +47,6 @@
import java.util.ResourceBundle;
import java.util.Set;
-import org.gatein.common.logging.Logger;
-import org.gatein.common.logging.LoggerFactory;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
@@ -750,30 +750,6 @@
}
/**
- * Replace occurence in a string.
- *
- * @param string the source string
- * @param pattern the replaced pattern
- * @param replacement the replacement text
- * @return the new string
- */
- public static String replace(String string, String pattern, String replacement)
- {
- StringBuffer buffer = new StringBuffer(string.length());
- int previous = 0;
- int current = string.indexOf(pattern);
- while (current != -1)
- {
- buffer.append(string.substring(previous, current));
- buffer.append(replacement);
- previous = current + pattern.length();
- current = string.indexOf(pattern, previous);
- }
- buffer.append(string.substring(previous));
- return buffer.toString();
- }
-
- /**
* Append an object to an array of objects. The original array is not modified. The returned array will be of the
* same component type of the provided array and its first n elements where n is the size of the provided array will
* be the elements of the provided array. The last element of the array will be the provided object to append.
@@ -808,11 +784,8 @@
}
/**
- * Return true if
- * <ul>
- * <li>o1 is null and o2 is null</li>
- * <li>o1 is not null and the invocation of <code>equals(Object o)</code> on o1 wit o2 as argument returns true</li>
- * </ul>
+ * Return true if <ul> <li>o1 is null and o2 is null</li> <li>o1 is not null and the invocation of
+ * <code>equals(Object o)</code> on o1 wit o2 as argument returns true</li> </ul>
*
* @param o1 the first argument
* @param o2 the second argument
@@ -831,94 +804,14 @@
}
/**
- * Same as replaceBoundedString(initial, prefix, suffix, replacement, true, false).
- *
- * @param initial
- * @param prefix
- * @param suffix
- * @param replacement
- * @return
- */
- public static String replaceAllInstancesOfBoundedString(String initial, String prefix, String suffix, String replacement)
- {
- return replaceBoundedString(initial, prefix, suffix, replacement, true, false);
- }
-
- /**
- * Replace instances of Strings delimited by the given prefix and suffix (hence, bounded) by the specified
- * replacement String. It is possible to specify whether the substitution will happen only if the delimited String is
- * non-empty by setting <code>replaceIfBoundedStringEmpty</code> to <code>false</code>. It is also possible to keep
- * the boundaries (prefix and suffix) after the substitution by setting <code>keepBoundaries</code> to
- * <code>true</code>.
- * <p/>
- * See org.gatein.common.StringTestCase.testReplaceBoundedString() for usage details.
- *
- * @param initial the String in which we want to replace bounded Strings
- * @param prefix the prefix used identify the beginning of the String targeted for replacement
- * @param suffix the suffix used to identify the end of the String targeted for replacement
- * @param replacement the String to replace the bounded String with
- * @param replaceIfBoundedStringEmpty <code>true</code> to allow replacement of empty Strings (in essence, insertion
- * of the replacement String between the prefix and suffix)
- * @param keepBoundaries <code>true</code> to keep the prefix and suffix markers in the resulting
- * String
- * @return a String where the Strings marked by prefix and suffix have been replaced by replacement
- */
- public static String replaceBoundedString(String initial, String prefix, String suffix, String replacement,
- boolean replaceIfBoundedStringEmpty, boolean keepBoundaries)
- {
- if (initial == null || initial.length() == 0)
- {
- return initial;
- }
-
- ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(prefix, "prefix", "Tools.replaceBoundedString");
- ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(suffix, "suffix", "Tools.replaceBoundedString");
- ParameterValidation.throwIllegalArgExceptionIfNull(replacement, "replacement");
-
- StringBuffer tmp = new StringBuffer(initial);
- int prefixIndex = tmp.indexOf(prefix);
- int suffixLength = suffix.length();
- int prefixLength = prefix.length();
-
- while (prefixIndex != -1)
- {
- int suffixIndex = tmp.indexOf(suffix, prefixIndex);
-
- if (suffixIndex != -1)
- {
- // we don't care about empty bounded strings or prefix and suffix don't delimit an empty String => replace!
- if (replaceIfBoundedStringEmpty || suffixIndex != prefixIndex + prefixLength)
- {
- if (keepBoundaries)
- {
- tmp.delete(prefixIndex + prefixLength, suffixIndex);
- tmp.insert(prefixIndex + prefixLength, replacement);
- }
- else
- {
- tmp.delete(prefixIndex, suffixIndex + suffixLength);
- tmp.insert(prefixIndex, replacement);
- }
- }
- }
-
- prefixIndex = tmp.indexOf(prefix, prefixIndex + prefixLength);
- }
-
- return tmp.toString();
- }
-
- /**
* Determines if value is contained in array.
* <p/>
* todo: correct this method contract in order to make it more reusable, it looks like for now like a method which
* has a contract convenient only for some kind of callers.
* <p/>
- * <ol>
- * <li>null value should be accepted (or the method should be called isContainedInButNotForNullValue ?)</li>
+ * <ol> <li>null value should be accepted (or the method should be called isContainedInButNotForNullValue ?)</li>
* <li>null array should not be accepted (or the method should be called isContainedInExceptIfThePassedArrayIsNull
- * ?)</li>
- * </ol>
+ * ?)</li> </ol>
*
* @param value
* @param array
Modified: components/common/trunk/common/src/test/java/org/gatein/common/StringTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/StringTestCase.java 2010-03-09 20:30:52 UTC (rev 2064)
+++ components/common/trunk/common/src/test/java/org/gatein/common/StringTestCase.java 2010-03-10 00:30:47 UTC (rev 2065)
@@ -23,7 +23,7 @@
package org.gatein.common;
import junit.framework.TestCase;
-import org.gatein.common.util.Tools;
+import org.gatein.common.text.TextTools;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -39,22 +39,22 @@
public void testReplace()
{
- assertEquals("", Tools.replace("", "abc", "def"));
- assertEquals("defg", Tools.replace("abc", "abc", "defg"));
- assertEquals("_defg_", Tools.replace("_abc_", "abc", "defg"));
- assertEquals("_defgdefg_", Tools.replace("_abcabc_", "abc", "defg"));
- assertEquals("_defg_defg_", Tools.replace("_abc_abc_", "abc", "defg"));
+ assertEquals("", TextTools.replace("", "abc", "def"));
+ assertEquals("defg", TextTools.replace("abc", "abc", "defg"));
+ assertEquals("_defg_", TextTools.replace("_abc_", "abc", "defg"));
+ assertEquals("_defgdefg_", TextTools.replace("_abcabc_", "abc", "defg"));
+ assertEquals("_defg_defg_", TextTools.replace("_abc_abc_", "abc", "defg"));
}
public void testReplaceBoundedString()
{
- assertEquals("", Tools.replaceAllInstancesOfBoundedString("", "PREFIX", "SUFFIX", "REPLACEMENT"));
- assertEquals("REPLACEMENT", Tools.replaceAllInstancesOfBoundedString("PREFIXSUFFIX", "PREFIX", "SUFFIX", "REPLACEMENT"));
- assertEquals("PREFIXSUFFIX", Tools.replaceBoundedString("PREFIXSUFFIX", "PREFIX", "SUFFIX", "REPLACEMENT", false, true));
- assertEquals("PREFIXSUFFIX", Tools.replaceBoundedString("PREFIXSUFFIX", "PREFIX", "SUFFIX", "REPLACEMENT", false, false));
- assertEquals("aaaaREPLACEMENTccccc", Tools.replaceAllInstancesOfBoundedString("aaaaPREFIXbbbbbSUFFIXccccc", "PREFIX", "SUFFIX", "REPLACEMENT"));
- assertEquals("aaaPREFIXbbbbSUFF", Tools.replaceAllInstancesOfBoundedString("aaaPREFIXbbbbSUFF", "PREFIX", "SUFFIX", "REPLACEMENT"));
- assertEquals("aRcccReeeR", Tools.replaceAllInstancesOfBoundedString("aPbbScccPdSeeePS", "P", "S", "R"));
- assertEquals("PSaPScccReeePS", Tools.replaceBoundedString("PSaPScccPdSeeePS", "P", "S", "R", false, false));
+ assertEquals("", TextTools.replaceAllInstancesOfBoundedString("", "PREFIX", "SUFFIX", "REPLACEMENT"));
+ assertEquals("REPLACEMENT", TextTools.replaceAllInstancesOfBoundedString("PREFIXSUFFIX", "PREFIX", "SUFFIX", "REPLACEMENT"));
+ assertEquals("PREFIXSUFFIX", TextTools.replaceBoundedString("PREFIXSUFFIX", "PREFIX", "SUFFIX", "REPLACEMENT", false, true));
+ assertEquals("PREFIXSUFFIX", TextTools.replaceBoundedString("PREFIXSUFFIX", "PREFIX", "SUFFIX", "REPLACEMENT", false, false));
+ assertEquals("aaaaREPLACEMENTccccc", TextTools.replaceAllInstancesOfBoundedString("aaaaPREFIXbbbbbSUFFIXccccc", "PREFIX", "SUFFIX", "REPLACEMENT"));
+ assertEquals("aaaPREFIXbbbbSUFF", TextTools.replaceAllInstancesOfBoundedString("aaaPREFIXbbbbSUFF", "PREFIX", "SUFFIX", "REPLACEMENT"));
+ assertEquals("aRcccReeeR", TextTools.replaceAllInstancesOfBoundedString("aPbbScccPdSeeePS", "P", "S", "R"));
+ assertEquals("PSaPScccReeePS", TextTools.replaceBoundedString("PSaPScccPdSeeePS", "P", "S", "R", false, false));
}
}
16 years, 1 month
- 1
- 0
gatein SVN: r2064 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2010-03-09 15:30:52 -0500 (Tue, 09 Mar 2010)
New Revision: 2064
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
Log:
- update LDAP examples
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2010-03-09 18:03:41 UTC (rev 2063)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2010-03-09 20:30:52 UTC (rev 2064)
@@ -25,30 +25,30 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>idm_realm</id>
+ <id>idm_realm_sample-portal</id>
<repository-id-ref>DefaultPortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
<options>
<option>
- <name>template</name>
- <value>true</value>
- </option>
- <option>
<name>cache.providerRegistryName</name>
<value>apiCacheProvider</value>
</option>
</options>
</realm>
<realm>
- <id>idm_realm_portal</id>
+ <id>idm_realm</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
<options>
<option>
+ <name>template</name>
+ <value>true</value>
+ </option>
+ <option>
<name>cache.providerRegistryName</name>
<value>apiCacheProvider</value>
</option>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2010-03-09 18:03:41 UTC (rev 2063)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2010-03-09 20:30:52 UTC (rev 2064)
@@ -25,30 +25,30 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>idm_realm</id>
+ <id>idm_realm_sample-portal</id>
<repository-id-ref>DefaultPortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
<options>
<option>
- <name>template</name>
- <value>true</value>
- </option>
- <option>
<name>cache.providerRegistryName</name>
<value>apiCacheProvider</value>
</option>
</options>
</realm>
<realm>
- <id>idm_realm_portal</id>
+ <id>idm_realm</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
- <options>
+ <options>
<option>
+ <name>template</name>
+ <value>true</value>
+ </option>
+ <option>
<name>cache.providerRegistryName</name>
<value>apiCacheProvider</value>
</option>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2010-03-09 18:03:41 UTC (rev 2063)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2010-03-09 20:30:52 UTC (rev 2064)
@@ -25,30 +25,30 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>idm_realm</id>
+ <id>idm_realm_sample-portal</id>
<repository-id-ref>DefaultPortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
<options>
<option>
- <name>template</name>
- <value>true</value>
- </option>
- <option>
<name>cache.providerRegistryName</name>
<value>apiCacheProvider</value>
</option>
</options>
</realm>
<realm>
- <id>idm_realm_portal</id>
+ <id>idm_realm</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
<options>
<option>
+ <name>template</name>
+ <value>true</value>
+ </option>
+ <option>
<name>cache.providerRegistryName</name>
<value>apiCacheProvider</value>
</option>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2010-03-09 18:03:41 UTC (rev 2063)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2010-03-09 20:30:52 UTC (rev 2064)
@@ -25,30 +25,30 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>idm_realm</id>
+ <id>idm_realm_sample-portal</id>
<repository-id-ref>DefaultPortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
<options>
<option>
- <name>template</name>
- <value>true</value>
- </option>
- <option>
<name>cache.providerRegistryName</name>
<value>apiCacheProvider</value>
</option>
</options>
</realm>
<realm>
- <id>idm_realm_portal</id>
+ <id>idm_realm</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
<options>
<option>
+ <name>template</name>
+ <value>true</value>
+ </option>
+ <option>
<name>cache.providerRegistryName</name>
<value>apiCacheProvider</value>
</option>
16 years, 1 month
- 1
- 0
gatein SVN: r2063 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-03-09 13:03:41 -0500 (Tue, 09 Mar 2010)
New Revision: 2063
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
Log:
GTNPORTAL-764: Handle the script tag separately than the other tags when adding markup headers to a page. We need to have the script tag be not self closing (handled by the html method) and have all other tags close (handled by the xml method).
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-09 17:38:10 UTC (rev 2062)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-09 18:03:41 UTC (rev 2063)
@@ -398,12 +398,24 @@
{
Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
- transformer.setOutputProperty(OutputKeys.METHOD, "html");
for (Element element : extraMarkupHeaders)
{
DOMSource source = new DOMSource(element);
StreamResult result = new StreamResult(new StringWriter());
+
+ // we want to ouput xhtml text that will still work on html browsers.
+ // In order to do this we need to have the script tag be not self closing
+ // which it will try and do with the xml or xhtml method. If we just use
+ // the html method then the other tags will not be closed.
+ if (element.getNodeName().equalsIgnoreCase("script"))
+ {
+ transformer.setOutputProperty(OutputKeys.METHOD, "html");
+ }
+ else
+ {
+ transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+ }
transformer.transform(source, result);
markupHeaders.add(result.getWriter().toString());
}
16 years, 1 month
- 1
- 0
gatein SVN: r2062 - in portal/trunk/docs/user-guide/en/modules: portal and 1 other directory.
by do-not-reply＠jboss.org
Author: luc.texier(a)jboss.com
Date: 2010-03-09 12:38:10 -0500 (Tue, 09 Mar 2010)
New Revision: 2062
Modified:
portal/trunk/docs/user-guide/en/modules/Portal.xml
portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml
portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml
portal/trunk/docs/user-guide/en/modules/portal/Drag_and_Drop_the_Page_Body.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml
portal/trunk/docs/user-guide/en/modules/portal/Page_Creation_Wizard.xml
portal/trunk/docs/user-guide/en/modules/portal/Switching_between_Portals.xml
portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml
Log:
GTNPORTAL-720: review finished, handing over to Scott
Modified: portal/trunk/docs/user-guide/en/modules/Portal.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Portal.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/Portal.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -7,19 +7,25 @@
<title>Portal Administration</title>
<!-- xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="portal/User_Workspace.xml" /> -->
<xi:include href="portal/Toolbar.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!-- <xi:include href="portal/Create_a_New_Portal.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <xi:include href="portal/Manage_Portals.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- <xi:include href="portal/Change_Portal_Skins.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+<!-- <xi:include href="portal/Switching_between_Portals.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+
+ <xi:include href="portal/Manage_Navigation_Nodes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- <xi:include href="portal/Change_Node_Order.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+
+<!-- <xi:include href="portal/Page_Creation_Wizard.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <xi:include href="portal/Manage_Pages.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- <xi:include href="portal/Drag_and_Drop_the_Page_Body.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+
<xi:include href="portal/User_Management.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portal/Manage_Permission.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portal/Change_Portal_Skins.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
<!--
<xi:include href="portal/Manage_Page_Navigation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-->
- <xi:include href="portal/Manage_Navigation_Nodes.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portal/Change_Node_Order.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portal/Manage_Pages.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portal/Page_Creation_Wizard.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portal/Drag_and_Drop_the_Page_Body.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portal/Create_a_New_Portal.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portal/Manage_Portals.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portal/Switching_between_Portals.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
</chapter>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -3,36 +3,8 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
-<section id="sect-User_Guide-Change_Node_Order">
- <title>Change Node Order</title>
- <para>
- You can easily change the position of nodes in the navigation bar following these steps:
- </para>
- <procedure>
- <step>
- <para>
- Click on <emphasis role="bold">Site</emphasis> then click on <emphasis role="bold">Edit Navigation</emphasis> of the portal you want to modify.
- </para>
- </step>
- <step>
- <para>
- Select the node that you want to move. Right click on the selected node and then click on <emphasis role="bold">Move up</emphasis> or <emphasis role="bold">Move down</emphasis>
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/MoveUpDown.png" format="PNG" align="center" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/MoveUpDown.png" format="PNG" align="center" contentwidth="130mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
- The selected node will be moved up or down within the list.
- </para>
- </step>
- </procedure>
-</section>
+TO DELETE
+
+
Modified: portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -3,84 +3,8 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
-<section id="sect-User_Guide-Change_Portal_Skins">
- <title>Change Portal Skins</title>
- <para>
- Skins are graphic styles that display an attractive user interface. Each skin has its own characteristics with different backgrounds, icons, and other visual elements. In order to be user-friendly and flexible, users are allowed to change the skin they use on the portal without having edit rights.
- </para>
- <para>
- Skins can be changed temporarily (and are reset at log-out) or permanently.
- </para>
- <variablelist>
- <varlistentry>
- <term>Change the skin temporarily</term>
- <listitem>
- <procedure>
- <step>
- <para>
- Go to <emphasis role="bold">&PRODUCT; Start</emphasis> and click on <emphasis role="bold">Change Skin</emphasis>.
- </para>
- </step>
- <step>
- <para>
- Select a new skin from the list on the left of the <emphasis role="bold">Skin Settings</emphasis> box. When you highlight a skin in the list a preview will appear in the pane on the right of the box.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/SkinSet1.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/SkinSet1.png" format="PNG" align="center" contentwidth="120mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
- If you are happy with your choice, click the <emphasis role="bold">Apply</emphasis> button to have it applied to the portal.
- </para>
- <para>
- Or, if you decide not to change the skin, click <emphasis role="bold">Cancel</emphasis> to close the dialogue box without making any changes to the portal.
- </para>
- </step>
- </procedure>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Change the skin permanently</term>
- <listitem>
- <procedure>
- <step>
- <para>
- Click on <emphasis role="bold">Site</emphasis>, then <emphasis role="bold">Edit Portal's Properties</emphasis> for the portal of your choice.
- </para>
- </step>
- <step>
- <para>
- In the <emphasis role="bold">Portal Setting</emphasis> tab: select one skin type in the <emphasis role="bold">Skin</emphasis> list field to change and display a skin.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Skin1.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Skin1.png" format="PNG" align="center" contentwidth="120mm"/>
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
- Click <emphasis role="bold">Save</emphasis> and <emphasis role="bold">Finish</emphasis> icon so that the modification can take effect.
- </para>
- </step>
- </procedure>
- </listitem>
- </varlistentry>
- </variablelist>
- <para>
- More information about adding skins to a portal see the &PRODUCT; Reference Guide at <ulink type="http" url="www.redhat.com/docs"></ulink>
- </para>
-</section>
+TO DELETE
Modified: portal/trunk/docs/user-guide/en/modules/portal/Drag_and_Drop_the_Page_Body.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Drag_and_Drop_the_Page_Body.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/Drag_and_Drop_the_Page_Body.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -3,39 +3,8 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
-<section id="sect-User_Guide-Drag_and_Drop_the_Page_Body">
- <title>Drag and Drop the Page Body</title>
- <para>
- To assist administrators to modify or personalize their portal &PRODUCT; allows you to easily drag and drop page content within the page.
- </para>
- <procedure>
- <step>
- <para>
- Go to <emphasis role="bold">Site Editor</emphasis> in the toolbar and click on <emphasis role="bold">Edit Layout</emphasis> It will display :
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/DragPage1.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/DragPage1.png" format="PNG" align="center" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
- Click on the <emphasis role="bold">Portal Page</emphasis>, drag and drop within the portal page.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/DragPage3.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/DragPage3.png" format="PNG" align="center" />
- </imageobject>
- </mediaobject>
- </step>
- </procedure>
-</section>
+TO DELETE
+
+
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -433,6 +433,36 @@
</step>
</procedure>
</section>
+
+ <section id="sect-User_Guide-Change_Node_Order">
+ <title>Change Node Order</title>
+ <para>
+ You can easily change the position of nodes in the navigation bar following these steps:
+ </para>
+ <procedure>
+ <step>
+ <para>
+ Click on <emphasis role="bold">Site</emphasis> then click on <emphasis role="bold">Edit Navigation</emphasis> of the portal you want to modify.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select the node that you want to move. Right click on the selected node and then click on <emphasis role="bold">Move up</emphasis> or <emphasis role="bold">Move down</emphasis>
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/MoveUpDown.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ The selected node will be moved up or down within the list.
+ </para>
+ </step>
+ </procedure>
+ </section>
+
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Pages.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -5,19 +5,200 @@
]>
<section id="sect-User_Guide-Manage_Pages">
<title>Manage Pages</title>
- <para>
- &PRODUCT; users can quickly add, edit, delete and view pages effectively in a comprehensive list. Follow the guide below to manage portal pages:
- </para>
+
+ <section id="sect-User_Guide-Manage_Pages-Adding_a_new_Page">
+ <title>Adding a new Page</title>
+
+ <section id="sect-User_Guide-Page_Creation_Wizard">
+ <title>Adding a new Page using Page Creation Wizard</title>
+ <para>
+ A page creation wizard is available to administrators in order to create and publish a page quickly and easily.
+ </para>
+ <procedure>
+ <step>
+ <para>
+ Click on <emphasis role="bold">Site Editor</emphasis> then select <emphasis role="bold">Add New Page</emphasis>.
+ </para>
+<note>
+<title>DOC TODO</title>
+<para>
+please redo screenshot
+</para>
+</note>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Wizard1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ The wizard window is divided in two sections: the left pane contains the existing page/node hierarchy and the right pane displays the Page editor.
+ </para>
+
+ </step>
+ <step>
+ <para>
+ In the left pane, you may navigate the node/page structure up and down
+ </para>
+ </step>
+ <step>
+<note>
+<title>DOC TODO</title>
+<para>
+please redo screenshot
+</para>
+</note>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Pagewizard1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ <variablelist>
+ <varlistentry>
+ <term>Current Selected Page Node</term>
+ <listitem>
+ <para>
+ The path of the selected node to add a new sub page
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Node Name</term>
+ <listitem>
+ <para>
+ The node name of the added page. It is required field. This field must start with a character and must have a length between 3 and 30 characters.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Display Name</term>
+ <listitem>
+ <para>
+ The display name of the node which contains the added page and must have a length between 3 and 30 characters.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Visible</term>
+ <listitem>
+ <para>
+ This checkbox toggles the global visibility of this page. If not checked the page is under no circumstances shown, even if the publication period is OK. If checked the page or the page node appears on on the navigation bar, the page navigation and the site map. If "visible" is checked the visibility depends on the "publication date & time" attribute if set.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Publication date &time</term>
+ <listitem>
+ <para>
+ This option allows publishing the page for a period of time. If this option is checked the visibility of the page depends on the publication period start and end date.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Start Publication Date</term>
+ <listitem>
+ <para>
+ The start date and time to publish the page
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>End Publication Date</term>
+ <listitem>
+ <para>
+ The end date and time to publish the page.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <note>
+ <title>Setting Time and Date</title>
+ <para>
+ You can set date and time by clicking the <emphasis role="bold">Start Publication Date</emphasis> field and <emphasis role="bold">End Publication Date</emphasis> field and select a date in the calendar pop up
+ </para>
+ </note>
+<!--
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Calendar.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+-->
+
+ </step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Next</emphasis> or number '2' of the wizard steps to go to step 2.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/PageWizard2.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Select <emphasis role="bold">Empty Layout</emphasis> or click the icon to see more templates to select.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Next</emphasis> button or number '3' of the wizard step to go to step 3. You can drag portlets from the popup panel into the main pane to create the content of this page.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/PageWizard3.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ <variablelist>
+ <varlistentry>
+ <term>Applications</term>
+ <listitem>
+ <para>
+ Allows listing all existing portlets
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Containers</term>
+ <listitem>
+ <para>
+ Allows listing all existing containers
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Switch View mode</term>
+ <listitem>
+ <para>
+ Allows viewing a page in preview mode
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Show Container</emphasis> icon if you want to see the existing containers and re-select the layout of the page. You can click on the <emphasis role="bold">Switch</emphasis> icon to view the content of this page.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Save</emphasis> to accept creating a new page, <emphasis role="bold">Back</emphasis> button to return the previous step or <emphasis role="bold">Abort</emphasis> button to quit without creating a new page.
+ </para>
+ </step>
+ </procedure>
+ </section>
+
+
<section id="sect-User_Guide-Manage_Pages-Add_a_new_Page_in_the_Page_List">
- <title>Add a new Page in the Page List</title>
- <para>
- You easily add a new page by following these steps:
- </para>
+ <title>Adding a new Page using Page Management</title>
<procedure>
<step>
<para>
- Hover over <emphasis role="bold">Group</emphasis> in the Toolbar, highlight <emphasis role="bold">Administration</emphasis> and click <emphasis role="bold">Page Management</emphasis>.
+ Mouse over <emphasis role="bold">Group</emphasis> in the Toolbar, highlight <emphasis role="bold">Administration</emphasis> then select <emphasis role="bold">Page Management</emphasis>.
</para>
<mediaobject>
<imageobject>
@@ -31,9 +212,7 @@
</para>
</step>
<step>
- <para>
- Enter values for fields in the <emphasis role="bold">Page Setting</emphasis> tab
- </para>
+
<mediaobject>
<imageobject>
<imagedata fileref="images/PageSetting.png" format="PNG" align="center" scale="110" />
@@ -60,6 +239,12 @@
<para>
If the page <emphasis role="bold">Owner type</emphasis> is <emphasis>group</emphasis> the page is created for a group. Therefore only users who have <emphasis>manager</emphasis> permissions for that group can create this page type.
</para>
+<note>
+<title>DOC TODO</title>
+<para>
+please redo screenshot
+</para>
+</note>
<mediaobject>
<imageobject role="html">
<imagedata fileref="images/PageSetting1.png" format="PNG" align="center" scale="110" />
@@ -156,23 +341,24 @@
</step>
<step>
<para>
- Click the <emphasis role="bold">Save</emphasis> button to accept creating a new page or the <emphasis role="bold">Cancel</emphasis> button to quit the form.
+ Click <emphasis role="bold">Save</emphasis>.
</para>
</step>
</procedure>
</section>
-
+ </section>
+
<section id="sect-User_Guide-Manage_Pages-Edit_a_Page">
<title>Edit a Page</title>
<procedure>
<step>
<para>
- Go to <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Administration</emphasis> and then click on <emphasis role="bold">Page Management</emphasis>.
+ Mouse over <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Administration</emphasis> and then click on <emphasis role="bold">Page Management</emphasis>.
</para>
</step>
<step>
<para>
- Click the edit icon on the row of page you want to edit in the existing pages list.
+ Click the edit icon on the row of page you want to edit in the existing page list.
</para>
<para>
Click the edit icon to show a form to edit page properties.
@@ -187,7 +373,7 @@
<term>Permission Setting</term>
<listitem>
<para>
- This form is supported for pages with <emphasis>group</emphasis> or <emphasis>portal</emphasis> ownershuip types. Because a user's page is private, no user, other than the creator, can access or edit it.
+ This form is supported for pages with <emphasis>group</emphasis> or <emphasis>portal</emphasis> ownership types. Because a user page is private, no user, other than the creator, can access or edit it.
</para>
<para>
Permission on each page is set in two levels: <emphasis role="bold">Access right</emphasis> and <emphasis role="bold">Edit right</emphasis>.
@@ -278,6 +464,36 @@
</procedure>
</section>
+ <section id="sect-User_Guide-Drag_and_Drop_the_Page_Body">
+ <title>Drag and Drop the Page Body</title>
+ <para>
+ To assist administrators to modify or personalize their portal &PRODUCT; allows you to easily drag and drop page content within the page.
+ </para>
+ <procedure>
+ <step>
+ <para>
+ Go to <emphasis role="bold">Site Editor</emphasis> in the toolbar and click on <emphasis role="bold">Edit Layout</emphasis> It will display :
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/DragPage1.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Click on the <emphasis role="bold">Portal Page</emphasis>, drag and drop within the portal page.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/DragPage3.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ </procedure>
+ </section>
+
+
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -6,210 +6,154 @@
<section id="sect-User_Guide-Manage_Permissions">
<title>Manage Permissions</title>
<para>
- Permissions play an important part in accessing and performing actions in the Portal. Depending on permissions assigned by an administrator, users can either access or edit portals, pages and portlets. &PRODUCT; has several permission levels:
+ Permissions play an important part in accessing and performing actions in the Portal. Depending on these permissions assigned by an administrator, users gain access to various components and actions such as edit portals, pages or portlets.
</para>
<para>
Details about permission types and levels can be found in <xref linkend="sect-User_Guide-Permissions"/>
</para>
-<!-- <variablelist>
- <varlistentry>
- <term>Portal</term>
- <listitem>
- <para>
- The portal permission includes access only to all pages withion the portal.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Page</term>
- <listitem>
- <para>
- Page permission restricts the access of a user to specific pages. Users can change page information (properties, layout) if they have the edit right.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Portlet</term>
- <listitem>
- <para>
- When users create a page, they need to drag and drop portlets into a page to create the page content. Some portlets are only used for administrators, some are used for individual needs of a group thus you have to set the appropriate access permission.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <para>
- The three above permission levels helps users assign access and edit permissions clearly and flexibly.
- </para> -->
-
- <section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Portal">
- <title>Set the Access permission on a portal</title>
- <para>
- Administrators have to set permissions for new portals as well as existing portals:
- </para>
- <variablelist>
- <varlistentry>
- <term>New portals</term>
- <listitem>
- <para>
- On the Toolbar <emphasis>click</emphasis> on <emphasis role="bold">Site</emphasis> (hovering will present the <emphasis role="bold">Site</emphasis> menu) then click on the <emphasis role="bold">Add New Portal</emphasis> button, select the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Access Permission Setting</emphasis> sub tab.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/AddPortal.png" format="PNG" align="center" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/AddPortal.png" format="PNG" align="center" contentwidth="120mm"/>
- </imageobject>
- </mediaobject>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/PortalAccessPermissions.png" format="PNG" align="center" width="444" />
- </imageobject>
- </mediaobject>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Existing portals</term>
- <listitem>
- <para>
- On the Toolbar click <emphasis role="bold">Site</emphasis> then <emphasis role="bold">Edit Portal's Properties</emphasis> of the chosen portal,
- then select the <emphasis role="bold">Permission Setting</emphasis> tab.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/PortalPermission.png" format="PNG" align="center" width="444" />
- </imageobject>
- </mediaobject>
-
- </listitem>
- </varlistentry>
- </variablelist>
- <note>
- <title>Public access</title>
- <para>
- If you do not want your Portal to be publicly accessible, ensure the <emphasis role="bold">Make it public</emphasis> check box is clear.
- </para>
- </note>
-
- <para>
- If the <emphasis role="bold">Make it public</emphasis> check-box is clear, you will need to add permissions by member group.
- </para>
-
- <procedure>
- <step>
- <para>
- Click the <emphasis role="bold">Add Permissions</emphasis> sub-tag on the <emphasis role="bold">Permission Setting</emphasis> tab.
- </para>
- </step>
- <step>
- <para>
- Make the appropriate selections from the <emphasis>group</emphasis> and <emphasis>membership</emphasis> options presented in the <emphasis role="bold">Permission Selector</emphasis> dialogue box.
- </para>
- </step>
- <step>
- <para>
- After selecting a membership type, the selected permission is displayed in the access permission list. You can only select one group with one membership type at a time. If you want to add more, click <emphasis role="bold">Add Permission</emphasis> and select again. Repeat the process for as many permission settings as you require.
+ <section id="sect-User_Guide-Manage_Permission-Set_Portal_Permission">
+ <title>Set Portal Permissions</title>
+ <variablelist>
+ <varlistentry>
+ <term><emphasis role="bold">New portals</emphasis></term>
+ <listitem>
+ <para>
+ Click on <emphasis role="bold">Site</emphasis> in the Toolbar then click on <emphasis role="bold">Add New Portal</emphasis>. Last select the <emphasis role="bold">Permission Setting</emphasis> tab.
+ </para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/PermissionSetting2.png" format="PNG" align="center" width="444" />
+ <imagedata fileref="images/AddPortal.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/PermissionSetting2.png" format="PNG" align="center" contentwidth="150mm" />
+ <imagedata fileref="images/AddPortal.png" format="PNG" align="center" contentwidth="120mm"/>
</imageobject>
</mediaobject>
- </para>
- </step>
- </procedure>
- </section>
-
- <section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Portal">
- <title>Set the Edit Permission on a Portal</title>
- <para>
- Only users who are in the portal editor group can edit that portal. Access rights can be given to several groups but edit rights can only be given to a group with a membership type. To assign an edit permission to a user, you must add him to the editor group of the respective portal.
- </para>
- <para>
- Use one of these following paths to open the permission setting function of the portal:
- </para>
- <procedure>
- <step>
+
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><emphasis role="bold">Existing portals</emphasis></term>
+ <listitem>
+ <para>
+ On the Toolbar click <emphasis role="bold">Site</emphasis> then <emphasis role="bold">Edit Portal's Properties</emphasis>. Last select the <emphasis role="bold">Permission Setting</emphasis> tab.
+ </para>
+
+<note>
+<title>DOC TODO</title>
+<para>
+please redo screenshot with mouse on "edit portal's properties"
+</para>
+</note>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+
+ <section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Portal">
+ <title>Set Access permissions</title>
+
+
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/PortalPermission.png" format="PNG" align="center" width="444" />
+ </imageobject>
+ </mediaobject>
+
+ <note>
+ <title>Public access</title>
<para>
- On the Toolbar <emphasis>click</emphasis> (don't hover) <emphasis role="bold">Site</emphasis> and click on <emphasis role="bold">Add New Portal</emphasis>.
- </para>
- </step>
- <step>
- <para>
- <emphasis role="bold">Permission Setting</emphasis> tab and the <emphasis role="bold">Edit Permission Setting</emphasis> sub-tab.
- </para>
- </step>
- </procedure>
- <para>
- Or for an existing portal;
- </para>
- <procedure>
- <step>
- <para>
- On the Toolbar click <emphasis role="bold">Site</emphasis> then <emphasis role="bold">Edit Portal's Properties</emphasis>.
- </para>
- </step>
- <step>
- <para>
- Select the <emphasis role="bold">Permission Setting</emphasis> tab.
- </para>
- </step>
- <step>
- <para>
- Go to the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab.
- </para>
- </step>
- </procedure>
+ If you do not want your Portal to be publicly accessible, make sure the <emphasis role="bold">Make it public</emphasis> check box is clear.
+ </para>
+ </note>
+
+ <para>
+ If <emphasis role="bold">Make it public</emphasis> is clear, you need to add permissions by member group.
+ </para>
+
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/Edit2.6.png" format="PNG" align="center" width="444" />
+ <imagedata fileref="images/PermissionSetting2.png" format="PNG" align="center" width="444" />
</imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Edit2.6.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/PermissionSetting2.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
</mediaobject>
+
+ <procedure>
+ <step>
+ <para>
+ Click <emphasis role="bold">Add Permission</emphasis>
+ </para>
+ </step>
+ <step>
+ <para>
+ Make the appropriate selections from the <emphasis>group</emphasis> and <emphasis>membership</emphasis> options presented in the <emphasis role="bold">Permission Selector</emphasis> dialogue box.
+ </para>
+ </step>
+ <step>
+ <para>
+ After selecting a membership type, the selected permission is displayed in the access permission list. You can only select one group with one membership type at a time. If you want to add more, click <emphasis role="bold">Add Permission</emphasis> and select again. Repeat the process for as many permission settings as you require.
+>
+ </para>
+ </step>
+ </procedure>
+
+
+
+ </section>
+
+ <section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Portal">
+
+ <title>Set Edit Permissions</title>
<para>
- Once you have the <emphasis role="bold">Edit Permission Setting</emphasis> screen open, follow the steps below to set the edit permissions of the portal.
+ Only users members of the Editor group can edit that portal. Access rights can be given to several groups but edit rights can only be given to a group with a membership type. To assign an edit permission to a user, you must add him/her to the editor group of the respective portal.
</para>
- <procedure>
- <step>
- <para>
- Click <emphasis role="bold">Select Permission</emphasis> to choose a group.
- </para>
- </step>
- <step>
- <para>
- Select a group and a membership type from the left and right panes, respectively, of the <emphasis role="bold">Permission Selector</emphasis> window (select * if you want to assign all available membership types to the selected group).
- </para>
- </step>
- <step>
- <para>
- Click on the <emphasis role="bold">Save</emphasis> button to accept.
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/PermissionSetting1.png" format="PNG" align="center" width="444" />
- </imageobject>
- </mediaobject>
- </para>
- </step>
- </procedure>
- </section>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/PermissionSetting1.png" format="PNG" align="center" width="444" />
+ </imageobject>
+ </mediaobject>
+
+ <procedure>
+ <step>
+ <para>
+ Click <emphasis role="bold">Edit Permission Setting</emphasis>
+ </para>
+ </step>
+
+ <step>
+ <para>
+ Click <emphasis role="bold">Select Permission</emphasis> to choose a group.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select a group and a membership type from the left and right panes, respectively, of the <emphasis role="bold">Permission Selector</emphasis> window (select * if you want to assign all available membership types to the selected group).
+ </para>
+ </step>
+
+ </procedure>
+ </section>
- <section id="sect-User_Guide-Manage_Permission-Initialize_a_Permission_on_a_Page">
- <title>Initialize a Permission on a Page</title>
- <para>
- In some cases, permissions on a page are initialized and users who have the edit permission can change the page.
- </para>
+ </section>
+
+
+
+<!-- Set_Page_Permission -->
+
+
+
+ <section id="sect-User_Guide-Manage_Permission-Set_Page_Permission">
+ <title>Set Page Permission</title>
<variablelist>
<varlistentry>
<term><emphasis role="bold">User</emphasis></term>
<listitem>
<para>
- If the owner type of a page is "user", you don't have to set permissions, no one except the creator has access and edit permissions.
+ If the owner type of a page is "user", you don't have to set permissions, no one except the creator has got access and edit permissions.
</para>
</listitem>
</varlistentry>
@@ -254,27 +198,24 @@
</listitem>
</varlistentry>
</variablelist>
- </section>
- <section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Page">
- <title>Set the Access Permission on a Page</title>
- <para>
- These following process will help you quickly set access permission for a page:
- </para>
+ <section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Page">
+ <title>Set Access Permission on a Page</title>
+
<procedure>
<step>
<para>
- Select <emphasis role="bold">Site Editor</emphasis> on the Toolbar and click the <emphasis role="bold">Edit Page</emphasis> entry.
+ Open up the page you wish to configure. Select <emphasis role="bold">Site Editor</emphasis> on the Toolbar and select <emphasis role="bold">Edit Page</emphasis>.
</para>
</step>
<step>
<para>
- Click on the <emphasis role="bold">View Page Properties</emphasis> button in the <emphasis role="bold">Page Editor</emphasis> applet.
+ Click <emphasis role="bold">View Page Properties</emphasis> in the <emphasis role="bold">Page Editor</emphasis> applet.
</para>
</step>
<step>
<para>
- Click the <emphasis role="bold">Permission Setting</emphasis> tab. You will see the <emphasis role="bold">Access Permission Setting</emphasis> sub tab.
+ Click the <emphasis role="bold">Permission Setting</emphasis> tab.
</para>
</step>
</procedure>
@@ -285,48 +226,48 @@
<procedure>
<step>
<para>
- Click the <emphasis role="bold">Add Permission</emphasis> button
+ Click <emphasis role="bold">Add Permission</emphasis>
</para>
</step>
<step>
<para>
- Select a group you want to add on the left and then select a membership type on the right.
+ Select a group in the left pane then select a membership type.
</para>
</step>
<step>
<para>
- After selecting a membership type, the selected permission is displayed in the access right list. Each time, you can only select one group with one membership type. If you want to add more, click the <emphasis role="bold">Add Permission</emphasis> button and select again.
+ After selecting a membership type, the selected permission is displayed in the access right list.
+ Note that you may associate group and membership only one at a time. To add more access permissions, click the <emphasis role="bold">Add Permission</emphasis> button and apply the same process again.
</para>
</step>
</procedure>
<para>
- If you want to allow any visitors to access the page tick the <emphasis role="bold">Make it public</emphasis> check-box. Any permission set for that page will be relaxed and the permissions list will disappear. When you click <emphasis role="bold">Save</emphasis> the page will be made accessible to the public.
+ If you want to allow any visitors to access the page tick the <emphasis role="bold">Make it public</emphasis> check-box. Any permission set for that page will be relaxed and the permissions list will disappear.
</para>
- </section>
+ </section>
- <section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Page">
- <title>Set the Edit Permission on a Page</title>
+ <section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Page">
+ <title>Set Edit Permission on a Page</title>
<para>
Only users who are in the page's editor group can edit it. The access right can be set for several groups but the <emphasis>edit</emphasis> right only can be set for one group. To give a user the edit permission, you must add them to the editors group of that page.
</para>
<para>
- This can be accessed on of two ways:
+ The Permission Setting tab is available in two different ways:
</para>
+
+ <para>
+ Via Edit Page:
+ </para>
<procedure>
<step>
<para>
- Select <emphasis role="bold">Site Editor</emphasis> on the Toolbar and click the <emphasis role="bold">Edit Page</emphasis> entry.
+ Mouse over <emphasis role="bold">Site Editor</emphasis> on the Toolbar and select <emphasis role="bold">Edit Page</emphasis>.
</para>
</step>
- <step>
- <para>
- Select <emphasis role="bold">Site Editor</emphasis> on the Toolbar and click the <emphasis role="bold">Edit Page</emphasis> entry.
- </para>
- </step>
<step>
<para>
- Click on the <emphasis role="bold">View Page Properties</emphasis> button in the <emphasis role="bold">Page Editor</emphasis> applet.
+ Click on <emphasis role="bold">View Page Properties</emphasis> in the <emphasis role="bold">Page Editor</emphasis> applet.
</para>
</step>
<step>
@@ -336,12 +277,12 @@
</step>
</procedure>
<para>
- Or;
+ Via Page Management:
</para>
<procedure>
<step>
<para>
- Select the <emphasis role="bold">Group</emphasis> navigation on the Toolbar, go to <emphasis role="bold">Administration</emphasis> and click on <emphasis role="bold">Page Management</emphasis>.
+ Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar, highlight <emphasis role="bold">Administration</emphasis> and click on <emphasis role="bold">Page Management</emphasis>.
</para>
</step>
<step>
@@ -351,7 +292,7 @@
</step>
<step>
<para>
- As, above, click on the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab.
+ Click on the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab.
</para>
</step>
</procedure>
@@ -376,22 +317,23 @@
</step>
<step>
<para>
- Click the <emphasis role="bold">Save</emphasis> button to accept.
+ Click the <emphasis role="bold">Save</emphasis>
</para>
</step>
</procedure>
+ </section>
+
</section>
<section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Category">
- <title>Set the Access Permission on a Category</title>
+ <title>Set Access Permission on a Category</title>
<para>
Setting access permission on a category allows to be able to list those categories when editing a page in order to add portlets or widgets.
- Follow these below steps to set access permission on a category:
</para>
<procedure>
<step>
<para>
- Select <emphasis role="bold">Group</emphasis> from the Toolbar. Highlight the <emphasis role="bold">Administration</emphasis> entry and click on <emphasis role="bold">Application Registry</emphasis>.
+ Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar, highlight <emphasis role="bold">Administration</emphasis> then click on <emphasis role="bold">Application Registry</emphasis>.
<mediaobject>
<imageobject>
<imagedata fileref="images/EditCategoryPermissions.png" format="PNG" align="center" width="444" />
@@ -401,7 +343,7 @@
</step>
<step>
<para>
- In the list of categories in the left pane, click the edit icon, then choose the <emphasis role="bold">Permission Setting</emphasis> tab.
+ In the list of categories available in the left pane, click the edit icon, then choose the <emphasis role="bold">Permission Setting</emphasis> tab.
</para>
</step>
<step>
@@ -425,14 +367,11 @@
</section>
<section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Portlet">
- <title>Set the Access Permission on a Portlet</title>
- <para>
- Follow these below steps to set access permission on a portlet:
- </para>
+ <title>Set Access Permission on a Portlet</title>
<procedure>
<step>
<para>
- Select <emphasis role="bold">Group</emphasis> from the Toolbar. Highlight the <emphasis role="bold">Administration</emphasis> entry and click on <emphasis role="bold">Application Registry</emphasis>.
+ Select <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight the <emphasis role="bold">Administration</emphasis> entry and click on <emphasis role="bold">Application Registry</emphasis>.
<mediaobject>
<imageobject role="html">
<imagedata fileref="images/Application1.png" format="PNG" align="center" width="444" />
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Portals.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -4,60 +4,69 @@
%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Manage_Portals">
- <title>Manage Portals</title>
+ <title>Manage Portals</title>
+
+
+<section id="sect-User_Guide-Create_a_New_Portal">
+ <title>Create a New Portal</title>
<para>
- Portals can easily be managed by editing or deleting.
+ Creating a new portal requires proper access credentials that only an administrator may set up.
</para>
- <section id="sect-User_Guide-Manage_Portals-Edit_a_Portal">
- <title>Edit a Portal</title>
- <para>
- You can change aspects of the current using portal, such as properties or layout if you have the edit right (granted by an Admininstrator).
- </para>
- <para>
- If you have edit rights, follow these steps to edit the current portal:
- </para>
- <procedure>
- <step>
- <para>
- Go to <emphasis role="bold">Editor</emphasis> on the Toolbar and click <emphasis role="bold">Edit Site Layout</emphasis>.
- </para>
+ <procedure>
+ <step>
+ <para>
+ Click on <emphasis role="bold">Site</emphasis> in the toolbar.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the <emphasis role="bold">Add New Portal</emphasis> button. By default, the <emphasis role="bold">Create New Portal</emphasis> window is shown with the <emphasis role="bold">Portal Templates</emphasis> tab.
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/EditPortal.png" format="PNG" align="center" scale="100"/>
+ <imagedata fileref="images/PortalTemplate.png" format="PNG" align="center" scale="100" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/EditPortal.png" format="PNG" align="center" contentwidth="130mm" />
+ <imagedata fileref="images/PortalTemplate.png" format="PNG" align="center" contentwidth="150mm" />
</imageobject>
</mediaobject>
- </step>
- <step>
- <para>
- Click the Properties button in the <emphasis role="bold">Edit Inline Composer</emphasis>. The edit Form of the portal will be shown:
- </para>
+ </para>
+ <para>
+ By default, Portal template is Classic. Select the <emphasis role="bold">Portal Setting</emphasis> tab.
+
+<note>
+<title>DOC TODO</title>
+<para>
+please redo screenshot
+</para>
+</note>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/EditPortal2.6New.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/PortalSetting2.5.png" format="PNG" align="center" scale="100" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/EditPortal2.6New.png" format="PNG" align="center" contentwidth="150mm" />
+ <imagedata fileref="images/PortalSetting2.5.png" format="PNG" align="center" contentwidth="150mm" />
</imageobject>
</mediaobject>
- </step>
- </procedure>
- <para>
- This form is where you can change portal settings.
- </para>
-
-
- <procedure id="proc-User_Guide-Manage_Portals-Edit_a_Portal-Change_Timeout_Settings">
- <title>Change Timeout Settings</title>
- <step>
- <para>
- Click the <emphasis role="bold">Propertites</emphasis> tab of the edit form. Select an option for <emphasis role="bold">Keep session alive</emphasis>
- </para>
- <para>
- This option controls how long your session is kept alive. There are 3 options:
- </para>
+ </para>
+ </step>
+ <step>
+ <para>
+ Enter a string for the <emphasis role="bold">Portal Name</emphasis> field. This field is required and must be unique. Only alphabetical, numerical and underscore characters are allowed for this field and the name must have at least 3 characters.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select the default display language for the portal
+ </para>
+ </step>
+ <step>
+ <para>
+ Select a skin for a portal
+ </para>
+ </step>
+ <step>
+ <para>
+ Click on the <emphasis role="bold">Properties</emphasis> tab to fill in the <emphasis role="bold">Keep session alive</emphasis> property. There are 3 options:
<variablelist>
<varlistentry>
<term><emphasis role="bold">Never</emphasis></term>
@@ -84,196 +93,211 @@
</listitem>
</varlistentry>
</variablelist>
- </step>
- <step>
- <para>
- Select the option that best suits your needs.
- </para>
- </step>
- <step>
- <para>
- Click the <emphasis role="bold">Save</emphasis> button to accept changes or the <emphasis role="bold">Cancel</emphasis> button to quit.
- </para>
- </step>
- </procedure>
- <procedure id="proc-User_Guide-Manage_Portals-Edit_a_Portal-Set_permissions_for_the_portal">
- <title>Set permissions for the portal</title>
- <step>
- <para>
- Go to the <emphasis role="bold">Permission Setting</emphasis> tab of the edit form and then the <emphasis role="bold">Edit Permission Setting</emphasis> sub-tab.
- </para>
- </step>
- <step>
- <para>
- Click the <emphasis role="bold">Select Permission</emphasis> button and then select a group with the Membership type you want. Only one group can have the Edit Permission of the portal.
- </para>
- </step>
+ </para>
+ </step>
+ <step>
+ <para>
+ Click on the <emphasis role="bold">Permission Setting</emphasis> tab and set the permissions for the Portal.
+ </para>
+ <para>
+ By default the access permissions list for the portal is empty. You have to select at least one or tick on the <emphasis role="bold">Make it public</emphasis> check box to assign access permission to everyone.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Save</emphasis>
+ </para>
+ </step>
+ </procedure>
+ <para>
+ You also can edit or delete a portal. See more details in <xref linkend="sect-User_Guide-Manage_Portals" />
+ </para>
+</section>
- <step>
- <para>
- Click the <emphasis role="bold">Save</emphasis> button to accept changes or the <emphasis role="bold">Cancel</emphasis> button to quit.
- </para>
- </step>
- </procedure>
-<!-- <procedure>
- <step>
- <para>
- Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> > <emphasis role="bold">Edit Current Portal</emphasis>. A form to edit the current portal will appear:
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/EditCurrentPortal.png" format="PNG" align="center" width="444" />
- </imageobject>
- </mediaobject>
- <variablelist>
- <varlistentry>
- <term>Preview page</term>
- <listitem>
- <para>
- allows viewing node's page in preview mode.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Edit page properties</term>
- <listitem>
- <para>
- Allows editing node's page properties.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Show container</term>
- <listitem>
- <para>
- Allows listing all existing containers when editing node's page.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Show portlet</term>
- <listitem>
- <para>
- Allows listing all existing portlets when editing node's page.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Save page</term>
- <listitem>
- <para>
- Allows saving changes of page when editing node's page.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Rollback</term>
- <listitem>
- <para>
- Allows canceling all changes that have not been saved.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Abort</term>
- <listitem>
- <para>
- Allows canceling all changes that have not been saved and escaping Edit page and navigation form.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Finish</term>
- <listitem>
- <para>
- Allows saving all changes and escaping Edit page and navigation form.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <step>
- <para>
- Click!images/EditPage.png! icon to edit portal properties.
- </para>
- </step>
- <step>
- <para>
- Click!images/ShowContainer.png! icon to edit portal container layout.
- </para>
- </step>
- <step>
- <para>
- Click!images/ShowPortlet.png! icon to edit portal portlet layout.
- </para>
- </step>
- <step>
- <para>
- Click!images/Savepage.png! icon to save changes.
- </para>
- </step>
- </procedure> -->
+ <section id="sect-User_Guide-Manage_Portals-Edit_a_Portal">
+ <title>Edit a Portal</title>
+ <para>
+ An administrater is allowed to alter many aspects of a portal:
+ </para>
+ <para>
+ Click <emphasis role="bold">Site</emphasis> on the Toolbar. A list of active portals will appear as such:
+ </para>
+<note>
+<title>DOC TODO</title>
+<para>
+please add screenshot
+</para>
+</note>
+
+ </section>
+ <section id="proc-User_Guide-Manage_Portals-Edit_Layout">
+ <title>Edit Layout</title>
+<note>
+<title>DOC TODO</title>
+<para>
+please add screenshot
+</para>
+</note>
+
</section>
+
+ <section id="proc-User_Guide-Manage_Portals-Edit_Navigation">
+ <title>Edit Navigation</title>
+<note>
+<title>DOC TODO</title>
+<para>
+please add screenshot
+</para>
+</note>
+
+ </section>
+
+ <section id="proc-User_Guide-Manage_Portals-Edit_Properties">
+ <title>Edit Properties</title>
+<note>
+<title>DOC TODO</title>
+<para>
+please add screenshot
+</para>
+</note>
+
+ </section>
+
<section id="sect-User_Guide-Manage_Portals-Delete_a_Portal">
<title>Delete a Portal</title>
- <procedure>
- <title>Method One:</title>
+ <procedure>
<step>
<para>
- Go to <emphasis role="bold">Group</emphasis> on the Toolbar and highlight <emphasis role="bold">Administration</emphasis>. Click on <emphasis role="bold">Portal Management</emphasis>. List of all portals will be shown.
+ Click on the Delete icon.The confirmation message will appear.
</para>
</step>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/SureDelete.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
<step>
<para>
- Click the trash can icon in the row of the portal you want to delete in the portal list.
+ Click <emphasis role="bold">OK</emphasis>
</para>
</step>
- <step>
- <para>
- Click the <emphasis role="bold">OK</emphasis> button in the confirmation message to delete.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/SureDelete.png" format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/SureDelete.png" format="PNG" align="center" contentwidth="70mm"/>
- </imageobject>
- </mediaobject>
- </step>
</procedure>
+ </section>
- <procedure>
- <title>Method Two:</title>
- <step>
- <para>
- Click on <emphasis role="bold">Site</emphasis> in the Toolbar
+ <section id="sect-User_Guide-Change_Portal_Skins">
+ <title>Change Portal Skins</title>
+ <para>
+ Skins are graphic styles used to provide an attractive user interface. Each skin has its own characteristics with different backgrounds, icons, and other visual elements.
+ </para>
+ <para>
+ Skins can be changed temporarily (and are reset at log-out) or permanently.
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>Change the skin temporarily</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Mouse over the Start menu and click on <emphasis role="bold">Change Skin</emphasis>.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select a new skin from the Skin list. By clicking on the skin name a picture will appear in the preview pane.
+ </para>
+<note>
+<title>DOC TODO</title>
+<para>
+please redo screenshot
+</para>
+</note>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/SkinSet1.png" format="PNG" width="444" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/SkinSet1.png" format="PNG" contentwidth="120mm" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ lick <emphasis role="bold">Apply</emphasis> to apply to the portal.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Change the skin permanently</term>
+ <listitem>
+ <procedure>
+ <step>
+ <para>
+ Click on <emphasis role="bold">Site</emphasis>, then <emphasis role="bold">Edit Portal's Properties</emphasis>.
+ </para>
+ </step>
- </para>
- </step>
- <step>
+ <step>
+ <para>
+ In the <emphasis role="bold">Portal Setting</emphasis> tab, select another skin <emphasis role="bold">Skin</emphasis> list
+ </para>
+<note>
+<title>DOC TODO</title>
+<para>
+please redo screenshot
+</para>
+</note>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/Skin1.png" format="PNG" width="444" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/Skin1.png" format="PNG" contentwidth="120mm"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Click <emphasis role="bold">Save</emphasis> then <emphasis role="bold">Finish</emphasis>.
+ </para>
+ </step>
+ </procedure>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>
- Click on the Delete icon.The confirmation message will appear.
+ More information about adding skins to a portal check out the &PRODUCT; Reference Guide at <ulink type="http" url="www.redhat.com/docs"></ulink>
</para>
- </step>
- <step>
- <para>
- Click <emphasis role="bold">OK</emphasis> to accept deleting a portal or <emphasis role="bold">Cancel</emphasis> to quit without deleting it.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/SureDelete.png" format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/SureDelete.png" format="PNG" align="center" contentwidth="70mm"/>
- </imageobject>
- </mediaobject>
- </step>
- </procedure>
+
</section>
+ <section id="sect-User_Guide-Switching_between_Portals">
+ <title>Switching between Portals</title>
+ <para>
+ Mouse over <emphasis role="bold">Site</emphasis> on the Toolbar for a list all portals in which you have at least access right
+ </para>
+ <note>
+ <title>DOC TODO</title>
+ <para>
+ please redo screenshot
+ </para>
+ </note>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/SitePortlet.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ <para>
+ Users switch between Portals by clicking on the desired portal. Please wait a few seconds for the change to take effect.
+ </para>
+ </section>
+
+
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Page_Creation_Wizard.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Page_Creation_Wizard.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/Page_Creation_Wizard.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -3,190 +3,9 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
-<section id="sect-User_Guide-Page_Creation_Wizard">
- <title>Page Creation Wizard</title>
- <para>
- A page creation wizard is included in &PRODUCT; to help administrators to create and publish a page quickly and easily.
- </para>
- <procedure>
- <step>
- <para>
- Hover on <emphasis role="bold">Site Editor</emphasis>and click on <emphasis role="bold">Add New Page</emphasis>. The <emphasis role="bold">Page Creation Wizard</emphasis> will appear.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Wizard1.png" format="PNG" align="center" scale="100" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Wizard1.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
- The wizard includes two parts: the left pane contains a list of navigations and shows the page list and the right pane displays the main information of the page selected in this list.
- </para>
- </step>
- <step>
- <para>
- In the left pane, select the navigation that you want to create a new page for. Clicking a navigation displays the pages already existing for that navigation.
- </para>
- </step>
- <step>
- <para>
- Select a page from the list or click on arrow up icon to add a page at root.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Pagewizard1.png" format="PNG" align="center" scale="110" />
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Pagewizard1.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- <variablelist>
- <varlistentry>
- <term><emphasis role="bold">Current Selected Page Node</emphasis></term>
- <listitem>
- <para>
- The path of the selected node to add a new sub page
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Node Name</emphasis></term>
- <listitem>
- <para>
- The node name of the added page. It is required field. This field must start with a character and must have a length between 3 and 30 characters.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Display Name</emphasis></term>
- <listitem>
- <para>
- The display name of the node which contains the added page and must have a length between 3 and 30 characters.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Visible</emphasis></term>
- <listitem>
- <para>
- This check box allows to hide this page. If not checked the page is under no circumstances shown, even if the publication period is OK. If checked the page or the page node appears on on the navigation bar, the page navigation and the site map. If "visible" is checked the visibility can depend on the "publication date & time" option.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Publication date &time</emphasis></term>
- <listitem>
- <para>
- This option allows publishing the page for a period of time. If this option is checked the visibility of the page depends on the publication period start and end date.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Start Publication Date</emphasis></term>
- <listitem>
- <para>
- The start date and time to publish the page
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">End Publication Date</emphasis></term>
- <listitem>
- <para>
- The end date and time to publish the page.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <note>
- <title>Setting Time and Date</title>
- <para>
- You can set date and time by clicking the <emphasis role="bold">Start Publication Date</emphasis> field and <emphasis role="bold">End Publication Date</emphasis> field and select a date in the calendar pop up
- </para>
- </note>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/Calendar.png" format="PNG" align="center"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/Calendar.png" format="PNG" align="center" contentwidth="70mm" />
- </imageobject>
- </mediaobject>
+TO DELETE
- </step>
- <step>
- <para>
- Click <emphasis role="bold">Next</emphasis> or number '2' of the wizard steps to go to step 2.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PageWizard2.png" format="PNG" align="center" scale="110"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/PageWizard2.png" format="PNG" align="center" contentwidth="150mm" />
- </imageobject>
- </mediaobject>
- </step>
- <step>
- <para>
- Select <emphasis role="bold">Empty Layout</emphasis> or click the icon to see more templates to select.
- </para>
- </step>
- <step>
- <para>
- Click the <emphasis role="bold">Next</emphasis> button or number '3' of the wizard step to go to step 3. You can drag portlets from the popup panel into the main pane to create the content of this page.
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/PageWizard3.png" format="PNG" align="center" scale="110"/>
- </imageobject>
- <imageobject>
- <imagedata fileref="images/PageWizard3.png" format="PNG" align="center" contentwidth="130mm" />
- </imageobject>
- </mediaobject>
- <variablelist>
- <varlistentry>
- <term><emphasis role="bold">Applications</emphasis></term>
- <listitem>
- <para>
- Allows listing all existing portlets
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Containers</emphasis></term>
- <listitem>
- <para>
- Allows listing all existing containers
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><emphasis role="bold">Switch View mode</emphasis></term>
- <listitem>
- <para>
- Allows viewing a page in preview mode
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </step>
- <step>
- <para>
- Click the <emphasis role="bold">Show Container</emphasis> icon if you want to see the existing containers and re-select the layout of the page. You can click on the <emphasis role="bold">Switch</emphasis> icon to view the content of this page.
- </para>
- </step>
- <step>
- <para>
- Click <emphasis role="bold">Save</emphasis> to accept creating a new page, the <emphasis role="bold">Back</emphasis> button to return the previous step or the <emphasis role="bold">Abort</emphasis> button to quit without creating a new page.
- </para>
- </step>
- </procedure>
-</section>
+
Modified: portal/trunk/docs/user-guide/en/modules/portal/Switching_between_Portals.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Switching_between_Portals.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/Switching_between_Portals.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -3,25 +3,9 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
%BOOK_ENTITIES;
]>
-<section id="sect-User_Guide-Switching_between_Portals">
- <title>Switching between Portals</title>
- <para>
- &PRODUCT; allows users to switch between portals simply and easily.
- </para>
- <para>
- Go to <emphasis role="bold">Site</emphasis> on the Toolbar for a list all portals in which you have at least the access right
- </para>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/SitePortlet.png" format="PNG" align="center" scale="110"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/SitePortlet.png" format="PNG" align="center" contentwidth="150mm"/>
- </imageobject>
- </mediaobject>
- <para>
- You easily switch between Portals by simply clicking on the portal that you wish to switch to and waiting for few seconds for the change to take effect.
- </para>
-</section>
+TO DELETE
+
+
+
Modified: portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2010-03-09 16:44:16 UTC (rev 2061)
+++ portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2010-03-09 17:38:10 UTC (rev 2062)
@@ -4,19 +4,16 @@
%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-User_management">
- <title>User management</title>
+ <title>Manage Users and Groups</title>
<para>
- &PRODUCT; offers a number of tools to assist Administrators to manage a number of registered users, groups and memberships easily and effectively.
+ Several tools are offered to assist Administrators manage users, groups and memberships easily and effectively.
</para>
<section id="sect-User_Guide-User_Management-Manage_users">
<title>Manage users</title>
<para>
- Select the <emphasis role="bold">Group</emphasis> navigation in the Toolbar. Under the <emphasis role="bold">Executive Board's Pages</emphasis> heading is a link to <emphasis role="bold">Organization</emphasis> options.
+ Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis>
</para>
- <para>
- Clicking <emphasis>Users and Groups Management</emphasis> in this list will open an easily navigated table of current registered users.
- </para>
<mediaobject>
<imageobject>
<imagedata fileref="images/UserManage.png" format="PNG" align="center" width="444" />
@@ -25,17 +22,29 @@
<para>
Administrators can see all existing registered users and search, edit or even delete them. Each user's groups and memberships (roles) in these groups are also available. You can not add users to a group but you can remove them from the group.
</para>
- </section>
- <section id="sect-User_Guide-User_Management-Search_a_user">
- <title>Search a user</title>
+
+ <section id="sect-User_Guide-User_Management-Add_a_user">
+ <title>Add a user</title>
+
+
+<note>
+<title>DOC TODO</title>
+<para>
+add Group/Organization/New Staff workflow
+</para>
+</note>
+ </section>
+
+ <section id="sect-User_Guide-User_Management-Search_a_user">
+ <title>Search for users</title>
<para>
The Administrator can search for specific users by username, first name, last name or email address.
</para>
<procedure>
<step>
<para>
- Select the parameter (name, email, etc) by which you would like to search from the drop-down menu.
+ Select the information type (name, email, etc) to search against
</para>
<mediaobject>
<imageobject>
@@ -45,18 +54,18 @@
</step>
<step>
<para>
- Type the search terms for the user that you want to locate. You may not need to enter the complete title as the tool will present partial match search results.
+ Type in a partial/full string which identifies the user record being searched. Note that wild cards are not supported at this release.
</para>
</step>
<step>
<para>
- Click the 'find' icon to begin the search.
+ Click the magnifying glass icon to begin the search.
</para>
</step>
</procedure>
- </section>
+ </section>
- <section id="sect-User_Guide-User_Management-Edit_a_user">
+ <section id="sect-User_Guide-User_Management-Edit_a_user">
<title>Edit a user</title>
<procedure>
<step>
@@ -66,7 +75,7 @@
</step>
<step>
<para>
- Click the edit icon (next to the trash icon) in the list entry of that user.
+ Click the edit icon (next to the trash icon).
</para>
<mediaobject>
<imageobject>
@@ -76,7 +85,7 @@
</step>
<step>
<para>
- Select the <emphasis role="bold">Account Info</emphasis> tab to view and change the essential user information.
+ Select the <emphasis role="bold">Account Info</emphasis> tab to edit the main user information set including first name, last name or email address.
</para>
<variablelist>
<varlistentry>
@@ -99,7 +108,7 @@
</step>
<step>
<para>
- Select the <emphasis role="bold">User Profile</emphasis> tab to view and change profile information. The <emphasis role="bold">Language</emphasis> field is used to set the display language for that user.
+ Select the <emphasis role="bold">User Profile</emphasis> tab to edit additional information about the user's profile such as the birthdate or the job title as well as some home and business metadata. You may also switch the default display language for that user.
</para>
</step>
<step>
@@ -116,10 +125,10 @@
<term>User Membership</term>
<listitem>
<para>
- The <emphasis role="bold">User Membership</emphasis> tab indicates which group (or groups) the selected user belongs to. In the above figure, the user "demo" is a member of two groups: "guests" and "users". The parent group of both is "platform".
+ The <emphasis role="bold">User Membership</emphasis> tab displays which group(s) the selected user belongs to. In the above figure, the user "demo" is a member of two groups: "guests" and "users". The parent group of both is "platform".
</para>
<para>
- To remove the user from a group, click the trash can icon on the row of the membership you want to revoke.
+ To remove the user from a group, click the trash can icon.
</para>
</listitem>
</varlistentry>
@@ -127,52 +136,54 @@
</step>
<step>
<para>
- Click the <emphasis role="bold">Save</emphasis> button to submit changes.
+ Click the <emphasis role="bold">Save</emphasis>.
</para>
</step>
</procedure>
- </section>
+ </section>
- <section id="sect-User_Guide-User_Management-Delete_a_user">
- <title>Delete a user</title>
+ <section id="sect-User_Guide-User_Management-Delete_a_user">
+ <title>Delete a user</title>
<procedure>
<step>
<para>
- Locate the user you wish to delete in the <emphasis role="bold">User Management</emphasis> form.
+ Locate the user you wish to delete
</para>
<para>
- Click the trash icon in the list entry corresponding to the user that you want to delete.
+ Click the trash icon in the Action column
</para>
</step>
<step>
<para>
- Click the <emphasis role="bold">OK</emphasis> button in the confirmation message to confirm or the <emphasis role="bold">Cancel</emphasis> button to quit without changing anything.
+ Click <emphasis role="bold">OK</emphasis> to confirm.
</para>
</step>
</procedure>
</section>
- <section id="sect-User_Guide-User_Management-Manage_groups">
+ </section>
+
+ <section id="sect-User_Guide-User_Management-Manage_groups">
<title>Manage groups</title>
<para>
- Select the <emphasis role="bold">Group Management</emphasis> tab in the <emphasis role="bold">Organization</emphasis> form.
+ Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis>
</para>
+ <para>Select the tab <emphasis>Group Management</emphasis></para>
<para>
- By default, all existing groups will be displayed on the left pane. This tab is used to add new, edit or delete a group. The right pane shows information about the selected group including information about the members in the specific group and a small form to add a new user to a group.
+ By default, all existing groups will be displayed on the left pane. This tab is used to add new, edit or delete a group. The right pane shows information about the selected group including information about the members in the specific group along with a small form to add a new user to a group.
</para>
<mediaobject>
<imageobject>
<imagedata fileref="images/GroupManage.png" format="PNG" align="center" width="444" />
</imageobject>
</mediaobject>
- </section>
<section id="sect-User_Guide-User_Management-Add_a_new_group">
<title>Add a New Group</title>
<procedure>
<step>
<para>
- Choose the path to create a new group by selecting the groups from list on the left pane or clicking the arrow icon if you want to create a group in a higher level. The selected path is displayed in the path bar.
+ First choose where in the existing group structure you want the new group to be created. You may navigate up the tree by clicking on the green vertical little arrow at the top of the tree. The current path is displayed in the path bar.
</para>
<mediaobject>
<imageobject role="html">
@@ -185,7 +196,7 @@
</step>
<step>
<para>
- Click the <emphasis role="bold">Add New Group</emphasis> icon. The <emphasis role="bold">Add New Group</emphasis> form will be displayed on the right pane:
+ Click <emphasis role="bold">Add New Group</emphasis>.
</para>
<mediaobject>
<imageobject role="html">
@@ -229,7 +240,7 @@
</step>
<step>
<para>
- Click the <emphasis role="bold">Save</emphasis> button to accept entered values or the <emphasis role="bold">Cancel</emphasis> button to quit.
+ Click <emphasis role="bold">Save</emphasis>
</para>
</step>
</procedure>
@@ -240,22 +251,22 @@
<procedure>
<step>
<para>
- Select the path to the group you want to edit by selecting the groups from list on the left pane.
+ Find the group in the existing tree and click on the label
</para>
</step>
<step>
<para>
- Click the edit icon to show the <emphasis role="bold">Edit Group</emphasis> form for the selected group. This form is identical to the <emphasis role="bold">New Group</emphasis> form.
+ Click the edit icon to display the <emphasis role="bold">Edit Current Group</emphasis> window.
</para>
</step>
<step>
<para>
- Make the desired changes in the approapraite fields. You can not change the Group Name, however you may change to the <emphasis role="bold">Label</emphasis> field if you wish to refer to the group by a different name. You are also able to edit the <emphasis role="bold">Description</emphasis> field should it be appropriate.
+ Make the desired changes in the appropriate fields. You can not change the Group Name, however you may change to the <emphasis role="bold">Label</emphasis> field. You are also able to edit the <emphasis role="bold">Description</emphasis> field.
</para>
</step>
<step>
<para>
- Click the <emphasis role="bold">Save</emphasis> button to accept changes or the <emphasis role="bold">Cancel</emphasis> button to cancel changes and return to the <emphasis role="bold">Group Info</emphasis> form.
+ Click <emphasis role="bold">Save</emphasis>
</para>
</step>
</procedure>
@@ -266,7 +277,7 @@
<procedure>
<step>
<para>
- Select the path to the group you want to edit by selecting the groups from the list on the left pane. The Group's information is displayed including the user list and a form which allows the addition of a new user.
+ Find the group in the existing tree and click on its label. Existing group memberships are listed on the left hand side along with the <emphasis role="bold">Add Member</emphasis> window.
</para>
<mediaobject>
<imageobject>
@@ -276,26 +287,23 @@
</step>
<step>
<para>
- Enter the username of the new user of the selected group.
+ Click on the magnify glass to open up the User selector.
</para>
<para>
- If you are unsure of the exact username of the user you wish to add to the group, you can use the search function to locate them.
- </para>
- <para>
Refer to <xref linkend="sect-User_Guide-User_Management-Search_a_user" /> for instructions on how to locate a user.
</para>
<para>
- After you have found the required username, click the <emphasis role="bold">Add</emphasis> button and the complete username will populate the <emphasis role="bold">Add member</emphasis> form.
+ Check the box next to the user name then click <emphasis role="bold">Add</emphasis>
</para>
</step>
<step>
<para>
- Select the membership for the user in a group from memberships list. The refresh icon can be used to update the memberships list if there are any changes to incorporate.
+ Select the membership appropriate for this user. If the desired membership does not appear you may try to click on the refresh icon to get the latest list.
</para>
</step>
<step>
<para>
- Click the <emphasis role="bold">Save</emphasis> button to accept adding the selected user to a specific group with the selected membership type.
+ Click <emphasis role="bold">Save</emphasis>
</para>
</step>
</procedure>
@@ -306,7 +314,7 @@
<procedure>
<step>
<para>
- Click the edit icon corresponding to a specific user with a membership in the <emphasis role="bold">Group Info</emphasis> table to open the <emphasis role="bold">Edit Membership</emphasis> form :
+ Click the edit icon in the Action column
</para>
<mediaobject>
<imageobject role="html">
@@ -319,12 +327,12 @@
</step>
<step>
<para>
- Change the membership of the selected user by selecting another value in the <emphasis role="bold">Membership</emphasis> field.
+ Select another membership.
</para>
</step>
<step>
<para>
- Complete editing the selected user by clicking the <emphasis role="bold">Save</emphasis> button.
+ Click <emphasis role="bold">Save</emphasis>.
</para>
</step>
</procedure>
@@ -335,42 +343,47 @@
<procedure>
<step>
<para>
- Select the path to the group you want to delete by selecting the groups from list on the left pane.
+ Find the group in the tree
</para>
</step>
<step>
<para>
- Click the trash icon to delete the group.
+ Click the trash icon.
</para>
+<note>
+<title>DOC TODO</title>
+<para>
+missing screenshot
+</para>
+</note>
</step>
<step>
<para>
- Click the <emphasis role="bold">OK</emphasis> button on the confirmation message to accept or the <emphasis role="bold">Cancel</emphasis> button to quit without deleting.
+ Click <emphasis role="bold">OK</emphasis>.
</para>
</step>
</procedure>
</section>
- <section id="sect-User_Guide-User_Management-Manage_memberships">
- <title>Manage memberships</title>
+ </section>
+
+ <section id="sect-User_Guide-User_Management-Manage_memberships">
+ <title>Manage memberships</title>
<para>
- The roles of an user in the specific group are managed in the <emphasis role="bold">Membership Management</emphasis> form.
+ The role of a user in a specific group is managed using memberships.
</para>
<para>
- Currently there are three membership types: <emphasis>Manager</emphasis>, <emphasis>Member</emphasis> and <emphasis>Validator</emphasis>. By default, Manager has the highest rights in a group.
+ By default three membership types are available: <emphasis>Manager</emphasis>, <emphasis>Member</emphasis> and <emphasis>Validator</emphasis>. By definition, Manager has got the highest rights in a group.
</para>
<para>
- Administrators can add new, edit or delete a membership type. Select the <emphasis role="bold">Membership Management</emphasis> tab in the <emphasis role="bold">Organization</emphasis> portlet.
+ Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis>. Select the <emphasis role="bold">Membership Management</emphasis> tab.
</para>
- <para>
- This will open a membership type list and a form to add new/edit:
- </para>
+
<mediaobject>
<imageobject>
<imagedata fileref="images/MembershipManage1.png" format="PNG" align="center" width="444" />
</imageobject>
</mediaobject>
- </section>
<section id="sect-User_Guide-User_Management-Add_a_new_membership_type">
<title>Add a new membership type</title>
@@ -382,7 +395,7 @@
</step>
<step>
<para>
- Click the <emphasis role="bold">Save</emphasis> button to accept adding the new membership or click <emphasis role="bold">Reset</emphasis> button to clear the entered values.
+ Click the <emphasis role="bold">Save</emphasis>
</para>
</step>
</procedure>
@@ -393,17 +406,17 @@
<procedure>
<step>
<para>
- Click the edit icon in the row of the membership type you want to edit. The selected Membership type information is displayed in the Add/Edit Membership form.
+ Click the edit icon in the Action column.
</para>
</step>
<step>
<para>
- Make the desired changes in this form.
+ Make the desired changes to the description.
</para>
</step>
<step>
<para>
- Click <emphasis role="bold">Save</emphasis> to accept changes.
+ Click <emphasis role="bold">Save</emphasis>
</para>
</step>
</procedure>
@@ -414,14 +427,16 @@
<procedure>
<step>
<para>
- Click the trash icon in the row of the membership type that you want to delete.
+ Click the trash icon in the Action column.
</para>
</step>
<step>
<para>
- Click the <emphasis role="bold">OK</emphasis> button in the confirmation message to accept the deletion.
+ Click <emphasis role="bold">OK</emphasis>
</para>
</step>
</procedure>
</section>
+ </section>
+
</section>
16 years, 1 month
- 1
- 0
gatein SVN: r2061 - maven/parent/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-09 11:44:16 -0500 (Tue, 09 Mar 2010)
New Revision: 2061
Modified:
maven/parent/trunk/pom.xml
Log:
GTNMAVEN-11: Release plugin issues
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2010-03-09 15:25:56 UTC (rev 2060)
+++ maven/parent/trunk/pom.xml 2010-03-09 16:44:16 UTC (rev 2061)
@@ -38,6 +38,12 @@
<!-- maven-release-plugin -->
<autoVersionSubmodules>true</autoVersionSubmodules>
+
+ <!-- maven-release-plugin -->
+ <arguments>-Prelease,pkg-tomcat,pkg-jbossas -DskipTests</arguments>
+
+ <!-- cf http://jira.codehaus.org/browse/MRELEASE-3 -->
+ <preparationGoals>clean install</preparationGoals>
</properties>
<!-- **************** -->
16 years, 1 month
- 1
- 0
gatein SVN: r2060 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-03-09 10:25:56 -0500 (Tue, 09 Mar 2010)
New Revision: 2060
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl
Log:
GTNPORTAL-807: we need to use collection.size() instead of collection.size because of a Groovy issue with the IBM jdk (see GROOVY-4094). Without the change it will try and find the properly size on the contents of the collection and not of the collection object itself.
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl 2010-03-09 15:24:23 UTC (rev 2059)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl 2010-03-09 15:25:56 UTC (rev 2060)
@@ -14,7 +14,7 @@
ArrayList children = uicomponent.getChildren();
- if(children != null && children.size > 0){
+ if(children != null && children.size() > 0){
boolean hasRenderedChild = false;
for(uiChild in children) {
if(uiChild.isRendered()) {
@@ -35,7 +35,7 @@
String id = uicomponent.getId();
%>
-<% if(children != null && children.size > 0) { %>
+<% if(children != null && children.size() > 0) { %>
<div class="UITabContainer">
<div class="UIHorizontalTabs">
<div class="LeftHorizontalTabs">
16 years, 1 month
- 1
- 0
gatein SVN: r2059 - portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-03-09 10:24:23 -0500 (Tue, 09 Mar 2010)
New Revision: 2059
Modified:
portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
Log:
GTNPORTAL-807: we need to use collection.size() instead of collection.size because of a Groovy issue with the IBM jdk (see GROOVY-4094). Without the change it will try and find the properly size on the contents of the collection and not of the collection object itself.
Modified: portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
===================================================================
--- portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2010-03-09 14:52:30 UTC (rev 2058)
+++ portal/trunk/component/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2010-03-09 15:24:23 UTC (rev 2059)
@@ -19,7 +19,7 @@
</div>
<div class="MiddleItemContainer UIResizableBlock">
<% List categories = uicomponent.getCategories();
- if(categories != null && categories.size > 0){
+ if(categories != null && categories.size() > 0){
for(category in categories){
%>
<div class="GadgetCategory" id="${category.getName()}">
16 years, 1 month
- 1
- 0
gatein SVN: r2058 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/mop and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-09 09:52:30 -0500 (Tue, 09 Mar 2010)
New Revision: 2058
Added:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visible.java
Modified:
portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
extract the visible aspect of a navigation in a mixin instead of generic properties
Modified: portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml
===================================================================
--- portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml 2010-03-09 14:21:42 UTC (rev 2057)
+++ portal/trunk/component/portal/src/main/java/conf/gatein-nodetypes.xml 2010-03-09 14:52:30 UTC (rev 2058)
@@ -57,4 +57,26 @@
</propertyDefinitions>
</nodeType>
+ <nodeType name="gtn:visible" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
+ <propertyDefinitions>
+ <propertyDefinition name="gtn:startpublicationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="gtn:endpublicationdate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="gtn:visibility" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints>
+ <valueConstraint>DISPLAYED</valueConstraint>
+ <valueConstraint>HIDDEN</valueConstraint>
+ <valueConstraint>TEMPORAL</valueConstraint>
+ <valueConstraint>SYSTEM</valueConstraint>
+ </valueConstraints>
+ <defaultValues>
+ <defaultValue>DISPLAYED</defaultValue>
+ </defaultValues>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
</nodeTypes>
Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visible.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visible.java (rev 0)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visible.java 2010-03-09 14:52:30 UTC (rev 2058)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.portal.mop;
+
+import org.chromattic.api.annotations.MixinType;
+import org.chromattic.api.annotations.Property;
+
+import java.util.Date;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+@MixinType(name = "gtn:visible")
+public abstract class Visible
+{
+
+ @Property(name = "gtn:startpublicationdate")
+ public abstract Date getStartPublicationDate();
+
+ public abstract void setStartPublicationDate(Date date);
+
+ @Property(name = "gtn:endpublicationdate")
+ public abstract Date getEndPublicationDate();
+
+ public abstract void setEndPublicationDate(Date date);
+
+ @Property(name = "gtn:visibility")
+ public abstract Visibility getVisibility();
+
+ public abstract void setVisibility(Visibility visibility);
+
+}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-03-09 14:21:42 UTC (rev 2057)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-03-09 14:52:30 UTC (rev 2058)
@@ -59,18 +59,9 @@
public static final Key<String> URI = Key.create("uri", ValueType.STRING);
/** . */
- public static final Key<Date> START_PUBLICATION_DATE = Key.create("start-publication-date", ValueType.DATE);
-
- /** . */
- public static final Key<Date> END_PUBLICATION_DATE = Key.create("end-publication-date", ValueType.DATE);
-
- /** . */
public static final Key<String> TEMPLATE = Key.create("template", ValueType.STRING);
/** . */
- public static final Key<String> VISIBILITY = Key.create("visibility", ValueType.STRING);
-
- /** . */
public static final Key<String> LOCALE = Key.create("locale", ValueType.STRING);
/** . */
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-03-09 14:21:42 UTC (rev 2057)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-03-09 14:52:30 UTC (rev 2058)
@@ -24,13 +24,10 @@
import org.exoplatform.portal.config.model.ApplicationState;
import org.exoplatform.portal.config.model.ApplicationType;
import org.exoplatform.portal.config.model.CloneApplicationState;
-import org.exoplatform.portal.mop.Decorated;
-import org.exoplatform.portal.mop.Described;
-import org.exoplatform.portal.mop.ProtectedResource;
+import org.exoplatform.portal.mop.*;
import org.exoplatform.portal.config.model.PersistentApplicationState;
import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.config.model.TransientApplicationState;
-import org.exoplatform.portal.mop.Visibility;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.Utils;
import org.exoplatform.portal.pom.spi.portlet.Portlet;
@@ -152,15 +149,18 @@
Described described = src.adapt(Described.class);
//
+ Visible visible = src.adapt(Visible.class);
+
+ //
NavigationNodeData dstNode = new NavigationNodeData(
src.getObjectId(),
attrs.getValue(MappedAttributes.URI),
described.getName(),
attrs.getValue(MappedAttributes.ICON),
src.getName(),
- attrs.getValue(MappedAttributes.START_PUBLICATION_DATE),
- attrs.getValue(MappedAttributes.END_PUBLICATION_DATE),
- Visibility.valueOf(attrs.getValue(MappedAttributes.VISIBILITY, Visibility.DISPLAYED.toString())),
+ visible.getStartPublicationDate(),
+ visible.getEndPublicationDate(),
+ visible.getVisibility() != null ? visible.getVisibility() : Visibility.DISPLAYED,
pageReference,
children
);
@@ -203,12 +203,15 @@
described.setName(node.getLabel());
//
+ Visible visible = dst.adapt(Visible.class);
+ visible.setVisibility(node.getVisibility());
+ visible.setStartPublicationDate(node.getStartPublicationDate());
+ visible.setEndPublicationDate(node.getEndPublicationDate());
+
+ //
Attributes attrs = dst.getAttributes();
attrs.setValue(MappedAttributes.URI, node.getURI());
attrs.setValue(MappedAttributes.ICON, node.getIcon());
- attrs.setValue(MappedAttributes.START_PUBLICATION_DATE, node.getStartPublicationDate());
- attrs.setValue(MappedAttributes.END_PUBLICATION_DATE, node.getEndPublicationDate());
- attrs.setValue(MappedAttributes.VISIBILITY, node.getVisibility().name());
}
else if (src instanceof NavigationData)
{
Modified: portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
===================================================================
--- portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-03-09 14:21:42 UTC (rev 2057)
+++ portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-03-09 14:52:30 UTC (rev 2058)
@@ -181,6 +181,7 @@
<value>org.exoplatform.portal.mop.ProtectedResource</value>
<value>org.exoplatform.portal.mop.Described</value>
<value>org.exoplatform.portal.mop.Decorated</value>
+ <value>org.exoplatform.portal.mop.Visible</value>
</values-param>
</init-params>
</component-plugin>
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-03-09 14:21:42 UTC (rev 2057)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-03-09 14:52:30 UTC (rev 2058)
@@ -20,9 +20,7 @@
package org.exoplatform.portal.config;
import org.exoplatform.container.PortalContainer;
-import org.exoplatform.portal.mop.Decorated;
-import org.exoplatform.portal.mop.Described;
-import org.exoplatform.portal.mop.ProtectedResource;
+import org.exoplatform.portal.mop.*;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMSessionManager;
import org.gatein.mop.api.Attributes;
@@ -113,13 +111,17 @@
Attributes nodeAttrs = nodeNavigation.getAttributes();
assertEquals("node_uri", nodeAttrs.getString("uri"));
assertEquals("node_icon", nodeAttrs.getString("icon"));
+
+ //
+ assertTrue(nodeNavigation.isAdapted(Visible.class));
+ Visible visible = nodeNavigation.adapt(Visible.class);
GregorianCalendar start = new GregorianCalendar(2000, 2, 21, 1, 33, 0);
start.setTimeZone(TimeZone.getTimeZone("UTC"));
- assertEquals(start.getTime(), nodeAttrs.getDate("start-publication-date"));
+ assertEquals(start.getTime(), visible.getStartPublicationDate());
GregorianCalendar end = new GregorianCalendar(2009, 2, 21, 1, 33, 0);
end.setTimeZone(TimeZone.getTimeZone("UTC"));
- assertEquals(end.getTime(), nodeAttrs.getDate("end-publication-date"));
- assertEquals("TEMPORAL", nodeAttrs.getString("visibility"));
+ assertEquals(end.getTime(), visible.getEndPublicationDate());
+ assertEquals(Visibility.TEMPORAL, visible.getVisibility());
//
Link link = nodeNavigation.getLink();
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-03-09 14:21:42 UTC (rev 2057)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-03-09 14:52:30 UTC (rev 2058)
@@ -254,6 +254,7 @@
<value>org.exoplatform.portal.mop.ProtectedResource</value>
<value>org.exoplatform.portal.mop.Described</value>
<value>org.exoplatform.portal.mop.Decorated</value>
+ <value>org.exoplatform.portal.mop.Visible</value>
</values-param>
<properties-param>
<name>options</name>
16 years, 1 month
- 1
- 0
gatein SVN: r2057 - in portal/trunk: component/identity/src/main/java/org/exoplatform/services/organization/idm and 3 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2010-03-09 09:21:42 -0500 (Tue, 09 Mar 2010)
New Revision: 2057
Added:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java
Removed:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheService.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheServiceImpl.java
Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
portal/trunk/component/identity/src/test/java/conf/portal/idm-configuration.xml
portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml
portal/trunk/pom.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
Log:
- expose PicketLinkIDMCacheService via REST and JMX
Deleted: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheService.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheService.java 2010-03-09 13:24:09 UTC (rev 2056)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheService.java 2010-03-09 14:21:42 UTC (rev 2057)
@@ -1,42 +0,0 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2010, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-package org.exoplatform.services.organization.idm;
-
-import org.picketlink.idm.cache.APICacheProvider;
-
-
-/*
- * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
- */
-public interface IdentityCacheService
-{
-
- public void register(APICacheProvider cacheProvider);
-
- public void invalidate(String namespace);
-
- public void invalidateAll();
-
-
-
-}
Deleted: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheServiceImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheServiceImpl.java 2010-03-09 13:24:09 UTC (rev 2056)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheServiceImpl.java 2010-03-09 14:21:42 UTC (rev 2057)
@@ -1,68 +0,0 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2010, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-package org.exoplatform.services.organization.idm;
-
-import org.picketlink.idm.cache.APICacheProvider;
-
-import java.util.LinkedList;
-import java.util.List;
-
-
-/*
- * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
- */
-public class IdentityCacheServiceImpl implements IdentityCacheService
-{
-
- private final List<APICacheProvider> cacheProviders = new LinkedList<APICacheProvider>();
-
- public IdentityCacheServiceImpl()
- {
- }
-
- public void register(APICacheProvider cacheProvider)
- {
-
- if (cacheProvider != null)
- {
- cacheProviders.add(cacheProvider);
- }
-
- }
-
- public void invalidate(String namespace)
- {
- for (APICacheProvider cacheProvider : cacheProviders)
- {
- cacheProvider.invalidate(namespace);
- }
- }
-
- public void invalidateAll()
- {
- for (APICacheProvider cacheProvider : cacheProviders)
- {
- cacheProvider.invalidateAll();
- }
- }
-}
Copied: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java (from rev 2049, portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheService.java)
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java (rev 0)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java 2010-03-09 14:21:42 UTC (rev 2057)
@@ -0,0 +1,90 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2010, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.exoplatform.services.organization.idm;
+
+import org.exoplatform.management.annotations.Impact;
+import org.exoplatform.management.annotations.ImpactType;
+import org.exoplatform.management.annotations.Managed;
+import org.exoplatform.management.annotations.ManagedDescription;
+import org.exoplatform.management.annotations.ManagedName;
+import org.exoplatform.management.jmx.annotations.NameTemplate;
+import org.exoplatform.management.jmx.annotations.Property;
+import org.exoplatform.management.management.annotations.RESTEndpoint;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.picketlink.idm.cache.APICacheProvider;
+
+
+/*
+ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
+ */
+@Managed
+@ManagedDescription("PicketLink IDM Cache Service")
+@NameTemplate({
+ @Property(key = "name", value = "plidmcache"),
+ @Property(key = "service", value = "PicketLinkIDMCacheService")
+})
+@RESTEndpoint(path = "plidmcache")
+public class PicketLinkIDMCacheService
+{
+
+ private final List<APICacheProvider> cacheProviders = new LinkedList<APICacheProvider>();
+
+ public PicketLinkIDMCacheService()
+ {
+ }
+
+ public void register(APICacheProvider cacheProvider)
+ {
+
+ if (cacheProvider != null)
+ {
+ cacheProviders.add(cacheProvider);
+ }
+
+ }
+
+ @Managed
+ @ManagedDescription("Ivalidate cache namespace")
+ @Impact(ImpactType.WRITE)
+ public void invalidate(@ManagedDescription("Cache namespace") @ManagedName("namespace")String namespace)
+ {
+ for (APICacheProvider cacheProvider : cacheProviders)
+ {
+ cacheProvider.invalidate(namespace);
+ }
+ }
+
+ @Managed
+ @ManagedDescription("Ivalidate all caches")
+ @Impact(ImpactType.WRITE)
+ public void invalidateAll()
+ {
+ for (APICacheProvider cacheProvider : cacheProviders)
+ {
+ cacheProvider.invalidateAll();
+ }
+ }
+}
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2010-03-09 13:24:09 UTC (rev 2056)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2010-03-09 14:21:42 UTC (rev 2057)
@@ -29,7 +29,6 @@
import org.picketlink.idm.api.IdentitySession;
import org.picketlink.idm.api.IdentitySessionFactory;
import org.picketlink.idm.api.cfg.IdentityConfiguration;
-import org.picketlink.idm.cache.APICacheProvider;
import org.picketlink.idm.common.exception.IdentityConfigurationException;
import org.picketlink.idm.impl.cache.JBossCacheAPICacheProviderImpl;
import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
@@ -82,7 +81,7 @@
InitParams initParams,
HibernateService hibernateService,
ConfigurationManager confManager,
- IdentityCacheService identityCache,
+ PicketLinkIDMCacheService picketLinkIDMCache,
InitialContextInitializer dependency) throws Exception
{
ValueParam config = initParams.getValueParam(PARAM_CONFIG_OPTION);
@@ -124,7 +123,7 @@
InputStream configStream = confManager.getInputStream(cacheConfig.getValue());
JBossCacheAPICacheProviderImpl cacheProvider = new JBossCacheAPICacheProviderImpl();
cacheProvider.initialize(configStream);
- identityCache.register(cacheProvider);
+ picketLinkIDMCache.register(cacheProvider);
identityConfiguration.getIdentityConfigurationRegistry().register(cacheProvider, "apiCacheProvider");
}
}
Modified: portal/trunk/component/identity/src/test/java/conf/portal/idm-configuration.xml
===================================================================
--- portal/trunk/component/identity/src/test/java/conf/portal/idm-configuration.xml 2010-03-09 13:24:09 UTC (rev 2056)
+++ portal/trunk/component/identity/src/test/java/conf/portal/idm-configuration.xml 2010-03-09 14:21:42 UTC (rev 2057)
@@ -25,8 +25,8 @@
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
<component>
- <key>org.exoplatform.services.organization.idm.IdentityCacheService</key>
- <type>org.exoplatform.services.organization.idm.IdentityCacheServiceImpl</type>
+ <key>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</key>
+ <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type>
</component>
<component>
Modified: portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml
===================================================================
--- portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml 2010-03-09 13:24:09 UTC (rev 2056)
+++ portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml 2010-03-09 14:21:42 UTC (rev 2057)
@@ -26,8 +26,8 @@
<component>
- <key>org.exoplatform.services.organization.idm.IdentityCacheService</key>
- <type>org.exoplatform.services.organization.idm.IdentityCacheServiceImpl</type>
+ <key>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</key>
+ <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type>
</component>
<component>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-03-09 13:24:09 UTC (rev 2056)
+++ portal/trunk/pom.xml 2010-03-09 14:21:42 UTC (rev 2057)
@@ -46,7 +46,7 @@
<org.gatein.common.version>2.0.0-CR03</org.gatein.common.version>
<org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version>
<org.gatein.pc.version>2.1.0-CR05</org.gatein.pc.version>
- <org.picketlink.idm>1.1.0.Beta9</org.picketlink.idm>
+ <org.picketlink.idm>1.1.0.Beta10</org.picketlink.idm>
<org.gatein.wsrp.version>1.0.0-Beta09</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.0-CR03</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-09 13:24:09 UTC (rev 2056)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-09 14:21:42 UTC (rev 2057)
@@ -26,8 +26,8 @@
<component>
- <key>org.exoplatform.services.organization.idm.IdentityCacheService</key>
- <type>org.exoplatform.services.organization.idm.IdentityCacheServiceImpl</type>
+ <key>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</key>
+ <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type>
</component>
<component>
16 years, 1 month
- 1
- 0