Răsfoiți Sursa

HUE-2076 [core] Create retina icons/logos

Retinified all the logos and images
Enrico Berti 11 ani în urmă
părinte
comite
8c29a4b
82 a modificat fișierele cu 101 adăugiri și 76 ștergeri
  1. 1 1
      apps/about/src/about/templates/admin_wizard.mako
  2. 1 1
      apps/about/src/about/templates/header.mako
  3. 1 1
      apps/beeswax/src/beeswax/settings.py
  4. 5 5
      apps/beeswax/src/beeswax/templates/layout.mako
  5. BIN
      apps/beeswax/static/art/icon_beeswax_48.png
  6. 1 1
      apps/filebrowser/src/filebrowser/settings.py
  7. BIN
      apps/filebrowser/src/filebrowser/static/art/icon_filebrowser_48.png
  8. 1 1
      apps/filebrowser/src/filebrowser/templates/fb_components.mako
  9. 1 1
      apps/hbase/src/hbase/settings.py
  10. 1 1
      apps/hbase/src/hbase/templates/app.mako
  11. 0 0
      apps/hbase/static/art/icon_hbase_24.png
  12. BIN
      apps/hbase/static/art/icon_hbase_48.png
  13. 1 1
      apps/impala/src/impala/settings.py
  14. BIN
      apps/impala/static/art/icon_impala_48.png
  15. 1 1
      apps/jobbrowser/src/jobbrowser/settings.py
  16. 1 1
      apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako
  17. BIN
      apps/jobbrowser/static/art/icon_jobbrowser_48.png
  18. 1 1
      apps/jobsub/src/jobsub/settings.py
  19. 1 1
      apps/jobsub/src/jobsub/templates/designs.mako
  20. BIN
      apps/jobsub/static/art/icon_jobsub_48.png
  21. 1 1
      apps/metastore/src/metastore/settings.py
  22. 1 1
      apps/metastore/src/metastore/templates/components.mako
  23. BIN
      apps/metastore/static/art/icon_metastore_48.png
  24. 3 3
      apps/oozie/src/oozie/models.py
  25. 1 1
      apps/oozie/src/oozie/settings.py
  26. 2 2
      apps/oozie/src/oozie/templates/navigation-bar.mako
  27. BIN
      apps/oozie/static/art/action.png
  28. BIN
      apps/oozie/static/art/decision.png
  29. BIN
      apps/oozie/static/art/decision_end.png
  30. BIN
      apps/oozie/static/art/droppable.png
  31. BIN
      apps/oozie/static/art/fork.png
  32. BIN
      apps/oozie/static/art/icon_oozie_48.png
  33. BIN
      apps/oozie/static/art/icon_oozie_bundle_48.png
  34. BIN
      apps/oozie/static/art/icon_oozie_coordinator_48.png
  35. BIN
      apps/oozie/static/art/icon_oozie_dashboard_48.png
  36. BIN
      apps/oozie/static/art/icon_oozie_editor_48.png
  37. BIN
      apps/oozie/static/art/icon_oozie_workflow_48.png
  38. BIN
      apps/oozie/static/art/join.png
  39. 1 1
      apps/pig/src/pig/settings.py
  40. 1 1
      apps/pig/src/pig/templates/app.mako
  41. BIN
      apps/pig/static/art/icon_pig_48.png
  42. 1 1
      apps/rdbms/src/rdbms/settings.py
  43. 1 1
      apps/rdbms/src/rdbms/templates/common.mako
  44. BIN
      apps/rdbms/static/art/icon_rdbms_48.png
  45. 5 5
      apps/search/src/search/models.py
  46. 1 1
      apps/search/src/search/settings.py
  47. 1 1
      apps/search/src/search/templates/admin_collections.mako
  48. BIN
      apps/search/static/art/icon_logs_48.png
  49. BIN
      apps/search/static/art/icon_search_48.png
  50. BIN
      apps/search/static/art/icon_twitter_48.png
  51. BIN
      apps/search/static/art/icon_yelp_48.png
  52. 1 1
      apps/spark/src/spark/settings.py
  53. 1 1
      apps/spark/src/spark/templates/common.mako
  54. BIN
      apps/spark/static/art/icon_spark_48.png
  55. 1 1
      apps/sqoop/src/sqoop/settings.py
  56. BIN
      apps/sqoop/static/art/icon_sqoop_48.png
  57. 1 1
      apps/useradmin/src/useradmin/settings.py
  58. 1 1
      apps/useradmin/src/useradmin/templates/layout.mako
  59. BIN
      apps/useradmin/static/art/icon_useradmin_48.png
  60. 1 1
      apps/zookeeper/src/zookeeper/settings.py
  61. 1 1
      apps/zookeeper/src/zookeeper/templates/shared_components.mako
  62. 0 0
      apps/zookeeper/static/art/icon_zookeeper_24.png
  63. BIN
      apps/zookeeper/static/art/icon_zookeeper_48.png
  64. 1 1
      desktop/core/src/desktop/app_template/src/app_name/settings.py
  65. BIN
      desktop/core/src/desktop/app_template/src/app_name/static/art/icon_app_name_48.png
  66. 1 1
      desktop/core/src/desktop/app_template/src/app_name/templates/shared_components.mako
  67. 1 1
      desktop/core/src/desktop/app_template_proxy/src/app_name/settings.py
  68. BIN
      desktop/core/src/desktop/app_template_proxy/src/app_name/static/art/icon_app_name_48.png
  69. 2 2
      desktop/core/src/desktop/models.py
  70. 1 1
      desktop/core/src/desktop/templates/about_layout.mako
  71. 12 0
      desktop/core/src/desktop/templates/common_footer.mako
  72. 15 15
      desktop/core/src/desktop/templates/common_header.mako
  73. 10 10
      desktop/core/src/desktop/templates/home.mako
  74. 9 1
      desktop/core/src/desktop/templates/login.mako
  75. BIN
      desktop/core/static/art/home.png
  76. BIN
      desktop/core/static/art/hue-login-logo-ellie.png
  77. BIN
      desktop/core/static/art/hue-login-logo-ellie@2x.png
  78. BIN
      desktop/core/static/art/hue-logo-mini-white-hover.png
  79. BIN
      desktop/core/static/art/hue-logo-mini-white.png
  80. BIN
      desktop/core/static/art/icon_hue_48.png
  81. 5 0
      desktop/core/static/css/hue3.css
  82. 1 1
      desktop/libs/indexer/src/indexer/settings.py

