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

source/web/css/office.css

@@ -175,13 +175,21 @@ input.button {
    display: none;
 }
 
-.header {
+.headerRow {
    clear: both;
-   font-weight: bold;
    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;
    text-overflow: ellipsis;
    white-space: nowrap;
@@ -205,23 +213,21 @@ input.button {
 
 .headerExtra {
    font-weight: normal;
-   float: right;
-   height: 13px;
-   margin: -13px 0px 0px 0px;
+   float: left;
+   margin: 0px 0px 0px -16px;
+   padding: 3px 0px 2px 0px;
+   width: 16px;
 }
 
 .taskKey {
-   float: left;
    margin: 0px 0px 0px 0px;
-   padding: 0px 0px 0px 0px;
+   padding: 0px 0px 0px 40px;
 }
 
 .toggle {
    background: transparent url("../images/office/arrow_up.gif") no-repeat;
    cursor: pointer;
-   display: block;
    float: left;
-   margin: -3px -1px 0px 4px;
    height: 16px;
    width: 16px;
 }
@@ -284,7 +290,7 @@ input.button {
    clear: both;
    float: left;
    width: 282px;
-   height: 174px;
+   height: 173px;
    overflow: auto;
    border: 1px solid #cccccc;
    border-top: none;
@@ -570,7 +576,7 @@ input.button {
 .taskParameters {
    border: 1px solid #ccc;
    margin: 4px;
-   height: 160px;
+   height: 168px;
    overflow: auto;
 }
 
@@ -593,7 +599,7 @@ input.button {
 .taskValue select, .taskValue input, .taskValue textarea {
    font-family: tahoma, sans-serif;
    font-size: 8pt;
-   padding: 1px 0px 1px 2px;
+   padding: 1px 0px;
    width: 172px;
 }
 

source/web/css/office_ie6.css

@@ -7,7 +7,7 @@
 .toggle {
    margin-top: 0px;
    position: relative;
-   top: -2px;
+   left: -3px;
 }
 
 .containerBig, .containerBigAlt, .containerMedium, .containerSmall, .containerSearchTerms, .containerSearchResults, .containerTabMedium, #currentSpaceInfo, #myAlfrescoActions, #navigationActions, #documentActions {

source/web/scripts/office/navigation.js

@@ -179,10 +179,10 @@ var OfficeNavigation =
 
       OfficeAddin.showStatusText("Creating space...", "ajax_anim.gif", false);
       var actionURL = commandURL + "?a=newspace&p=" + nodeId;
-      actionURL += "&sn=" + encodeURI(spaceName);
-      actionURL += "&st=" + encodeURI(spaceTitle);
-      actionURL += "&sd=" + encodeURI(spaceDescription);
-      actionURL += "&t=" + encodeURI(spaceTemplate);
+      actionURL += "&sn=" + encodeURIComponent(spaceName);
+      actionURL += "&st=" + encodeURIComponent(spaceTitle);
+      actionURL += "&sd=" + encodeURIComponent(spaceDescription);
+      actionURL += "&t=" + encodeURIComponent(spaceTemplate);
       var myAjax = new Ajax(actionURL, {
          method: 'get',
          headers: {'If-Modified-Since': 'Sat, 1 Jan 2000 00:00:00 GMT'},
@@ -196,7 +196,7 @@ var OfficeNavigation =
             if (textResponse != "")
             {
                href += (href.indexOf("?") == -1) ? "?" : "&";
-               href += "st=" + encodeURI(textResponse);
+               href += "st=" + encodeURIComponent(textResponse);
             }
             window.location.href = href;
          }

source/web/scripts/office/search.js

@@ -44,7 +44,7 @@ var OfficeSearch =
       var searchString = $('searchText').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, {
          method: 'get',
          headers: {'If-Modified-Since': 'Sat, 1 Jan 2000 00:00:00 GMT'},