Browse Source

HUE-3362 [home] Indicate that a folder or doc is shared with the user

Johan Ahlen 9 years ago
parent
commit
d7a5efe

+ 17 - 12
desktop/core/src/desktop/templates/file_browser.mako

@@ -556,18 +556,23 @@ from desktop.views import _ko
                 <!-- /ko -->
               </ul>
               <div class="fb-primary-col">
-                <!-- ko if: isDirectory() -->
-                <i class="fa fa-fw fa-folder-o"></i>
-                <!-- /ko -->
-                <!-- ko if: ! isDirectory() && definition().type === 'query-hive' -->
-                <svg class="hi"><use xlink:href="#hi-file-hive"></use></svg>
-                <!-- /ko -->
-                <!-- ko if: ! isDirectory() && definition().type === 'query-impala' -->
-                <svg class="hi"><use xlink:href="#hi-file-impala"></use></svg>
-                <!-- /ko -->
-                <!-- ko if: ! isDirectory() && definition().type !== 'query-impala' && definition().type !== 'query-hive' -->
-                <i class="fa fa-fw fa-file-o"></i>
-                <!-- /ko -->
+                <svg class="hi">
+                  <!-- ko if: isDirectory() -->
+                  <use xlink:href="#hi-folder"></use>
+                  <!-- /ko -->
+                  <!-- ko if: ! isDirectory() && definition().type === 'query-hive' -->
+                  <use xlink:href="#hi-file-hive"></use>
+                  <!-- /ko -->
+                  <!-- ko if: ! isDirectory() && definition().type === 'query-impala' -->
+                  <use xlink:href="#hi-file-impala"></use>
+                  <!-- /ko -->
+                  <!-- ko if: ! isDirectory() && definition().type !== 'query-impala' && definition().type !== 'query-hive' -->
+                  <use xlink:href="#hi-file"></use>
+                  <!-- /ko -->
+                  <!-- ko if: isSharedWithMe -->
+                  <use xlink:href="#hi-share-addon"></use>
+                  <!-- /ko -->
+                </svg>
                 <a href="javascript: void(0);" data-bind="text: definition().name, click: open, attr: { 'title': definition().name }"></a>
               </div>
               <div class="fb-attr-group">

+ 16 - 0
desktop/core/src/desktop/templates/hue_icons.mako

@@ -32,5 +32,21 @@
       <path d="M25.37,36.41c-2-1.3-4-3.5-4-6.12C23.32,31.91,24.37,34.41,25.37,36.41Z"/>
       <path d="M59.43,19.43V60.57A3.43,3.43,0,0,1,56,64H8a3.43,3.43,0,0,1-3.43-3.43V3.43A3.43,3.43,0,0,1,8,0H40a9.58,9.58,0,0,1,5.86,2.43L57,13.57A9.58,9.58,0,0,1,59.43,19.43Zm-20,3.38a3.43,3.43,0,0,1-2.84-3.38V4.57H9.14V59.43H54.86V22.86H42.23a17.09,17.09,0,0,1-.32,2.05,1,1,0,0,1-.48.61A19.21,19.21,0,0,0,37.06,31a14.08,14.08,0,0,0-.87,3,1,1,0,0,0,.35.9,1.21,1.21,0,0,0,1-.24,29.08,29.08,0,0,0,2.36-2.62c0.87-1.1,1.49-2.23,2.78-4,0.5,2.84-.4,6.81-2.71,8.05a3.68,3.68,0,0,0-.86.78c-1.42,1.51-1.31,2.63.33,3.77a2.26,2.26,0,0,1-.75.38,1.52,1.52,0,0,0-.54,1.08c-0.18.4-.67,0.35-0.71,1.07-0.2,3.7-.73,8.53-2.27,12a4.29,4.29,0,0,1-2.93,2.51,2,2,0,0,0,0-1.62,6.24,6.24,0,0,1-1.79-.6,1,1,0,0,1,.67,0,0.92,0.92,0,0,0,1.15-.69,1.31,1.31,0,0,0-.78-1.5,1.32,1.32,0,0,1-1-1.46,3.58,3.58,0,0,1,1.26,1c0.71,0.75,1-.15,1.44-0.53a1,1,0,0,0,.49-0.56c-0.1-.5-0.09-1-0.19-1.64-0.51-3.3-.34-5.8,1.61-8.59a3.36,3.36,0,0,0,.17-3.72c-0.2-.33-0.37-0.68-0.58-1a6.74,6.74,0,0,1-.21-7.32,20.62,20.62,0,0,1,4.67-6A1.41,1.41,0,0,0,39.41,22.81Zm1.73-4.52H54.57a4.55,4.55,0,0,0-.79-1.46L42.61,5.64a4.55,4.55,0,0,0-1.46-.79V18.29Z"/>
     </symbol>