+ 1 - 1
apps/about/src/about/templates/admin_wizard.mako

@@ -160,7 +160,7 @@ ${ header.menubar() }
                 <div class="card-body">
                   <p>
                     <a href="${ url('useradmin.views.list_users') }" target="_blank" style="padding-left: 2px"><img
-                        src="/useradmin/static/art/icon_useradmin_24.png"
+                        src="/useradmin/static/art/icon_useradmin_48.png" class="app-icon"
                         style="margin-right: 4px;"> ${ _('User Admin') }</a>
                   </p>
                 </div>

+ 1 - 1
apps/about/src/about/templates/header.mako

@@ -24,7 +24,7 @@ from django.utils.translation import ugettext as _
           <div class="nav-collapse">
             <ul class="nav">
               <li class="currentApp">
-                <a href="/${app_name}"><img src="/static/art/icon_hue_24.png" />
+                <a href="/${app_name}"><img src="/static/art/icon_hue_48.png" class="app-icon" />
                 ${ _('About Hue') }</a>
                </li>
                % if user.is_superuser:

+ 1 - 1
apps/beeswax/src/beeswax/settings.py

@@ -16,7 +16,7 @@
 DJANGO_APPS = [ "beeswax" ]
 NICE_NAME = "Hive Editor"
 REQUIRES_HADOOP = True
-ICON = "/beeswax/static/art/icon_beeswax_24.png"
+ICON = "/beeswax/static/art/icon_beeswax_48.png"
 MENU_INDEX = 10
 
 IS_URL_NAMESPACED = True

+ 5 - 5
apps/beeswax/src/beeswax/templates/layout.mako

@@ -37,7 +37,7 @@ def is_selected(section, matcher):
           <ul class="nav">
             <li class="currentApp">
               <a href="/spark">
-                <img src="/spark/static/art/icon_spark_24.png" />
+                <img src="/spark/static/art/icon_spark_48.png" class="app-icon" />
                 ${ _('Spark Igniter') }
               </a>
             </li>
@@ -62,13 +62,13 @@ def is_selected(section, matcher):
               <li class="currentApp">
                 <a href="/${app_name}">
                 % if app_name == 'impala':
-                  <img src="/impala/static/art/icon_impala_24.png" />
+                  <img src="/impala/static/art/icon_impala_48.png" class="app-icon" />
                   Impala
                 % elif app_name == 'rdbms':
-                  <img src="/rdbms/static/art/icon_rdbms_24.png" />
+                  <img src="/rdbms/static/art/icon_rdbms_48.png" class="app-icon" />
                   DB Query
                 % else:
-                  <img src="/beeswax/static/art/icon_beeswax_24.png" />
+                  <img src="/beeswax/static/art/icon_beeswax_48.png" class="app-icon" />
                   Hive Editor
                 % endif
                 </a>
@@ -93,7 +93,7 @@ def is_selected(section, matcher):
             <ul class="nav">
               <li class="currentApp">
                 <a href="/metastore">
-                  <img src="/metastore/static/art/icon_metastore_24.png" />
+                  <img src="/metastore/static/art/icon_metastore_48.png" class="app-icon" />
                   ${ _('Metastore Manager') }
                 </a>
               </li>

BIN
apps/beeswax/static/art/icon_beeswax_48.png


+ 1 - 1
apps/filebrowser/src/filebrowser/settings.py

@@ -18,5 +18,5 @@
 DJANGO_APPS = ['filebrowser']
 NICE_NAME = "File Browser"
 REQUIRES_HADOOP = False
-ICON = "/filebrowser/static/art/icon_filebrowser_24.png"
+ICON = "/filebrowser/static/art/icon_filebrowser_48.png"
 MENU_INDEX = 20

BIN
apps/filebrowser/src/filebrowser/static/art/icon_filebrowser_48.png


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

@@ -64,7 +64,7 @@ from django.utils.translation import ugettext as _
             <ul class="nav">
               <li class="currentApp">
                 <a href="/${app_name}">
