inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for ridiculous IE7 CSS behaviour

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7297 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2007-11-05 16:39:28 +00:00
parent a75defb600
commit eb989afb99
3 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
config/alfresco/templates/webscripts/org/alfresco/presence/status.get.html.ftl
View File

@@ -1,30 +1,31 @@
<script type="text/javascript" src="${url.context}/scripts/ajax/presence.js"></script> <script type="text/javascript" src="${url.context}/scripts/ajax/presence.js"></script>
<div class="presenceTitle">Colleague Status</div> <div class="presenceTitle">Colleague Status</div>
<div class="presenceKeyContainer"> <div id="presenceKeyContainer">
<div class="presenceKeyTitle">Presence Status Key:</div> <div class="presenceKeyTitle">Presence Status Key:</div>
<div class="presenceKey"> <div class="presenceKey">
<img src="${url.context}/images/icons/presence_skype_online.png" width="16" height="16" alt="online" title="Skype online">=Skype online<br> <img src="${url.context}/images/icons/presence_skype_online.png" width="16" height="16" alt="Skype online" title="Skype online">=Skype online<br>
<img src="${url.context}/images/icons/presence_yahoo_online.png" width="16" height="16" alt="online" title="Yahoo online">=Yahoo online<br> <img src="${url.context}/images/icons/presence_yahoo_online.png" width="16" height="16" alt="Yahoo online" title="Yahoo online">=Yahoo online<br>
<img src="${url.context}/images/icons/presence_status_none.png" width="16" height="16" alt="offline" title="Not configured">=not configured <img src="${url.context}/images/icons/presence_status_none.png" width="16" height="16" alt="Not configured" title="Not configured">=not configured
</div> </div>
<div class="presenceKey"> <div class="presenceKey">
<img src="${url.context}/images/icons/presence_skype_offline.png" width="16" height="16" alt="online" title="Skype offline">=offline<br> <img src="${url.context}/images/icons/presence_skype_offline.png" width="16" height="16" alt="Skype offline" title="Skype offline">=offline<br>
<img src="${url.context}/images/icons/presence_yahoo_offline.png" width="16" height="16" alt="offline" title="Yahoo offline">=offline<br> <img src="${url.context}/images/icons/presence_yahoo_offline.png" width="16" height="16" alt="Yahoo offline" title="Yahoo offline">=offline<br>
<img src="${url.context}/images/icons/presence_status_unknown.png" width="16" height="16" alt="online" title="Status possibly blocked due to privacy settings">=unknown <img src="${url.context}/images/icons/presence_status_unknown.png" width="16" height="16" alt="Unknown" title="Status possibly blocked due to privacy settings">=unknown
</div> </div>
</div> </div>
<div id="presenceContainer"> <div id="presenceContainer">
<#list presenceResults as pr> <#list presenceResults as pr>
<div class="presenceUser"> <div class="presenceUser">
<div class="presenceStatus ${pr[0]}" rel="${pr[2]}" title=""></div> <div class="presenceStatus" rel="${pr[2]}" title=""></div>
<div class="presenceUsername">${pr[1]}</div> <div class="presenceUsername">${pr[1]}</div>
</div> </div>
</#list> </#list>
</div> </div>
<div id="recentDocsContainer"> <div id="recentDocsContainer">
<div class="presenceTitle">Documents created or modified in the last week</div> <div class="recentDocsTitle">Recently created or modified documents</div>
<div id="recentDocsTable"> <div id="recentDocsTable">
<table cellspacing="0" cellpadding="3" border="0"> <table cellspacing="0" cellpadding="3" border="0">
<tr> <tr>
@@ -38,7 +39,7 @@
<#if (dateCompare(child.properties["cm:modified"], date, 1000*60*60*24*7) == 1) || (dateCompare(child.properties["cm:created"], date, 1000*60*60*24*7) == 1)> <#if (dateCompare(child.properties["cm:modified"], date, 1000*60*60*24*7) == 1) || (dateCompare(child.properties["cm:created"], date, 1000*60*60*24*7) == 1)>
<#assign rowNum = rowNum + 1> <#assign rowNum = rowNum + 1>
<tr class="recentDoc ${(rowNum % 2 = 0)?string("even", "odd")}"> <tr class="recentDoc ${(rowNum % 2 = 0)?string("even", "odd")}">
<td><a href="${url.context}${child.url}" target="new"><img src="${url.context}${child.icon16}" border=0></a></td> <td><a href="${url.context}${child.url}" target="new"><img src="${url.context}${child.icon16}" alt="*" border="0"></a></td>
<td><a href="${url.context}${child.url}" target="new">${child.properties.name}</a></td> <td><a href="${url.context}${child.url}" target="new">${child.properties.name}</a></td>
<td>${child.properties["cm:created"]?datetime}</td> <td>${child.properties["cm:created"]?datetime}</td>
<td>${child.properties["cm:modified"]?datetime}</td> <td>${child.properties["cm:modified"]?datetime}</td>
@@ -59,7 +60,7 @@
float: left; float: left;
} }
.presenceKeyContainer #presenceKeyContainer
{ {
float: right; float: right;
border: 1px dashed grey; border: 1px dashed grey;
@@ -99,19 +100,19 @@
margin: 0px 4px; margin: 0px 4px;
} }
.presenceStatus.skype.online .presenceStatus.skype-online
{ {
background-image: url(${url.context}/images/icons/presence_skype_online.png) !important; background-image: url(${url.context}/images/icons/presence_skype_online.png) !important;
} }
.presenceStatus.skype.offline .presenceStatus.skype-offline
{ {
background-image: url(${url.context}/images/icons/presence_skype_offline.png) !important; background-image: url(${url.context}/images/icons/presence_skype_offline.png) !important;
} }
.presenceStatus.yahoo.online .presenceStatus.yahoo-online
{ {
background-image: url(${url.context}/images/icons/presence_yahoo_online.png) !important; background-image: url(${url.context}/images/icons/presence_yahoo_online.png) !important;
} }
.presenceStatus.yahoo.offline .presenceStatus.yahoo-offline
{ {
background-image: url(${url.context}/images/icons/presence_yahoo_offline.png) !important; background-image: url(${url.context}/images/icons/presence_yahoo_offline.png) !important;
} }
@@ -119,7 +120,7 @@
{ {
background-image: url(${url.context}/images/icons/presence_status_unknown.png) !important; background-image: url(${url.context}/images/icons/presence_status_unknown.png) !important;
} }
.presenceStatus.null.unknown .presenceStatus.none
{ {
background-image: url(${url.context}/images/icons/presence_status_none.png) !important; background-image: url(${url.context}/images/icons/presence_status_none.png) !important;
} }
@@ -130,11 +131,20 @@
margin: 4px 0px 0px; margin: 4px 0px 0px;
} }
.recentDocsTitle
{
font-family: "Trebuchet MS", Verdana, Helvetica, sans-serif;
font-size: medium;
font-weight: bold;
margin: 0px 0px 4px;
float: left;
}
#recentDocsContainer #recentDocsContainer
{ {
float: left; float: left;
clear: both; clear: left;
margin-top: 8px; margin-top: 32px;
} }
#recentDocsTable #recentDocsTable

