diff --git a/themes/welcome-theme/docroot/WEB-INF/lib/.gitignore b/themes/welcome-theme/docroot/WEB-INF/lib/.gitignore deleted file mode 100644 index 21d22fe0554..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/lib/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/commons-logging.jar -/log4j.jar -/util-bridges.jar -/util-java.jar -/util-taglib.jar \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/liferay-look-and-feel.xml b/themes/welcome-theme/docroot/WEB-INF/liferay-look-and-feel.xml new file mode 100644 index 00000000000..4c6c977b35a --- /dev/null +++ b/themes/welcome-theme/docroot/WEB-INF/liferay-look-and-feel.xml @@ -0,0 +1,14 @@ + + + + + + 6.1.1+ + + + + + + + + \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/liferay-releng.properties b/themes/welcome-theme/docroot/WEB-INF/liferay-releng.properties deleted file mode 100644 index 1c6d38e50d3..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/liferay-releng.properties +++ /dev/null @@ -1,10 +0,0 @@ -bundle=false -category= -compatibility=6.1.1 -demo-url= -labs=true -marketplace=true -parent-app= -public=true -standalone-app=true -supported=true \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/META-INF/messaging-spring.xml b/themes/welcome-theme/docroot/WEB-INF/src/META-INF/messaging-spring.xml deleted file mode 100644 index 2820d8fef34..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/META-INF/messaging-spring.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/com/liferay/welcome/messaging/ResourcesImporterMessageListener.java b/themes/welcome-theme/docroot/WEB-INF/src/com/liferay/welcome/messaging/ResourcesImporterMessageListener.java deleted file mode 100644 index c768d490644..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/com/liferay/welcome/messaging/ResourcesImporterMessageListener.java +++ /dev/null @@ -1,114 +0,0 @@ -/** - * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved. - * - * This library 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 library 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. - */ - -package com.liferay.welcome.messaging; - -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.messaging.BaseMessageListener; -import com.liferay.portal.kernel.messaging.Message; -import com.liferay.portal.kernel.util.MethodKey; -import com.liferay.portal.kernel.util.PortalClassInvoker; -import com.liferay.portal.model.Group; -import com.liferay.portal.model.GroupConstants; -import com.liferay.portal.model.Layout; -import com.liferay.portal.model.LayoutConstants; -import com.liferay.portal.model.LayoutSet; -import com.liferay.portal.model.LayoutSetPrototype; -import com.liferay.portal.model.LayoutTypePortlet; -import com.liferay.portal.service.GroupLocalServiceUtil; -import com.liferay.portal.service.LayoutLocalServiceUtil; -import com.liferay.portal.service.LayoutSetLocalServiceUtil; -import com.liferay.portal.service.LayoutSetPrototypeLocalServiceUtil; - -import java.util.List; - -/** - * @author Brian Wing Shun Chan - * @author Ryan Park - */ -public class ResourcesImporterMessageListener extends BaseMessageListener { - - @Override - protected void doReceive(Message message) throws Exception { - String servletContextName = message.getString("servletContextName"); - - if (!servletContextName.equals("welcome-theme")) { - return; - } - - long companyId = message.getLong("companyId"); - - Group group = GroupLocalServiceUtil.getGroup( - companyId, GroupConstants.GUEST); - - if (group.getPublicLayoutsPageCount() != 1) { - return; - } - - List layouts = LayoutLocalServiceUtil.getLayouts( - group.getGroupId(), false); - - Layout layout = layouts.get(0); - - LayoutTypePortlet layoutTypePortlet = - (LayoutTypePortlet)layout.getLayoutType(); - - List portletIds = layoutTypePortlet.getPortletIds(); - - if (portletIds.size() != 2) { - return; - } - - for (String portletId : portletIds) { - if (!portletId.equals("47") && !portletId.equals("58")) { - return; - } - } - - long layoutSetPrototypeId = message.getLong("layoutSetPrototypeId"); - - if (_log.isInfoEnabled()) { - _log.info( - "Apply content and pages from layout set prototype " + - layoutSetPrototypeId + " onto the Guest group"); - } - - LayoutLocalServiceUtil.deleteLayouts(group.getGroupId(), false, null); - - LayoutSetPrototype layoutSetPrototype = - LayoutSetPrototypeLocalServiceUtil.getLayoutSetPrototype( - layoutSetPrototypeId); - - LayoutSetLocalServiceUtil.updateLayoutSetPrototypeLinkEnabled( - group.getGroupId(), false, true, layoutSetPrototype.getUuid()); - - PortalClassInvoker.invoke( - true, _mergeLayoutSetProtypeLayoutsMethodKey, group, - group.getPublicLayoutSet()); - - LayoutLocalServiceUtil.getLayouts( - group.getGroupId(), false, - LayoutConstants.DEFAULT_PARENT_LAYOUT_ID); - } - - private static Log _log = LogFactoryUtil.getLog( - ResourcesImporterMessageListener.class); - - private static MethodKey _mergeLayoutSetProtypeLayoutsMethodKey = - new MethodKey( - "com.liferay.portlet.sites.util.SitesUtil", - "mergeLayoutSetProtypeLayouts", Group.class, LayoutSet.class); - -} \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Document Managment.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Document Managment.jpg deleted file mode 100644 index 3f84f91cf30..00000000000 Binary files a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Document Managment.jpg and /dev/null differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Dynamic Websites.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Dynamic Websites.jpg deleted file mode 100644 index 543ba3bf957..00000000000 Binary files a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Dynamic Websites.jpg and /dev/null differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Marketplace.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Marketplace.jpg deleted file mode 100644 index e2ad3f9ba00..00000000000 Binary files a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Marketplace.jpg and /dev/null differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Mobile Sync.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Mobile Sync.jpg deleted file mode 100644 index 276f80e4d8c..00000000000 Binary files a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Mobile Sync.jpg and /dev/null differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Workflow.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Workflow.jpg deleted file mode 100644 index ae3e3e7b43b..00000000000 Binary files a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/Workflow.jpg and /dev/null differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_1.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_1.jpg new file mode 100644 index 00000000000..be9887903f7 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_1.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_10.png b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_10.png new file mode 100644 index 00000000000..4b0fa0f4939 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_10.png differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_11.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_11.jpg new file mode 100644 index 00000000000..2beda378ba1 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_11.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_12.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_12.jpg new file mode 100644 index 00000000000..01068078a0b Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_12.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_13.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_13.jpg new file mode 100644 index 00000000000..1304e1ac4b3 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_13.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_2.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_2.jpg new file mode 100644 index 00000000000..1bb5c44566d Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_2.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_3.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_3.jpg new file mode 100644 index 00000000000..b7e75a1d7d2 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_3.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_4.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_4.jpg new file mode 100644 index 00000000000..cbc33d6a8d5 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_4.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_5.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_5.jpg new file mode 100644 index 00000000000..3b54425c3df Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_5.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_6.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_6.jpg new file mode 100644 index 00000000000..0cddc7948b0 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_6.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_7.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_7.jpg new file mode 100644 index 00000000000..c1ddd81a2b1 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_7.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_8.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_8.jpg new file mode 100644 index 00000000000..f3c64e1e841 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_8.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_9.jpg b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_9.jpg new file mode 100644 index 00000000000..3c61ae4ea85 Binary files /dev/null and b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/document_library/documents/welcome_bg_9.jpg differ diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Data Lists and Forms.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Data Lists and Forms.html deleted file mode 100644 index 9781746e607..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Data Lists and Forms.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
-