-                  <img src="/filebrowser/static/art/icon_filebrowser_24.png" />
+                  <img src="/filebrowser/static/art/icon_filebrowser_48.png" class="app-icon" />
                   ${ _('File Browser') }
                 </a>
               </li>

+ 1 - 1
apps/hbase/src/hbase/settings.py

@@ -16,7 +16,7 @@
 DJANGO_APPS = ['hbase']
 NICE_NAME = 'HBase Browser'
 MENU_INDEX = 55
-ICON = '/hbase/static/art/icon_24.png'
+ICON = '/hbase/static/art/icon_hbase_48.png'
 
 REQUIRES_HADOOP = False
 IS_URL_NAMESPACED = True

+ 1 - 1
apps/hbase/src/hbase/templates/app.mako

@@ -31,7 +31,7 @@ ${ commonheader(None, "hbase", user) | n,unicode }
         <ul class="nav">
           <li class="currentApp">
             <a href="/${app_name}">
-              <img src="/hbase/static/art/icon_24.png" />
+              <img src="/hbase/static/art/icon_hbase_48.png" class="app-icon" />
               ${ _('HBase Browser') }
             </a>
           </li>

+ 0 - 0
apps/hbase/static/art/icon_24.png → apps/hbase/static/art/icon_hbase_24.png


BIN
apps/hbase/static/art/icon_hbase_48.png


+ 1 - 1
apps/impala/src/impala/settings.py

@@ -17,7 +17,7 @@
 DJANGO_APPS = ['impala']
 NICE_NAME = 'Impala Editor'
 MENU_INDEX = 11
-ICON = '/impala/static/art/icon_impala_24.png'
+ICON = '/impala/static/art/icon_impala_48.png'
 
 REQUIRES_HADOOP = False
 IS_URL_NAMESPACED = True

BIN
apps/impala/static/art/icon_impala_48.png


+ 1 - 1
apps/jobbrowser/src/jobbrowser/settings.py

@@ -21,5 +21,5 @@
 DJANGO_APPS = ['jobbrowser']
 NICE_NAME = "Job Browser"
 REQUIRES_HADOOP = True
-ICON = "/jobbrowser/static/art/icon_jobbrowser_24.png"
+ICON = "/jobbrowser/static/art/icon_jobbrowser_48.png"
 MENU_INDEX = 30

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako

@@ -235,7 +235,7 @@
             <ul class="nav">
               <li class="currentApp">
                 <a href="/${app_name}">
-                  <img src="/jobbrowser/static/art/icon_jobbrowser_24.png" />
+                  <img src="/jobbrowser/static/art/icon_jobbrowser_48.png" class="app-icon"/>
                   ${ _('Job Browser') }
                 </a>
               </li>

BIN
apps/jobbrowser/static/art/icon_jobbrowser_48.png


+ 1 - 1
apps/jobsub/src/jobsub/settings.py

@@ -19,5 +19,5 @@ REQUIRES_HADOOP = True
 
 MIDDLEWARE_CLASSES=[]
 
-ICON = "/jobsub/static/art/icon_jobsub_24.png"
+ICON = "/jobsub/static/art/icon_jobsub_48.png"
 MENU_INDEX = 40

+ 1 - 1
apps/jobsub/src/jobsub/templates/designs.mako

@@ -47,7 +47,7 @@ ${ commonheader(None, "jobsub", user) | n,unicode }
           <ul class="nav">
             <li class="currentApp">
               <a href="/${app_name}">
-                <img src="/jobsub/static/art/icon_jobsub_24.png" />
+                <img src="/jobsub/static/art/icon_jobsub_48.png" class="app-icon" />
                 ${ _('Job Designer') }
               </a>
             </li>

BIN
apps/jobsub/static/art/icon_jobsub_48.png


+ 1 - 1
apps/metastore/src/metastore/settings.py

@@ -18,7 +18,7 @@
 DJANGO_APPS = ['metastore']
 NICE_NAME = "Metastore Manager"
 REQUIRES_HADOOP = True
-ICON = "/metastore/static/art/icon_metastore_24.png"
+ICON = "/metastore/static/art/icon_metastore_48.png"
 MENU_INDEX = 20
 
 IS_URL_NAMESPACED = True

+ 1 - 1
apps/metastore/src/metastore/templates/components.mako

@@ -26,7 +26,7 @@
             <ul class="nav">
               <li class="currentApp">
                 <a href="/${app_name}">
-                  <img src="/metastore/static/art/icon_metastore_24.png" />
+                  <img src="/metastore/static/art/icon_metastore_48.png" class="app-icon" />
                   ${ _('Metastore Manager') }
                 </a>
               </li>

BIN
apps/metastore/static/art/icon_metastore_48.png


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

@@ -340,7 +340,7 @@ class Workflow(Job):
   objects = WorkflowManager()
 
   HUE_ID = 'hue-id-w'
-  ICON = '/oozie/static/art/icon_oozie_workflow_24.png'
+  ICON = '/oozie/static/art/icon_oozie_workflow_48.png'
   METADATA_FORMAT_VERSION = "0.0.1"
 
   def get_type(self):
@@ -1416,7 +1416,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_coordinator_24.png'
+  ICON = '/oozie/static/art/icon_oozie_coordinator_48.png'
   METADATA_FORMAT_VERSION = "0.0.1"
 
   def get_type(self):
