From a483738354e78f0b19c8e8d969f19c92731ff6b1 Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Fri, 13 Jul 2007 17:11:28 +0000
Subject: [PATCH] Usability updates for Office Web Scripts

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../office/myTasksDetail.get.html.ftl         |  15 ++++-----
 .../alfresco/office/navigation.get.html.ftl   |   2 +-
 source/web/css/office.css                     |  18 ++++++++--
 source/web/images/office/insert_document.gif  | Bin 278 -> 645 bytes
 source/web/images/office/navigator.gif        | Bin 574 -> 553 bytes
 source/web/scripts/office/my_tasks.js         |  17 ++++++++++
 source/web/scripts/office/office_addin.js     |  31 ++++++++++++++++++
 7 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
index 217e32e29f..35e66a90e9 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
@@ -68,15 +68,14 @@
       </table>
    </div>
 
-   <div>   
-      <table class="taskActions" style="padding-left:16px">
-         <tr>
+   <div class="taskActionContainer">   
+      <span class="taskActions">
    <#list task.transitions as wt>
-            <td>
-               <a class="taskAction" href="#" onclick="OfficeMyTasks.transitionTask('${task.id}', '${url.context}/command/task/end/${task.id}<#if wt.id?exists>/${wt.id}</#if>', 'Workflow action \'${wt.label?html}\' completed.');">${wt.label?html}</a>
-            </td>
+         <span class="taskAction" onclick="OfficeMyTasks.transitionTask('${task.id}', '${url.context}/command/task/end/${task.id}<#if wt.id?exists>/${wt.id}</#if>', 'Workflow action \'${wt.label?html}\' completed.');">${wt.label?html}</span>
    </#list>
-         </tr>
-      </table>
+      </span>
+      <span class="taskManage">
+         <span class="taskAction" onclick="OfficeAddin.openWindowCallback('${url.context}/command/ui/managetask?id=${task.id}&amp;type=${task.qnameType}&amp;container=plain&amp;ticket=${session.ticket}', OfficeMyTasks.refreshPage);">Manage...</span>
+      </span>
    </div>
 </#if>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
index de0df9c2d4..3931ed8af9 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
@@ -163,7 +163,7 @@
             <a href="#" onclick="OfficeAddin.runAction('${doc_actions}','checkout','${child.id}', '');"><img src="${url.context}/images/office/checkout.gif" style="padding:3px 6px 2px 0px;" alt="Check Out" title="Check Out" /></a>
       </#if>
             <a href="${url.serviceContext}/office/myTasks?p=${path?url}&amp;w=new&amp;wd=${child.id}"><img src="${url.context}/images/office/new_workflow.gif" style="padding:3px 6px 2px 0px;" alt="Create Workflow..." title="Create Workflow..." /></a>
-            <a href="#" onclick="window.external.insertDocument('${relativePath}')"><img src="${url.context}/images/office/attach_document.gif" style="padding:3px 6px 2px 0px;" alt="Attach File to Current Document" title="Attach File to Current Document" /></a>
+            <a href="#" onclick="window.external.insertDocument('${relativePath}')"><img src="${url.context}/images/office/insert_document.gif" style="padding:3px 6px 2px 0px;" alt="Insert File into Current Document" title="Insert File into Current Document" /></a>
       <#if !child.name?ends_with(".pdf")>
             <a href="#" onclick="OfficeAddin.runAction('${doc_actions}','makepdf','${child.id}', '');"><img src="${url.context}/images/office/makepdf.gif" style="padding:3px 6px 2px 0px;" alt="Make PDF..." title="Make PDF" /></a>
       </#if>
diff --git a/source/web/css/office.css b/source/web/css/office.css
index f9bf1c1d27..ab494340fb 100644
--- a/source/web/css/office.css
+++ b/source/web/css/office.css
@@ -33,7 +33,7 @@ a img {
    border: 0px;
 }
 