- Model business processes with new productivity tools like Lists and Forms. -

-

- Learn more about Lists and Forms -

-
-
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Desktop Mobile Access.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Desktop Mobile Access.html deleted file mode 100644 index 4e9ba6b66b2..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Desktop Mobile Access.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
-

- Access Liferay anywhere with the new Liferay Sync. -

-

- Get Liferay Sync for your desktop or mobile device -

-
-
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Document Management.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Document Management.html deleted file mode 100644 index f9a19545f3a..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Document Management.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
-

- Manage Documents from all your repositories in a single place. -

-

- Read more about Document Management -

-
-
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Dynamic Websites.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Dynamic Websites.html deleted file mode 100644 index e630e4b3bf9..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Dynamic Websites.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
-

- Create Dynamic Websites with large teams working simultaniously. -

-

- Checkout SesameStreet.com built on Liferay -

-
-
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Life Saving Support.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Life Saving Support.html deleted file mode 100644 index 2a27d0d703c..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Life Saving Support.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
-

- Liferay support has been absolutely fantastic. - Honestly never had a team that actively wanted to help, and it makes a big difference. -

-
- Jerry Sanders, Union Pacific -
-
-

- See more testimonials about Liferay Support -

-
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Liferay Marketplace.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Liferay Marketplace.html deleted file mode 100644 index 34c4e3270b9..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Liferay Marketplace.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
-

