From bfefbcbabc2fd61610eda0516260e68723df2634 Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Sat, 8 Dec 2007 01:59:01 +0000 Subject: [PATCH] Project Space - various layout tweaks and fixes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../collaboration/blogSpace.get.html.ftl | 4 +- .../colleaguePresence.get.html.ftl | 29 ------------- .../collaboration/docLibrary.get.html.ftl | 8 ++-- .../collaboration/projectSpace.get.html.ftl | 40 ++++++++++++------ source/web/images/parts/collab_topleft.png | Bin 304 -> 2966 bytes source/web/images/parts/collab_topright.png | Bin 3276 -> 3252 bytes source/web/scripts/ajax/project_presence.js | 10 ++++- source/web/scripts/ajax/project_space.js | 6 +++ 8 files changed, 49 insertions(+), 48 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/collaboration/blogSpace.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/collaboration/blogSpace.get.html.ftl index 2cc6ddd0d1..ae071a9b16 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/collaboration/blogSpace.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/collaboration/blogSpace.get.html.ftl @@ -29,7 +29,8 @@ ${n.properties["cm:created"]?datetime} ${p.properties["cm:firstName"]} ${p.properties["cm:lastName"]} - + details + details @@ -72,6 +73,7 @@ ${n.properties["blg:lastUpdate"]?datetime} ${n.properties["cm:modified"]?datetime} + details diff --git a/config/alfresco/templates/webscripts/org/alfresco/collaboration/colleaguePresence.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/collaboration/colleaguePresence.get.html.ftl index 57a8b7a4dd..e37ad421ec 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/collaboration/colleaguePresence.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/collaboration/colleaguePresence.get.html.ftl @@ -35,9 +35,6 @@ diff --git a/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.html.ftl index 99f02bc593..47e720ac74 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.html.ftl @@ -79,12 +79,12 @@ padding: 5px 15px 4px 6px; } -div.collabRowEven { - padding: 4px 2px 4px 2px; +div.collabRowOdd { + padding: 4px 2px; } div.collabRowEven { - padding: 4px 2px 4px 2px; + padding: 4px 2px; background-color: #F1F7FD; } @@ -105,6 +105,6 @@ a.collabNodeLink, a.collabNodeLink:hover { div.collabNodeActions { float: right; - padding: 0px 4px 0px 4px; + padding: 0px 4px; } diff --git a/config/alfresco/templates/webscripts/org/alfresco/collaboration/projectSpace.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/collaboration/projectSpace.get.html.ftl index 9c30ad7903..56511dc377 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/collaboration/projectSpace.get.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/collaboration/projectSpace.get.html.ftl @@ -5,21 +5,34 @@
- +
+ +
+ + + + +
+<#assign panelCount = 0> <#list projectSpace.subSpaces?keys?sort as key> <#assign node = projectSpace.subSpaces[key]> <#assign summary = node.properties["cm:summaryWebscript"]!""> -
-
- -
- -
${url.context}${summary}?nodeRef=${node.nodeRef}">
-
+
+
+ +
+ +
${url.context}${summary}?nodeRef=${node.nodeRef}">
+
+ <#assign panelCount = panelCount + 1> + <#if (panelCount % 2 = 0)> +
+ +
@@ -54,21 +67,19 @@ .collabHeader { background: url(${url.context}/images/parts/collab_topleft.png) no-repeat left top; - margin: 0px -1px; - padding: 0px 0px 0px 8px; + margin: 0px; + padding: 0px 0px 0px 2px; } .collabHeader span { background: url(${url.context}/images/parts/collab_topright.png) no-repeat right top; display: block; float: none; - padding: 5px 15px 4px 6px; + padding: 5px 15px 6px 6px; font-weight: bold; font-size: 10pt; } .collabContainer { - border-left: 1px solid #B9BEC4; - border-right: 1px solid #B9BEC4; min-height: 290px; } @@ -82,6 +93,9 @@ float: left; padding-right: 8px; } +.projectSpaceIcon a img { + border: none; +} a.projectSpaceTitle:link, a.projectSpaceTitle:visited { font-weight: bold; diff --git a/source/web/images/parts/collab_topleft.png b/source/web/images/parts/collab_topleft.png index cc40c86a96bf5263742f9a1a645a4e5d8d4646be..bc97805314b9d9436c65a48c40a93c7274f197d3 100644 GIT binary patch literal 2966 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 M07*qoM6N<$f>{cLr~m)} literal 304 zcmV-00nh%4P)K_K3-N<7PvHsb?xR|pdvFPT?P!m1jLV@KG#rH{D%#& zeE;#2k&%g&g$2mL)Xnnu?_XwSCaiK$yMb=QC(ZExKVE49x%+&dFW+EM0nKB- ze*Zpu;p*G>AGtX>fCi#VLjW*KfO6=cKX4I%00RIxh>u#pya1g50000jxkXa3Gr-TCmrII^fq{Y7)59f*fq~5)$d>0|1Cl%3?yuUYIG?NjzNd?0NX4x; zclLV8B#In=X#B3{N2h$C5a%~Gk))}oj_uyIv8z{MlA8I3ma{^wp(od*l|A=;ZhPio z<*Ds|w%ebJj*YF?X9Swaz+m9ud-=$_b7eC1|3uh-R|^UTZvDLT2Sko1=(=vww?9IU z%*Zvka-~K)Ddu={1 zR8`n)t6!=5bzmMtWr+4vsOe9XpkgaK9dpTg1G6x2VeQLk6$hwyMB4{isO^nyTR5nG++6y`tMx);}3`9 zV&ZDLm#thp%jdtyWr(Enl`Exh-sK$6FsZ8l4Rp=_|I7?`Uu5JfK6BLqsql35b6Mw< G&;$T{;j7O8 delta 571 zcmdlYc}7yPGr-TCmrII^fq{Y7)59f*fq~5d$d>0|1Csk$824{foX=JN-P6S}q~g|_ zJA1Q45+&Lmrf)J{?dB|Gx}w9k>wy!?+BG>g+0xp%EP~Sh3LY^%8>H^=zIoTvYX3m- z%<0mp@jthizrVhx>Tenc&`<`3101EX)0_Y9wW+GGFVC0%SDim?^;8BXuw2ijs=X&4 z9Zx-HSAX(d@9WBMDbrLk>$lxr3zNV1yMKPs>t}gs>c=yG@7oSB(V%McN$WJ4Mi~xUAuXb5t_VpVMCh4c(yo{6BZ@I(2dG;XO4UZDOyhdCvO$^ZG#>urUWDN^@re nxg^pP3=zZT1s^noUMiKuSDa{an^LB{Ts5mFBR; diff --git a/source/web/scripts/ajax/project_presence.js b/source/web/scripts/ajax/project_presence.js index cd8996ce07..9cb2610acd 100644 --- a/source/web/scripts/ajax/project_presence.js +++ b/source/web/scripts/ajax/project_presence.js @@ -8,7 +8,12 @@ var ProjectPresence = init: function() { window.contextPath = ProjectPresence.getContextPath(); - + // $("refreshColleagues").addEvent("click", ProjectPresence.refreshStatus); + ProjectPresence.refreshStatus(); + }, + + refreshStatus: function() + { var statuses = $$("#projectColleagues .colleaguePresence"); var rows = $$("#projectColleagues .colleagueRow"); @@ -20,11 +25,14 @@ var ProjectPresence = var userDetails = stat.attributes["rel"].value.split("|"); var proxyURL = window.contextPath + "/ajax/invoke/PresenceProxyBean.proxyRequest"; var statusURL = ProjectPresence.getStatusURL(userDetails); + row.removeEvent("click"); row.setStyle("cursor", "auto"); if (statusURL != "") { + stat.attributes["class"].value = "colleaguePresence"; + // ajax call to load online status var myAjax = new Ajax(proxyURL, { method: 'get', diff --git a/source/web/scripts/ajax/project_space.js b/source/web/scripts/ajax/project_space.js index 44346a37f4..1d041eba8b 100644 --- a/source/web/scripts/ajax/project_space.js +++ b/source/web/scripts/ajax/project_space.js @@ -5,6 +5,12 @@ var ProjectSpace = { init: function() { + // $("refreshProjectSpace").addEvent("click", ProjectSpace.updateSummaries); + ProjectSpace.updateSummaries(); + }, + + updateSummaries: function() + { var summaries = $$("#projectSummary .projectSpaceSummary"); summaries.each(function(summary, i)