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 cc40c86a96..bc97805314 100644 Binary files a/source/web/images/parts/collab_topleft.png and b/source/web/images/parts/collab_topleft.png differ diff --git a/source/web/images/parts/collab_topright.png b/source/web/images/parts/collab_topright.png index 8fe51daddd..aa11a7f73d 100644 Binary files a/source/web/images/parts/collab_topright.png and b/source/web/images/parts/collab_topright.png differ 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)