+
+    <symbol id="hi-file" viewBox="0 0 64 64">
+      <path d="M57,13.57a8.33,8.33,0,0,1,1.71,2.71,8.25,8.25,0,0,1,.71,3.14V60.57A3.41,3.41,0,0,1,56,64H8a3.41,3.41,0,0,1-3.43-3.43V3.43A3.31,3.31,0,0,1,5.57,1,3.31,3.31,0,0,1,8,0H40a8.25,8.25,0,0,1,3.14.71,8.31,8.31,0,0,1,2.71,1.71ZM54.86,59.43V22.86H40a3.41,3.41,0,0,1-3.43-3.43V4.57H9.14V59.43H54.86ZM41.14,4.86V18.29H54.57a3.91,3.91,0,0,0-.79-1.46L42.61,5.64A3.9,3.9,0,0,0,41.14,4.86Z"/>
+    </symbol>
+
+    <symbol id="hi-folder" viewBox="0 0 64 64">
+      <path d="M64,23.38V50.46a8.67,8.67,0,0,1-8.62,8.62H8.62a8.29,8.29,0,0,1-6.08-2.54A8.29,8.29,0,0,1,0,50.46V13.54A8.29,8.29,0,0,1,2.54,7.46,8.29,8.29,0,0,1,8.62,4.92H20.92A8.29,8.29,0,0,1,27,7.46a8.29,8.29,0,0,1,2.54,6.08v1.23H55.38A8.67,8.67,0,0,1,64,23.38ZM59.08,50.46V23.38a3.68,3.68,0,0,0-3.69-3.69H28.31A3.68,3.68,0,0,1,24.62,16V13.54a3.68,3.68,0,0,0-3.69-3.69H8.62a3.68,3.68,0,0,0-3.69,3.69V50.46a3.68,3.68,0,0,0,3.69,3.69H55.38A3.68,3.68,0,0,0,59.08,50.46Z"/>
+    </symbol>
+
+    <symbol id="hi-share-addon" viewBox="0 0 64 64">
+      <path d="M64.64,50.32c-1.28-4.08-4-6.65-7.53-7.28A11.31,11.31,0,1,0,37,43c-3.55.63-6.25,3.2-7.55,7.32a30.36,30.36,0,0,0-1.14,8C28.36,64.67,33,66,36.95,66H57.21c5.38,0,8.59-2.87,8.59-7.68A35.73,35.73,0,0,0,64.64,50.32Z" style="fill:#fff"/>
+      <circle cx="47.08" cy="37.86" r="8.9"/>
+      <path d="M57.21,64H36.95c-6,0-6.19-3.63-6.19-5.48a29.35,29.35,0,0,1,1-7.33c0.25-.77,1.7-5.86,7-5.86a2,2,0,0,1,1,.48,12.34,12.34,0,0,0,7.33,2.71c1,0,3.59-.08,7.32-2.73a2.43,2.43,0,0,1,1-.5c5.33,0,6.75,5.07,7,5.84a36.26,36.26,0,0,1,1,7.4C63.4,60.37,62.8,64,57.21,64Z"/>
+      <path d="M36.79,59a4.17,4.17,0,0,1-1.09-.24c0-.08,0-0.25,0-0.35a24.24,24.24,0,0,1,.79-5.77l0-.1a5.07,5.07,0,0,1,.8-1.63,1.94,1.94,0,0,1,.49-0.46,16.89,16.89,0,0,0,9.28,3c1.17,0,4.6,0,9.26-3a1.83,1.83,0,0,1,.5.45,5.12,5.12,0,0,1,.8,1.64l0,0.08a30.38,30.38,0,0,1,.79,5.73c0,0.09,0,.33,0,0.39a3.43,3.43,0,0,1-1.25.29H36.79Z" style="fill:#fff"/>
+      <circle cx="47.08" cy="37.86" r="4.01" style="fill:#fff"/>
+    </symbol>
   </svg>
 </%def>