gatein SVN: r1582 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-09 04:33:04 -0500 (Tue, 09 Feb 2010)
New Revision: 1582
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java
Log:
add getDescription(() method that returns empty in the PageNavigation to make UI happy for now
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java 2010-02-09 09:10:02 UTC (rev 1581)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNavigation.java 2010-02-09 09:33:04 UTC (rev 1582)
@@ -71,6 +71,12 @@
this.pageNodes = children;
}
+ // Make gtmpl happy with that for now
+ public String getDescription()
+ {
+ return null;
+ }
+
public int getId()
{
return getOwner().hashCode();
14 years, 10 months
- 1
- 0
gatein SVN: r1581 - /.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-09 04:10:02 -0500 (Tue, 09 Feb 2010)
New Revision: 1581
Removed:
tools/
Log:
Delete tools
14 years, 10 months
- 1
- 0
gatein SVN: r1580 - tools and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-09 04:09:35 -0500 (Tue, 09 Feb 2010)
New Revision: 1580
Added:
maven/packager/
Removed:
tools/packager/
Log:
Move the packager
Copied: maven/packager (from rev 1579, tools/packager)
14 years, 10 months
- 1
- 0
gatein SVN: r1579 - tools and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-09 04:08:13 -0500 (Tue, 09 Feb 2010)
New Revision: 1579
Added:
maven/
Removed:
tools/maven/
Log:
Move Maven stuff (and remove 'tools')
Copied: maven (from rev 1578, tools/maven)
14 years, 10 months
- 1
- 0
gatein SVN: r1578 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-09 03:04:25 -0500 (Tue, 09 Feb 2010)
New Revision: 1578
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java
Log:
GTNPORTAL-429 Still show group which user has no right
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java 2010-02-09 06:28:52 UTC (rev 1577)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupExplorer.java 2010-02-09 08:04:25 UTC (rev 1578)
@@ -123,8 +123,7 @@
sibblingsGroup_ = service.getGroupHandler().findGroups(parentGroup);
// if not administrator
- String username = org.exoplatform.portal.webui.util.Util.getPortalRequestContext().getRemoteUser();
- if (!GroupManagement.isSuperUserOfGroup(username, groupId))
+ if (!GroupManagement.isAdministrator(null))
{
childrenGroup_ = GroupManagement.getRelatedGroups(null, childrenGroup_);
sibblingsGroup_ = GroupManagement.getRelatedGroups(null, sibblingsGroup_);
14 years, 10 months
- 1
- 0
gatein SVN: r1577 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/page and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-02-09 01:28:52 -0500 (Tue, 09 Feb 2010)
New Revision: 1577
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector2.java
Log:
GTNPORTAL-587: Still show messsage when create new page in add new node
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl 2010-02-09 05:36:44 UTC (rev 1576)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBrowser.gtmpl 2010-02-09 06:28:52 UTC (rev 1577)
@@ -1,4 +1,4 @@
-<% uicomponent.defaultValue(uicomponent.getLastQuery()); %>
+<% uicomponent.feedDataWithQuery(uicomponent.getLastQuery()); %>
<div class="UIPageBrowser" id="<%=uicomponent.getId();%>">
<%/*Begin UIPageBrowser Content*/%>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-02-09 05:36:44 UTC (rev 1576)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-02-09 06:28:52 UTC (rev 1577)
@@ -126,47 +126,50 @@
return lastQuery_;
}
- public void defaultValue(Query<Page> query) throws Exception
+ /**
+ * Update data feed in UIRepeater with a given query.
+ * Returns false if no result is found, true other wise
+ *
+ * @param query
+ * @return
+ * @throws Exception
+ */
+ public boolean feedDataWithQuery(Query<Page> query) throws Exception
{
lastQuery_ = query;
- // UIGrid uiGrid = findFirstComponentOfType(UIGrid.class);
- // UIPageIterator pageIterator = uiGrid.getUIPageIterator();
+
UIVirtualList virtualList = getChild(UIVirtualList.class);
- DataStorage service = getApplicationComponent(DataStorage.class);
- if (lastQuery_ == null)
+ DataStorage dataStorage = getApplicationComponent(DataStorage.class);
+ if(lastQuery_ == null)
{
lastQuery_ = new Query<Page>(null, null, null, null, Page.class);
}
-/*
- try
+ virtualList.dataBind(new PageQueryAccessList(lastQuery_, 10));
+
+ UIRepeater repeater = (UIRepeater)virtualList.getDataFeed();
+ PageList datasource = repeater.getDataSource();
+
+ if (datasource.getAvailable() > 0)
{
-*/
- //pagelist.setPageSize(10);
- //pageIterator.setPageList(pagelist);
- virtualList.dataBind(new PageQueryAccessList(lastQuery_, 10));
-/*
+ return true;
}
- catch (RepositoryException e)
+ else
{
- //pageIterator.setPageList(new ObjectPageList(new ArrayList<String>(), 0));
- virtualList.dataBind(new ObjectPageList(new ArrayList<String>(), 0));
- UIApplication uiApp = Util.getPortalRequestContext().getUIApplication();
- uiApp.addMessage(new ApplicationMessage("UISearchForm.msg.empty", null));
- Util.getPortalRequestContext().addUIComponentToUpdateByAjax(uiApp.getUIPopupMessages());
- return;
+ return false;
}
-*/
-
-
- UIRepeater repeater = (UIRepeater)virtualList.getDataFeed();
- PageList datasource = repeater.getDataSource();
- if (datasource.getAvailable() > 0)
- return;
+ }
+
+ /**
+ * Show a popup informing that no result available for the last query
+ *
+ */
+ public static void showNoResultMessagePopup()
+ {
UIApplication uiApp = Util.getPortalRequestContext().getUIApplication();
uiApp.addMessage(new ApplicationMessage("UISearchForm.msg.empty", null));
Util.getPortalRequestContext().addUIComponentToUpdateByAjax(uiApp.getUIPopupMessages());
}
-
+
public void quickSearch(UIFormInputSet quickSearchInput) throws Exception
{
UIFormStringInput input = (UIFormStringInput)quickSearchInput.getChild(0);
@@ -181,8 +184,14 @@
else if (selectBoxValue.equals("ownerId"))
query.setOwnerId(value);
query.setName(null);
+
lastQuery_ = query;
- defaultValue(lastQuery_);
+ boolean dataAvailable = feedDataWithQuery(lastQuery_);
+ if(!dataAvailable)
+ {
+ showNoResultMessagePopup();
+ }
+
if (this.<UIComponent> getParent() instanceof UIPopupWindow)
{
UIPopupWindow popupWindow = getParent();
@@ -224,19 +233,21 @@
{
}
- void reset() throws Exception
+ /*
+ public void reset() throws Exception
{
UIVirtualList virtualList = getChild(UIVirtualList.class);
UIRepeater repeater = (UIRepeater)virtualList.getDataFeed();
LazyPageList datasource = (LazyPageList)repeater.getDataSource();
int currentPage = datasource.getCurrentPage();
- defaultValue(null);
+ feedDataWithQuery(null);
if (currentPage > datasource.getAvailablePage())
currentPage = datasource.getAvailablePage();
if (currentPage > 0)
datasource.getPage(currentPage);
}
-
+ */
+
static public class DeleteActionListener extends EventListener<UIPageBrowser>
{
public void execute(Event<UIPageBrowser> event) throws Exception
@@ -277,7 +288,11 @@
}
else
{
- uiPageBrowser.defaultValue(uiPageBrowser.getLastQuery());
+ boolean dataAvailable = uiPageBrowser.feedDataWithQuery(uiPageBrowser.getLastQuery());
+ if(!dataAvailable)
+ {
+ showNoResultMessagePopup();
+ }
if (currentPage > datasource.getAvailablePage())
currentPage = datasource.getAvailablePage();
datasource.getPage(currentPage);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector.java 2010-02-09 05:36:44 UTC (rev 1576)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector.java 2010-02-09 06:28:52 UTC (rev 1577)
@@ -137,7 +137,7 @@
uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.NoPermission", new String[]{id}));;
}
uiPageSelector.setValue(id);
- uiPageBrowser.defaultValue(null);
+ uiPageBrowser.feedDataWithQuery(null);
UIForm uiForm = uiPageSelector.getAncestorOfType(UIForm.class);
if (uiForm != null)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector2.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector2.java 2010-02-09 05:36:44 UTC (rev 1576)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageSelector2.java 2010-02-09 06:28:52 UTC (rev 1577)
@@ -167,7 +167,7 @@
uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.NoPermission", new String[]{id}));;
}
uiPageSelector.setValue(id);
- uiPageBrowser.defaultValue(null);
+ uiPageBrowser.feedDataWithQuery(null);
UIForm uiForm = uiPageSelector.getAncestorOfType(UIForm.class);
if (uiForm != null)
14 years, 10 months
- 1
- 0
gatein SVN: r1576 - portal/trunk/docs/reference-guide/en/modules/gadgets.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-02-09 00:36:44 -0500 (Tue, 09 Feb 2010)
New Revision: 1576
Modified:
portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml
portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml
Log:
Edits to Chapters 4 & 5
Modified: portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml 2010-02-09 04:49:33 UTC (rev 1575)
+++ portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml 2010-02-09 05:36:44 UTC (rev 1576)
@@ -75,9 +75,9 @@
</varlistentry>
</variablelist>
<important>
+ <para>
+ The following sections require more textual information.
</para>
- The following sections require more textual information.
- <para>
</important>
<section id="sect-Reference_Guide-Gadgets-Existing_Gadgets">
<title>Existing Gadgets</title>
Modified: portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml 2010-02-09 04:49:33 UTC (rev 1575)
+++ portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml 2010-02-09 05:36:44 UTC (rev 1576)
@@ -71,7 +71,7 @@
<section id="sect-Reference_Guide-Configuration-Proxy">
<title>Proxy</title>
<para>
- To allow external gadgets when the server is behind a proxy, add the following code to the beginning of the JVM :
+ To allow external gadgets when the server is behind a proxy, add the following code to the beginning of the JVM:
</para>
<programlisting>-Dhttp.proxyHost=proxyhostURL -Dhttp.proxyPort=proxyPortNumber -Dhttp.proxyUser=someUserName -Dhttp.proxyPassword=somePassword
14 years, 10 months
- 1
- 0
gatein SVN: r1575 - in portal/trunk/docs/reference-guide/en/modules: gadgets and 1 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-02-08 23:49:33 -0500 (Mon, 08 Feb 2010)
New Revision: 1575
Modified:
portal/trunk/docs/reference-guide/en/modules/Portlets.xml
portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml
portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml
portal/trunk/docs/reference-guide/en/modules/portlets/Create_a_WebUI_Portlet.xml
portal/trunk/docs/reference-guide/en/modules/portlets/Standard.xml
Log:
Edits to Chapters 4 & 5
Modified: portal/trunk/docs/reference-guide/en/modules/Portlets.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Portlets.xml 2010-02-09 03:44:16 UTC (rev 1574)
+++ portal/trunk/docs/reference-guide/en/modules/Portlets.xml 2010-02-09 04:49:33 UTC (rev 1575)
@@ -10,6 +10,6 @@
<xi:include href="portlets/Groovy_Templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portlets/Portlet_Lifecycle.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portlets/Standard.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="portlets/Create_a_WebUI_Portlet.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- Unedited pending new example --> <xi:include href="portlets/Create_a_WebUI_Portlet.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
Modified: portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml 2010-02-09 03:44:16 UTC (rev 1574)
+++ portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml 2010-02-09 04:49:33 UTC (rev 1575)
@@ -5,43 +5,80 @@
]>
<section id="sect-Reference_Guide-Gadgets">
<title>Gadgets</title>
- <section id="sect-Reference_Guide-Gadgets-Overview">
- <title>Overview</title>
<para>
- An gadget is a mini web application running on a platform and you can put it in a web page. This is a small application that helps users to do some private actions.
+ A gadget is a mini web application, embedded in a web page and running on an application server platform. These small applications help users perform various tasks.
</para>
<para>
- GateIn Portal supports some gadgets such as: Todo gadget, Calendar gadget, Calculator gadget, Weather Forecasts, RSS Reader gadget.
+ &PRODUCT; supports gadgets such as: Todo gadget, Calendar gadget, Calculator gadget, Weather Forecasts and and RSS Reader.
</para>
- <itemizedlist>
- <listitem>
- <para>
- Todo: This mini - application helps you to organize your day and work group.
- </para>
- </listitem>
- <listitem>
- <para>
- Calendar: A cool calendar to keep track of date in style.
- </para>
- </listitem>
- <listitem>
- <para>
- Calculator: This is the coolest calculator for your page.
- </para>
- </listitem>
- <listitem>
- <para>
- RSS Reader: This gadget lets you het a sneak preview of your favourite feeds around web
- </para>
- </listitem>
- <listitem>
- <para>
- Weather Forecasts: This gadget notifies you of current weather condition and gives tomorrow's forecast.
- </para>
- </listitem>
- </itemizedlist>
- </section>
-
+ <variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
+ <title>Default Gadgets:</title>
+ <varlistentry>
+ <term>Calendar</term>
+ <listitem>
+ <para>
+ The calendar gadget allows users to switch easily between daily, monthly and yearly view and, again, is customizable to match your portal's theme.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Calendar.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>ToDo</term>
+ <listitem>
+ <para>
+ This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. Tasks can be highlighted with different colors.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Todo.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Calculator</term>
+ <listitem>
+ <para>
+ This mini-application lets you perform most basic arithmetic operations and can be themed to match the rest of your portal.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Calculator.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>RSS Reader</term>
+ <listitem>
+ <para>
+ An RSS reader, or aggregator, collates content from various, user-specified feed sources and displays them in one location. This content can include, but isn't limited to, news headlines, blog posts or email. The RSS Reader gadget displays this content in a single window on your Portal page.
+ </para>
+ <!-- <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/RSS.png" format="PNG"></imagedata>
+ </imageobject>
+ </mediaobject> -->
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>More Gadgets</term>
+ <listitem>
+ <para>
+ Further gadgets can be obtained from the <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> site. &PRODUCT; is compatible with most of the gadgets available here.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+<important>
+ </para>
+ The following sections require more textual information.
+ <para>
+</important>
<section id="sect-Reference_Guide-Gadgets-Existing_Gadgets">
<title>Existing Gadgets</title>
<mediaobject>
Modified: portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml 2010-02-09 03:44:16 UTC (rev 1574)
+++ portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml 2010-02-09 04:49:33 UTC (rev 1575)
@@ -5,16 +5,17 @@
]>
<section id="sect-Reference_Guide-Setup_a_Gadget_Server">
<title>Setup a Gadget Server</title>
- <section id="sect-Reference_Guide-Setup_a_Gadget_Server-Setup_virtual_servers_for_the_gadget_rendering">
- <title>Setup virtual servers for the gadget rendering</title>
+ <section id="sect-Reference_Guide-Setup_a_Gadget_Server-Virtual_servers_for_gadget_rendering">
+ <title>Virtual servers for gadget rendering</title>
<para>
- GateIn recommend you to setup 2 different virtual hosts because it's the basis of the security model of gadgets. Having the gadget running on a different domain than the container (the website that 'contains' the app), the gadget can't read / modify / do anything nasty to GateIn Portal (like adding spam messages, stealing your cookies, whatever).
+ &PRODUCT; recommends using two virtual hosts for security. If the gadget is running on a different domain than the container (the website that 'contains' the app), it is unable to interfere with the portal by modifying code or cookies.
</para>
<para>
- For example you can server the portal from <emphasis role="bold">http://www.sample.com</emphasis> and the gadgets from <emphasis role="bold">http://www.samplemodules.com</emphasis>
+ An example would hosting the portal from <emphasis role="bold">http://www.sample.com</emphasis> and the gadgets from <emphasis role="bold">http://www.samplemodules.com</emphasis>.
</para>
<para>
- To do this, we need to configure a parameter with the name is <emphasis>gadgets.hostName</emphasis> , the value is the <emphasis>path/to/gadgetServer</emphasis> in GadgetRegisteryService service like following:
+ To do this, configure a parameter called <emphasis>gadgets.hostName</emphasis>. The value is the <emphasis>path/to/gadgetServer</emphasis> in <literal>GadgetRegisteryService</literal>:
+ </para>
<programlisting><component>
<key>org.exoplatform.application.gadget.GadgetRegistryService</key>
<type>org.exoplatform.application.gadget.jcr.GadgetRegistryServiceImpl</type>
@@ -27,12 +28,12 @@
</init-params>
</component>
</programlisting>
- </para>
+
<para>
- It's possible to have multiple rendering servers. That would help to balance the load across multiple servers.
+ It is also possible to have multiple rendering servers. This helps to balance the rendering load across multiple servers.
</para>
<para>
- If you still want to deploy it on the same server, make sure that it starts before anything that use the gadgets (for example the webapp GateInGadgets that use org.exoplatform.application.gadget.GadgetRegister)
+ When deploying on the same server ensure the gadget initiates before anything that calls it (for example; the webapp <literal>GateInGadgets</literal> which uses <literal>org.exoplatform.application.gadget.GadgetRegister</literal>).
</para>
</section>
@@ -41,17 +42,21 @@
<section id="sect-Reference_Guide-Configuration-Security_key">
<title>Security key</title>
<para>
- A file <emphasis role="bold">key.txt</emphasis> has to be generated <emphasis role="bold">for every installation of GateIn to be secure</emphasis> . This file contains a secret key used to crypt the security token used for authenticating the user. On Linux this can be generated such as:
+ A file called <emphasis role="bold">key.txt</emphasis> has to be generated for every installation of &PRODUCT; to be secure. This file contains a secret key used to encrypt the security token used for authenticating the user.
</para>
+ <para>
+ In Linux systems this file can be generated with:
+ </para>
-<programlisting>dd if=/dev/random bs=32 count=1 | openssl base64 > /tmp/key.txt
+<programlisting><command>dd if=/dev/random bs=32 count=1 | openssl base64 > /tmp/key.txt</command>
</programlisting>
</section>
<section id="sect-Reference_Guide-Configuration-Gadget_proxy_and_concat_configuration">
<title>Gadget proxy and concat configuration</title>
<para>
- These servers have to be on the same domain as the gadget server. You can configure it in: <filename>eXoGadgetServer:/WEB-INF/classes/containers/default/container.js</filename>.
+ These servers have to be on the same domain as the gadget server. You can configure the container in <filename>eXoGadgetServer:/WEB-INF/classes/containers/default/container.js</filename>.
+ </para>
<programlisting>"gadgets.content-rewrite" : {
"include-urls": ".*",
"exclude-urls": "",
@@ -61,13 +66,12 @@
"concat-url": "http://localhost:8080/eXoGadgetServer/gadgets/concat?"
},
</programlisting>
- </para>
</section>
<section id="sect-Reference_Guide-Configuration-Proxy">
<title>Proxy</title>
<para>
- if your server is behind a proxy and you want to allow external gadgets, you should configure the proxy of your JVM adding this code at the begining.
+ To allow external gadgets when the server is behind a proxy, add the following code to the beginning of the JVM :
</para>
<programlisting>-Dhttp.proxyHost=proxyhostURL -Dhttp.proxyPort=proxyPortNumber -Dhttp.proxyUser=someUserName -Dhttp.proxyPassword=somePassword
Modified: portal/trunk/docs/reference-guide/en/modules/portlets/Create_a_WebUI_Portlet.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/portlets/Create_a_WebUI_Portlet.xml 2010-02-09 03:44:16 UTC (rev 1574)
+++ portal/trunk/docs/reference-guide/en/modules/portlets/Create_a_WebUI_Portlet.xml 2010-02-09 04:49:33 UTC (rev 1575)
@@ -6,12 +6,15 @@
<section id="sect-Reference_Guide-Create_a_WebUI_Portlet">
<title>Create a WebUI Portlet</title>
<section id="sect-Reference_Guide-Create_a_WebUI_Portlet-Overview">
- <title>Overview</title>
+ <title>Overview</title>
+ <important>
+ <title>TODO</title>
<para>
- TODO: Create example (This one doesn't exist anymore). Overall this chapter need to be reviewed, any taker ? :)
+ Create example (This one doesn't exist anymore). Overall this chapter need to be reviewed, any taker ? :)
</para>
+ </important>
<para>
- This example is based on the testPortlet in portal/trunk/portlet/test.
+ This example is based on the <literal>testPortlet</literal> in <filename>portal/trunk/portlet/test</filename>.
</para>
</section>
Modified: portal/trunk/docs/reference-guide/en/modules/portlets/Standard.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/portlets/Standard.xml 2010-02-09 03:44:16 UTC (rev 1574)
+++ portal/trunk/docs/reference-guide/en/modules/portlets/Standard.xml 2010-02-09 04:49:33 UTC (rev 1575)
@@ -531,13 +531,13 @@
</programlistingco>
<para>
- As well as the <literal>VIEW</literal> portlet mode, the spec defines two other modes; <literal>EDIT</literal> and <literal>HELP</literal>.
+ As well as the <literal>VIEW</literal> portlet mode, the specification defines two other modes; <literal>EDIT</literal> and <literal>HELP</literal>.
</para>
<para>
- These modes need to be defined in the <filename>portlet.xml</filename> descriptor. Having those modes defined will enable the corresponding buttons on the portlet's window.
+ These modes need to be defined in the <filename>portlet.xml</filename> descriptor. This will enable the corresponding buttons on the portlet's window.
</para>
<para>
- The generic portlet that is inherited dispatches the different views to methods named: <literal>doView</literal> , <literal>doHelp</literal> and <literal>doEdit</literal> . Let's watch the code for those two last portlet modes.
+ The generic portlet that is inherited dispatches the different views to the methods: <literal>doView</literal> , <literal>doHelp</literal> and <literal>doEdit</literal>.
</para>
<programlisting role="JAVA">...
@@ -559,9 +559,12 @@
...
</programlisting>
<para>
- If you have read the portlet specification carefully you should have notice that portlet calls happen in one or two phases. One when the portlet is just rendered, two when the portlet is actionned then rendered. An action phase is a phase where some state change. The render phase will have access to render parameters that will be passed each time the portlet is refreshed (with the exception of caching capabilities).
+ Portlet calls happen in one or two phases. One when the portlet is rendered and two when the portlet is actioned <emphasis>then</emphasis> rendered.
</para>
<para>
+ An action phase is a phase where some state changes. The render phase will have access to render parameters that will be passed each time the portlet is refreshed (with the exception of caching capabilities).
+ </para>
+ <para>
The code to be executed during an action has to be implemented in the <emphasis>processAction</emphasis> method of the portlet.
</para>
<programlistingco>
@@ -583,17 +586,17 @@
<calloutlist>
<callout arearefs="area-Reference_Guide-tutorials.jsphello.processAction">
<para>
- <literal>processAction</literal> is the method from GernericPorlet to override for the <emphasis>action</emphasis> phase.
+ <literal>processAction</literal> is the method from <literal>GernericPorlet</literal> to override for the <emphasis>action</emphasis> phase.
</para>
</callout>
<callout arearefs="area-Reference_Guide-tutorials.jsphello.getActionParameter">
<para>
- Here we retrieve the parameter obtained through an <emphasis>action URL</emphasis> .
+ Here the parameter is retrieved through an <emphasis>action URL</emphasis> .
</para>
</callout>
<callout arearefs="area-Reference_Guide-tutorials.jsphello.setRenderParameter">
<para>
- Here we need to keep the value of <literal>yourname</literal> to make it available in the rendering phase. With the previous line, we are simply copying an action parameter to a render parameter for the sake of this example.
+ The value of <literal>yourname</literal> is kept to make it available in the rendering phase. The previous line simply copies an action parameters to a render parameter for this example.
</para>
</callout>
</calloutlist>
@@ -602,10 +605,9 @@
</section>
<section id="sect-Reference_Guide-_JavaServer_Pages_Portlet_Example_-_JSP_files_and_the_Portlet_Tag_Library_">
- <title><trademark class="trade">JSP</trademark> files and the Portlet Tag Library </title>
- <bridgehead>Let's have a look inside the JSP pages. </bridgehead>
+ <title>JSP files and the Portlet Tag Library</title>
<para>
- The <filename>help.jsp</filename> and <filename>edit.jsp</filename> files are very simple, they simply display some text. Note that we used CSS styles as defined in the portlet specification. It ensures that the portlet will look "good" within the theme and accross portal vendors.
+ The <filename>help.jsp</filename> and <filename>edit.jsp</filename> files are very simple. Note that CSS styles are used as defined in the portlet specification. This ensures that the portlet will render well within the theme and across portal vendors.
</para>
<programlisting role="XHTML"><div class="portlet-section-header">Help mode</div>
@@ -616,7 +618,7 @@
<div class="portlet-section-body">This is the edit mode, a convenient place to let the user change his portlet preferences.</div>
</programlisting>
<para>
- Now let's have a look at the landing page, it contains the links and form to call our portlet:
+ The landing page contains the links and form to call our portlet:
</para>
<programlistingco>
<areaspec>
@@ -668,17 +670,17 @@
<calloutlist>
<callout arearefs="area-Reference_Guide-tutorials.jsphello.taglib">
<para>
- Since we will use the portlet taglib, we first need to declare it.
+ The portlet taglib, needs to be declared.
</para>
</callout>
<callout arearefs="area-Reference_Guide-tutorials.jsphello.method1">
<para>
- The first method showed here is the simplest one, <literal>portlet:renderURL</literal> will create a URL that will call the render phase of the current portlet and append the result at the place of the markup (Here within a tag...). We also added a parameter directly on the URL.
+ The first method showed here is the simplest one. <literal>portlet:renderURL</literal> will create a URL that calls the render phase of the current portlet and append the result at the place of the markup (within a tag). A parameter is also added directly to the URL.
</para>
</callout>
<callout arearefs="area-Reference_Guide-tutorials.jsphello.method2.1">
<para>
- In this method instead of having a tag within another tag, which is not XML valid, we use the <literal>var</literal> attribute. Instead of printing the url the <literal>portlet:renderURL</literal> tag will store the result in the referenced variable ( <literal>myRenderURL</literal> in our case).
+ In this method the <literal>var</literal> attribute is used. This avoids having one XML tag within another. Instead of printing the url the <literal>portlet:renderURL</literal> tag will store the result in the referenced variable ( <literal>myRenderURL</literal>).
</para>
</callout>
<callout arearefs="area-Reference_Guide-tutorials.jsphello.method2.2">
@@ -688,19 +690,19 @@
</callout>
<callout arearefs="area-Reference_Guide-tutorials.jsphello.method3.1">
<para>
- The third method mixes form submission and action request. Like in the second method, we used a temporary variable to put the created URL into.
+ The third method mixes form submission and action request. Again, a temporary variable is used to put the created URL into.
</para>
</callout>
<callout arearefs="area-Reference_Guide-tutorials.jsphello.method3.2">
<para>
- The action URL is used in the HTML form.
+ The action URL is used in HTML form.
</para>
</callout>
</calloutlist>
</programlistingco>
<para>
- On the third method, first the action phase is triggered then later in the request, the render phase is triggered, which output some content back to the web browser based on the available render parameters.
+ In the third method the action phase is triggered first then the render phase is triggered, which outputs some content back to the web browser based on the available render parameters.
<mediaobject>
<imageobject>
<imagedata fileref="images/tutorials/jsp_portlet/process.png" format="PNG" scalefit="1" width="444" />
@@ -710,14 +712,16 @@
</section>
<section id="sect-Reference_Guide-_JavaServer_Pages_Portlet_Example_-_JSF_example_using_the_JBoss_Portlet_Bridge_">
- <title><trademark class="trade">JSF</trademark> example using the JBoss Portlet Bridge </title>
- <bridgehead>In order to write a portlet using JSF we need a piece of software called 'bridge' that lets us write a portlet application as if it was a JSF application, the bridge takes care of the interactions between the two layers.</bridgehead>
+ <title>JSF example using the JBoss Portlet Bridge </title>
<para>
- Such an example is available in examples/JSFHelloUser, it uses the JBoss Portlet Bridge. The configuration is slightly different from a JSP application, since it is a bit tricky it is usally a good idea to copy an existing application that starting from scratch.
+ In order to write a portlet using JSF a 'bridge' is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers.
</para>
<para>
- First, as any JSF application, the file <literal>faces-config.xml</literal> is required. It includes the following required information in it:
+ An example of the JBoss Portlet Bridge is available in <filename>examples/JSFHelloUser</filename>. The configuration is slightly different from a JSP application. This example can be used as a base to configure instead of creating a new application.
</para>
+ <para>
+ As in any JSF application, the file <literal>faces-config.xml</literal> is required. It must contain the following information:
+ </para>
<programlisting role="XML"><faces-config>
...
14 years, 10 months
- 1
- 0
gatein SVN: r1574 - in components/wsrp/trunk/admin-gui/src/main: webapp and 9 other directories.
by do-not-reply＠jboss.org
Author: wesleyhales
Date: 2010-02-08 22:44:16 -0500 (Mon, 08 Feb 2010)
New Revision: 1574
Added:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java
components/wsrp/trunk/admin-gui/src/main/webapp/skin/
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/ControlIcon.gif
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/TabEditInline.gif
components/wsrp/trunk/admin-gui/src/main/webapp/styles/
components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css
components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css
Removed:
components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css
components/wsrp/trunk/admin-gui/src/main/webapp/style.css
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml
Log:
initial webui-like skin for wsrp admin
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-09 03:30:46 UTC (rev 1573)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-09 03:44:16 UTC (rev 1574)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2009, Red Hat Middleware, LLC, and individual
+ * 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.
Added: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java (rev 0)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java 2010-02-09 03:44:16 UTC (rev 1574)
@@ -0,0 +1,96 @@
+/******************************************************************************
+ * 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.gatein.wsrp.admin.ui;
+
+import javax.faces.context.FacesContext;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:whales@redhat.com">Wesley Hales</a>
+ * @version $Revision: 630 $
+ */
+public class ResourceBean implements Map<String, String>
+{
+
+ public void clear() {
+ }
+
+ public boolean containsKey(Object key) {
+ return true;
+ }
+
+ public boolean containsValue(Object value) {
+ return true;
+ }
+
+ public Set<Entry<String, String>> entrySet() {
+ return Collections.emptySet();
+ }
+
+ public String get(Object key) {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ String url = null;
+ if(null == key){
+ url = null;
+ } else if(null != facesContext){
+ url = facesContext.getApplication().getViewHandler().getResourceURL(facesContext, key.toString());
+ url = facesContext.getExternalContext().encodeResourceURL(url);
+ } else {
+ url = key.toString();
+ }
+ return url;
+ }
+
+ public boolean isEmpty() {
+ return false;
+ }
+
+ public Set<String> keySet() {
+ return Collections.emptySet();
+ }
+
+ public String put(String key, String value) {
+ return null;
+ }
+
+ public void putAll(Map<? extends String, ? extends String> t) {
+ }
+
+ public String remove(Object key) {
+ return null;
+ }
+
+ public int size() {
+ return 0;
+ }
+
+ public Collection<String> values() {
+ return Collections.emptySet();
+ }
+
+
+
+}
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2010-02-09 03:30:46 UTC (rev 1573)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2010-02-09 03:44:16 UTC (rev 1574)
@@ -108,6 +108,11 @@
<value>#{beanContext}</value>
</managed-property>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>resource</managed-bean-name>
+ <managed-bean-class>org.gatein.wsrp.admin.ui.ResourceBean</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ </managed-bean>
<navigation-rule>
<navigation-case>
Deleted: components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css 2010-02-09 03:30:46 UTC (rev 1573)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css 2010-02-09 03:44:16 UTC (rev 1574)
@@ -1,102 +0,0 @@
-.zero {
- margin: 0;
- padding: 0;
-}
-
-.align-center {
- text-align: center;
-}
-
-.align-center-margin {
- margin: 0 auto 0 auto;
-}
-
-.float-left {
- float: left;
-}
-
-.float-right {
- float: right;
-}
-
-.align-left {
- text-align: left;
-}
-
-.align-right {
- text-align: right;
-}
-
-.align-top {
- vertical-align: top;
-}
-
-.half-width {
- width: 49%;
-}
-
-.quarter-width {
- width: 24.9%;
-}
-
-.three-quarter-width {
- width: 74.9%;
-}
-
-.full-width {
- width: 100%;
-}
-
-.third-width {
- width: 32.9%;
-}
-
-.two-third-width {
- width: 65.9%;
-}
-
-.third-width-pad5 {
- width: 32.5%;
- padding: 5px;
-}
-
-.two-third-width-pad5 {
- width: 65.5%;
- padding: 5px;
-}
-
-.tenpx-top-bottom {
- margin: 10px 0 10px 0;
-}
-
-.clear {
- clear: both;
-}
-
-.pad5 {
- padding: 5px;
-}
-
-.pad10 {
- padding: 10px
-}
-
-.grey-border {
- border: 1px solid #B3C0C7;
-}
-
-.dotted-blue-border {
- font-weight: bold;
- color: #315896;
- font-size: 11px;
- padding: 3px 0 3px 3px;
- background-image: url(img/section-subHeader-bg.gif);
- background-position: left top;
- background-repeat: repeat-x;
- border: 1px solid #b9c6d7;
-}
-
-.dotted-blue-vert-rt {
-
-}
-
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-09 03:30:46 UTC (rev 1573)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-09 03:44:16 UTC (rev 1574)
@@ -24,7 +24,13 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"
xmlns:ui="http://java.sun.com/jsf/facelets">
+
+ <link rel="stylesheet" type="text/css" href="#{facesContext.externalContext.requestContextPath}/styles/style.css" media="screen"/>
+ <link rel="stylesheet" type="text/css" href="#{facesContext.externalContext.requestContextPath}/skin/wsrp/DefaultSkin/DefaultStylesheet.css" media="screen"/>
+
+
<f:loadBundle basename="Resource" var="i18n"/>
+ <div class="UIWsrpPortlet">
<div class="wsrp-consumers-ui">
<ui:insert name="topnav">Top navigation</ui:insert>
@@ -35,10 +41,11 @@
<ui:insert name="objectpath">Object path if needed</ui:insert>
<div class="wsrp-content-container">
- <c:if test="#{!empty title}">
- <h3 class="sectionTitle">${title}</h3>
+ <ui:remove>
+ <c:if test="#{!empty title}">
+ <h3 class="UIControlBar">${title}</h3>
</c:if>
-
+ </ui:remove>
<!-- Status message -->
<h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
@@ -49,4 +56,6 @@
</div>
</div>
+
+ </div>
</ui:composition>
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 03:30:46 UTC (rev 1573)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 03:44:16 UTC (rev 1574)
@@ -28,43 +28,61 @@
xmlns:c="http://java.sun.com/jstl/core">
<ui:define name="topnav">
- <h:form id="cons-temp-form">
- <ul class="topnav">
- <li id="currentTab">#{i18n.nav_tabs_consumers}</li>
- <li>
- <h:commandLink id="producer-link" value="#{i18n.nav_tabs_producer_config}" action="producer"/>
- </li>
- <ui:remove>
- <li>
- <h:commandLink id="management-link" value="#{i18n.nav_tabs_producer_management}"
- action="management"/>
- </li>
- </ui:remove>
- </ul>
+ <h:form id="cons-temp-form" styleClass="cons-temp-form">
+
+ <div class="TabsContainer">
+ <table class="TabsActionContainer"><tr><td>
+ <div class="UITab GrayTabStyle">
+ <div class="SelectedTab">
+ <div class="LeftTab">
+ <div class="RightTab">
+ <div class="MiddleTab">
+ #{i18n.nav_tabs_consumers}
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </td><td>
+ <div class="UITab GrayTabStyle">
+ <div class="NormalTab">
+ <div class="LeftTab">
+ <div class="RightTab">
+ <div class="MiddleTab">
+ <h:commandLink id="producer-link" value="#{i18n.nav_tabs_producer_config}" action="producer"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr></table>
+ </div>
+
</h:form>
</ui:define>
<ui:define name="objectpath">
<h:form id="cons-temp-form1">
- <ul class="objectpath">
- <li class="#{!empty title ? 'selected' : 'pathItem'}">
+ <div class="UIControlBar">
+ <span class="#{!empty title ? 'selected' : 'pathItem'}">
<h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}"
value="#{i18n.path_consumers_root}"/>
- </li>
+ </span>
<c:if test="#{empty title}">
- <li class="pathSeparator">
+ <span class="pathSeparator">
<h:graphicImage url="/img/pathSeparator.png" alt=">"/>
- </li>
- <li
+ </span>
+ <span
class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
<h:outputFormat value="#{i18n.path_consumers_consumer}">
<f:param value="#{consumer.id}"/>
</h:outputFormat>
(#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
#{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
- </li>
+ </span>
</c:if>
- </ul>
+ </div>
</h:form>
</ui:define>
</ui:decorate>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-09 03:30:46 UTC (rev 1573)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-09 03:44:16 UTC (rev 1574)
@@ -27,87 +27,117 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jstl/core">
- <ui:param name="title" value="#{i18n.consumers_title}"/>
+ <ui:param name="title" value="#{i18n.consumers_title}"/>
- <ui:define name="content">
+ <ui:define name="content">
- <!-- Consumer creation -->
- <h:form id="createConsumer" styleClass="createObjectForm">
- <span class="portlet-font">#{i18n.consumers_create_title}</span>
- <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
- required="true"/>
- <h:commandButton id="createConsumerButton" action="#{consumersMgr.createConsumer}"
- value="#{i18n.consumers_create_submit}" styleClass="portlet-form-button"/>
- <h:message for="consumerName" errorClass="portlet-msg-error"/>
- </h:form>
+ <!-- Consumer creation -->
+ <div class="create-container">
+ <h:form id="createConsumer" styleClass="createObjectForm">
+ <span class="portlet-font">#{i18n.consumers_create_title}</span>
+ <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
+ required="true"/>  
- <br/>
+ <table class="ActionContainer">
+ <tr>
+ <td>
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <h:commandLink id="createConsumerButton" action="#{consumersMgr.createConsumer}"
+ value="#{i18n.consumers_create_submit}"/>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
- <!-- Consumers list -->
- <h:form id="consumer-list-form">
- <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons"
- rendered="#{!consumersMgr.consumersEmpty}"
- rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"
- styleClass="datatable objectList" width="100%">
- <h:column>
- <f:facet name="header">
- #{i18n.consumers_table_column_consumer}
- <div style="font-size: 90%; display:inline; font-weight: normal;">
- [#{i18n.consumers_table_column_consumer_status} <span
- class="active">#{i18n.path_consumers_active}</span>,
- <span class="inactive">#{i18n.path_consumers_inactive}</span>,
- <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>]
- </div>
- </f:facet>
+ <h:message for="consumerName" errorClass="portlet-msg-error"/>
- <h:outputText style="display:block; width:100%;"
- styleClass="#{cons.active ? 'active' : 'inactive'} #{cons.refreshNeeded ? 'needsRefresh' : ''}"
- value="#{cons.producerId} (#{cons.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ </h:form>
+ </div>
+ <br/>
+
+ <!-- Consumers list -->
+ <h:form id="consumer-list-form">
+ <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons"
+ rendered="#{!consumersMgr.consumersEmpty}"
+ rowClasses="EvenRow,OddRow"
+ styleClass="UIGrid ConsumerGrid" width="100%">
+ <h:column>
+ <f:facet name="header">
+ #{i18n.consumers_table_column_consumer}
+ <div style="font-size: 90%; display:inline; font-weight: normal;">
+ [#{i18n.consumers_table_column_consumer_status} <span
+ class="active">#{i18n.path_consumers_active}</span>,
+ <span class="inactive">#{i18n.path_consumers_inactive}</span>,
+ <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>]
+ </div>
+ </f:facet>
+
+ <h:outputText style="display:block; width:100%;"
+ styleClass="#{cons.active ? 'active' : 'inactive'} #{cons.refreshNeeded ? 'needsRefresh' : ''}"
+ value="#{cons.producerId} (#{cons.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
#{cons.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/>
- </h:column>
+ </h:column>
- <h:column>
- <f:facet name="header">#{i18n.consumers_table_column_actions}</f:facet>
+ <h:column>
+ <f:facet name="header">#{i18n.consumers_table_column_actions}</f:facet>
- <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure" id="configure">
- <f:param name="id" value="#{cons.producerId}"/>
- #{i18n.consumers_table_action_configure}
- </h:commandLink>
- |
- <h:commandLink action="#{consumersMgr.refreshConsumer}" styleClass="actionRefresh" id="refresh">
- <f:param name="id" value="#{cons.producerId}"/>
- #{i18n.consumers_table_action_refresh}
- </h:commandLink>
- |
- <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate"
- styleClass="#{cons.active ? 'actionDeactivate' : 'actionActivate'}">
- <f:param name="id" value="#{cons.producerId}"/>
- <f:param name="activate" value="#{!cons.active}"/>
- #{cons.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}
- </h:commandLink>
- <h:panelGroup
- rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}">
- |
- <h:commandLink action="#{consumersMgr.registerConsumer}" id="register"
- styleClass="action#{cons.producerInfo.registered ? 'Deregister' : 'Register'}">
- <f:param name="id" value="#{cons.producerId}"/>
- <f:param name="register" value="#{!cons.producerInfo.registered}"/>
- #{cons.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}
- </h:commandLink>
- </h:panelGroup>
- |
- <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete"
- actionListener="#{consumersMgr.selectConsumer}">
- <f:param name="id" value="#{cons.producerId}"/>
- #{i18n.consumers_table_action_delete}
- </h:commandLink>
- </h:column>
- </h:dataTable>
- </h:form>
+ <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure"
+ id="configure">
+ <f:param name="id" value="#{cons.producerId}"/>
+ #{i18n.consumers_table_action_configure}
+ </h:commandLink>
+ |
+ <h:commandLink action="#{consumersMgr.refreshConsumer}" styleClass="actionRefresh" id="refresh">
+ <f:param name="id" value="#{cons.producerId}"/>
+ #{i18n.consumers_table_action_refresh}
+ </h:commandLink>
+ |
+ <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate"
+ styleClass="#{cons.active ? 'actionDeactivate' : 'actionActivate'}">
+ <f:param name="id" value="#{cons.producerId}"/>
+ <f:param name="activate" value="#{!cons.active}"/>
+ #{cons.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}
+ </h:commandLink>
+ <h:panelGroup
+ rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}">
+ |
+ <h:commandLink action="#{consumersMgr.registerConsumer}" id="register"
+ styleClass="action#{cons.producerInfo.registered ? 'Deregister' : 'Register'}">
+ <f:param name="id" value="#{cons.producerId}"/>
+ <f:param name="register" value="#{!cons.producerInfo.registered}"/>
+ #{cons.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}
+ </h:commandLink>
+ </h:panelGroup>
+ |
+ <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete"
+ actionListener="#{consumersMgr.selectConsumer}">
+ <f:param name="id" value="#{cons.producerId}"/>
+ #{i18n.consumers_table_action_delete}
+ </h:commandLink>
+ </h:column>
+ </h:dataTable>
+ </h:form>
- <h:form>
- <h:commandButton id="createConsumerButton" action="#{consumersMgr.reload}"
- value="#{i18n.consumers_table_reload}" styleClass="portlet-form-button"/>
- </h:form>
- </ui:define>
+ <h:form>
+ <table class="ActionContainer">
+ <tr>
+ <td>
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <h:commandLink id="createConsumerButton" action="#{consumersMgr.reload}"
+ value="#{i18n.consumers_table_reload}"/>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ </h:form>
+ </ui:define>
</ui:decorate>
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-02-09 03:30:46 UTC (rev 1573)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-02-09 03:44:16 UTC (rev 1574)
@@ -29,18 +29,35 @@
<ui:define name="topnav">
<h:form id="producer-temp-form">
- <ul class="topnav">
- <li>
- <h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/>
- </li>
- <li id="currentTab">#{i18n.nav_tabs_producer_config}</li>
- <ui:remove>
- <li>
- <h:commandLink id="prod-manag-link" value="#{i18n.nav_tabs_producer_management}"
- action="management"/>
- </li>
- </ui:remove>
- </ul>
+
+ <div class="TabsContainer">
+ <table class="TabsActionContainer"><tr><td>
+ <div class="UITab GrayTabStyle">
+ <div class="NormalTab">
+ <div class="LeftTab">
+ <div class="RightTab">
+ <div class="MiddleTab">
+ <h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </td><td>
+ <div class="UITab GrayTabStyle">
+ <div class="SelectedTab">
+ <div class="LeftTab">
+ <div class="RightTab">
+ <div class="MiddleTab">
+ #{i18n.nav_tabs_producer_config}"
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr></table>
+ </div>
</h:form>
</ui:define>
Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css (rev 0)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-09 03:44:16 UTC (rev 1574)
@@ -0,0 +1,125 @@
+.UIWsrpPortlet .UIControlBar {
+ background: url('background/ControlIcon.gif') repeat-x center -222px;
+ border: 1px solid #b7b7b7;
+ height: 23px;
+ line-height: 23px;
+ padding: 0px 10px;
+ margin: 5px 0px;
+}
+
+.UIWsrpPortlet .cons-temp-form {
+ height: 27px;
+}
+
+.UIWsrpPortlet .UIGrid {
+ border: 1px solid #B7B7B7;
+}
+
+.UIWsrpPortlet .ConsumerGrid thead tr th,
+.UIWsrpPortlet .ConsumerGrid tbody tr td {
+ border: 1px solid #B7B7B7;
+}
+
+.UIWsrpPortlet .create-container {
+ position: relative;
+}
+
+.UIWsrpPortlet .create-container .ActionContainer {
+ position: absolute;
+ top: -2px;
+}
+
+.ActionButton {
+
+}
+
+/***************************** ActionButton Style ************************/
+.UIWsrpPortlet .ActionContainer {
+ width: auto;
+ display: inline; /*margin: auto;*/
+}
+
+.UIWsrpPortlet .ButtonLeft {
+ background: url('background/LightBlueStyle.gif') no-repeat left top;
+ padding: 0px 0px 0px 3px;
+}
+
+.UIWsrpPortlet .ButtonRight {
+ background: url('background/LightBlueStyle.gif') no-repeat right top;
+ padding: 0px 3px 0px 0px;
+}
+
+.UIWsrpPortlet .ButtonMiddle {
+ line-height: 22px;
+ text-align: center;
+ background: url('background/LightBlueStyle.gif') repeat-x bottom;
+ white-space: nowrap;
+ display: table-cell;
+ padding: 0px 12px;
+}
+
+/***************************** GrayTabStyle ************************/
+
+.UIWsrpPortlet .TabsActionContainer {
+ position: absolute;
+ bottom: -6px;
+ width: auto;
+}
+
+.UIWsrpPortlet .TabsContainer {
+ height: 24px;
+ position: relative;
+}
+
+.UIHorizontalTabs .UITab {
+ float: left; /* orientation=lt */
+ font-weight: bold;
+ text-align: center;
+ width: auto;
+}
+
+.UIWsrpPortlet .GrayTabStyle {
+ margin-right: 2px; /* orientation=lt */
+}
+
+.UIWsrpPortlet .GrayTabStyle .NormalTab .LeftTab {
+ background: url(background/TabEditInline.gif) no-repeat left top;
+ padding-left: 4px;
+ cursor: pointer;
+}
+
+.UIWsrpPortlet .GrayTabStyle .NormalTab .RightTab {
+ background: url(background/TabEditInline.gif) no-repeat right top;
+ padding-right: 4px;
+}
+
+.UIWsrpPortlet .GrayTabStyle .NormalTab .MiddleTab {
+ background: url(background/TabEditInline.gif) repeat-x left -25px;
+ line-height: 25px;
+ color: #000;
+ padding: 0px 8px;
+ font-weight: normal;
+}
+
+.UIWsrpPortlet .GrayTabStyle .SelectedTab .LeftTab {
+ background: url(background/TabEditInline.gif) no-repeat left -50px;
+ padding-left: 4px;
+ cursor: pointer;
+}
+
+.UIWsrpPortlet .GrayTabStyle .SelectedTab .RightTab {
+ background: url(background/TabEditInline.gif) no-repeat right -50px;
+ padding-right: 4px;
+}
+
+.UIWsrpPortlet .GrayTabStyle .SelectedTab .MiddleTab {
+ background: url(background/TabEditInline.gif) repeat-x left -75px;
+ line-height: 25px;
+ color: #000;
+ padding: 0px 8px;
+ font-weight: normal;
+}
+
+.UIWsrpPortlet .tab-blank {
+ border-bottom: 1px solid #B7B7B7;
+}
Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/ControlIcon.gif
===================================================================
(Binary files differ)
Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/ControlIcon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif
===================================================================
(Binary files differ)
Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/TabEditInline.gif
===================================================================
(Binary files differ)
Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/TabEditInline.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: components/wsrp/trunk/admin-gui/src/main/webapp/style.css
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/style.css 2010-02-09 03:30:46 UTC (rev 1573)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/style.css 2010-02-09 03:44:16 UTC (rev 1574)
@@ -1,350 +0,0 @@
-@import url(basestyles.css);
-
-.wsrp-consumers-ui table {
- border: 0;
- border-collapse: separate;
-}
-
-.wsrp-consumers-ui form {
- margin: 0;
- border: 0;
-}
-
-.wsrp-consumers-ui hr {
- border-top-style: solid;
-}
-
-/* Top nav. */
-
-.wsrp-consumers-ui ul.topnav {
- padding: 4px 0 3px;
- border-bottom: 1px solid #b3c0c7;
- margin: 0;
-}
-
-.wsrp-consumers-ui ul.topnav li {
- list-style-type: none;
- display: inline;
- margin: 0 0 0 5px;
- padding: 3px 0.5em;
- border: 1px solid #b3c0c7;
- border-bottom: none;
- background-color: #f2f4f5;
-}
-
-.wsrp-consumers-ui ul.topnav li:hover {
- background-color: #fff;
-}
-
-.wsrp-consumers-ui ul.topnav li#currentTab {
- background-color: white;
- border-bottom: 1px solid white;
-}
-
-.wsrp-consumers-ui ul.topnav li#currentTab a:hover {
-}
-
-.wsrp-consumers-ui div.tab-container {
- border-bottom: 1px solid #B3C0C7;
- border-right: 1px solid #B3C0C7;
- border-left: 1px solid #B3C0C7;
- padding: 15px 0 10px 0;
-}
-
-/* Object path. */
-
-.wsrp-consumers-ui ul.objectpath {
- list-style-type: none;
- font-size: 11px;
- border: solid 1px #bbb;
- border-left: solid 1px #eee;
- border-right: solid 1px #eee;
- background: url(img/pathBackground.png) repeat-x left;
- height: 21px;
- margin: 0;
- padding: 0 0 0 2px;
-}
-
-.wsrp-consumers-ui ul.objectpath li {
- list-style-type: none;
- display: block;
- float: left;
-}
-
-.wsrp-consumers-ui ul li.pathItem {
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
-}
-
-.wsrp-consumers-ui ul.objectpath li.selected {
- font-weight: bold;
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
-}
-
-.wsrp-consumers-ui ul.objectpath a {
- color: #333333;
- text-decoration: none;
-}
-
-.wsrp-consumers-ui ul.objectpath a:hover {
- color: #5078aa;
- text-decoration: none;
-}
-
-/* Override theme styles */
-.wsrp-consumers-ui h3.sectionTitle {
- font-weight: bold;
- color: #315896;
- font-size: 11px;
- padding: 3px 0 3px 3px;
- background: url(img/section-subHeader-bg.gif) repeat-x left top;
- border: 1px solid #b9c6d7;
-}
-
-.wsrp-consumers-ui .portlet-section-header {
- background: url(img/pathBackground.png) repeat-x left;
- font-weight: bold;
- color: #656565;
- font-size: 10px;
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #999;
- padding-left: 4px;
-}
-
-.wsrp-consumers-ui .portlet-section-header th {
- background: url(img/pathBackground.png) repeat-x left;
- font-weight: bold;
- color: #656565;
- font-size: 10px;
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #999;
- padding-left: 4px;
-}
-
-.wsrp-consumers-ui .actionConfigure {
- padding: 5px 5px 5px 20px;
- background: url(img/jbp-icon-set/settings.gif) no-repeat left;
- line-height: 18px;
- white-space: nowrap;
-}
-
-.wsrp-consumers-ui .actionRefresh {
- padding: 5px 5px 5px 20px;
- background: url(img/jbp-icon-set/refresh.gif) no-repeat left;
- line-height: 18px;
- white-space: nowrap;
-}
-
-.wsrp-consumers-ui .actionRegister {
- padding: 5px 5px 5px 24px;
- background: url(img/jbp-icon-set/register.gif) no-repeat left;
- line-height: 18px;
- white-space: nowrap;
-}
-
-.wsrp-consumers-ui .actionDeregister {
- padding: 5px 5px 5px 24px;
- background: url(img/jbp-icon-set/deregister.gif) no-repeat left;
- line-height: 18px;
- white-space: nowrap;
-}
-
-.wsrp-consumers-ui .actionDelete {
- padding: 5px 5px 5px 20px;
- background: url(img/jbp-icon-set/delete2.gif) no-repeat left;
- line-height: 18px;
- white-space: nowrap;
-}
-
-.wsrp-consumers-ui .actionActivate {
- padding: 5px 5px 5px 23px;
- background: url(img/jbp-icon-set/activate.gif) no-repeat left;
- line-height: 18px;
- white-space: nowrap;
-}
-
-.wsrp-consumers-ui .actionDeactivate {
- padding: 5px 5px 5px 20px;
- background: url(img/jbp-icon-set/deactivate.gif) no-repeat left;
- line-height: 18px;
- white-space: nowrap;
-}
-
-.wsrp-consumers-ui td {
- border: 0;
- padding-bottom: 2px;
- padding-top: 2px;
- vertical-align: top;
-}
-
-.wsrp-consumers-ui th {
- text-align: left;
- border: 0;
- vertical-align: top;
-}
-
-.wsrp-consumers-ui .active {
- background-color: #C7DDB7;
- font-weight: bold;
-}
-
-.wsrp-consumers-ui table.active {
- border-bottom: 4px solid #C7DDB7;
- border-top: 4px solid #C7DDB7;
- background: inherit;
- font-weight: normal;
-}
-
-.wsrp-consumers-ui li.active {
- font-weight: normal;
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
- background: inherit;
-}
-
-.wsrp-consumers-ui li.active:before {
- content: "__";
- padding: 1px;
- background-color: #C7DDB7;
- color: #C7DDB7;
- border: 1px solid #999;
-}
-
-.wsrp-consumers-ui .inactive {
- background-color: #EBD1B8;
-}
-
-.wsrp-consumers-ui table.inactive {
- border-bottom: 4px solid #EBD1B8;
- border-top: 4px solid #EBD1B8;
- background: inherit;
-}
-
-.wsrp-consumers-ui li.inactive {
- font-weight: normal;
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
- background: inherit;
-}
-
-.wsrp-consumers-ui li.inactive:before {
- content: "__";
- padding: 1px;
- background-color: #EBD1B8;
- color: #EBD1B8;
- border: 1px solid #999;
-}
-
-.wsrp-consumers-ui .needsRefresh {
- font-style: italic;
-}
-
-.wsrp-consumers-ui .registration-prop-table {
- text-align: left;
- width: 100%;
- margin-bottom: .3em;
-}
-
-.wsrp-consumers-ui .registration-prop-table.active {
- border: 1px solid #C7DDB7;
-}
-
-.wsrp-consumers-ui .registration-prop-table.active th {
- background: #C7DDB7 none;
-}
-
-.wsrp-consumers-ui .registration-prop-table.active .portlet-section-alternate {
- background: #dcf0d0;
-}
-
-.wsrp-consumers-ui .registration-prop-table.inactive, .wsrp-consumers-ui span.inactive {
- border: 1px solid #EBD1B8;
-}
-
-.wsrp-consumers-ui .registration-prop-table.inactive th {
- background: #EBD1B8 none;
-}
-
-.wsrp-consumers-ui .registration-prop-table.inactive .portlet-section-alternate {
- background: #f0f0dd;
-}
-
-.wsrp-consumers-ui .registration-prop-table .nameColumn {
- width: 20%;
-}
-
-.wsrp-consumers-ui .registration-prop-table .descColumn {
- width: 20%;
-}
-
-.wsrp-consumers-ui .portlet-section-buttonrow {
- margin-top: 6px;
- margin-bottom: 6px;
- float: right;
-}
-
-.wsrp-consumers-ui #handle a.portlet-form-button {
- padding: .2em;
- margin-left: 3em;
-}
-
-.wsrp-consumers-ui .portlet-form-button {
- padding: .2em;
- margin: 0 .3em;
-}
-
-.portlet-msg-status:before {
- content: "Info: "
-}
-
-.portlet-msg-error:before {
- content: "Error: "
-}
-
-.portlet-msg-alert:before {
- content: "Warning: "
-}
-
-.wsrp-consumers-ui .portlet-area-header {
- border: 1px solid #54708c;
- font-weight: bold;
- color: #fff;
- font-size: 11px;
- background-color: #5986b3;
- padding: 2px 2px 2px 4px;
- margin: 0;
- display: block;
-}
-
-.wsrp-consumers-ui .portlet-area-body {
- border: 1px solid #d5d5d5;
- border-top: 0;
- background-color: #fff;
- padding: 4px;
- margin: 0;
- display: block;
-}
-
-.wsrp-consumers-ui .portlet-msg {
- border: 1px solid #bbb;
- margin: 2em auto;
- padding: 1em;
- width: 60%;
-}
-
-.wsrp-consumers-ui .portlet-msg-body {
- position: relative;
- top: -3em;
- left: 3em;
- width: 95%;
-}
-
-.wsrp-consumers-ui .wsrp-content-container {
- margin: 0 auto 0 auto;
- width: 98%;
-}
Copied: components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css (from rev 1569, components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css)
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css (rev 0)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css 2010-02-09 03:44:16 UTC (rev 1574)
@@ -0,0 +1,102 @@
+.zero {
+ margin: 0;
+ padding: 0;
+}
+
+.align-center {
+ text-align: center;
+}
+
+.align-center-margin {
+ margin: 0 auto 0 auto;
+}
+
+.float-left {
+ float: left;
+}
+
+.float-right {
+ float: right;
+}
+
+.align-left {
+ text-align: left;
+}
+
+.align-right {
+ text-align: right;
+}
+
+.align-top {
+ vertical-align: top;
+}
+
+.half-width {
+ width: 49%;
+}
+
+.quarter-width {
+ width: 24.9%;
+}
+
+.three-quarter-width {
+ width: 74.9%;
+}
+
+.full-width {
+ width: 100%;
+}
+
+.third-width {
+ width: 32.9%;
+}
+
+.two-third-width {
+ width: 65.9%;
+}
+
+.third-width-pad5 {
+ width: 32.5%;
+ padding: 5px;
+}
+
+.two-third-width-pad5 {
+ width: 65.5%;
+ padding: 5px;
+}
+
+.tenpx-top-bottom {
+ margin: 10px 0 10px 0;
+}
+
+.clear {
+ clear: both;
+}
+
+.pad5 {
+ padding: 5px;
+}
+
+.pad10 {
+ padding: 10px
+}
+
+.grey-border {
+ border: 1px solid #B3C0C7;
+}
+
+.dotted-blue-border {
+ font-weight: bold;
+ color: #315896;
+ font-size: 11px;
+ padding: 3px 0 3px 3px;
+ background-image: url(../img/section-subHeader-bg.gif);
+ background-position: left top;
+ background-repeat: repeat-x;
+ border: 1px solid #b9c6d7;
+}
+
+.dotted-blue-vert-rt {
+
+}
+
Copied: components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css (from rev 1569, components/wsrp/trunk/admin-gui/src/main/webapp/style.css)
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css (rev 0)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-09 03:44:16 UTC (rev 1574)
@@ -0,0 +1,354 @@
+@import url(basestyles.css);
+
+.wsrp-consumers-ui {
+ padding: 10px;
+}
+.wsrp-consumers-ui table {
+ border: 0;
+ /*border-collapse: separate;*/
+}
+
+.wsrp-consumers-ui form {
+ margin: 0;
+ border: 0;
+}
+
+.wsrp-consumers-ui hr {
+ border-top-style: solid;
+}
+
+/* Top nav. */
+
+.wsrp-consumers-ui ul.topnav {
+ padding: 4px 0 3px;
+ border-bottom: 1px solid #b3c0c7;
+ margin: 0;
+}
+
+.wsrp-consumers-ui ul.topnav li {
+ list-style-type: none;
+ display: inline;
+ margin: 0 0 0 5px;
+ padding: 3px 0.5em;
+ border: 1px solid #b3c0c7;
+ border-bottom: none;
+ background-color: #f2f4f5;
+}
+
+.wsrp-consumers-ui ul.topnav li:hover {
+ background-color: #fff;
+}
+
+.wsrp-consumers-ui ul.topnav li#currentTab {
+ background-color: white;
+ border-bottom: 1px solid white;
+}
+
+.wsrp-consumers-ui ul.topnav li#currentTab a:hover {
+}
+
+.wsrp-consumers-ui div.tab-container {
+ border-bottom: 1px solid #B3C0C7;
+ border-right: 1px solid #B3C0C7;
+ border-left: 1px solid #B3C0C7;
+ border-top: 1px solid #B3C0C7;
+ padding: 15px 0 10px 0;
+}
+
+/* Object path. */
+
+.wsrp-consumers-ui ul.objectpath {
+ list-style-type: none;
+ font-size: 11px;
+ border: solid 1px #bbb;
+ border-left: solid 1px #eee;
+ border-right: solid 1px #eee;
+ background: url(../img/pathBackground.png) repeat-x left;
+ height: 21px;
+ margin: 0;
+ padding: 0 0 0 2px;
+}
+
+.wsrp-consumers-ui ul.objectpath li {
+ list-style-type: none;
+ display: block;
+ float: left;
+}
+
+.wsrp-consumers-ui ul li.pathItem {
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+.wsrp-consumers-ui ul.objectpath li.selected {
+ font-weight: bold;
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+.wsrp-consumers-ui ul.objectpath a {
+ color: #333333;
+ text-decoration: none;
+}
+
+.wsrp-consumers-ui ul.objectpath a:hover {
+ color: #5078aa;
+ text-decoration: none;
+}
+
+/* Override theme styles */
+.wsrp-consumers-ui h3.sectionTitle {
+ font-weight: bold;
+ color: #315896;
+ font-size: 11px;
+ padding: 3px 0 3px 3px;
+ background: url(../img/section-subHeader-bg.gif) repeat-x left top;
+ border: 1px solid #b9c6d7;
+}
+
+.wsrp-consumers-ui .portlet-section-header {
+ background: url(../img/pathBackground.png) repeat-x left;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.wsrp-consumers-ui .portlet-section-header th {
+ background: url(../img/pathBackground.png) repeat-x left;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.wsrp-consumers-ui .actionConfigure {
+ padding: 5px 5px 5px 20px;
+ background: url(../img/jbp-icon-set/settings.gif) no-repeat left;
+ line-height: 18px;
+ white-space: nowrap;
+}
+
+.wsrp-consumers-ui .actionRefresh {
+ padding: 5px 5px 5px 20px;
+ background: url(../img/jbp-icon-set/refresh.gif) no-repeat left;
+ line-height: 18px;
+ white-space: nowrap;
+}
+
+.wsrp-consumers-ui .actionRegister {
+ padding: 5px 5px 5px 24px;
+ background: url(../img/jbp-icon-set/register.gif) no-repeat left;
+ line-height: 18px;
+ white-space: nowrap;
+}
+
+.wsrp-consumers-ui .actionDeregister {
+ padding: 5px 5px 5px 24px;
+ background: url(../img/jbp-icon-set/deregister.gif) no-repeat left;
+ line-height: 18px;
+ white-space: nowrap;
+}
+
+.wsrp-consumers-ui .actionDelete {
+ padding: 5px 5px 5px 20px;
+ background: url(../img/jbp-icon-set/delete2.gif) no-repeat left;
+ line-height: 18px;
+ white-space: nowrap;
+}
+
+.wsrp-consumers-ui .actionActivate {
+ padding: 5px 5px 5px 23px;
+ background: url(../img/jbp-icon-set/activate.gif) no-repeat left;
+ line-height: 18px;
+ white-space: nowrap;
+}
+
+.wsrp-consumers-ui .actionDeactivate {
+ padding: 5px 5px 5px 20px;
+ background: url(../img/jbp-icon-set/deactivate.gif) no-repeat left;
+ line-height: 18px;
+ white-space: nowrap;
+}
+
+.wsrp-consumers-ui td {
+ border: 0;
+ padding-bottom: 2px;
+ padding-top: 2px;
+ vertical-align: top;
+}
+
+.wsrp-consumers-ui th {
+ text-align: left;
+ border: 0;
+ vertical-align: top;
+}
+
+.wsrp-consumers-ui .active {
+ background-color: #C7DDB7;
+ font-weight: bold;
+}
+
+.wsrp-consumers-ui table.active {
+ border-bottom: 4px solid #C7DDB7;
+ border-top: 4px solid #C7DDB7;
+ background: inherit;
+ font-weight: normal;
+}
+
+.wsrp-consumers-ui li.active {
+ font-weight: normal;
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+ background: inherit;
+}
+
+.wsrp-consumers-ui li.active:before {
+ content: "__";
+ padding: 1px;
+ background-color: #C7DDB7;
+ color: #C7DDB7;
+ border: 1px solid #999;
+}
+
+.wsrp-consumers-ui .inactive {
+ background-color: #EBD1B8;
+}
+
+.wsrp-consumers-ui table.inactive {
+ border-bottom: 4px solid #EBD1B8;
+ border-top: 4px solid #EBD1B8;
+ background: inherit;
+}
+
+.wsrp-consumers-ui li.inactive {
+ font-weight: normal;
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+ background: inherit;
+}
+
+.wsrp-consumers-ui li.inactive:before {
+ content: "__";
+ padding: 1px;
+ background-color: #EBD1B8;
+ color: #EBD1B8;
+ border: 1px solid #999;
+}
+
+.wsrp-consumers-ui .needsRefresh {
+ font-style: italic;
+}
+
+.wsrp-consumers-ui .registration-prop-table {
+ text-align: left;
+ width: 100%;
+ margin-bottom: .3em;
+}
+
+.wsrp-consumers-ui .registration-prop-table.active {
+ border: 1px solid #C7DDB7;
+}
+
+.wsrp-consumers-ui .registration-prop-table.active th {
+ background: #C7DDB7 none;
+}
+
+.wsrp-consumers-ui .registration-prop-table.active .portlet-section-alternate {
+ background: #dcf0d0;
+}
+
+.wsrp-consumers-ui .registration-prop-table.inactive, .wsrp-consumers-ui span.inactive {
+ border: 1px solid #EBD1B8;
+}
+
+.wsrp-consumers-ui .registration-prop-table.inactive th {
+ background: #EBD1B8 none;
+}
+
+.wsrp-consumers-ui .registration-prop-table.inactive .portlet-section-alternate {
+ background: #f0f0dd;
+}
+
+.wsrp-consumers-ui .registration-prop-table .nameColumn {
+ width: 20%;
+}
+
+.wsrp-consumers-ui .registration-prop-table .descColumn {
+ width: 20%;
+}
+
+.wsrp-consumers-ui .portlet-section-buttonrow {
+ margin-top: 6px;
+ margin-bottom: 6px;
+ float: right;
+}
+
+.wsrp-consumers-ui #handle a.portlet-form-button {
+ padding: .2em;
+ margin-left: 3em;
+}
+
+.wsrp-consumers-ui .portlet-form-button {
+ padding: .2em;
+ margin: 0 .3em;
+}
+
+.portlet-msg-status:before {
+ content: "Info: "
+}
+
+.portlet-msg-error:before {
+ content: "Error: "
+}
+
+.portlet-msg-alert:before {
+ content: "Warning: "
+}
+
+.wsrp-consumers-ui .portlet-area-header {
+ border: 1px solid #54708c;
+ font-weight: bold;
+ color: #fff;
+ font-size: 11px;
+ background-color: #5986b3;
+ padding: 2px 2px 2px 4px;
+ margin: 0;
+ display: block;
+}
+
+.wsrp-consumers-ui .portlet-area-body {
+ border: 1px solid #d5d5d5;
+ border-top: 0;
+ background-color: #fff;
+ padding: 4px;
+ margin: 0;
+ display: block;
+}
+
+.wsrp-consumers-ui .portlet-msg {
+ border: 1px solid #bbb;
+ margin: 2em auto;
+ padding: 1em;
+ width: 60%;
+}
+
+.wsrp-consumers-ui .portlet-msg-body {
+ position: relative;
+ top: -3em;
+ left: 3em;
+ width: 95%;
+}
+
+.wsrp-consumers-ui .wsrp-content-container {
+ margin: 0 auto 0 auto;
+ width: 98%;
+}
14 years, 10 months
- 1
- 0
gatein SVN: r1573 - in portal/trunk: web/portal/src/main/webapp/login/jsp and 1 other directory.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-08 22:30:46 -0500 (Mon, 08 Feb 2010)
New Revision: 1573
Modified:
portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
Log:
GTNPORTAL-603 Use httpResponse.setContentType("text/html; charset=UTF-8"); in login form
Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
===================================================================
--- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-02-09 03:26:35 UTC (rev 1572)
+++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-02-09 03:30:46 UTC (rev 1573)
@@ -55,6 +55,7 @@
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
+ resp.setContentType("text/html; charset=UTF-8");
HttpSession session = req.getSession();
Credentials credentials = (Credentials)session.getAttribute(InitiateLoginServlet.CREDENTIALS);
session.setAttribute("initialURI", req.getAttribute("javax.servlet.forward.request_uri"));
Modified: portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
===================================================================
--- portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-02-09 03:26:35 UTC (rev 1572)
+++ portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-02-09 03:30:46 UTC (rev 1573)
@@ -43,8 +43,8 @@
cookie.setMaxAge(0);
response.addCookie(cookie);
- response.setCharacterEncoding("UTF-8");
-
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("text/html; charset=UTF-8");
%>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
14 years, 10 months
- 1
- 0