From: bsinou Date: Fri, 10 Feb 2017 18:09:23 +0000 (+0100) Subject: Various small UI enhancements X-Git-Tag: argeo-suite-0.1.1~2 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=fe916e251a36556d328e1259d71c21891cd92c17;hp=e7ec976e33b8893b93b953c69c816286d7a118c7 Various small UI enhancements --- diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml index 1d7eab8..14dd45e 100644 --- a/org.argeo.suite.workbench.rap/plugin.xml +++ b/org.argeo.suite.workbench.rap/plugin.xml @@ -26,13 +26,6 @@ - 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 cc45bb2..24ada50 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 @@ -26,7 +26,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re private int wh = 300; private int hh = 350; - private Composite projectsGadget; + private Composite lastUpdatedDocsGadget; @Override public void createPartControl(Composite parent) { @@ -42,13 +42,12 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re bodyLayout.verticalSpacing = 20; body.setLayout(bodyLayout); - // Last updated doc List - projectsGadget = createGadgetCmp(body, wh, hh); - // refreshDocListGadget(projectsGadget); - // Contacts Composite contactGadget = createGadgetCmp(body, wh, hh); populateContactsGadget(contactGadget); + + // Last updated doc List + lastUpdatedDocsGadget = createGadgetCmp(body, wh, hh); } @Override @@ -63,17 +62,17 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re /** Links to the various last updated docs */ private void refreshDocListGadget() { - EclipseUiUtils.clear(projectsGadget); - projectsGadget.setLayout(EclipseUiUtils.noSpaceGridLayout()); - createGadgetTitleCmp(projectsGadget, "Last updated documents"); - Composite bodyCmp = createGadgetBodyCmp(projectsGadget); + EclipseUiUtils.clear(lastUpdatedDocsGadget); + lastUpdatedDocsGadget.setLayout(EclipseUiUtils.noSpaceGridLayout()); + createGadgetTitleCmp(lastUpdatedDocsGadget, "Last updated documents"); + Composite bodyCmp = createGadgetBodyCmp(lastUpdatedDocsGadget); NodeIterator nit = getDocumentsService().getLastUpdatedDocuments(getSession()); while (nit.hasNext()) { Node file = nit.nextNode(); createOpenEntityEditorLink(getAppWorkbenchService(), bodyCmp, ConnectJcrUtils.getName(file), file); } - projectsGadget.layout(true, true); + lastUpdatedDocsGadget.layout(true, true); } /** Links to the various contact search pages */ @@ -91,7 +90,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re Node tagParent = getPeopleService().getResourceService().getTagLikeResourceParent(getSession(), PeopleTypes.PEOPLE_MAILING_LIST); PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Mailing lists", - PeopleTypes.PEOPLE_MAILING_LIST, ConnectJcrUtils.getPath(tagParent)); + PeopleTypes.PEOPLE_MAILING_LIST, ConnectJcrUtils.getPath(tagParent)); PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tasks", PeopleTypes.PEOPLE_TASK, getPeopleService().getBasePath(null)); 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 461dffa..7f673f7 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 @@ -235,6 +235,37 @@ Button[PUSH][FLAT].createFolder_btn:pressed, Button[PUSH][FLAT].shareFolder_btn: /** PEOPLE **/ +Button[PUSH][FLAT].markAsDone_btn { + background-image: url( theme/argeo-classic/icons/fs/open.png); +} + +Button[PUSH][FLAT].cancel_btn { + background-image: url( theme/argeo-classic/icons/fs/open.png); +} + +Button[PUSH][FLAT].cancel_btn, +Button[PUSH][FLAT].markAsDone_btn { + border: 0px solid white; + border-left: 10px solid transparent; + border-radius: 0px; + padding: 4px 5px 4px 24px; + background-color: transparent; + background-repeat: no-repeat; + background-position: left; + animation: hoverOut 500ms ease-out; + cursor: pointer; +} + +Button[PUSH][FLAT].cancel_btn:hover, +Button[PUSH][FLAT].markAsDone_btn:hover { + background-color: #fef0ea; +} + +Button[PUSH][FLAT].cancel_btn:pressed, +Button[PUSH][FLAT].markAsDone_btn:pressed { + background-color: #fde2d5; +} + /** Gadgets **/ .people_gadget { border: 1px solid #f3f3f4; diff --git a/pom.xml b/pom.xml index 5a5d7e7..d38e51f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.60-SNAPSHOT + 2.1.60 org.argeo.suite argeo-suite @@ -21,7 +21,7 @@ 0.1.1-SNAPSHOT 0.1 - 2.1.65-SNAPSHOT + 2.1.66-SNAPSHOT 2.1.9