@@ -1750,7 +1750,7 @@ class Bundle(Job):
   coordinators = models.ManyToManyField(Coordinator, through='BundledCoordinator')
 
   HUE_ID = 'hue-id-b'
-  ICON = '/oozie/static/art/icon_oozie_bundle_24.png'
+  ICON = '/oozie/static/art/icon_oozie_bundle_48.png'
   METADATA_FORMAT_VERSION = '0.0.1'
 
   def get_type(self):

+ 1 - 1
apps/oozie/src/oozie/settings.py

@@ -16,7 +16,7 @@
 
 DJANGO_APPS=['oozie']
 NICE_NAME = "Oozie Editor/Dashboard"
-ICON = "/oozie/static/art/icon_oozie_24.png"
+ICON = "/oozie/static/art/icon_oozie_48.png"
 MENU_INDEX = 41
 
 REQUIRES_HADOOP = True

+ 2 - 2
apps/oozie/src/oozie/templates/navigation-bar.mako

@@ -30,9 +30,9 @@
               <li class="currentApp">
                 <a href="/${app_name}">
                   % if dashboard:
-                    <img src="/oozie/static/art/icon_oozie_dashboard_24.png" />
+                    <img src="/oozie/static/art/icon_oozie_dashboard_48.png" class="app-icon" />
                   % else:
-                    <img src="/oozie/static/art/icon_oozie_editor_24.png" />
+                    <img src="/oozie/static/art/icon_oozie_editor_48.png" class="app-icon" />
                   % endif
                   ${ _('Oozie Dashboard') if dashboard else _('Oozie Editor') }
                 </a>

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


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


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


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


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


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


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


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


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


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


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


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


+ 1 - 1
apps/pig/src/pig/settings.py

@@ -16,7 +16,7 @@
 DJANGO_APPS = ['pig']
 NICE_NAME = 'Pig Editor'
 MENU_INDEX = 12
-ICON = '/pig/static/art/icon_pig_24.png'
+ICON = '/pig/static/art/icon_pig_48.png'
 
 REQUIRES_HADOOP = False
 IS_URL_NAMESPACED = True

+ 1 - 1
apps/pig/src/pig/templates/app.mako

@@ -29,7 +29,7 @@ ${ commonheader(None, "pig", user) | n,unicode }
           <ul class="nav">
             <li class="currentApp">
               <a href="/${app_name}">
-                <img src="/pig/static/art/icon_pig_24.png" />
+                <img src="/pig/static/art/icon_pig_48.png" class="app-icon"/>
                 ${ _('Pig Editor') }
               </a>
             </li>

BIN
apps/pig/static/art/icon_pig_48.png


+ 1 - 1
apps/rdbms/src/rdbms/settings.py

@@ -17,7 +17,7 @@
 DJANGO_APPS = ['rdbms']
 NICE_NAME = 'RDBMS UI'
 MENU_INDEX = 11
-ICON = '/rdbms/static/art/icon_rdbms_24.png'
+ICON = '/rdbms/static/art/icon_rdbms_48.png'
 
 REQUIRES_HADOOP = False
 IS_URL_NAMESPACED = True

+ 1 - 1
apps/rdbms/src/rdbms/templates/common.mako

@@ -23,7 +23,7 @@
           <ul class="nav">
             <li class="currentApp">
               <a href="/rdbms">
-                <img src="/rdbms/static/art/icon_rdbms_24.png" />
+                <img src="/rdbms/static/art/icon_rdbms_48.png" class="app-icon" />
                 ${ _('DB Query') }
               </a>
             </li>

BIN
apps/rdbms/static/art/icon_rdbms_48.png


+ 5 - 5
apps/search/src/search/models.py

@@ -240,7 +240,7 @@ class Collection(models.Model):
   sorting = models.ForeignKey(Sorting)
 
   _ATTRIBUTES = ['collection', 'layout', 'autocomplete']
-  ICON = '/search/static/art/icon_search_24.png'
+  ICON = '/search/static/art/icon_search_48.png'
 
   objects = CollectionManager()
 
@@ -369,13 +369,13 @@ class Collection(models.Model):
   @property
   def icon(self):
     if self.name == 'twitter_demo':
-      return '/search/static/art/icon_twitter.png'
+      return '/search/static/art/icon_twitter_48.png'
     elif self.name == 'yelp_demo':
-      return '/search/static/art/icon_yelp.png'
+      return '/search/static/art/icon_yelp_48.png'
     elif self.name == 'log_analytics_demo':
-      return '/search/static/art/icon_logs.png'
+      return '/search/static/art/icon_logs_48.png'
     else:
-      return '/search/static/art/icon_search_24.png'
+      return '/search/static/art/icon_search_48.png'
 
   def _import_hue_3_5_collections(self, props, user):
     props['collection']['template']['template'] = self.result.get_template()

+ 1 - 1
apps/search/src/search/settings.py

@@ -17,7 +17,7 @@
 DJANGO_APPS = ["search"]
 NICE_NAME = "Solr Search"
 MENU_INDEX = 42
-ICON = "/search/static/art/icon_search_24.png"
+ICON = "/search/static/art/icon_search_48.png"
 
 REQUIRES_HADOOP = False
 IS_URL_NAMESPACED = True