-TABLE, TR, TD {
+TABLE, TD {
    border: 0px;
    border-collapse: collapse;
    padding: 2px;
@@ -449,6 +449,20 @@ input.button {
    overflow: auto;
 }
 
+.taskActionContainer {
+   float: left;
+   width: 272px;
+}
+
+.taskActions {
+   float: left;
+   padding-right: 2px;
+}
+
+.taskManage {
+   float: right;
+}
+
 .taskAction {
    background-color: #cce6ff;
    border: 1px solid #0073e6;
@@ -457,7 +471,7 @@ input.button {
    font-size: 11px;
    font-weight: bold;
    cursor: pointer;
-   margin: 0px 0px 0px 2px;
+   margin: 0px 0px 0px 4px;
    padding: 4px;
    filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr='#ffffff', EndColorStr='#cce6ff');
 }
diff --git a/source/web/images/office/insert_document.gif b/source/web/images/office/insert_document.gif
index 6bba036529908c3501e1797aa1deed0c0f2391f9..b2ce9a797bb22aee7ff61e8045c3ef4cb25a63dd 100644
GIT binary patch
literal 645
zcmZ?wbhEHb6krfwcvi&VH;b*MrKRhUN%1AIr%#_ge*E~`w{P3GZ-4pe!ONE~A3l8e
z=+UEHyLNs5@#FjV@6Vn+`|{<>uV25OJbCi&-Ma$^4!n5r;`8UvfByXW{pZi?*ROy6
z{Q2k4-yJ)496fU6!Gj0)@8A3S?c4L`&mTT~@blNNty{P5+qduRnKSkE_51hlpEGC9
z`}gmwtE=C>eS7KB#X|=UeER(P-o1ODzkFG}di8?&3wG|@dGqG=34Ohdb+ubIZ+`Ib
z!G{kYcJA15{P^+Jt5$`Fhj+BLo;rE5r>pDUy}Ml<9pAtI`1|)yUr+b)Wy{W<IlFev
znoXNF9X)z<&z?Qowr%V0?b*G1_u_?%-n@CcYSpUjjP&B-VxSv8e)`<f*m&sBp>t=?
z?%TWP+SRLv4<GLD>G}EN$E#Pb-n@CUXwjm-|Nl4E*R5Z-uC2NGz`lK(Hg5d%>C>4r
zXZG&dvt#@A70Z^MJb8TP%$YA<Jpb|IM|O7h|Ns9Phy#j0Sr{1@iWqc2%0Y3$!2YN~
zRxLLs$~xUs)3~Uo*Hk*mRU(c}AkD+8w<lUqLRyfQjmO4YghwS$q)3-nS=oh6AwpbS
zkWauUC^M3cmyd%%OjSy%fK4n>yU@W<;Q)ia2^-(k3@sf-*{}ml4EOG9SP4rq>fK>_
z@shzuIDwNf>j3lTFU$=7lAMZ+*?~L^-}Y5LUeNErAj7$@;6vGg<BjdUasnCx4QFO^
ziSjWh2sSjha|(%Ra9n6Uz}(5A!lDt7(CEQ$z$BCCS$wdQ!J?RL0h4PZ6TgznlNFyH
cHVc@|I(DPr(ov5IiuR{sb{e_{D==6C0D2Bm82|tP

literal 278
zcmV+x0qOonNk%w1VGsZi0K^{viHC=#q@?NT>GARL?(Oa6<>mGD_S4eR;o;%T%ge;W
z!`<E7{r>*>`ue)Lxv;RXf`5Pa`1sh^*y!lz{QUjo<l~QxjNstl>+9^}<m78;XW!r7
zzrViY<KqAT0RR90A^8LW0018VEC2ui01yBW000G(;3sX1bR>%MJYM^~0>w~NWEh9X
zz1~|iw1y4maXdb~PbJb2-aH6TpqIQDBEx}4i=n<2x7$EV@N|(c$#_ln2)v&In^5jf
z;0L<C{Jx_<2^fNceFai~2?C0W6L$p#Q!gJ1jg^lXElDpNkDV129S9czk{=EosHh05
c7aOFK4y>!98ziqU5Ei<+0KE_p8j>LZJN?6qt^fc4

diff --git a/source/web/images/office/navigator.gif b/source/web/images/office/navigator.gif
index 2138578cfe5087b844f5ecf803b7b4e650627791..da1ec33147d0006d3415e6992a9fc89e005e17d7 100644
GIT binary patch
literal 553
zcmZ?wbhEHb6krfwc*Xz%|NsBrymi~$`3q*uo?~V2VC&?Zk(=k_?r!hm;^OJ)?BU_+
z>FMI(;q312?(Oa7<>em~Br7LZSW?p6*VoY8T-VsBt)nw{{`?uUW=)zhrM9l_(&ft+
zFI_rx`0$>+d$;e{;qK!d78My38WI>1T-#6|8W|oO9-5h*HD%h=wvP7t#)egERwpDU
z#wEtbCdAb@H6*4a#wW!mCMPB&CB(+Z=H%tfnK!4Wucx)WwYjzV^qJE~jviUDaz$!-
zN^xn?ij~V}%$#0cQ5qZIe`fEV{|pSDn3-R4bN?3*I3*+9EG+!rz~GFo?owCRGkLlH
z`};31S<+oy{o%uhWy_W=UAlD1k|q89{T&@0Zf<Ts?>ag<>gwvMtE($3D=R1{NJ~pg
zNl6I{3-j>s07D5JT2v+!f3h$#FeEeRfXoHO2?KjuLvmAdOKY1`TW6EKW0P&Of2W0=
zjk#`<cb9{qiJqyS$HZ1MV<Rm&7avzoZ4K2{eM`n*UpIGW6{$8W>yYReuK>YL9X0u=
zxcERBr8Wa~W$}dA@E}Qk(H2criHJlY1z8auZjQFlBxywfE<WL|$R=K~WKOouur_Aa
Qu1<EQzdV8pA{-3X0GY9_jsO4v

literal 574
zcmZ?wbhEHb6krfwc*Xz%|NsC0`t|FlPoF-1{P^b0o0l(NzIgHC`Sa(`o;`c=<jJE)
zj~+gJ_~5~V`}gnPy?gh@jT_gmU%z(k+LbF;E?v5G?%cVPCr=(ddi3z&!-ozXI(YEl
z{{8#+?c29!&z>DSc5K_WZOfJ|n>TOXv}x1&_3PKITeo`k>Q$>&tz5Zs>C&Z3mMmGg
zaN+#<^XJT&Gkf;zS+izMn>KCo<jE5zOz7?H?dj?1?Ck95=xA$eYiVg|Zf<UBYHDn3
ztgo-Ht*x!Dt}ZVxFD)%CDJdx~F3!)-&&|!v%*@Ql$Vf{|OHEBpPEJltOpJ?*i-?E_
z4-XFu3kwYm4Gatn2ng`^_xJVn_4M@g@bGYSbhNj(x3#skva+(Yw6w6W(9+UUQ&Uq?
zQW6&z7Z4Bt1`aroXhkUgWMO1rNMO(bSpbR?2KLzv2~Euj%;GH_9nu<|y$L#o9DNB)
zLLw}B_QDB*e4XsNJ}z2;_Hu?&om|3p5%T^KUZEY_oC?-a;c8C)e)a-fO$r_cZjk}*
zR<_ED77iwk8e+OC`r7i+w#FfG(ZM#Fvd#ROvB5Di?!JbiY#kitp5F25K~W05TxMdD
lVXjK1RS6j?oIZVuO%gsrPn?c9If;AO$b>9#T<pML4FI{5(=`A9

diff --git a/source/web/scripts/office/my_tasks.js b/source/web/scripts/office/my_tasks.js
index 3a40b1eee6..52dc74b916 100644
--- a/source/web/scripts/office/my_tasks.js
+++ b/source/web/scripts/office/my_tasks.js
@@ -226,6 +226,23 @@ var OfficeMyTasks =
          }
       });
       myAjax.request();
+   },
+   
+   refreshPage: function()
+   {
+      // Remove any trailing hash
+      var href = window.location.href.replace("#", "")
+      // Remove any previous "st", "w", "wd" or "t" parameters
+      href = OfficeAddin.removeParameters(href, "st|w|wd|t");
+      // Re-select a selected task after reload
+      var taskSel = $E('#taskList .taskItemSelected');
+      if (taskSel != null)
+      {
+         var taskId = taskSel.id;
+         href += (href.indexOf("?") == -1) ? "?" : "&";
+         href += "t=" + encodeURI(taskId);
+      }
+      window.location.href = href;
    }
 };
 
