From 799603d3374a67f4a6ffc1fdbef68f96e24c4809 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Thu, 12 Jul 2007 11:30:02 +0000 Subject: [PATCH] Changes to MyWebForms and MyWebFiles after UI review with Linton. Fix to q=query parameter on DocList portlet causing error. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6226 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../client/myspaces_preview_panel.ftl | 19 +++++++++++------- .../alfresco/portlets/doclist.get.html.ftl | 4 +--- .../alfresco/portlets/myspaces.get.html.ftl | 6 ++++++ .../alfresco/portlets/mywebfiles.get.html.ftl | 2 +- .../alfresco/portlets/mywebforms.get.html.ftl | 8 +++++++- source/web/images/icons/view_web_project.gif | Bin 0 -> 623 bytes source/web/scripts/ajax/doclist.js | 2 +- 7 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 source/web/images/icons/view_web_project.gif diff --git a/config/alfresco/templates/client/myspaces_preview_panel.ftl b/config/alfresco/templates/client/myspaces_preview_panel.ftl index 6a5ab1a8ce..b27eecaa29 100644 --- a/config/alfresco/templates/client/myspaces_preview_panel.ftl +++ b/config/alfresco/templates/client/myspaces_preview_panel.ftl @@ -13,12 +13,17 @@ <#elseif isImage>
<#elseif node.isContainer> - <#list node.children?sort_by('name') as c> - <#--if (c_index >= 25)>
...
<#break>--> - <#if c.isDocument || c.isContainer> -
${c.name}
- - + <#assign childs=node.children?sort_by('name')> + <#if childs?size != 0> + <#list childs as c> + <#--if (c_index >= 25)>
...
<#break>--> + <#if c.isDocument || c.isContainer> +
${c.name}
+ + + <#else> +
No items to display
+ @@ -28,7 +33,7 @@ <#assign navurl='/navigate/showDocDetails/' + node.nodeRef.storeRef.protocol + '/' + node.nodeRef.storeRef.identifier + '/' + node.nodeRef.id> <#if node.isDocument> -<#if node.isLocked > +<#if node.isLocked> (Locked) <#elseif hasAspect(node, "cm:workingcopy") == 1> onclick='event.cancelBubble=true;MySpaces.checkinItem("${node.name}", "${node.nodeRef}");'>Check In diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl index 431c8d7b72..3b13dbdda7 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl @@ -70,9 +70,7 @@ diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl index 92c1c4e803..8382b392e2 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl @@ -517,6 +517,12 @@ a.childSpaceLink:link, a.childSpaceLink:visited, a.childSpaceLink:hover font-family: Trebuchet MS, Arial, Helvetica, sans-serif; } +div.spacesNoItems +{ + color: #5A5741; + font-family: Trebuchet MS, Arial, Helvetica, sans-serif; +} + img.spaceImageIcon { vertical-align: -25%; diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebfiles.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebfiles.get.html.ftl index 3cf3550e95..024fe95acd 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebfiles.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebfiles.get.html.ftl @@ -31,10 +31,10 @@
${wp.name} - View Web Project + View Web Project <#if wp.properties.description?exists && wp.properties.description?length!=0>
${wp.properties.description} diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl index eb4f79815d..632b850b54 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl @@ -31,10 +31,10 @@
${wp.name} - View Web Project + View Web Project <#if wp.properties.description?exists && wp.properties.description?length!=0>
${wp.properties.description} @@ -138,6 +138,12 @@ span.webProjectInfo padding: 8px; } +img.itemImageIcon +{ + vertical-align: -25%; + padding-right:4px; +} + .formsRowSeparator { border-bottom: 1px dotted #CCD4DB; diff --git a/source/web/images/icons/view_web_project.gif b/source/web/images/icons/view_web_project.gif new file mode 100644 index 0000000000000000000000000000000000000000..051120e2d3c90939defac3aab38660af4f4a585c GIT binary patch literal 623 zcmZ?wbhEHb6krfwc$UUsZEc;9kdT|3`|jPF`}gl3J9aEBEp5xz&HMK4J9_k}zrX+M zH}8J^`dL_5xNiNL@87>A)6Q*AKYsdHT3+0}{n`Hg`}=miym;ySi4(^j zJb1Wu>*m>WX0>m5eC^4nwQE;r)lF<(d$VrEm4uwqgGY}h7S^7-aPi)wXLn!ym^gK6 zN_O70Ygcc-_&#yzj`#21Ma0A`S+Sya$=U6@cTZllzP+RM;*I-PuHPt|x+S-;pl{c! zy84>R+57Ii`q8-J;?Y78Hb2oG^+Oc#0;hK2|mapAdT3OM$?Btx)JFY$cR61qLotHm4w?3(FsD1eK zvnYScz*Bo&yCx6XIHmx+rFiJ&BaBF7ySSKpMiQn@h1x-149~v z4#-GQoG`GTX-I2IW0&;^5)fr??qRW(jMh^$Qg$mw7AWbfG>Y2m&@FoA)enOTHEUp7rU%vs1ulaY;qhli1g z!6nVWB*soSoRRZ3|4Rn1G!-f4L?zvu3|zeT7}V256t|>OHuhO-K}aG%H_nc OAl=>Ark0I~!5RR_Y!zMr literal 0 HcmV?d00001 diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js index 2cb2450f27..b424c73120 100644 --- a/source/web/scripts/ajax/doclist.js +++ b/source/web/scripts/ajax/doclist.js @@ -23,7 +23,7 @@ var MyDocs = { // is responsible for rendering just the contents of the main panel div YAHOO.util.Connect.asyncRequest( "GET", - MyDocs.ServiceContext + '/ui/doclistpanel?f='+MyDocs.Filter+'&h='+MyDocs.Home+'&q='+MyDocs.Query, + MyDocs.ServiceContext + '/ui/doclistpanel?f=' + MyDocs.Filter + '&q=' + MyDocs.Query + (MyDocs.Home != null ? '&h=' + MyDocs.Home : ''), { success: function(response) {