From 6fcadd5457518ce2e3aa05bdfd1cbc874ed8deab Mon Sep 17 00:00:00 2001 From: bsinou Date: Mon, 20 Feb 2017 15:36:36 +0100 Subject: [PATCH] Refactoring --- .../META-INF/spring/osgi.xml | 13 ++++++------ .../META-INF/spring/parts.xml | 10 ++++----- .../parts/AbstractSuiteDashboard.java | 17 ++++++++-------- .../parts/DefaultDashboardEditor.java | 19 +++++------------- .../{delete_small.gif => deleteSmall.gif} | Bin .../icons/actions/openCalendar.gif | Bin 0 -> 257 bytes .../theme/argeo-classic/workbench-ext.css | 16 ++++++++++++++- 7 files changed, 39 insertions(+), 36 deletions(-) rename org.argeo.suite.workbench.rap/theme/argeo-classic/icons/actions/{delete_small.gif => deleteSmall.gif} (100%) create mode 100644 org.argeo.suite.workbench.rap/theme/argeo-classic/icons/actions/openCalendar.gif diff --git a/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml b/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml index f026adb..8f1400f 100644 --- a/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml +++ b/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml @@ -9,12 +9,13 @@ - - - + + - + + diff --git a/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml b/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml index 78b54a8..ee418dd 100644 --- a/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml +++ b/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml @@ -18,17 +18,15 @@ - - - - + - + + + diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java index f356ca2..48053da 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java @@ -40,8 +40,8 @@ public abstract class AbstractSuiteDashboard extends EditorPart { // DEPENDENCY INJECTION private Repository repository; - private ResourcesService resourceService; - private ActivitiesService activityService; + private ResourcesService resourcesService; + private ActivitiesService activitiesService; private PeopleService peopleService; private DocumentsService documentsService; private AppWorkbenchService appWorkbenchService; @@ -187,11 +187,11 @@ public abstract class AbstractSuiteDashboard extends EditorPart { } public ResourcesService getResourceService() { - return resourceService; + return resourcesService; } protected ActivitiesService getActivityService() { - return activityService; + return activitiesService; } protected PeopleService getPeopleService() { @@ -219,12 +219,12 @@ public abstract class AbstractSuiteDashboard extends EditorPart { this.repository = repository; } - public void setResourceService(ResourcesService resourceService) { - this.resourceService = resourceService; + public void setResourcesService(ResourcesService resourcesService) { + this.resourcesService = resourcesService; } - public void setActivityService(ActivitiesService activityService) { - this.activityService = activityService; + public void setActivitiesService(ActivitiesService activitiesService) { + this.activitiesService = activitiesService; } public void setDocumentsService(DocumentsService documentsService) { @@ -238,5 +238,4 @@ public abstract class AbstractSuiteDashboard extends EditorPart { public void setAppWorkbenchService(AppWorkbenchService appWorkbenchService) { this.appWorkbenchService = appWorkbenchService; } - } diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java index a9dd0e5..db04a73 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java @@ -5,7 +5,6 @@ import javax.jcr.NodeIterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.connect.ConnectConstants; import org.argeo.connect.activities.ActivitiesTypes; import org.argeo.connect.people.PeopleTypes; import org.argeo.connect.resources.ResourcesTypes; @@ -82,23 +81,15 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re parent.setLayout(EclipseUiUtils.noSpaceGridLayout()); createGadgetTitleCmp(parent, "Contacts"); Composite bodyCmp = createGadgetBodyCmp(parent); - ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Persons", - PeopleTypes.PEOPLE_PERSON, getPeopleService().getBasePath(PeopleTypes.PEOPLE_PERSON)); - + PeopleTypes.PEOPLE_PERSON); ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Organisations", - PeopleTypes.PEOPLE_ORG, getPeopleService().getBasePath(PeopleTypes.PEOPLE_ORG)); - - Node tagParent = getResourceService().getTagLikeResourceParent(getSession(), PeopleTypes.PEOPLE_MAILING_LIST); + PeopleTypes.PEOPLE_ORG); ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Mailing lists", - PeopleTypes.PEOPLE_MAILING_LIST, ConnectJcrUtils.getPath(tagParent)); + PeopleTypes.PEOPLE_MAILING_LIST); ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tasks", - ActivitiesTypes.ACTIVITIES_TASK, getPeopleService().getBasePath(null)); - - tagParent = getResourceService().getTagLikeResourceParent(getSession(), ConnectConstants.RESOURCE_TAG); - + ActivitiesTypes.ACTIVITIES_TASK); ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tags", - ResourcesTypes.RESOURCES_TAG_INSTANCE, ConnectJcrUtils.getPath(tagParent)); - + ResourcesTypes.RESOURCES_TAG_INSTANCE); } } diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/actions/delete_small.gif b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/actions/deleteSmall.gif similarity index 100% rename from org.argeo.suite.workbench.rap/theme/argeo-classic/icons/actions/delete_small.gif rename to org.argeo.suite.workbench.rap/theme/argeo-classic/icons/actions/deleteSmall.gif diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/actions/openCalendar.gif b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/actions/openCalendar.gif new file mode 100644 index 0000000000000000000000000000000000000000..5a89e333c01d5aaf055721714721dc3d8b242c26 GIT binary patch literal 257 zcmZ?wbhEHb6k`xzXyIT00&Z?@RTULYO-)@L9X(xLeLXz`J-vGj3||iAOPCrW^vOuQLk=J%qwd4=1O00!n0u3>^x^cGyStvl?|z$BgPt|7u%9kWio{r2uS%?n$W zH{=8}@RhlH3AA;|cn660O^_BA6`eeFN=dbisO21qc{AH*&s`$HuzbbJRjZdPGFSru D{MTIf literal 0 HcmV?d00001 diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/workbench-ext.css b/org.argeo.suite.workbench.rap/theme/argeo-classic/workbench-ext.css index 0f41a28..0c902eb 100644 --- a/org.argeo.suite.workbench.rap/theme/argeo-classic/workbench-ext.css +++ b/org.argeo.suite.workbench.rap/theme/argeo-classic/workbench-ext.css @@ -87,6 +87,19 @@ Button.flat_btn, Button[PUSH][FLAT].flat_btn, Button.flat_btn:default, cursor: pointer; } + +Button[FLAT].open_calendar_btn { + background-image: url( theme/argeo-classic/icons/actions/openCalendar.gif); + background-color: transparent; + background-repeat: no-repeat; + border: 0px solid white; + border-radius: 0px; + padding: 0px 0px; + animation: hoverOut 500ms ease-out; + cursor: pointer; +} + + /* Links */ Link, Link-Hyperlink, Link-Hyperlink:link, Link-Hyperlink:visited, Link-Hyperlink:active { @@ -142,6 +155,7 @@ Text.workbench_form_text:focused { } + /****** DASHBOARD *********/ /** Gadgets **/ @@ -288,7 +302,7 @@ Button[PUSH][FLAT].markAsDone_btn:pressed { } Button[PUSH][FLAT].small_delete_btn{ - background-image: url( theme/argeo-classic/icons/actions/delete_small.gif); + background-image: url( theme/argeo-classic/icons/actions/deleteSmall.gif); border: 0px solid white; border-radius: 0px; padding: 0px 0px; -- 2.30.2