+ 1 - 1
apps/search/src/search/templates/admin_collections.mako

@@ -81,7 +81,7 @@ ${ commonheader(_('Search'), "search", user, "29px") | n,unicode }
         <a data-bind="click: $root.copyCollection, clickBubble: false"><i class="fa fa-files-o"></i> ${_('Copy')}</a> &nbsp;
         <a data-bind="click: $root.markForDeletion, clickBubble: false"><i class="fa fa-times"></i> ${_('Delete')}</a>
       </div>
-      <h4><img src="/search/static/art/icon_search_24.png"/> <span data-bind="text: label"></span></h4>
+      <h4><img src="/search/static/art/icon_search_48.png" class="app-icon"/> <span data-bind="text: label"></span></h4>
     </li>
   </script>
   </div>

BIN
apps/search/static/art/icon_logs_48.png


BIN
apps/search/static/art/icon_search_48.png


BIN
apps/search/static/art/icon_twitter_48.png


BIN
apps/search/static/art/icon_yelp_48.png


+ 1 - 1
apps/spark/src/spark/settings.py

@@ -17,7 +17,7 @@
 DJANGO_APPS = ['spark']
 NICE_NAME = 'Spark Editor'
 MENU_INDEX = 11
-ICON = '/spark/static/art/icon_spark_24.png'
+ICON = '/spark/static/art/icon_spark_48.png'
 
 REQUIRES_HADOOP = False
 IS_URL_NAMESPACED = True

+ 1 - 1
apps/spark/src/spark/templates/common.mako

@@ -34,7 +34,7 @@ def is_selected(section, matcher):
           <ul class="nav">
             <li class="currentApp">
               <a href="/spark">
-                <img src="/spark/static/art/icon_spark_24.png" />
+                <img src="/spark/static/art/icon_spark_48.png" class="app-icon"/>
                 ${ _('Spark Igniter') }
               </a>
             </li>

BIN
apps/spark/static/art/icon_spark_48.png


+ 1 - 1
apps/sqoop/src/sqoop/settings.py

@@ -16,7 +16,7 @@
 DJANGO_APPS = ['sqoop']
 NICE_NAME = 'Sqoop'
 MENU_INDEX = 20
-ICON = '/sqoop/static/art/icon_sqoop_24.png'
+ICON = '/sqoop/static/art/icon_sqoop_48.png'
 
 REQUIRES_HADOOP = False
 IS_URL_NAMESPACED = True

BIN
apps/sqoop/static/art/icon_sqoop_48.png


+ 1 - 1
apps/useradmin/src/useradmin/settings.py

@@ -17,7 +17,7 @@
 DJANGO_APPS = [ "useradmin" ]
 NICE_NAME = "User Admin"
 REQUIRES_HADOOP = False
-ICON = "/useradmin/static/art/icon_useradmin_24.png"
+ICON = "/useradmin/static/art/icon_useradmin_48.png"
 MENU_INDEX = 60
 
 PERMISSION_ACTIONS = (

+ 1 - 1
apps/useradmin/src/useradmin/templates/layout.mako

@@ -55,7 +55,7 @@ def is_selected(section, matcher):
             <ul class="nav">
               <li class="currentApp">
                 <a href="/${app_name}">
-                  <img src="/useradmin/static/art/icon_useradmin_24.png" />
+                  <img src="/useradmin/static/art/icon_useradmin_48.png" class="app-icon" />
                   ${ _('User Admin') }
                 </a>
               </li>

BIN
apps/useradmin/static/art/icon_useradmin_48.png


+ 1 - 1
apps/zookeeper/src/zookeeper/settings.py

@@ -18,5 +18,5 @@
 DJANGO_APPS = [ "zookeeper" ]
 NICE_NAME = "ZooKeeper Browser"
 MENU_INDEX = 58
-ICON = '/zookeeper/static/art/icon_24.png'
+ICON = '/zookeeper/static/art/icon_zookeeper_48.png'
 IS_URL_NAMESPACED = True

+ 1 - 1
apps/zookeeper/src/zookeeper/templates/shared_components.mako

@@ -77,7 +77,7 @@
             <ul class="nav">
               <li class="currentApp">
                 <a href="/${app_name}">
-                  <img src="/zookeeper/static/art/icon_24.png" />
+                  <img src="/zookeeper/static/art/icon_zookeeper_48.png" class="app-icon"/>
                   ${ _('ZooKeeper Browser') }
                 </a>
                </li>

+ 0 - 0
apps/zookeeper/static/art/icon_24.png → apps/zookeeper/static/art/icon_zookeeper_24.png


BIN
apps/zookeeper/static/art/icon_zookeeper_48.png


+ 1 - 1
desktop/core/src/desktop/app_template/src/app_name/settings.py

@@ -16,4 +16,4 @@
 DJANGO_APPS = [ "${app_name}" ]
 REQUIRES_HADOOP = False
 MENU_INDEX = 100
-ICON = "/${app_name}/static/art/icon_${app_name}_24.png"
+ICON = "/${app_name}/static/art/icon_${app_name}_48.png"

BIN
desktop/core/src/desktop/app_template/src/app_name/static/art/icon_app_name_48.png


+ 1 - 1
desktop/core/src/desktop/app_template/src/app_name/templates/shared_components.mako

@@ -30,7 +30,7 @@ ${'<%'}def name="menubar(section='')">
           <ul class="nav">
             <li class="currentApp">
               <a href="/${app_name}">
-                <img src="/${app_name}/static/art/icon_${app_name}_24.png" />
+                <img src="/${app_name}/static/art/icon_${app_name}_48.png" class="app-icon" />
                 ${" ".join(word.capitalize() for word in app_name.split("_"))}
               </a>
              </li>

+ 1 - 1
desktop/core/src/desktop/app_template_proxy/src/app_name/settings.py

@@ -17,4 +17,4 @@ DJANGO_APPS = [ "${app_name}" ]
 NICE_NAME = "${app_name}"
 REQUIRES_HADOOP = False
 MENU_INDEX = 100
-ICON = "/${app_name}/static/art/icon_${app_name}_24.png"
+ICON = "/${app_name}/static/art/icon_${app_name}_48.png"

BIN
desktop/core/src/desktop/app_template_proxy/src/app_name/static/art/icon_app_name_48.png


+ 2 - 2
desktop/core/src/desktop/models.py

@@ -449,10 +449,10 @@ class Document(models.Model):
       elif self.content_type.app_label in apps:
         return apps[self.content_type.app_label].icon_path
       else:
-        return '/static/art/favicon.png'
+        return '/static/art/icon_hue_48.png'
     except Exception, e:
       LOG.warn(force_unicode(e))
-      return '/static/art/favicon.png'
+      return '/static/art/icon_hue_48.png'
 
   def share(self, users, groups, name='read'):
     DocumentPermission.objects.filter(document=self, name=name).update(users=users, groups=groups, add=True)

+ 1 - 1
desktop/core/src/desktop/templates/about_layout.mako

@@ -35,7 +35,7 @@ def is_selected(section, matcher):
             <ul class="nav">
               <li class="currentApp">
                 <a href="/about">
-                  <img src="/static/art/icon_hue_24.png" />
+                  <img src="/static/art/icon_hue_48.png" class="app-icon" />
                   ${ _('About Hue') }
                 </a>
                </li>

+ 12 - 0
desktop/core/src/desktop/templates/common_footer.mako

@@ -117,6 +117,17 @@ from django.template.defaultfilters import escape, escapejs
           return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
         }
     %endif