8
config/alfresco/templates/webscripts/org/alfresco/presence/status.get.js
View File

@@ -22,6 +22,8 @@ function parsePermissions(space)
{ {
var tokens, user, group; var tokens, user, group;
try
{
for each(perm in space.permissions) for each(perm in space.permissions)
{ {
tokens = perm.split(";"); tokens = perm.split(";");
@@ -48,12 +50,16 @@ function parsePermissions(space)
} }
} }
} }
}
catch (e)
{
}
} }
function pushUnique(results, user, details) function pushUnique(results, user, details)
{ {
var provider = String(details).split("|")[0]; var provider = String(details).split("|")[0];
if (provider == "") if (provider == "null")
{ {
provider = "none"; provider = "none";
} }

4
source/web/scripts/ajax/presence.js
View File

@@ -27,7 +27,7 @@ var Presence =
onComplete: function(textResponse, xmlResponse) onComplete: function(textResponse, xmlResponse)
{ {
var statusType = Presence.getStatusType(userDetails[0], textResponse); var statusType = Presence.getStatusType(userDetails[0], textResponse);
status.addClass(statusType); status.addClass(userDetails[0] + "-" + statusType);
user.addClass(statusType); user.addClass(statusType);
if (statusType == "unknown") if (statusType == "unknown")
{ {
@@ -44,7 +44,7 @@ var Presence =
} }
else else
{ {
status.addClass("unknown"); status.addClass("none");
status.title = "User's presence provider has not been configured by Alfresco admin"; status.title = "User's presence provider has not been configured by Alfresco admin";
user.title = status.title; user.title = status.title;
} }