- Deliver apps effortlessly to your enterprise with the Liferay Marketplace. -

-

- Discover apps now > -

-
-
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Data Lists and Forms.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Data Lists and Forms.html deleted file mode 100644 index 0878bc31951..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Data Lists and Forms.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Liferay Portal 6.1 -

-

- Discover the Benefits -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Desktop and Mobile Access.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Desktop and Mobile Access.html deleted file mode 100644 index 81e2e62cf02..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Desktop and Mobile Access.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Enterprise Edition -

-

- For Critical Deployments -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Document Management.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Document Management.html deleted file mode 100644 index e727ff75dfa..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Document Management.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Enterprise Edition -

-

- For Critical Deployments -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Dynamic Websites.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Dynamic Websites.html deleted file mode 100644 index 3f7ce5659ee..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Dynamic Websites.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Enterprise Edition -

-

- For Critical Deployments -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Life Saving Support.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Life Saving Support.html deleted file mode 100644 index 1c1b3c4eb56..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Enterprise Edition Life Saving Support.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Enterprise Edition -

-

- For Critical Deployments -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Data Lists and Forms.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Data Lists and Forms.html deleted file mode 100644 index c9f47dbf84a..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Data Lists and Forms.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Liferay Portal 6.1 -

-

- Discover the Benefits -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Desktop and Mobile Access.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Desktop and Mobile Access.html deleted file mode 100644 index 63937d0b889..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Desktop and Mobile Access.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Liferay Portal 6.1 -

-

- Discover the Benefits -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Document Management.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Document Management.html deleted file mode 100644 index 7496422a667..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Document Management.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Liferay Portal 6.1 -

-

- Discover the Benefits -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Dynamic Websites.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Dynamic Websites.html deleted file mode 100644 index 1c7012c172f..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Dynamic Websites.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Liferay Portal 6.1 -

-

- Discover the Benefits -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Liferay Marketplace.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Liferay Marketplace.html deleted file mode 100644 index a5ed2729a09..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Navigation Liferay Portal Liferay Marketplace.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
-

- Liferay Portal 6.1 -

-

- Discover the Benefits -

-
- - -
\ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Welcome Content Template/Liferay Benefits.xml b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Welcome Content Template/Liferay Benefits.xml new file mode 100644 index 00000000000..f533b454fd2 --- /dev/null +++ b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Welcome Content Template/Liferay Benefits.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Welcome Content Template/What do we do.xml b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Welcome Content Template/What do we do.xml new file mode 100644 index 00000000000..0bc62021923 --- /dev/null +++ b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Welcome Content Template/What do we do.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Who is using Liferay.html b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Who is using Liferay.html new file mode 100644 index 00000000000..8fc1e2bbaa3 --- /dev/null +++ b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/articles/Who is using Liferay.html @@ -0,0 +1,49 @@ + + +
+
+
+

+ Liferay helps you build feature-rich, easy-to-use web applications quickly. +

+ +
+
+ +

+ Here are some of our customers from around the globe: +

+ +
    +
  • + Rolex
    • +
  • + Bugaboo
    • +
  • + Deluxe Corporation
    • +
  • + Domino's Pizza
    • +
  • + BASF
    • +