+
+
+##    if (window.devicePixelRatio > 1) {
+##        $('img').each(function(i) {
+##            var lowres = $(this).attr('src');
+##            var highres = lowres.replace(".", "@2x.");
+##            $(this).attr('src', highres).attr("width", "24").attr("height", "24");
+##        });
+##    }
+
+
   });
 
   function resetPrimaryButtonsStatus() {
@@ -148,6 +159,7 @@ from django.template.defaultfilters import escape, escapejs
     }
   });
 
+
     %if collect_usage:
 
       var _gaq = _gaq || [];

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

@@ -322,7 +322,7 @@ from django.utils.translation import ugettext as _
   % endif
 
   </div>
-    <a class="brand nav-tooltip pull-left" title="${_('About Hue')}" rel="navigator-tooltip" href="/about"><img src="/static/art/hue-logo-mini-white.png" data-orig="/static/art/hue-logo-mini-white.png" data-hover="/static/art/hue-logo-mini-white-hover.png"/></a>
+    <a class="brand nav-tooltip pull-left" title="${_('About Hue')}" rel="navigator-tooltip" href="/about"><img width="60" height="12" src="/static/art/hue-logo-mini-white.png" data-orig="/static/art/hue-logo-mini-white.png" data-hover="/static/art/hue-logo-mini-white-hover.png"/></a>
     % if user.is_authenticated() and section != 'login':
      <ul class="nav nav-pills pull-left">
        <li><a title="${_('My documents')}" rel="navigator-tooltip" href="${ url('desktop.views.home') }" style="padding-bottom:2px!important"><i class="fa fa-home" style="font-size: 19px"></i></a></li>        
@@ -334,22 +334,22 @@ from django.utils.translation import ugettext as _
          <a title="${_('Query data')}" rel="navigator-tooltip" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Query Editors')} <b class="caret"></b></a>
          <ul role="menu" class="dropdown-menu">
            % if 'beeswax' in apps:
-           <li><a href="/${apps['beeswax'].display_name}"><img src="${ apps['beeswax'].icon_path }"/> ${_('Hive')}</a></li>
+           <li><a href="/${apps['beeswax'].display_name}"><img src="${ apps['beeswax'].icon_path }" class="app-icon"/> ${_('Hive')}</a></li>
            % endif
            % if 'impala' in apps:
-           <li><a href="/${apps['impala'].display_name}"><img src="${ apps['impala'].icon_path }"/> ${_('Impala')}</a></li>
+           <li><a href="/${apps['impala'].display_name}"><img src="${ apps['impala'].icon_path }" class="app-icon"/> ${_('Impala')}</a></li>
            % endif
            % if 'rdbms' in apps:
-           <li><a href="/${apps['rdbms'].display_name}"><img src="${ apps['rdbms'].icon_path }"/> ${_('DB Query')}</a></li>
+           <li><a href="/${apps['rdbms'].display_name}"><img src="${ apps['rdbms'].icon_path }" class="app-icon"/> ${_('DB Query')}</a></li>
            % endif
            % if 'pig' in apps:
