mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.9 to HEAD
9229: Merged V2.1 to V2.9 8654: Office add-in client updates 8655: Office add-in UI updates 9230: Minor updates to Office add-in UI webscripts git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -175,16 +175,24 @@ input.button {
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header {
|
.headerRow {
|
||||||
clear: both;
|
clear: both;
|
||||||
font-weight: bold;
|
|
||||||
float: left;
|
float: left;
|
||||||
padding: 6px 2px 2px 4px;
|
}
|
||||||
height: 13px;
|
|
||||||
width: 282px;
|
.headerWrapper {
|
||||||
|
float: left;
|
||||||
|
width: 288px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
font-weight: bold;
|
||||||
|
margin: 0px 24px 0px 0px;
|
||||||
|
padding: 3px 2px 2px 4px;
|
||||||
|
height: 16px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space:nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tabHeader {
|
.tabHeader {
|
||||||
@@ -205,23 +213,21 @@ input.button {
|
|||||||
|
|
||||||
.headerExtra {
|
.headerExtra {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
float: right;
|
float: left;
|
||||||
height: 13px;
|
margin: 0px 0px 0px -16px;
|
||||||
margin: -13px 0px 0px 0px;
|
padding: 3px 0px 2px 0px;
|
||||||
|
width: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.taskKey {
|
.taskKey {
|
||||||
float: left;
|
|
||||||
margin: 0px 0px 0px 0px;
|
margin: 0px 0px 0px 0px;
|
||||||
padding: 0px 0px 0px 0px;
|
padding: 0px 0px 0px 40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toggle {
|
.toggle {
|
||||||
background: transparent url("../images/office/arrow_up.gif") no-repeat;
|
background: transparent url("../images/office/arrow_up.gif") no-repeat;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
display: block;
|
|
||||||
float: left;
|
float: left;
|
||||||
margin: -3px -1px 0px 4px;
|
|
||||||
height: 16px;
|
height: 16px;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
}
|
}
|
||||||
@@ -284,7 +290,7 @@ input.button {
|
|||||||
clear: both;
|
clear: both;
|
||||||
float: left;
|
float: left;
|
||||||
width: 282px;
|
width: 282px;
|
||||||
height: 174px;
|
height: 173px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
border: 1px solid #cccccc;
|
border: 1px solid #cccccc;
|
||||||
border-top: none;
|
border-top: none;
|
||||||
@@ -570,7 +576,7 @@ input.button {
|
|||||||
.taskParameters {
|
.taskParameters {
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
margin: 4px;
|
margin: 4px;
|
||||||
height: 160px;
|
height: 168px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -593,7 +599,7 @@ input.button {
|
|||||||
.taskValue select, .taskValue input, .taskValue textarea {
|
.taskValue select, .taskValue input, .taskValue textarea {
|
||||||
font-family: tahoma, sans-serif;
|
font-family: tahoma, sans-serif;
|
||||||
font-size: 8pt;
|
font-size: 8pt;
|
||||||
padding: 1px 0px 1px 2px;
|
padding: 1px 0px;
|
||||||
width: 172px;
|
width: 172px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
.toggle {
|
.toggle {
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -2px;
|
left: -3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.containerBig, .containerBigAlt, .containerMedium, .containerSmall, .containerSearchTerms, .containerSearchResults, .containerTabMedium, #currentSpaceInfo, #myAlfrescoActions, #navigationActions, #documentActions {
|
.containerBig, .containerBigAlt, .containerMedium, .containerSmall, .containerSearchTerms, .containerSearchResults, .containerTabMedium, #currentSpaceInfo, #myAlfrescoActions, #navigationActions, #documentActions {
|
||||||
|
@@ -179,10 +179,10 @@ var OfficeNavigation =
|
|||||||
|
|
||||||
OfficeAddin.showStatusText("Creating space...", "ajax_anim.gif", false);
|
OfficeAddin.showStatusText("Creating space...", "ajax_anim.gif", false);
|
||||||
var actionURL = commandURL + "?a=newspace&p=" + nodeId;
|
var actionURL = commandURL + "?a=newspace&p=" + nodeId;
|
||||||
actionURL += "&sn=" + encodeURI(spaceName);
|
actionURL += "&sn=" + encodeURIComponent(spaceName);
|
||||||
actionURL += "&st=" + encodeURI(spaceTitle);
|
actionURL += "&st=" + encodeURIComponent(spaceTitle);
|
||||||
actionURL += "&sd=" + encodeURI(spaceDescription);
|
actionURL += "&sd=" + encodeURIComponent(spaceDescription);
|
||||||
actionURL += "&t=" + encodeURI(spaceTemplate);
|
actionURL += "&t=" + encodeURIComponent(spaceTemplate);
|
||||||
var myAjax = new Ajax(actionURL, {
|
var myAjax = new Ajax(actionURL, {
|
||||||
method: 'get',
|
method: 'get',
|
||||||
headers: {'If-Modified-Since': 'Sat, 1 Jan 2000 00:00:00 GMT'},
|
headers: {'If-Modified-Since': 'Sat, 1 Jan 2000 00:00:00 GMT'},
|
||||||
@@ -196,7 +196,7 @@ var OfficeNavigation =
|
|||||||
if (textResponse != "")
|
if (textResponse != "")
|
||||||
{
|
{
|
||||||
href += (href.indexOf("?") == -1) ? "?" : "&";
|
href += (href.indexOf("?") == -1) ? "?" : "&";
|
||||||
href += "st=" + encodeURI(textResponse);
|
href += "st=" + encodeURIComponent(textResponse);
|
||||||
}
|
}
|
||||||
window.location.href = href;
|
window.location.href = href;
|
||||||
}
|
}
|
||||||
|
@@ -44,7 +44,7 @@ var OfficeSearch =
|
|||||||
var searchString = $('searchText').value;
|
var searchString = $('searchText').value;
|
||||||
var maxResults = $('maxResults').value;
|
var maxResults = $('maxResults').value;
|
||||||
|
|
||||||
var actionURL = useTemplate + argPath + "&search=" + searchString + "&maxresults=" + maxResults;
|
var actionURL = useTemplate + argPath + "&search=" + encodeURIComponent(searchString) + "&maxresults=" + maxResults;
|
||||||
var myAjax = new Ajax(actionURL, {
|
var myAjax = new Ajax(actionURL, {
|
||||||
method: 'get',
|
method: 'get',
|
||||||
headers: {'If-Modified-Since': 'Sat, 1 Jan 2000 00:00:00 GMT'},
|
headers: {'If-Modified-Since': 'Sat, 1 Jan 2000 00:00:00 GMT'},
|
||||||
|
@@ -40,7 +40,7 @@ var OfficeTags =
|
|||||||
|
|
||||||
var tagContainer, tagName, tagNameClass, tagCount;
|
var tagContainer, tagName, tagNameClass, tagCount;
|
||||||
|
|
||||||
tagCloud.empty();
|
tagCloud.empty();
|
||||||
tagQuery.tags.each(function(tag, i)
|
tagQuery.tags.each(function(tag, i)
|
||||||
{
|
{
|
||||||
tagNameClass = "tagName" + Math.round((tag.count - tagQuery.countMin) / scale);
|
tagNameClass = "tagName" + Math.round((tag.count - tagQuery.countMin) / scale);
|
||||||
|
Reference in New Issue
Block a user