Author: wesleyhales Date: 2007-10-22 13:06:49 -0400 (Mon, 22 Oct 2007) New Revision: 8740 Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Admin.gif branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_DashConfig.gif branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Default1.gif branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc1.gif branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc2.gif branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc3.gif branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc4.gif branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Users.gif branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/portletIcon_CMS.gif branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/portletIcon_Users.gif branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-basic-samples-war/images/portletIcon_Exception.gif branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-basic-samples-war/images/portletIcon_Upload.gif branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-news-samples-war/ branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-news-samples-war/images/ branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-news-samples-war/images/portletIcon_News.gif branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-weather-samples-war/ branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-weather-samples-war/images/ branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-weather-samples-war/images/portletIcon_Weather.gif branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/images/portletIcon_Users.gif Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml Log: JBPORTAL-1766 Portal Administration Icons Added: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/images/portletIcon_Users.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/images/portletIcon_Users.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2007-10-22 16:57:26 UTC (rev 8739) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2007-10-22 17:06:49 UTC (rev 8740) @@ -31,6 +31,12 @@ <transaction> <trans-attribute>Required</trans-attribute> </transaction> + <portlet-info> + <icon> + <small-icon>/images/portletIcon_Users.gif</small-icon> + <large-icon>/images/portletIcon_Users.gif</large-icon> + </icon> + </portlet-info> </portlet> <portlet> <portlet-name>RolePortlet</portlet-name> @@ -50,6 +56,12 @@ } </script> </header-content> + <portlet-info> + <icon> + <small-icon>/images/portletIcon_Users.gif</small-icon> + <large-icon>/images/portletIcon_Users.gif</large-icon> + </icon> + </portlet-info> </portlet> <portlet> Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Admin.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Admin.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_DashConfig.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_DashConfig.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Default1.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Default1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc1.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc2.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc3.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc3.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc4.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Misc4.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Users.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Users.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-10-22 16:57:26 UTC (rev 8739) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-10-22 17:06:49 UTC (rev 8740) @@ -203,7 +203,7 @@ } else { - return ""; + return "/portal-admin/img/portletIcon_Default1.gif"; } } }); @@ -220,7 +220,7 @@ } else { - return ""; + return "/portal-admin/img/portletIcon_Default1.gif"; } } }); Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-10-22 16:57:26 UTC (rev 8739) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-10-22 17:06:49 UTC (rev 8740) @@ -37,6 +37,12 @@ <header-content> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> + <portlet-info> + <icon> + <small-icon>/img/portletIcon_Admin.gif</small-icon> + <large-icon>/img/portletIcon_Admin.gif</large-icon> + </icon> + </portlet-info> </portlet> <portlet> <portlet-name>DashboardConfigPortlet</portlet-name> @@ -49,6 +55,12 @@ <header-content> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> + <portlet-info> + <icon> + <small-icon>/img/portletIcon_DashConfig.gif</small-icon> + <large-icon>/img/portletIcon_DashConfig.gif</large-icon> + </icon> + </portlet-info> </portlet> <!-- Service injected in the portlet context. --> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-10-22 16:57:26 UTC (rev 8739) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-10-22 17:06:49 UTC (rev 8740) @@ -42,6 +42,7 @@ <tr class="#{portlet.context.id == portletmgr.selectedPortlet.context.id ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> <td> + <img src="#{portlet.smallIconLocation}" align="middle" style="margin:0 4px 0 0"/> <h:commandLink action="#{portletmgr.selectPortlet}" title="#{portlet.context.id}"> Added: branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/portletIcon_CMS.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/portletIcon_CMS.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2007-10-22 16:57:26 UTC (rev 8739) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2007-10-22 17:06:49 UTC (rev 8740) @@ -34,6 +34,12 @@ <header-content> <link rel="stylesheet" type="text/css" href="/images/cms/admin/style.css" media="screen"/> </header-content> + <portlet-info> + <icon> + <small-icon>/images/portletIcon_CMS.gif</small-icon> + <large-icon>/images/portletIcon_CMS.gif</large-icon> + </icon> + </portlet-info> </portlet> <!-- Service injected in the portlet context. --> <service> Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/portletIcon_Users.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/portletIcon_Users.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2007-10-22 16:57:26 UTC (rev 8739) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2007-10-22 17:06:49 UTC (rev 8740) @@ -37,6 +37,12 @@ <header-content> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> + <portlet-info> + <icon> + <small-icon>/img/portletIcon_Users.gif</small-icon> + <large-icon>/img/portletIcon_Users.gif</large-icon> + </icon> + </portlet-info> </portlet> <portlet> <portlet-name>IdentityAdminPortlet</portlet-name> @@ -49,6 +55,12 @@ <header-content> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> + <portlet-info> + <icon> + <small-icon>/img/portletIcon_Users.gif</small-icon> + <large-icon>/img/portletIcon_Users.gif</large-icon> + </icon> + </portlet-info> </portlet> <!-- Injecting of required services into the portlet context. --> Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-basic-samples-war/images/portletIcon_Exception.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-basic-samples-war/images/portletIcon_Exception.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-basic-samples-war/images/portletIcon_Upload.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-basic-samples-war/images/portletIcon_Upload.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-news-samples-war/images/portletIcon_News.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-news-samples-war/images/portletIcon_News.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-weather-samples-war/images/portletIcon_Weather.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/bin/portal-weather-samples-war/images/portletIcon_Weather.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml 2007-10-22 16:57:26 UTC (rev 8739) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml 2007-10-22 17:06:49 UTC (rev 8740) @@ -52,6 +52,12 @@ </portlet> <portlet> <portlet-name>ExceptionPortlet</portlet-name> + <portlet-info> + <icon> + <small-icon>/images/portletIcon_Exception.gif</small-icon> + <large-icon>/images/portletIcon_Exception.gif</large-icon> + </icon> + </portlet-info> </portlet> <portlet> <portlet-name>PortletB</portlet-name> @@ -83,6 +89,15 @@ <portlet> <portlet-name>BasicPortlet</portlet-name> </portlet> + <portlet> + <portlet-name>FileUploadPortlet</portlet-name> + <portlet-info> + <icon> + <small-icon>/images/portletIcon_Upload.gif</small-icon> + <large-icon>/images/portletIcon_Upload.gif</large-icon> + </icon> + </portlet-info> + </portlet> <!-- Service injected in the portlet context. --> <service> Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jboss-portlet.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jboss-portlet.xml 2007-10-22 17:06:49 UTC (rev 8740) @@ -0,0 +1,38 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE portlet-app PUBLIC + "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> + +<portlet-app> + <portlet> + <portlet-name>NewsPortlet</portlet-name> + <portlet-info> + <icon> + <small-icon>/images/portletIcon_News.gif</small-icon> + <large-icon>/images/img/portletIcon_News.gif</large-icon> + </icon> + </portlet-info> + </portlet> +</portlet-app> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jboss-portlet.xml 2007-10-22 16:57:26 UTC (rev 8739) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jboss-portlet.xml 2007-10-22 17:06:49 UTC (rev 8740) @@ -30,7 +30,7 @@ <portlet> <portlet-name>CurrentUsersPortlet</portlet-name> - </portlet> + </portlet> <service> <service-name>UsersActivityStats</service-name> Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jboss-portlet.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jboss-portlet.xml 2007-10-22 17:06:49 UTC (rev 8740) @@ -0,0 +1,38 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE portlet-app PUBLIC + "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> + +<portlet-app> + <portlet> + <portlet-name>WeatherPortlet</portlet-name> + <portlet-info> + <icon> + <small-icon>/images/portletIcon_Weather.gif</small-icon> + <large-icon>/images/portletIcon_Weather.gif</large-icon> + </icon> + </portlet-info> + </portlet> +</portlet-app> \ No newline at end of file