From 54d4e556fe3302d1e580cb6d4abbfcd5699263a5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 12 Sep 2012 00:57:01 -0400
Subject: [PATCH] Add lock and clock icon for sharing

---
 AUTHORS                    |   3 +++
 core/img/actions/clock.png | Bin 0 -> 466 bytes
 core/img/actions/clock.svg |  20 ++++++++++++++++++++
 core/img/actions/lock.png  | Bin 0 -> 346 bytes
 core/img/actions/lock.svg  |   8 ++++++++
 core/js/share.js           |   3 +--
 6 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 core/img/actions/clock.png
 create mode 100755 core/img/actions/clock.svg
 create mode 100644 core/img/actions/lock.png
 create mode 100755 core/img/actions/lock.svg

diff --git a/AUTHORS b/AUTHORS
index f618df9311d..f79733c2502 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,3 +19,6 @@ With help from many libraries and frameworks including:
 	SabreDAV
 	jQuery
 	…
+
+"Lock” symbol from thenounproject.com collection
+"Clock” symbol by Brandon Hopkins, from thenounproject.com collection
\ No newline at end of file
diff --git a/core/img/actions/clock.png b/core/img/actions/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..671b3f4f0c1daf8bbea5eb8c8881b07e79ec3b4c
GIT binary patch
literal 466
zcmV;@0WJQCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<SbV)=(R5*=&(?4reQ4j_2-`!ne(yU;R
zWs``;+CnX~5F`+>OKTbN14s%*1qDH{^a}_Y{L@(&NCFm`Z(%2zq!KLzLDLw<;@%hT
zhPRpK@n+_nnRn*A6cOr3Db3;*7IC_yzu_ZRBjWoAAR-i!E*@dKJkR4QuHYgbV+Z%p
zIlxumw|IvkhD}4M-^6vy;yqqABu&G^0`6i0$18Bc7o01#ZXvnTeEv*Xdj^w-Cf~p_
zY*o3bvdInxog&x^1SXBfS=`2(DmR6Hc!g!y!i9QrHSGcR&~K?-!iNsdpl^JvMa1ux
zd>`|@^0Ge$ypFXowSDNx0{&_1h=|WeY_^B5J=tMPDWxCy8xg;b07)rL%jaCeC$e$2
z<ugvSiFru8W0=D(PBzK=vN^i)nNG9-rwh1;4Xo5o>|j+EYz~7Kf+0>}6VH(j2r81h
zWwj^rov&d5m+`dJRvK_b6qZqu2C~BzF)ur``JG=!#Lv3_KdxZutm_X>mjD0&07*qo
IM6N<$g5^5J6#xJL

literal 0
HcmV?d00001

diff --git a/core/img/actions/clock.svg b/core/img/actions/clock.svg
new file mode 100755
index 00000000000..1821f474df5
--- /dev/null
+++ b/core/img/actions/clock.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 100 100" xml:space="preserve">
+<path d="M50,89.836c-23.389,0-42.418-19.027-42.418-42.417C7.582,24.029,26.611,5,50,5c23.389,0,42.418,19.029,42.418,42.419  C92.418,70.809,73.389,89.836,50,89.836z M50,9.912c-20.681,0-37.506,16.826-37.506,37.508c0,20.681,16.826,37.505,37.506,37.505  s37.507-16.824,37.507-37.505C87.507,26.737,70.681,9.912,50,9.912z"/>
+<path d="M50.001,49.875c-0.141,0-0.283-0.011-0.427-0.037c-1.173-0.206-2.03-1.226-2.03-2.419V29.442c0-1.355,1.1-2.456,2.456-2.456  c1.355,0,2.456,1.1,2.456,2.456v4.003l5.431-14.974c0.464-1.274,1.872-1.937,3.146-1.471c1.274,0.462,1.934,1.871,1.471,3.146  l-10.195,28.11C51.952,49.241,51.019,49.875,50.001,49.875z"/>
+<circle cx="49.999" cy="12.956" r="1.617"/>
+<path d="M50,14.778c-1.006,0-1.823-0.817-1.823-1.823c0-1.005,0.817-1.823,1.823-1.823c1.004,0,1.821,0.817,1.821,1.823  C51.821,13.961,51.004,14.778,50,14.778z M50,11.542c-0.779,0-1.414,0.635-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414  s1.412-0.635,1.412-1.414C51.412,12.177,50.779,11.542,50,11.542z"/>
+<circle cx="34.343" cy="20.301" r="1.47"/>
+<path d="M23.617,30.488c0.703,0.409,0.945,1.305,0.537,2.008c-0.405,0.704-1.305,0.947-2.007,0.538  c-0.703-0.403-0.945-1.305-0.539-2.008C22.016,30.325,22.913,30.085,23.617,30.488z"/>
+<circle cx="15.536" cy="47.42" r="1.618"/>
+<path d="M15.536,49.242c-1.006,0-1.823-0.817-1.823-1.823c0.001-1,0.819-1.819,1.823-1.822c1.006,0,1.823,0.817,1.823,1.822  C17.359,48.425,16.542,49.242,15.536,49.242z M15.536,46.006c-0.777,0.003-1.412,0.636-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414  s1.413-0.635,1.413-1.414C16.949,46.641,16.315,46.006,15.536,46.006z"/>
+<path d="M22.147,61.803c0.705-0.406,1.602-0.167,2.007,0.537c0.408,0.703,0.166,1.602-0.537,2.008  c-0.704,0.406-1.604,0.163-2.008-0.537C21.202,63.104,21.447,62.209,22.147,61.803z"/>
+<path d="M33.07,73.803c0.408-0.706,1.305-0.946,2.008-0.537c0.704,0.403,0.945,1.302,0.538,2.005  c-0.405,0.704-1.307,0.947-2.007,0.537C32.904,75.402,32.667,74.507,33.07,73.803z"/>
+<path d="M48.382,81.884c0-0.896,0.725-1.618,1.618-1.618c0.892-0.003,1.618,0.723,1.618,1.618c0,0.892-0.728,1.618-1.618,1.618  C49.104,83.498,48.385,82.775,48.382,81.884z"/>
+<path d="M50,83.706L50,83.706c-1.002-0.003-1.819-0.82-1.823-1.822c0-1.006,0.817-1.823,1.823-1.823  c1.007,0,1.822,0.817,1.822,1.823C51.822,82.889,51.006,83.706,50,83.706z M50.006,80.47c-0.785,0-1.42,0.635-1.42,1.414  c0.003,0.775,0.637,1.41,1.414,1.413c0.78,0,1.413-0.635,1.413-1.413C51.413,81.104,50.782,80.47,50.006,80.47z"/>
+<path d="M64.385,75.271c-0.408-0.703-0.167-1.602,0.537-2.005c0.702-0.409,1.601-0.169,2.008,0.537  c0.406,0.7,0.163,1.603-0.539,2.005C65.686,76.214,64.791,75.971,64.385,75.271z"/>
+<path d="M76.384,64.348c-0.704-0.406-0.945-1.305-0.537-2.008c0.402-0.704,1.301-0.943,2.006-0.537  c0.704,0.402,0.945,1.308,0.539,2.008C77.98,64.511,77.087,64.751,76.384,64.348z"/>
+<path d="M84.464,49.038c-0.896-0.003-1.618-0.726-1.618-1.618c-0.001-0.892,0.723-1.618,1.618-1.618  c0.893-0.003,1.618,0.726,1.618,1.618C86.077,48.315,85.356,49.034,84.464,49.038z"/>
+<path d="M84.464,49.242L84.464,49.242c-1.006-0.003-1.822-0.822-1.822-1.823c-0.002-0.486,0.188-0.943,0.532-1.287  c0.344-0.345,0.803-0.535,1.29-0.535c1.007,0,1.822,0.817,1.822,1.822C86.282,48.422,85.463,49.239,84.464,49.242z M84.471,46.006  c-0.386,0-0.74,0.147-1.008,0.416c-0.267,0.267-0.412,0.621-0.412,0.998c0,0.777,0.635,1.41,1.413,1.414  c0.775-0.003,1.408-0.638,1.413-1.415C85.877,46.641,85.246,46.006,84.471,46.006z"/>
+<path d="M77.853,33.034c-0.705,0.409-1.604,0.166-2.006-0.538c-0.408-0.7-0.168-1.599,0.537-2.008  c0.701-0.406,1.604-0.163,2.008,0.537C78.795,31.732,78.553,32.627,77.853,33.034z"/>
+<path d="M66.93,21.036c-0.407,0.704-1.308,0.943-2.008,0.537c-0.704-0.403-0.945-1.305-0.537-2.008  c0.404-0.703,1.306-0.943,2.006-0.537C67.095,19.437,67.333,20.333,66.93,21.036z"/>
+</svg>
\ No newline at end of file
diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..511bfa615bb4b28755140658d0f868cb3fe411ec
GIT binary patch
literal 346
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m=sKo-U3d7QJsL8fLX52(-o@Qi{3}k@b|7g?r;Skw>N?bvij~Tt0}H
z#kmP=*(8vA#BcU}r`ev9bqd3sIijD19zHWWKTYC7=c!F9*GoOGmtHEJYjb|_s#WLK
zeCcC<TFG~N+eRJkCIyCMp3gRiH|dDDe#~Isclp*fRYw60-^<HAJts}j=(<vRSFxVq
z$3FjMne*0pxui(2wI){7I$bs?ka=Et*59(PdDlAroy-aM%RMHQa0<8z-rg3={BM!D
zk`hD5V~NOVj?+?Ctg6bAJ1+QoSCe6zMi&Fa_Vr2kzdxAMT-=vAt8R`J&*9g8KiKy$
o6x1(Xq;bLIZMbjOqC1cI{nT$i?ACs|8W;`?p00i_>zopr0NoXd6aWAK

literal 0
HcmV?d00001

diff --git a/core/img/actions/lock.svg b/core/img/actions/lock.svg
new file mode 100755
index 00000000000..8fb039b9e3b
--- /dev/null
+++ b/core/img/actions/lock.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 71 100" xml:space="preserve">
+<path d="M65.5,45V30c0-16.542-13.458-30-30-30s-30,13.458-30,30v15H0v55h71V45H65.5z M13.5,30c0-12.131,9.869-22,22-22
+	s22,9.869,22,22v15h-44V30z"/>
+</svg>
diff --git a/core/js/share.js b/core/js/share.js
index e85c134f825..3fe1f259617 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -132,8 +132,7 @@ OC.Share={
 			if (link) {
 				html += '<div id="link">';
 				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">Share with link</label>';
-				// TODO Change to lock/unlock icon?
-				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>';
+				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>';
 				html += '<br />';
 				html += '<input id="linkText" type="text" readonly="readonly" />';
 				html += '<div id="linkPass">';
-- 
2.39.5