From 50c4536cb616d27f1a4a2d1a91d6fae2c26b5ed2 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Thu, 29 Oct 2009 18:57:20 +0000 Subject: [PATCH] Merged CMIS063 to HEAD 16997: Move internal todo's from external change list. 16999: CMIS 0.7 upgrade checkpoint. 17001: Update CMIS front page for 0.7 17003: CMIS 0.7 update - checkpoint. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/web/WEB-INF/web.xml | 8 +- source/web/cmisfs/browser/browser.css | 24 +++-- source/web/cmisfs/browser/cmis.png | Bin 0 -> 6991 bytes source/web/cmisfs/stylesheets/acl.xsl | 12 +-- source/web/cmisfs/stylesheets/actions.xsl | 8 +- source/web/cmisfs/stylesheets/entry.xsl | 59 ++++++----- source/web/cmisfs/stylesheets/feed.xsl | 118 ++++++++++++---------- source/web/cmisfs/stylesheets/service.xsl | 20 ++-- 8 files changed, 143 insertions(+), 106 deletions(-) create mode 100644 source/web/cmisfs/browser/cmis.png diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml index 1b4813237e..b6dfbde4d7 100644 --- a/source/web/WEB-INF/web.xml +++ b/source/web/WEB-INF/web.xml @@ -439,8 +439,12 @@ CMISFileShareServlet de.fmui.cmis.fileshare.info.BrowseServlet - webcontentroot - cmisfs/ + auxroot + cmisfs/browser/ + + + allow + http.* stylesheet:application/atomsvc+xml diff --git a/source/web/cmisfs/browser/browser.css b/source/web/cmisfs/browser/browser.css index 654d5e51ef..4f4f637b18 100644 --- a/source/web/cmisfs/browser/browser.css +++ b/source/web/cmisfs/browser/browser.css @@ -5,6 +5,18 @@ body { font-size: 10pt; } +h1 { + font-family: Georgia; +} + +h2 { + font-family: Georgia; +} + +h3 { + font-family: Georgia; +} + a:link { color: #204a87; text-decoration: none; @@ -26,7 +38,7 @@ a:active { } div.navigationbox { - background-color: #eeeeec; + background-color: #f6f1de; margin-top: 10px; margin-bottom: 10px; margin-left: 0px; @@ -50,7 +62,7 @@ table.servicetable td { } .servicebox { - background-color: #eeeeec; + background-color: #f6f1de; font-size: 10pt; padding: 10px; margin: 10px; @@ -132,22 +144,22 @@ table.feedtable { border-width: 1px; } -a.actionink:link { +a.actionlink:link { color: #888a85; text-decoration: none; } -a.actionink:visited { +a.actionlink:visited { color: #888a85; text-decoration: none; } -a.actionink:hover { +a.actionlink:hover { color: #2e3436; text-decoration: underline; } -a.actionink:active { +a.actionlink:active { color: red; text-decoration: underline; } diff --git a/source/web/cmisfs/browser/cmis.png b/source/web/cmisfs/browser/cmis.png new file mode 100644 index 0000000000000000000000000000000000000000..871717a2b8f0778c86ea926a73b57b21bf88022d GIT binary patch literal 6991 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 literal 0 HcmV?d00001 diff --git a/source/web/cmisfs/stylesheets/acl.xsl b/source/web/cmisfs/stylesheets/acl.xsl index c417ac64ff..f76df64e3d 100644 --- a/source/web/cmisfs/stylesheets/acl.xsl +++ b/source/web/cmisfs/stylesheets/acl.xsl @@ -1,32 +1,32 @@ + xmlns:atom="http://www.w3.org/2005/Atom" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/" + xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"> - + ACL - +

ACL

- + - + diff --git a/source/web/cmisfs/stylesheets/actions.xsl b/source/web/cmisfs/stylesheets/actions.xsl index 97734f26b4..0786b755b7 100644 --- a/source/web/cmisfs/stylesheets/actions.xsl +++ b/source/web/cmisfs/stylesheets/actions.xsl @@ -1,19 +1,19 @@ + xmlns:atom="http://www.w3.org/2005/Atom" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/" + xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"> - + Allowable Actions - +

Allowable Actions

diff --git a/source/web/cmisfs/stylesheets/entry.xsl b/source/web/cmisfs/stylesheets/entry.xsl index d5a7f17dde..9a01230d39 100644 --- a/source/web/cmisfs/stylesheets/entry.xsl +++ b/source/web/cmisfs/stylesheets/entry.xsl @@ -1,40 +1,41 @@ + xmlns:atom="http://www.w3.org/2005/Atom" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/" + xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"> - + <xsl:value-of select="atom:entry/atom:title" /> - + +

- - + + - - + + - - + + - - + + - + - +

@@ -48,11 +49,11 @@ - Down () - + Down () - - - Folder Tree - + + Folder Tree - Download - @@ -65,17 +66,17 @@ Rendition () - - - Relationships - + + Relationships - - - Allowable Actions - + + Allowable Actions - - - ACL - + + ACL - - - Policies - + + Policies - Type @@ -93,7 +94,7 @@
Principal IdPermissionPermissions Direct

- + + + + + + +

@@ -107,6 +108,12 @@
Path Segment
diff --git a/source/web/cmisfs/stylesheets/feed.xsl b/source/web/cmisfs/stylesheets/feed.xsl index ed590b119d..47806790c9 100644 --- a/source/web/cmisfs/stylesheets/feed.xsl +++ b/source/web/cmisfs/stylesheets/feed.xsl @@ -1,21 +1,22 @@ + xmlns:atom="http://www.w3.org/2005/Atom" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/" + xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"> - + <xsl:value-of select="atom:feed/atom:title" /> - + +

@@ -29,7 +30,7 @@ - Down () - + Down () - @@ -44,17 +45,17 @@ Last - - - Folder Tree - + + Folder Tree - - - Allowable Actions - + + Allowable Actions - - - ACL - + + ACL - - - Policies - + + Policies - Type @@ -74,8 +75,8 @@ Major /
Latest - - + + @@ -85,83 +86,88 @@ - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - - - - - - + + + + + + - Entry - - Type Info - - - Down - + Entry - + Type Info - + + + Down () - + - Download - + Download - - All Versions - + All Versions - - Rendition () - + Rendition () - - - Allowable Actions - + + Relationships - + + + Allowable Actions - - - ACL + + ACL - - + + - + @@ -176,7 +182,7 @@ Local Namespace Display Name Query Name - Base Type + Base Id Description @@ -187,7 +193,7 @@ - + @@ -198,15 +204,15 @@ - + - Entry - - Type Info - + Entry - + Type Info - - Down + Down diff --git a/source/web/cmisfs/stylesheets/service.xsl b/source/web/cmisfs/stylesheets/service.xsl index 2cdbf796d2..3012c47e05 100644 --- a/source/web/cmisfs/stylesheets/service.xsl +++ b/source/web/cmisfs/stylesheets/service.xsl @@ -1,26 +1,29 @@ + xmlns:atom="http://www.w3.org/2005/Atom" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/" + xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"> - + Service - + + +

Repositories

-

Repository

+

Repository

Collections:

Links:

+

URI Templates:

@@ -90,11 +93,16 @@ -
  • ()
    • +
  • ()
    •
  • ()
    •  + + +
  • (): +
    • +     \ No newline at end of file