+ +
    +
  • + Honda
    • +
  • + GE Capital
    • +
  • + Sesame
    • +
  • + China Mobile
    • +
  • + York University
    • +
+
+ +
+   +
+
diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/structures/Welcome Content Structure.xml b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/structures/Welcome Content Structure.xml new file mode 100644 index 00000000000..f08db86cbbe --- /dev/null +++ b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/structures/Welcome Content Structure.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/templates/Welcome Content Structure/Welcome Content Template.vm b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/templates/Welcome Content Structure/Welcome Content Template.vm new file mode 100644 index 00000000000..666816ff128 --- /dev/null +++ b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/journal/templates/Welcome Content Structure/Welcome Content Template.vm @@ -0,0 +1,98 @@ +
+
+
+

$page-title.data

+ +
+
+ + +
+ +
+ #foreach($link in $links.siblings) + #if($velocityCount == 1) + + +
+ $link.data +   +
+ #else +
+ $link.data +   +
+ #end + #end +
+
+ + \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/sitemap.json b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/sitemap.json index d714f55220b..bdbc15973da 100644 --- a/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/sitemap.json +++ b/themes/welcome-theme/docroot/WEB-INF/src/resources-importer/sitemap.json @@ -1,96 +1,35 @@ -{ - "layoutTemplateId": "2_columns_ii", - "layouts": [ - { - "columns": [ - [ - { - "portletId": "56", - "portletPreferences": { - "articleId": "Navigation Liferay Portal Liferay Marketplace.html", - "groupId": "${groupId}", - "portletSetupShowBorders": "false" - } - } - ], - [ - "Liferay Marketplace.html" - ] - ], - "friendlyURL": "/home", - "name": "Welcome to Liferay Portal", - "layouts": [ - { - "columns": [ - [ - "Navigation Liferay Portal Dynamic Websites.html" - ], - [ - "Dynamic Websites.html" - ] - ], - "friendlyURL": "/dynamic-websites", - "name": "Welcome to Liferay Portal", - "title": "Liferay Portal: Dynamic Websites" - }, - { - "columns": [ - [ - "Navigation Liferay Portal Document Management.html" - ], - [ - "Document Management.html" - ] - ], - "friendlyURL": "/document-management", - "name": "Welcome to Liferay Portal", - "title": "Liferay Portal: Document Management" - }, - { - "columns": [ - [ - "Navigation Liferay Portal Desktop and Mobile Access.html" - ], - [ - "Desktop Mobile Access.html" - ] - ], - "friendlyURL": "/desktop-and-mobile-access", - "name": "Welcome to Liferay Portal", - "title": "Liferay Portal: Desktop and Mobile Access" - }, - { - "columns": [ - [ - "Navigation Enterprise Edition Data Lists and Forms.html" - ], - [ - "Data Lists and Forms.html" - ] - ], - "friendlyURL": "/data-lists-and-forms", - "name": "Welcome to Liferay Portal", - "title": "Liferay Portal: Data Lists and Forms" - } - ], - "title": "Liferay Portal: Marketplace" - }, - { - "columns": [ - [] - ], - "friendlyURL": "/users", - "layoutTemplateId": "1_column", - "name": "Who's Using Liferay", - "title": "Liferay Users" - }, - { - "columns": [ - [] - ], - "friendlyURL": "/enterprise", - "name": "Enterprise Edition", - "title": "Liferay Enterprise" - } - ] +{ + "layoutTemplateId": "1_column", + "layouts": [ + { + "columns": [ + [ + "What do we do.xml" + ] + ], + "friendlyURL": "/home", + "name": "What We Do", + "title": "Liferay Portal: What We Do" + }, + { + "columns": [ + [ + "Who is using Liferay.html" + ] + ], + "friendlyURL": "/whos-using-liferay", + "name": "Who's Using Liferay", + "title": "Liferay Users" + }, + { + "columns": [ + [ + "Liferay Benefits.xml" + ] + ], + "friendlyURL": "/liferay-benefits", + "name": "Liferay Benefits", + "title": "Liferay Benefits" + } + ] } \ No newline at end of file diff --git a/themes/welcome-theme/docroot/WEB-INF/web.xml b/themes/welcome-theme/docroot/WEB-INF/web.xml deleted file mode 100644 index d8dae2ad677..00000000000 --- a/themes/welcome-theme/docroot/WEB-INF/web.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - portalContextConfigLocation - /WEB-INF/classes/META-INF/messaging-spring.xml - - \ No newline at end of file diff --git a/themes/welcome-theme/docroot/_diffs/css/custom.css b/themes/welcome-theme/docroot/_diffs/css/custom.css index 2e4ca72e995..09207429f5d 100644 --- a/themes/welcome-theme/docroot/_diffs/css/custom.css +++ b/themes/welcome-theme/docroot/_diffs/css/custom.css @@ -1,162 +1,401 @@ -@import "compass"; - -/* Wrapper */ - -#wrapper { - font-size: 16px; - margin: 0 auto; - padding: 35px 0 0; - position: relative; - width: 700px; -} - -/* Skip to Content */ - -#skip-to-content { - clip: rect(0 0 0 0); - left: 0; - overflow: hidden; - position: fixed; - right: 0; - top: 0; - z-index: 100; -} - -#skip-to-content:focus, -#skip-to-content:hover { - clip: inherit; - outline: 0; - padding: 0.5em 0.75em; -} - -#skip-to-content:focus, -#skip-to-content:hover { - background: #4497D1; - border-bottom: 1px solid rgba(0, 0, 0, 0.2); - color: #FF6; -} - -#heading .site-title { - margin: 0 0 0.25em; -} - -#heading .page-title { - font-size: 100%; - margin: 0 0 1em; -} - -/* Sign In */ - -#sign-in { - font-size: 75%; - padding: 0.5em 1em; - position: absolute; - right: 1em; - text-decoration: none; - top: 35px; -} - -#sign-in { - background: #4497D1; - color: #FFF; -} - -#sign-in:focus, -#sign-in:hover { - color: #FF0; -} - -/* Navigation */ - -#navigation h1 { - clip: rect(0 0 0 0); - position: absolute; -} - -#navigation ul { - border-collapse: collapse; - display: table; - margin: 0; - width: 100%; -} - -#navigation li { - border: 0 solid; - border-width: 0 1px; - display: table-cell; - width: 33.333%; -} - -#navigation li { - border-color: #FFF; -} - -#navigation li:first-child { - border-left-width: 0; -} - -#navigation li:last-child { - border-right-width: 0; -} - -#navigation a { - display: block; - outline: 0; - overflow: hidden; - padding: 0.3125em 0; - text-align: center; - text-decoration: none; -} - -#navigation a { - background: #ECECEC; - color: #919191; -} - -#navigation a:focus, -#navigation a:hover { - background: #717171; - color: #FFF; - outline: 0; -} - -#navigation a.selected { - background: #4497D1; - color: #FFF; -} - -#navigation a.selected:focus, -#navigation a.selected:hover { - color: #FF0; -} - -/* Footer */ - -#footer { - border-collapse: collapse; - display: table; - margin: 0; - width: 100%; -} - -#footer div { - border: 1px solid; - display: table-cell; - height: 94px; - width: 33.333%; -} - -#footer div { - border-color: #DCDEE0; -} - -/* Extras */ - -#navigation { - @include box-shadow(0 0 5px #000); -} - -#skip-to-content:focus, -#skip-to-content:hover { - @include box-shadow(0 1px 5px rgba(0, 0, 0, 0.5), 0 1px 50px rgba(0, 0, 0, 0.5)); +@import "compass"; + +body { + color: #484A4C; +} + +h1 { + font-size: 17px; +} + +/* ---------- Wrapper ---------- */ + +#wrapper { + font-size: 16px; + margin: 0 auto; + padding: 35px 0 0; + position: relative; + width: 700px; +} + +/* ---------- Skip to Content ---------- */ + +#skip-to-content { + clip: rect(0 0 0 0); + left: 0; + overflow: hidden; + position: fixed; + right: 0; + top: 0; + z-index: 100; + + &:focus, &:hover { + background: #4497D1; + border-bottom: 1px solid rgba(0, 0, 0, 0.2); + clip: inherit; + color: #FF6; + outline: 0; + padding: 0.5em 0.75em; + } +} + +#heading { + margin-left: 20px; + + .site-title { + margin: 0 0 0.25em; + + .logo img { + height: 60px; + width: auto; + } + } + + .page-title { + font-size: 100%; + margin: 0 0 20px; + } +} + +/* ---------- Sign In ---------- */ + +#sign-in { + background: #2CABE2; + color: #FFF; + font-size: 12px; + padding: 2px 20px; + position: absolute; + right: 20px; + text-decoration: none; + top: 100px; + + &:focus, &:hover { + background: #F8F8F8; + color: #908E91; + } +} + +/* ---------- Navigation ---------- */ + +.page-maximized.signed-out #navigation { + display: none; +} + +#navigation { + position: relative; + z-index: 3; + + h1 { + clip: rect(0 0 0 0); + position: absolute; + margin: 0; + } + + ul { + border-collapse: collapse; + display: table; + margin: 0; + width: 100%; + + li ul { + display: none; + } + } + + li { + border-color: #E2E3E3; + border-style: solid; + border-width: 0 1px; + display: table-cell; + width: 33.333%; + + &:first-child { + border-left-width: 0; + } + + &:last-child { + border-right-width: 0; + } + + &.selected a { + background: #2CABE2; + color: #FFF; + } + } + + a { + background: #F8F8F8; + color: #908E91; + display: block; + font-size: 12px; + font-weight: bold; + outline: 0; + overflow: hidden; + padding: 0.3125em 0; + text-align: center; + text-decoration: none; + + &:focus, &:hover { + background: #2CABE2; + color: #FFF; + } + + &.selected { + &:focus, &:hover { + color: #FF0; + } + } + } +} + +.journal-content-article { + ul { + list-style: none; + margin: 8px 14px 8px 20px; + } + + li { + margin: 4px 0; + } + + a, li span { + color: #484A4C; + font-size: 11px; + font-weight: bold; + text-decoration: none; + } + + p { + font-size: 11px; + font-weight: bold; + margin: 10px 10px 10px 20px; + } + + .left, .right { + float: left; + } + + nav { + ul li.selected { + list-style-image: url(../images/custom/blue_arrow.png); + } + + li:hover a, li.selected a { + color: #2CABE2; + } + } +} + +.portlet-column-content { + padding: 0px; +} + +.navigation-wrapper { + position: relative; + width: 100%; + + .content-area { + display: none; + + &.selected { + display: block; + height: 304px; + float: left; + position: absolute; + text-indent: -9999px; + top: 0; + right: 0; + width: 100%; + z-index: 1; + } + } + + .content-head { + position: relative; + min-height: 304px; + width: 343px; + z-index: 2; + + hgroup { + h1 { + margin: 0; + padding: 1em + } + + hr { + border-color: #CECDD2; + border-style: solid; + border-width: 1px 0 0 0; + height: 1px; + margin-left: 18px; + width: 80%; + } + } + } +} + +#marketplace { + cursor: pointer; + display: block; + height: 22px; + position: absolute; + right: 10px; + top: 251px; + width: 289px; +} + +.portlet-login { + border-top: 1px solid #BFBFBF; + font-size: 13px; + padding-top: 15px; + + a { + color: #2CABE2; + font-size: 13px; + } + + a, .taglib-icon .taglib-text { + text-decoration: none; + } + + .aui-form { + padding-bottom: 15px; + } + + .navigation { + padding-bottom: 0; + } + + .navigation, .portlet-column { + background: transparent; + } +} + +/* ---------- Footer ---------- */ + +#footer { + border-collapse: collapse; + display: table; + margin: 0; + width: 100%; + + div { + border: 1px solid #BFBFBF; + display: table-cell; + height: 74px; + width: 33.333%; + + &.column-1 { + border-left: 0; + } + + &.column-3 { + border-right: 0; + } + } + + h3 { + font-size: 13px; + margin-top: 7px; + } + + a { + bottom: 10px; + color: #484A4C; + font-size: 11px; + font-weight: bold; + position: absolute; + text-decoration: none; + + &:hover { + color: #2CABE2; + } + } + + &:after { + clear: both; + content: ""; + } + + .footer-column-content { + border: none; + display: block; + margin: 10px auto; + position: relative; + width: 200px; + } + + .footer-box { + border: none; + padding-left: 10px; + } + + #getting-started, #ide, #social-office { + .footer-logo { + background-image: url(../images/custom/footer_sprite.png); + background-repeat: no-repeat; + display: block; + float: left; + height: 76px; + width: 76px; + } + } + + #ide .footer-logo { + background-position: -76px; + } + + #social-office .footer-logo { + background-position: -152px; + } +} + +/* ---------- Internet Explorer ---------- */ + +.ie6 { + #skip-to-content { + position: absolute; + } + + .signed-out #navigation { + display: block; + } + + #footer .footer-box { + width: 114px; + } +} + +.ie7 { + #footer { + .footer-column-content { + height: 90px; + } + + div.column-1, div.column-2, div.column-3 { + height: 100px; + } + } +} + +.ie6, .ie7 { + #footer div.column-1, #footer div.column-2, #footer div.column-3, #navigation li { + float: left; + width: 231px; + } + + #marketplace { + top: 231px; + z-index: 4; + } +} + +/* ---------- Extras ---------- */ + +#navigation { + @include box-shadow(0 2px 5px #E2E3E3); +} + +#skip-to-content:focus, #skip-to-content:hover { + @include box-shadow(0 1px 5px rgba(0, 0, 0, 0.5), 0 1px 50px rgba(0, 0, 0, 0.5)); } \ No newline at end of file diff --git a/themes/welcome-theme/docroot/_diffs/images/custom/blue_arrow.png b/themes/welcome-theme/docroot/_diffs/images/custom/blue_arrow.png new file mode 100644 index 00000000000..4051140f2a4 Binary files /dev/null and b/themes/welcome-theme/docroot/_diffs/images/custom/blue_arrow.png differ diff --git a/themes/welcome-theme/docroot/_diffs/images/custom/footer_sprite.png b/themes/welcome-theme/docroot/_diffs/images/custom/footer_sprite.png new file mode 100644 index 00000000000..43e611fef49 Binary files /dev/null and b/themes/welcome-theme/docroot/_diffs/images/custom/footer_sprite.png differ diff --git a/themes/welcome-theme/docroot/_diffs/images/screenshot.png b/themes/welcome-theme/docroot/_diffs/images/screenshot.png new file mode 100644 index 00000000000..6f07df105ba Binary files /dev/null and b/themes/welcome-theme/docroot/_diffs/images/screenshot.png differ diff --git a/themes/welcome-theme/docroot/_diffs/images/thumbnail.png b/themes/welcome-theme/docroot/_diffs/images/thumbnail.png new file mode 100644 index 00000000000..135b6fe9520 Binary files /dev/null and b/themes/welcome-theme/docroot/_diffs/images/thumbnail.png differ diff --git a/themes/welcome-theme/docroot/_diffs/templates/portal_normal.vm b/themes/welcome-theme/docroot/_diffs/templates/portal_normal.vm index cde84c5c186..1354a6df9af 100644 --- a/themes/welcome-theme/docroot/_diffs/templates/portal_normal.vm +++ b/themes/welcome-theme/docroot/_diffs/templates/portal_normal.vm @@ -11,7 +11,6 @@ - $theme.include($body_top_include) #if ($is_signed_in) @@ -36,7 +35,7 @@ $theme.include($body_top_include)

- $the_title + Welcome to Liferay Portal

@@ -62,9 +61,38 @@ $theme.include($body_top_include)