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
2025-08-07 17:49:17 +00:00 · 2007-12-08 01:59:01 +00:00
parent 804ba60ce3
commit bfefbcbabc
8 changed files with 49 additions and 48 deletions
--- 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 @@
               	   <td>${n.properties["cm:created"]?datetime}</td>
               	   <td>${p.properties["cm:firstName"]} ${p.properties["cm:lastName"]}</td>
               	   <td>
-               	      <a class="blogAction" title="Post this article" href="${scripturl("?nodeRef=" + n.parent.nodeRef + "&n=" + n.nodeRef + "&a=p")}"><img src="${url.context}/images/icons/blog_post.png"></a>
+                        <a class="blogAction" title="Details" href="${url.context}/n/showDocDetails/${n.nodeRef.storeRef.protocol}/${n.nodeRef.storeRef.identifier}/${n.id}"><img src="${url.context}/images/icons/View_details.gif" alt="details"></a>
+               	      <a class="blogAction" title="Post this article" href="${scripturl("?nodeRef=" + n.parent.nodeRef + "&n=" + n.nodeRef + "&a=p")}"><img src="${url.context}/images/icons/blog_post.png" alt="details"></a>
               	   </td>
               	</tr>
 </#list>
@@ -72,6 +73,7 @@
               	   <td>${n.properties["blg:lastUpdate"]?datetime}</td>
               	   <td>${n.properties["cm:modified"]?datetime}</td>
               	   <td>
+                        <a class="blogAction" title="Details" href="${url.context}/n/showDocDetails/${n.nodeRef.storeRef.protocol}/${n.nodeRef.storeRef.identifier}/${n.id}"><img src="${url.context}/images/icons/View_details.gif" alt="details"></a>
               	      <a class="blogAction" title="Update blog" href="${scripturl("?nodeRef=" + p.parent.nodeRef + "&n=" + p.nodeRef + "&a=u")}"><img src="${url.context}/images/icons/blog_update.png"></a>
               	      <a class="blogAction" title="Remove from blog" href="${scripturl("?nodeRef=" + n.parent.nodeRef + "&n=" + n.nodeRef + "&a=r")}"><img src="${url.context}/images/icons/blog_remove.png"></a>
               	   </td>
--- 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 @@

 <style>
 /* Colleague Status */
-#projectColleagues .collabHeader {
-}
-
 .colleagueList {
   border-left: 1px solid #B9BEC4;
   border-right: 1px solid #B9BEC4;
@@ -112,30 +109,4 @@

 .colleagueDetail {
 }
-
-.collabHeader {
-   background: url(${url.context}/images/parts/collab_topleft.png) no-repeat left top;
-   margin: 0px -1px;
-   padding: 0px 0px 0px 8px;
-}
-.collabHeader span {
-   background: url(${url.context}/images/parts/collab_topright.png) no-repeat right top;
-   display: block;
-   float: none;
-   padding: 5px 15px 4px 6px;
-   font-weight: bold;
-   font-size: 10pt;
-}
-
-.collabFooter {
-   background: url(${url.context}/images/parts/collab_bottomleft.png) no-repeat left top;
-   margin: 0px;
-   padding: 0px 0px 0px 4px;
-}
-.collabFooter span {
-   background: url(${url.context}/images/parts/collab_bottomright.png) no-repeat right top;
-   display: block;
-   float: none;
-   padding: 5px 15px 4px 6px;
-}
 </style>
--- 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;
 }
 </style>
--- 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,22 +5,35 @@
 </div>
 <div class="collabContainer">

-<table width="100%" cellpadding="16" cellspacing="0">
+<table width="100%" cellpadding="0" cellspacing="0">
   <tr valign="top">
+      <td width="1" style="background-color:#b9bec4;"></td>
      <td>
+         <table width="100%" cellpadding="16" cellspacing="0">
+            <tr vaalign="top">
+               <td>
+<#assign panelCount = 0>
 <#list projectSpace.subSpaces?keys?sort as key>
   <#assign node = projectSpace.subSpaces[key]>
   <#assign summary = node.properties["cm:summaryWebscript"]!"">
                  <div class="projectSpace">
                     <div class="projectSpaceIcon">
-               <img src="${url.context}${node.icon64}" height="64" width="64">
+                        <a href="${url.context}${node.url}"><img src="${url.context}${node.icon64}" height="64" width="64"></a>
                     </div>
                     <div><a class="projectSpaceTitle" href="${url.context}${node.url}">${node.name}</a></div>
                     <div class="projectSpaceSummary" rel="<#if summary != "">${url.context}${summary}?nodeRef=${node.nodeRef}</#if>"></div>
                  </div>
+   <#assign panelCount = panelCount + 1>
+   <#if (panelCount % 2 = 0)>
+         <div style="clear:left;"></div>
+   </#if>
 </#list>      
               </td>
            </tr>
+         </table>
+      </td>
+      <td width="1" style="background-color:#b9bec4;"></td>
+   </tr>
 </table>

 </div>
@@ -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;
--- a/source/web/images/parts/collab_topleft.png
+++ b/source/web/images/parts/collab_topleft.png
--- a/source/web/images/parts/collab_topright.png
+++ b/source/web/images/parts/collab_topright.png
--- 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',
--- a/source/web/scripts/ajax/project_space.js
+++ b/source/web/scripts/ajax/project_space.js
@@ -4,6 +4,12 @@
 var ProjectSpace =
 {
 	init: function()
+	{
+		// $("refreshProjectSpace").addEvent("click", ProjectSpace.updateSummaries);
+		ProjectSpace.updateSummaries();
+   },
+   
+   updateSummaries: function()
   {
 		var summaries = $$("#projectSummary .projectSpaceSummary");