-           <li><a href="/${apps['pig'].display_name}"><img src="${ apps['pig'].icon_path }"/> ${_('Pig')}</a></li>
+           <li><a href="/${apps['pig'].display_name}"><img src="${ apps['pig'].icon_path }" class="app-icon"/> ${_('Pig')}</a></li>
            % endif
            % if 'jobsub' in apps:
-           <li><a href="/${apps['jobsub'].display_name}"><img src="${ apps['jobsub'].icon_path }"/> ${_('Job Designer')}</a></li>
+           <li><a href="/${apps['jobsub'].display_name}"><img src="${ apps['jobsub'].icon_path }" class="app-icon"/> ${_('Job Designer')}</a></li>
            % endif
            % if 'spark' in apps:
-           <li><a href="/${apps['spark'].display_name}"><img src="${ apps['spark'].icon_path }"/> ${_('Spark')}</a></li>
+           <li><a href="/${apps['spark'].display_name}"><img src="${ apps['spark'].icon_path }" class="app-icon"/> ${_('Spark')}</a></li>
            % endif
          </ul>
        </li>
@@ -364,16 +364,16 @@ from django.utils.translation import ugettext as _
          <a title="${_('Manage data')}" rel="navigator-tooltip" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Data Browsers')} <b class="caret"></b></a>
          <ul role="menu" class="dropdown-menu">
            % if 'metastore' in apps:
-           <li><a href="/${apps['metastore'].display_name}"><img src="${ apps['metastore'].icon_path }"/> ${_('Metastore Tables')}</a></li>
+           <li><a href="/${apps['metastore'].display_name}"><img src="${ apps['metastore'].icon_path }" class="app-icon"/> ${_('Metastore Tables')}</a></li>
            % endif
            % if 'hbase' in apps:
-           <li><a href="/${apps['hbase'].display_name}"><img src="${ apps['hbase'].icon_path }"/> ${_('HBase')}</a></li>
+           <li><a href="/${apps['hbase'].display_name}"><img src="${ apps['hbase'].icon_path }" class="app-icon"/> ${_('HBase')}</a></li>
            % endif
            % if 'sqoop' in apps:
-           <li><a href="/${apps['sqoop'].display_name}"><img src="${ apps['sqoop'].icon_path }"/> ${_('Sqoop Transfer')}</a></li>
+           <li><a href="/${apps['sqoop'].display_name}"><img src="${ apps['sqoop'].icon_path }" class="app-icon"/> ${_('Sqoop Transfer')}</a></li>
            % endif
            % if 'zookeeper' in apps:
-           <li><a href="/${apps['zookeeper'].display_name}"><img src="${ apps['zookeeper'].icon_path }"/> ${_('ZooKeeper')}</a></li>
+           <li><a href="/${apps['zookeeper'].display_name}"><img src="${ apps['zookeeper'].icon_path }" class="app-icon"/> ${_('ZooKeeper')}</a></li>
            % endif
          </ul>
        </li>
@@ -384,8 +384,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="/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>
+           <li><a href="${ url('oozie:index') }"><img src="/oozie/static/art/icon_oozie_dashboard_48.png" class="app-icon" /> ${_('Dashboard')}</a></li>
+           <li><a href="${ url('oozie:list_workflows') }"><img src="/oozie/static/art/icon_oozie_editor_48.png" class="app-icon" /> ${_('Editor')}</a></li>
          </ul>
        </li>
        % endif
@@ -401,7 +401,7 @@ from django.utils.translation import ugettext as _
              <a title="${_('Solr Search')}" rel="navigator-tooltip" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Search')} <b class="caret"></b></a>
              <ul role="menu" class="dropdown-menu">
                % for collection in collections:
-               <li><a href="${ url('search:index') }?collection=${ collection.id }"><img src="${ collection.icon }"/> ${ collection.label }</a></li>
+               <li><a href="${ url('search:index') }?collection=${ collection.id }"><img src="${ collection.icon }" class="app-icon"/> ${ collection.label }</a></li>
                % endfor
                % if user.is_superuser:
                  <li class="divider"></li>
@@ -416,7 +416,7 @@ from django.utils.translation import ugettext as _
          <a href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Other apps')} <b class="caret"></b></a>
          <ul role="menu" class="dropdown-menu">
            % for other in other_apps:
-             <li><a href="/${ other.display_name }"><img src="${ other.icon_path }"/> ${ other.nice_name }</a></li>
+             <li><a href="/${ other.display_name }"><img src="${ other.icon_path }" class="app-icon"/> ${ other.nice_name }</a></li>
            % endfor
          </ul>
        </li>

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

@@ -102,7 +102,7 @@ ${ commonheader(_('Welcome Home'), "home", user) | n,unicode }
         <ul class="nav">
           <li class="currentApp">
             <a href="${ url('desktop.views.home') }">
-              <img src="/static/art/home.png" />
+              <img src="/static/art/home.png" class="app-icon" />
               ${ _('My documents') }
             </a>
            </li>
@@ -122,24 +122,24 @@ ${ commonheader(_('Welcome Home'), "home", user) | n,unicode }
               <a href="#" data-toggle="dropdown"><i class="fa fa-plus-circle"></i> ${_('New document')}</a>
               <ul class="dropdown-menu" role="menu">
                 % if 'beeswax' in apps:
