From 69b3645e9cf8f640147e611adb2a608ac0042a60 Mon Sep 17 00:00:00 2001 From: "Matt@MBP13-PC" Date: Tue, 31 Jul 2012 13:31:31 -0100 Subject: [PATCH] Added Edit / Download context menu support for media library --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 +++ .../umbraco/images/download.png | Bin 0 -> 1420 bytes src/Umbraco.Web.UI/umbraco/images/pencil.png | Bin 0 -> 450 bytes .../ContextMenu/Css/jquery.contextMenu.css | 10 +++---- .../FolderBrowser/Js/folderbrowser.js | 28 ++++++++++++++++++ 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 src/Umbraco.Web.UI/umbraco/images/download.png create mode 100644 src/Umbraco.Web.UI/umbraco/images/pencil.png diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index f599c1f051..f865dc322b 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -327,9 +327,13 @@ + + + + diff --git a/src/Umbraco.Web.UI/umbraco/images/download.png b/src/Umbraco.Web.UI/umbraco/images/download.png new file mode 100644 index 0000000000000000000000000000000000000000..0885c935e4b629033e74e59e0bdaf0187dab0982 GIT binary patch literal 1420 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvv ztM~P_^2{qPNz6-5^>ndS0-B(gnVDi`U|?=$;$mvx;$-M(Xy|Ha>Eh((>}=ua=;mbN zW@K&#)9aF-T$-DjR|3es=X0=p1Ch=dPjmIeW<)fn|Yn-R3I@^|Nl)Si==CQ0yqqSk7Zpn+F z^}Mo7|JZpHz4zRha7J%BY7+!7Th9(Mh< z=X6_qQSkX4&L)N)!yU%*cHdPQCvLs{_QLntih1mX+g4qD<#wgXBhJ|O^2z6)Pox0{OFcDPfdqic7k3)AC|5?>$tTUgt-?u`=R zl3-expt_%F`8STEUt()2ehIcZG5)Rlzt$u7<=!~|u>PY-7fNOI-Z~5G+z3(#a=6&ywdoelieU^UNx9tYz&jpGd4H)l3*+CIpEuSK6`fS&QbJd%>kyHv^_} zsvOw%c7@c1gxT!BOC7!x-gsGJ*6Dj^;kMk3h5L5~ ld3Sa*wcpCEe?FgyhhfR_w%C>#TU|iqqo=E%%Q~loCIAGu4X6MB literal 0 HcmV?d00001 diff --git a/src/Umbraco.Web.UI/umbraco/images/pencil.png b/src/Umbraco.Web.UI/umbraco/images/pencil.png new file mode 100644 index 0000000000000000000000000000000000000000..0bfecd50ee9f5bc5828f0c0745aa3e0effcbe250 GIT binary patch literal 450 zcmV;z0X_bSP)Rq1}l<=psl5*5Xz9i;M}s*NP=ugs7Q#8Z;Dyx|}!`#}xw_C3!B-yaPC&0j)XcpuX@rNfq|q}N(wJOjA& z>u+z?dfJEuLePrqzy!)73pvLjxk4d6XNZt?hm_iYES{i}J5y3l?}PPNYDBR7oPc~6 zL^d)Bi4Q2L3pnp!nFxN9c2E+=@XAl&+;2m6a~kZj1r3Mz3C=hmUG<{+vWR@t4q?fJ zhFc(ozZD#Mx`^Q~g1v=K6!QnfuqyD4>U4EjF0eamL}Jx| z%&`kR-H+3GBYr*Qx}frLU4`%n9(`uSomzw)t%%NagXkA*R5Mbv9VLDp1wMo$cOMa~ s3Wm%r7^bwK$2$}-<~D8p`#1iScU4^XCLAA~0ssI207*qoM6N<$g3sK(Qvd(} literal 0 HcmV?d00001 diff --git a/src/Umbraco.Web.UI/umbraco_client/ContextMenu/Css/jquery.contextMenu.css b/src/Umbraco.Web.UI/umbraco_client/ContextMenu/Css/jquery.contextMenu.css index 1a57a33180..6c1bd904b8 100644 --- a/src/Umbraco.Web.UI/umbraco_client/ContextMenu/Css/jquery.contextMenu.css +++ b/src/Umbraco.Web.UI/umbraco_client/ContextMenu/Css/jquery.contextMenu.css @@ -61,6 +61,8 @@ .context-menu-separator { padding-bottom:0; + height: 1px; + margin: 3px 0 3px 30px; border-bottom: 1px solid #DDD; } @@ -104,13 +106,9 @@ .context-menu-item.icon:before {} */ .context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 4px; } -.context-menu-item.icon-edit { background-image: url(../../../umbraco/images/copy.small.png); } -.context-menu-item.icon-cut { background-image: url(images/cut.png); } -.context-menu-item.icon-copy { background-image: url(images/page_white_copy.png); } -.context-menu-item.icon-paste { background-image: url(images/page_white_paste.png); } +.context-menu-item.icon-edit { background-image: url(../../../umbraco/images/pencil.png); } .context-menu-item.icon-delete { background-image: url(../../../umbraco/images/delete.small.png); } -.context-menu-item.icon-add { background-image: url(images/page_white_add.png); } -.context-menu-item.icon-quit { background-image: url(images/door.png); } +.context-menu-item.icon-download { background-image: url(../../../umbraco/images/download.png); } /* vertically align inside labels */ .context-menu-input > label > * { vertical-align: top; } diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js index b0ce3788b2..29df398007 100644 --- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js +++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js @@ -36,6 +36,26 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); return results.length == 1 ? results[0] : null; }, + _editItem: function (id) { + var self = this; + + var item = self._getItemById(id); + if (item === null) + throw Error("No item found with the id: " + id); + + window.location.href = "editMedia.aspx?id="+ item.Id(); + }, + + _downloadItem: function (id) { + var self = this; + + var item = self._getItemById(id); + if (item === null) + throw Error("No item found with the id: " + id); + + window.open(item.FileUrl(), "Download"); + }, + _deleteItem: function (id) { var self = this; @@ -232,6 +252,12 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); callback: function (key, options) { var id = options.$trigger.data("id"); switch (key) { + case "edit": + self._editItem(id); + break; + case "download": + self._downloadItem(id); + break; case "delete": self._deleteItem(id); break; @@ -239,6 +265,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); }, items: { "edit": { name: "Edit", icon: "edit" }, + "download": { name: "Download", icon: "download" }, + "separator1": "-----", "delete": { name: "Delete", icon: "delete" } }, animation: { show: "fadeIn", hide: "fadeOut" }