Browse Source

[fb] Add custom icon for the Ozone File Browser

Johan Åhlén 2 years ago
parent
commit
ec50f22ac8

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/fb_components.mako

@@ -54,7 +54,7 @@ else:
         %elif path.lower().find('ofs://') == 0:
         %elif path.lower().find('ofs://') == 0:
           <li style="padding-top: 12px">
           <li style="padding-top: 12px">
             <span class="breadcrumb-link homeLink">
             <span class="breadcrumb-link homeLink">
-              <svg class="hi"><use xlink:href='#hi-adls'></use></svg>
+              <svg class="hi"><use xlink:href='#hi-ofs'></use></svg>
             </span>
             </span>
           </li>
           </li>
         %else:
         %else:

+ 1 - 0
desktop/core/src/desktop/js/components/sidebar/HueSidebar.vue

@@ -100,6 +100,7 @@
     'oozie-bundle': `<svg class="hi hi-fw"><use xlink:href="#hi-oozie-bundle"></use></svg>`,
     'oozie-bundle': `<svg class="hi hi-fw"><use xlink:href="#hi-oozie-bundle"></use></svg>`,
     'oozie-coordinator': `<svg class="hi hi-fw"><use xlink:href="#hi-oozie-coordinator"></use></svg>`,
     'oozie-coordinator': `<svg class="hi hi-fw"><use xlink:href="#hi-oozie-coordinator"></use></svg>`,
     'oozie-workflow': `<svg class="hi hi-fw"><use xlink:href="#hi-oozie-workflow"></use></svg>`,
     'oozie-workflow': `<svg class="hi hi-fw"><use xlink:href="#hi-oozie-workflow"></use></svg>`,
+    ofs: `<svg class="hi hi-fw"><use xlink:href="#hi-ofs"></use></svg>`,
     pig: `<svg class="hi hi-fw"><use xlink:href="#hi-pig"></use></svg>`,
     pig: `<svg class="hi hi-fw"><use xlink:href="#hi-pig"></use></svg>`,
     py: `<svg class="hi hi-fw"><use xlink:href="#hi-py"></use></svg>`,
     py: `<svg class="hi hi-fw"><use xlink:href="#hi-py"></use></svg>`,
     pyspark: `<svg class="hi hi-fw"><use xlink:href="#hi-spark"></use></svg>`,
     pyspark: `<svg class="hi hi-fw"><use xlink:href="#hi-spark"></use></svg>`,

+ 2 - 2
desktop/core/src/desktop/js/jquery/plugins/jquery.filechooser.js

@@ -132,8 +132,8 @@ const defaults = {
       home: '/?default_ofs_home',
       home: '/?default_ofs_home',
       icon: {
       icon: {
         svg: {
         svg: {
-          brand: '#hi-adls',
-          home: '#hi-adls'
+          brand: '#hi-ofs',
+          home: '#hi-ofs'
         },
         },
         brand: 'fa-windows',
         brand: 'fa-windows',
         home: 'fa-windows'
         home: 'fa-windows'

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

@@ -207,6 +207,13 @@
       <path d="M476.92,424.62,384.62,323.08h61.54V215.38h61.54V323.08h61.54Z"></path>
       <path d="M476.92,424.62,384.62,323.08h61.54V215.38h61.54V323.08h61.54Z"></path>
     </symbol>
     </symbol>
 
 
+    <symbol id="hi-ofs" viewBox="0 0 24 24">
+      <path d="M20.2,10.5h3.1c-0.1-1.5-0.5-3-1.2-4.2l-2.4,2.2C20,9.1,20.1,9.8,20.2,10.5z"></path>
+      <path d="M23.1,3.8l-9.8,0L9.6,7.3h3.9c0.2,0,0.3,0.1,0.3,0.2c0.1,0.1,0,0.3-0.1,0.4C13.7,8,7,14.5,5.8,15.6H11L4.1,24c1.4-1,4.7-3.5,7.1-5.3c2.7-2.1,8.2-6.6,9.4-7.5h-5.5L23.1,3.8z"></path>
+      <path d="M20,13.5c-0.9,3.5-4.2,6.1-8,6.1c-0.3,0-0.6,0-0.9,0c-1,0.8-2.1,1.6-3.1,2.4c1.3,0.5,2.6,0.7,4,0.7c6.3,0,11.3-5.1,11.3-11.3c0-0.2,0-0.4,0-0.6l-0.8,0.6C22.5,11.4,21.4,12.3,20,13.5z"></path>
+      <path d="M5.3,16.3h-1c0,0,0.2-0.2,0.6-0.6c-0.8-1.3-1.2-2.7-1.2-4.3c0-4.6,3.7-8.3,8.3-8.3c0.5,0,1,0.1,1.4,0.1h6.5c-2-2-4.8-3.2-7.9-3.2C5.7,0,0.6,5.1,0.6,11.3c0,4,2.1,7.5,5.2,9.6l2-2.4C6.9,17.9,6,17.2,5.3,16.3z"></path>
+    </symbol>
+
     <symbol id="hi-oozie" viewBox="0 0 640 640">
     <symbol id="hi-oozie" viewBox="0 0 640 640">
       <path d="M523.82,640H116.18A116.31,116.31,0,0,1,0,523.82V116.18A116.31,116.31,0,0,1,116.18,0H523.82A116.31,116.31,0,0,1,640,116.18V523.82A116.31,116.31,0,0,1,523.82,640ZM116.18,32.05a84.23,84.23,0,0,0-84.13,84.13V523.82a84.23,84.23,0,0,0,84.13,84.13H523.82a84.23,84.23,0,0,0,84.13-84.13V116.18a84.23,84.23,0,0,0-84.13-84.13Z"></path>
       <path d="M523.82,640H116.18A116.31,116.31,0,0,1,0,523.82V116.18A116.31,116.31,0,0,1,116.18,0H523.82A116.31,116.31,0,0,1,640,116.18V523.82A116.31,116.31,0,0,1,523.82,640ZM116.18,32.05a84.23,84.23,0,0,0-84.13,84.13V523.82a84.23,84.23,0,0,0,84.13,84.13H523.82a84.23,84.23,0,0,0,84.13-84.13V116.18a84.23,84.23,0,0,0-84.13-84.13Z"></path>
       <path d="M320,530c-115.79,0-210-94.21-210-210s94.21-210,210-210,210,94.21,210,210S435.79,530,320,530Zm0-388c-98.15,0-178,79.85-178,178s79.85,178,178,178,178-79.85,178-178S418.15,142,320,142Z"></path>
       <path d="M320,530c-115.79,0-210-94.21-210-210s94.21-210,210-210,210,94.21,210,210S435.79,530,320,530Zm0-388c-98.15,0-178,79.85-178,178s79.85,178,178,178,178-79.85,178-178S418.15,142,320,142Z"></path>