-                <li><a href="${ url('beeswax:index') }"><img src="${ apps['beeswax'].icon_path }"/> ${_('Hive Query')}</a></li>
+                <li><a href="${ url('beeswax:index') }"><img src="${ apps['beeswax'].icon_path }" class="app-icon"/> ${_('Hive Query')}</a></li>
                 % endif
                 % if 'impala' in apps:
-                <li><a href="${ url('impala:index') }"><img src="${ apps['impala'].icon_path }"/> ${_('Impala Query')}</a></li>
+                <li><a href="${ url('impala:index') }"><img src="${ apps['impala'].icon_path }" class="app-icon"/> ${_('Impala Query')}</a></li>
                 % endif
                 % if 'pig' in apps:
-                <li><a href="${ url('beeswax:index') }"><img src="${ apps['pig'].icon_path }"/> ${_('Pig Script')}</a></li>
+                <li><a href="${ url('beeswax:index') }"><img src="${ apps['pig'].icon_path }" class="app-icon"/> ${_('Pig Script')}</a></li>
                 % endif
                 % if 'spark' in apps:
-                <li><a href="${ url('spark:index') }"><img src="${ apps['spark'].icon_path }"/> ${_('Spark Job')}</a></li>
+                <li><a href="${ url('spark:index') }"><img src="${ apps['spark'].icon_path }" class="app-icon"/> ${_('Spark Job')}</a></li>
                 % endif
                 % if 'oozie' in apps:
                 <li class="dropdown-submenu">
-                  <a href="#"><img src="${ apps['oozie'].icon_path }"/> ${_('Oozie Scheduler')}</a>
+                  <a href="#"><img src="${ apps['oozie'].icon_path }" class="app-icon"/> ${_('Oozie Scheduler')}</a>
                   <ul class="dropdown-menu">
-                    <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>
+                    <li><a href="${ url('oozie:create_workflow') }"><img src="/oozie/static/art/icon_oozie_workflow_48.png" class="app-icon"/> ${_('Workflow')}</a></li>
+                    <li><a href="${ url('oozie:create_coordinator') }"><img src="/oozie/static/art/icon_oozie_coordinator_48.png" class="app-icon"/> ${_('Coordinator')}</a></li>
+                    <li><a href="${ url('oozie:create_bundle') }"><img src="/oozie/static/art/icon_oozie_bundle_48.png" class="app-icon"/> ${_('Bundle')}</a></li>
                   </ul>
                 </li>
                 % endif
@@ -250,7 +250,7 @@ ${ commonheader(_('Welcome Home'), "home", user) | n,unicode }
 
 <script type="text/html" id="document-template">
   <tr>
-    <td style="width: 26px"><img data-bind="attr: { src: icon }"></td>
+    <td style="width: 26px"><img data-bind="attr: { src: icon }" class="app-icon"></td>
     <td><a data-bind="attr: { href: url }, text: name"></a></td>
     <td data-bind="text: description"></td>
     <td data-bind="text: lastModified"></td>

+ 9 - 1
desktop/core/src/desktop/templates/login.mako

@@ -42,7 +42,7 @@ ${ commonheader("Welcome to Hue", "login", user, "50px") | n,unicode }
     margin-left: auto;
     margin-right: auto;
     margin-bottom: 10px;
-    background: #FFF url("/static/art/hue-login-logo-ellie.png") 50% 14px no-repeat;
+    background: #FFF url("/static/art/hue-login-logo-ellie.png") 50% 2px no-repeat;
     width: 130px;
     height: 130px;
     -webkit-border-radius: 65px;
@@ -51,6 +51,14 @@ ${ commonheader("Welcome to Hue", "login", user, "50px") | n,unicode }
     border: 1px solid #EEE;
   }
 
+  @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
+    #logo {
+      background: #FFF url("/static/art/hue-login-logo-ellie@2x.png") 50% 2px no-repeat;
+      background-size: 114px 114px;
+
+    }
+  }
+
   #logo.waiting {
     -webkit-animation-name: spinner;
     -webkit-animation-timing-function: linear;

BIN
desktop/core/static/art/home.png


BIN
desktop/core/static/art/hue-login-logo-ellie.png


BIN
desktop/core/static/art/hue-login-logo-ellie@2x.png


BIN
desktop/core/static/art/hue-logo-mini-white-hover.png


BIN
desktop/core/static/art/hue-logo-mini-white.png


BIN
desktop/core/static/art/icon_hue_48.png


+ 5 - 0
desktop/core/static/css/hue3.css

@@ -1659,3 +1659,8 @@ border-bottom-left-radius: 0px;
 .control-group.error .input-prepend .add-on i, .control-group.error .input-append .add-on i {
     color: #fff;
 }
+
+.app-icon {
+  width: 24px;
+  height: 24px;
+}

+ 1 - 1
desktop/libs/indexer/src/indexer/settings.py

@@ -19,6 +19,6 @@ DJANGO_APPS = [ "indexer" ]
 NICE_NAME = "Solr Indexer"
 REQUIRES_HADOOP = False
 MENU_INDEX = 43
-ICON = "/search/static/art/icon_search_24.png"
+ICON = "/search/static/art/icon_search_48.png"
 
 IS_URL_NAMESPACED = True