Przeglądaj źródła

HUE-1616 [core] Diversify Oozie icons for dashboard and editor

Added new icons
Renamed other oozie icons
Enrico Berti 12 lat temu
rodzic
commit
6117ca6

+ 3 - 3
apps/oozie/src/oozie/models.py

@@ -281,7 +281,7 @@ class Workflow(Job):
   objects = WorkflowManager()
 
   HUE_ID = 'hue-id-w'
-  ICON = '/oozie/static/art/icon_oozie_24_workflow.png'
+  ICON = '/oozie/static/art/icon_oozie_workflow_24.png'
 
   def get_type(self):
     return 'workflow'
@@ -1273,7 +1273,7 @@ class Coordinator(Job):
                                     help_text=_t('Additional properties to transmit to the workflow, e.g. limit=100, and EL functions, e.g. username=${coord:user()}'))
 
   HUE_ID = 'hue-id-c'
-  ICON = '/oozie/static/art/icon_oozie_24_coordinator.png'
+  ICON = '/oozie/static/art/icon_oozie_coordinator_24.png'
 
   def get_type(self):
     return 'coordinator'
@@ -1540,7 +1540,7 @@ class Bundle(Job):
   coordinators = models.ManyToManyField(Coordinator, through='BundledCoordinator')
 
   HUE_ID = 'hue-id-b'
-  ICON = '/oozie/static/art/icon_oozie_24_bundle.png'
+  ICON = '/oozie/static/art/icon_oozie_bundle_24.png'
 
   def get_type(self):
     return 'bundle'

+ 0 - 0
apps/oozie/static/art/icon_oozie_24_bundle.png → apps/oozie/static/art/icon_oozie_bundle_24.png


+ 0 - 0
apps/oozie/static/art/icon_oozie_24_coordinator.png → apps/oozie/static/art/icon_oozie_coordinator_24.png


BIN
apps/oozie/static/art/icon_oozie_dashboard_24.png


BIN
apps/oozie/static/art/icon_oozie_editor_24.png


+ 0 - 0
apps/oozie/static/art/icon_oozie_24_workflow.png → apps/oozie/static/art/icon_oozie_workflow_24.png


+ 2 - 2
desktop/core/src/desktop/templates/common_header.mako

@@ -295,8 +295,8 @@ from django.utils.translation import ugettext as _
        <li class="dropdown">
          <a title="${_('Schedule with Oozie')}" rel="navigator-tooltip" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Workflows')} <b class="caret"></b></a>
          <ul role="menu" class="dropdown-menu">
-           <li><a href="${ url('oozie:index') }"><img src="${ apps['oozie'].icon_path }"/> ${_('Dashboard')}</a></li>
-           <li><a href="${ url('oozie:list_workflows') }"><img src="${ apps['oozie'].icon_path }"/> ${_('Editor')}</a></li>
+           <li><a href="${ url('oozie:index') }"><img src="/oozie/static/art/icon_oozie_dashboard_24.png" /> ${_('Dashboard')}</a></li>
+           <li><a href="${ url('oozie:list_workflows') }"><img src="/oozie/static/art/icon_oozie_editor_24.png" /> ${_('Editor')}</a></li>
          </ul>
        </li>
        % endif

+ 3 - 3
desktop/core/src/desktop/templates/home.mako

@@ -109,9 +109,9 @@ ${ commonheader(_('Welcome Home'), "home", user) | n,unicode }
                 <li class="dropdown-submenu">
                   <a href="#"><img src="${ apps['oozie'].icon_path }"/> ${_('Oozie Scheduler')}</a>
                   <ul class="dropdown-menu">
-                    <li><a href="${ url('oozie:create_workflow') }"><img src="/oozie/static/art/icon_oozie_24_workflow.png"/> ${_('Workflow')}</a></li>
-                    <li><a href="${ url('oozie:create_coordinator') }"><img src="/oozie/static/art/icon_oozie_24_coordinator.png"/> ${_('Coordinator')}</a></li>
-                    <li><a href="${ url('oozie:create_bundle') }"><img src="/oozie/static/art/icon_oozie_24_bundle.png"/> ${_('Bundle')}</a></li>
+                    <li><a href="${ url('oozie:create_workflow') }"><img src="/oozie/static/art/icon_oozie_workflow_24.png"/> ${_('Workflow')}</a></li>
+                    <li><a href="${ url('oozie:create_coordinator') }"><img src="/oozie/static/art/icon_oozie_coordinator_24.png"/> ${_('Coordinator')}</a></li>
+                    <li><a href="${ url('oozie:create_bundle') }"><img src="/oozie/static/art/icon_oozie_bundle_24.png"/> ${_('Bundle')}</a></li>
                   </ul>
                 </li>
                 % endif