diff --git a/source/web/scripts/office/office_addin.js b/source/web/scripts/office/office_addin.js
index d5324b6c09..0d53d50407 100644
--- a/source/web/scripts/office/office_addin.js
+++ b/source/web/scripts/office/office_addin.js
@@ -204,6 +204,37 @@ var OfficeAddin =
       var x = a.dueDate;
       var y = b.dueDate;
       return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+   },
+   
+   openWindowCallback: function(url, callback)
+   {
+      // Store the callback function for later
+      OfficeAddin.callbackFunction = callback;
+      // Register our "well known" callback function
+      window.alfrescoCallback = OfficeAddin.openWindowOnCallback;
+      // Use a named window so that only one dialog is active at a time
+      window.open(url, 'alfrescoDialog', 'width=1024,height=768');
+   },
+   
+   openWindowOnCallback: function(fromTimeout)
+   {
+      if (typeof(fromTimeout)=='undefined')
+      {
+         window.setTimeout("OfficeAddin.openWindowOnCallback(true)", 10);
+      }
+      else
+      {
+         // Clear out the global callback function
+         window.alfrescoCallback = null;
+         try
+         {
+            OfficeAddin.callbackFunction();
+         }
+         catch (e)
+         {
+         }
+         OfficeAddin.callbackFunction = null;
+      }
    }
 };