From: bsinou Date: Thu, 2 Feb 2017 12:36:30 +0000 (+0100) Subject: Clean styling X-Git-Tag: argeo-suite-0.1.1~12 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=7ee00fe2723d690b6311ebe219a364a066d35f03 Clean styling --- diff --git a/org.argeo.suite.core/bnd.bnd b/org.argeo.suite.core/bnd.bnd index 7537584..d316eb5 100644 --- a/org.argeo.suite.core/bnd.bnd +++ b/org.argeo.suite.core/bnd.bnd @@ -3,6 +3,7 @@ cms.datamodel; filter:="(name=documents)" Import-Package:\ javax.jcr.nodetype,\ org.argeo.node,\ +org.argeo.util,\ javax.jcr.security,\ * diff --git a/org.argeo.suite.web/META-INF/spring/ui.xml b/org.argeo.suite.web/META-INF/spring/ui.xml index 8e5f084..bbf3325 100644 --- a/org.argeo.suite.web/META-INF/spring/ui.xml +++ b/org.argeo.suite.web/META-INF/spring/ui.xml @@ -76,7 +76,7 @@ theme/argeo-classic/argeo-classic.css theme/argeo-classic/people-classic.css - theme/argeo-classic/fs-classic.css + theme/argeo-classic/documents-classic.css theme/argeo-classic/maintenance-classic.css diff --git a/org.argeo.suite.web/theme/argeo-classic/documents-classic.css b/org.argeo.suite.web/theme/argeo-classic/documents-classic.css new file mode 100644 index 0000000..8721244 --- /dev/null +++ b/org.argeo.suite.web/theme/argeo-classic/documents-classic.css @@ -0,0 +1,116 @@ +/** +Argeo Blue: #00294b +*/ + + + +/** Same styles are also provided by the workbench CSS. TODO: enhance single sourcing */ + + +/* Breadcrumb ***/ +Button.breadCrumb_btn { + border: 1px solid #f4f6f7; + border-radius: 3px; + padding: 2px 2px 2px 2px; + background-color: transparent; + background-repeat: no-repeat; + animation: hoverOut 500ms ease-out; + cursor: pointer; + font-color: #00294b; + text-decoration: none; +} + +Button.breadCrumb_btn:hover { + text-decoration: underline; +} + +/* Documents lists context menu */ +.contextMenu_box { + border: 0px solid #fde2d5; + padding: 0px; + box-shadow: 2px 2px 5px #fde2d5; +} + +Button[PUSH][FLAT].createFolder_btn { + background-image: url( theme/argeo-classic/icons/fs/addFolder.gif); +} + +Button[PUSH][FLAT].shareFolder_btn { + background-image: url( theme/argeo-classic/icons/fs/shareFolder.png); +} + +Button[PUSH][FLAT].bookmarkFolder_btn { + background-image: url( theme/argeo-classic/icons/fs/bookmarkFolder.png); +} + +Button[PUSH][FLAT].downloadFolder_btn { + background-image: url( theme/argeo-classic/icons/fs/downloadFolder.png); +} + +Button[PUSH][FLAT].delete_btn, +Button[PUSH][FLAT].deleteBookmark_btn { + background-image: url( theme/argeo-classic/icons/fs/delete.png); +} + +Button[PUSH][FLAT].rename_btn, +Button[PUSH][FLAT].renameBookmark_btn { + background-image: url( theme/argeo-classic/icons/fs/rename.png); +} + + +Button[PUSH][FLAT].uploadFiles_btn { + background-image: url( theme/argeo-classic/icons/fs/upload.png); +} + +Button[PUSH][FLAT].open_btn { + background-image: url( theme/argeo-classic/icons/fs/open.png); +} + + +Button[PUSH][FLAT].createFolder_btn, +Button[PUSH][FLAT].shareFolder_btn, +Button[PUSH][FLAT].bookmarkFolder_btn, +Button[PUSH][FLAT].downloadFolder_btn, +Button[PUSH][FLAT].delete_btn, +Button[PUSH][FLAT].rename_btn, +Button[PUSH][FLAT].uploadFiles_btn, +Button[PUSH][FLAT].open_btn, +Button[PUSH][FLAT].deleteBookmark_btn, +Button[PUSH][FLAT].renameBookmark_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].createFolder_btn:hover, +Button[PUSH][FLAT].shareFolder_btn:hover, +Button[PUSH][FLAT].bookmarkFolder_btn:hover, +Button[PUSH][FLAT].downloadFolder_btn:hover, +Button[PUSH][FLAT].delete_btn:hover, +Button[PUSH][FLAT].rename_btn:hover, +Button[PUSH][FLAT].uploadFiles_btn:hover, +Button[PUSH][FLAT].open_btn:hover, +Button[PUSH][FLAT].deleteBookmark_btn:hover, +Button[PUSH][FLAT].renameBookmark_btn:hover { + background-color: #fef0ea; +} + +Button[PUSH][FLAT].createFolder_btn:pressed, +Button[PUSH][FLAT].shareFolder_btn:pressed, +Button[PUSH][FLAT].bookmarkFolder_btn:pressed, +Button[PUSH][FLAT].shareFolder_btn:pressed, +Button[PUSH][FLAT].downloadFolder_btn:pressed, +Button[PUSH][FLAT].delete_btn:pressed, +Button[PUSH][FLAT].rename_btn:pressed, +Button[PUSH][FLAT].uploadFiles_btn:pressed, +Button[PUSH][FLAT].open_btn:pressed, +Button[PUSH][FLAT].deleteBookmark_btn:pressed, +Button[PUSH][FLAT].renameBookmark_btn:pressed{ + background-color: #fde2d5; +} \ No newline at end of file diff --git a/org.argeo.suite.web/theme/argeo-classic/fs-classic.css b/org.argeo.suite.web/theme/argeo-classic/fs-classic.css deleted file mode 100644 index 923fd39..0000000 --- a/org.argeo.suite.web/theme/argeo-classic/fs-classic.css +++ /dev/null @@ -1,87 +0,0 @@ -/** -Argeo Blue: #00294b -*/ - -/**** BREAD CRUMB ***/ -Button.breadCrumb_btn { - border: 1px solid #f4f6f7; - border-radius: 3px; - padding: 5px 2px 5px 2px; - background-color: transparent; - background-repeat: no-repeat; - animation: hoverOut 500ms ease-out; - cursor: pointer; - font-color: #00294b; - text-decoration: none; -} - -Button.breadCrumb_btn:hover { - text-decoration: underline; -} - - -/****** Context menu *********/ -.contextMenu_box { - border: 1px solid #fde2d5; - padding: 0px; - box-shadow: 2px 2px 5px #fde2d5; -} - -Button[PUSH][FLAT].createFolder_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].shareFolder_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].downloadFolder_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].delete_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].uploadFiles_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].open_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].shareFolder_btn, -Button[PUSH][FLAT].downloadFolder_btn, -Button[PUSH][FLAT].delete_btn, -Button[PUSH][FLAT].uploadFiles_btn, -Button[PUSH][FLAT].open_btn, -Button[PUSH][FLAT].createFolder_btn { - border: 0px solid white; - border-left: 10px solid transparent; - border-radius: 0px; - padding: 8px 5px 8px 24px; - background-color: transparent; - background-repeat: no-repeat; - background-position: left; - animation: hoverOut 500ms ease-out; - cursor: pointer; -} - -Button[PUSH][FLAT].shareFolder_btn:hover, -Button[PUSH][FLAT].downloadFolder_btn:hover, -Button[PUSH][FLAT].delete_btn:hover, -Button[PUSH][FLAT].uploadFiles_btn:hover, -Button[PUSH][FLAT].open_btn:hover, -Button[PUSH][FLAT].createFolder_btn:hover { - background-color: #fef0ea; -} - -Button[PUSH][FLAT].shareFolder_btn:pressed, -Button[PUSH][FLAT].downloadFolder_btn:pressed, -Button[PUSH][FLAT].delete_btn:pressed, -Button[PUSH][FLAT].uploadFiles_btn:pressed, -Button[PUSH][FLAT].open_btn:pressed, -Button[PUSH][FLAT].createFolder_btn:pressed { - background-color: #fde2d5; -} diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/addFolder.gif b/org.argeo.suite.web/theme/argeo-classic/icons/fs/addFolder.gif new file mode 100644 index 0000000..d3f43d9 Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/addFolder.gif differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/bookmarkFolder.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/bookmarkFolder.png new file mode 100644 index 0000000..8bb2361 Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/bookmarkFolder.png differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/createFolder.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/createFolder.png deleted file mode 100644 index 3f56074..0000000 Binary files a/org.argeo.suite.web/theme/argeo-classic/icons/fs/createFolder.png and /dev/null differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/delete.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/delete.png new file mode 100644 index 0000000..9150e40 Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/delete.png differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/downloadFolder.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/downloadFolder.png new file mode 100644 index 0000000..3f56074 Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/downloadFolder.png differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/file.gif b/org.argeo.suite.web/theme/argeo-classic/icons/fs/file.gif new file mode 100644 index 0000000..ef30288 Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/file.gif differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/folder.gif b/org.argeo.suite.web/theme/argeo-classic/icons/fs/folder.gif new file mode 100644 index 0000000..42e027c Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/folder.gif differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/fsBrowser.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/fsBrowser.png new file mode 100644 index 0000000..3f56074 Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/fsBrowser.png differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/open.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/open.png new file mode 100644 index 0000000..3836e12 Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/open.png differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/rename.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/rename.png new file mode 100644 index 0000000..ad3db9f Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/rename.png differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/shareFolder.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/shareFolder.png new file mode 100644 index 0000000..269cdac Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/shareFolder.png differ diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/upload.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/upload.png new file mode 100644 index 0000000..71c80e8 Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/fs/upload.png differ