WIP: we need the sprite of the logos

Vizzuality · Dec 2, 2015 · 8fc1b87 · 8fc1b87
1 parent 753a4f1
commit 8fc1b87
Show file tree

Hide file tree

Showing 144 changed files with 53 additions and 12 deletions.
diff --git a/app/assets/images/logos/Untitled-5.png b/app/assets/images/logos/Untitled-5.png
diff --git a/app/assets/images/logos/afc.png b/app/assets/images/logos/afc.png
diff --git a/app/assets/images/logos/afchover.png b/app/assets/images/logos/afchover.png
diff --git a/app/assets/images/logos/airbus.png b/app/assets/images/logos/airbus.png
diff --git a/app/assets/images/logos/airbushover.png b/app/assets/images/logos/airbushover.png
diff --git a/app/assets/images/logos/bei.png b/app/assets/images/logos/bei.png
diff --git a/app/assets/images/logos/beihover.png b/app/assets/images/logos/beihover.png
diff --git a/app/assets/images/logos/bigdataclimatechallengewinner.png b/app/assets/images/logos/bigdataclimatechallengewinner.png
diff --git a/app/assets/images/logos/bigdataclimatechallengewinnerhover.png b/app/assets/images/logos/bigdataclimatechallengewinnerhover.png
diff --git a/app/assets/images/logos/blueraster.png b/app/assets/images/logos/blueraster.png
diff --git a/app/assets/images/logos/bluerasterhover.png b/app/assets/images/logos/bluerasterhover.png
diff --git a/app/assets/images/logos/bnpb.png b/app/assets/images/logos/bnpb.png
diff --git a/app/assets/images/logos/bnpbhover.png b/app/assets/images/logos/bnpbhover.png
diff --git a/app/assets/images/logos/bobolink.png b/app/assets/images/logos/bobolink.png
diff --git a/app/assets/images/logos/bobolinkfundation.png b/app/assets/images/logos/bobolinkfundation.png
diff --git a/app/assets/images/logos/bobolinkfundationhover.png b/app/assets/images/logos/bobolinkfundationhover.png
diff --git a/app/assets/images/logos/cambridge.png b/app/assets/images/logos/cambridge.png
diff --git a/app/assets/images/logos/cambridgehover.png b/app/assets/images/logos/cambridgehover.png
diff --git a/app/assets/images/logos/cartodb.png b/app/assets/images/logos/cartodb.png
diff --git a/app/assets/images/logos/cartodbhover.png b/app/assets/images/logos/cartodbhover.png
diff --git a/app/assets/images/logos/centerforglobaldevelopment.png b/app/assets/images/logos/centerforglobaldevelopment.png
diff --git a/app/assets/images/logos/centerforglobaldevelopmenthover.png b/app/assets/images/logos/centerforglobaldevelopmenthover.png
diff --git a/app/assets/images/logos/cfgd.png b/app/assets/images/logos/cfgd.png
diff --git a/app/assets/images/logos/cgiar.png b/app/assets/images/logos/cgiar.png
diff --git a/app/assets/images/logos/cgiarhover.png b/app/assets/images/logos/cgiarhover.png
diff --git a/app/assets/images/logos/ciat.png b/app/assets/images/logos/ciat.png
diff --git a/app/assets/images/logos/ciathover.png b/app/assets/images/logos/ciathover.png
diff --git a/app/assets/images/logos/clua.png b/app/assets/images/logos/clua.png
diff --git a/app/assets/images/logos/cluahover.png b/app/assets/images/logos/cluahover.png
diff --git a/app/assets/images/logos/danida.png b/app/assets/images/logos/danida.png
diff --git a/app/assets/images/logos/danidahover.png b/app/assets/images/logos/danidahover.png
diff --git a/app/assets/images/logos/digitalglobe.png b/app/assets/images/logos/digitalglobe.png
diff --git a/app/assets/images/logos/digitalglobehover.png b/app/assets/images/logos/digitalglobehover.png
diff --git a/app/assets/images/logos/ejn.png b/app/assets/images/logos/ejn.png
diff --git a/app/assets/images/logos/ejnhover.png b/app/assets/images/logos/ejnhover.png
diff --git a/app/assets/images/logos/esri.png b/app/assets/images/logos/esri.png
diff --git a/app/assets/images/logos/esrihover.png b/app/assets/images/logos/esrihover.png
diff --git a/app/assets/images/logos/ewmi.png b/app/assets/images/logos/ewmi.png
diff --git a/app/assets/images/logos/ewmihover.png b/app/assets/images/logos/ewmihover.png
diff --git a/app/assets/images/logos/geengine.png b/app/assets/images/logos/geengine.png
diff --git a/app/assets/images/logos/gef.png b/app/assets/images/logos/gef.png
diff --git a/app/assets/images/logos/gefhover.png b/app/assets/images/logos/gefhover.png
diff --git a/app/assets/images/logos/generation.png b/app/assets/images/logos/generation.png
diff --git a/app/assets/images/logos/generationhover.png b/app/assets/images/logos/generationhover.png
diff --git a/app/assets/images/logos/gfwca.png b/app/assets/images/logos/gfwca.png
diff --git a/app/assets/images/logos/globalforestwatchcanada.png b/app/assets/images/logos/globalforestwatchcanada.png
diff --git a/app/assets/images/logos/globalforestwatchcanadahover.png b/app/assets/images/logos/globalforestwatchcanadahover.png
diff --git a/app/assets/images/logos/google.png b/app/assets/images/logos/google.png
diff --git a/app/assets/images/logos/google.svg b/app/assets/images/logos/google.svg
diff --git a/app/assets/images/logos/googlehover.png b/app/assets/images/logos/googlehover.png
diff --git a/app/assets/images/logos/icf.png b/app/assets/images/logos/icf.png
diff --git a/app/assets/images/logos/icfhover.png b/app/assets/images/logos/icfhover.png
diff --git a/app/assets/images/logos/imazon.png b/app/assets/images/logos/imazon.png
diff --git a/app/assets/images/logos/imazonhover.png b/app/assets/images/logos/imazonhover.png
diff --git a/app/assets/images/logos/inab.png b/app/assets/images/logos/inab.png
diff --git a/app/assets/images/logos/inabhover.png b/app/assets/images/logos/inabhover.png
diff --git a/app/assets/images/logos/ioi.png b/app/assets/images/logos/ioi.png
diff --git a/app/assets/images/logos/ioihover.png b/app/assets/images/logos/ioihover.png
diff --git a/app/assets/images/logos/logo.png b/app/assets/images/logos/logo.png
diff --git a/app/assets/images/logos/ministiere.png b/app/assets/images/logos/ministiere.png
diff --git a/app/assets/images/logos/ministierehover.png b/app/assets/images/logos/ministierehover.png
diff --git a/app/assets/images/logos/ministryofforeignaffairs.png b/app/assets/images/logos/ministryofforeignaffairs.png
diff --git a/app/assets/images/logos/ministryofforeignaffairshover.png b/app/assets/images/logos/ministryofforeignaffairshover.png
diff --git a/app/assets/images/logos/moises.png b/app/assets/images/logos/moises.png
diff --git a/app/assets/images/logos/moiseshover.png b/app/assets/images/logos/moiseshover.png
diff --git a/app/assets/images/logos/mongabay.png b/app/assets/images/logos/mongabay.png
diff --git a/app/assets/images/logos/mongabayhover.png b/app/assets/images/logos/mongabayhover.png
diff --git a/app/assets/images/logos/moore.png b/app/assets/images/logos/moore.png
diff --git a/app/assets/images/logos/moorehover.png b/app/assets/images/logos/moorehover.png
diff --git a/app/assets/images/logos/muyissi.png b/app/assets/images/logos/muyissi.png
diff --git a/app/assets/images/logos/muyissihover.png b/app/assets/images/logos/muyissihover.png
diff --git a/app/assets/images/logos/norwegianministri.png b/app/assets/images/logos/norwegianministri.png
diff --git a/app/assets/images/logos/norwegianministrihover.png b/app/assets/images/logos/norwegianministrihover.png
diff --git a/app/assets/images/logos/opendevcam.png b/app/assets/images/logos/opendevcam.png
diff --git a/app/assets/images/logos/opendevcamhover.png b/app/assets/images/logos/opendevcamhover.png
diff --git a/app/assets/images/logos/opendevmekong.png b/app/assets/images/logos/opendevmekong.png
diff --git a/app/assets/images/logos/opendevmekonghover.png b/app/assets/images/logos/opendevmekonghover.png
diff --git a/app/assets/images/logos/orbital.png b/app/assets/images/logos/orbital.png
diff --git a/app/assets/images/logos/orbitalhover.png b/app/assets/images/logos/orbitalhover.png
diff --git a/app/assets/images/logos/osfac.png b/app/assets/images/logos/osfac.png
diff --git a/app/assets/images/logos/osfachover.png b/app/assets/images/logos/osfachover.png
diff --git a/app/assets/images/logos/osinfor.png b/app/assets/images/logos/osinfor.png
diff --git a/app/assets/images/logos/osinforhover.png b/app/assets/images/logos/osinforhover.png
diff --git a/app/assets/images/logos/raisg.png b/app/assets/images/logos/raisg.png
diff --git a/app/assets/images/logos/raisghover.png b/app/assets/images/logos/raisghover.png
diff --git a/app/assets/images/logos/redd.png b/app/assets/images/logos/redd.png
diff --git a/app/assets/images/logos/reddhover.png b/app/assets/images/logos/reddhover.png
diff --git a/app/assets/images/logos/resolve.png b/app/assets/images/logos/resolve.png
diff --git a/app/assets/images/logos/resolvehover.png b/app/assets/images/logos/resolvehover.png
diff --git a/app/assets/images/logos/rfuk.png b/app/assets/images/logos/rfuk.png
diff --git a/app/assets/images/logos/rfukhover.png b/app/assets/images/logos/rfukhover.png
diff --git a/app/assets/images/logos/rm.png b/app/assets/images/logos/rm.png
diff --git a/app/assets/images/logos/rmhover.png b/app/assets/images/logos/rmhover.png
diff --git a/app/assets/images/logos/rspo.png b/app/assets/images/logos/rspo.png
diff --git a/app/assets/images/logos/rspohover.png b/app/assets/images/logos/rspohover.png
diff --git a/app/assets/images/logos/rtrs.png b/app/assets/images/logos/rtrs.png
diff --git a/app/assets/images/logos/rtrshover.png b/app/assets/images/logos/rtrshover.png
diff --git a/app/assets/images/logos/scannex.png b/app/assets/images/logos/scannex.png
diff --git a/app/assets/images/logos/scannexhover.png b/app/assets/images/logos/scannexhover.png
diff --git a/app/assets/images/logos/sgf.jpg b/app/assets/images/logos/sgf.jpg
diff --git a/app/assets/images/logos/sgfhover.jpg b/app/assets/images/logos/sgfhover.jpg
diff --git a/app/assets/images/logos/sgflogo.jpg b/app/assets/images/logos/sgflogo.jpg
diff --git a/app/assets/images/logos/sida.png b/app/assets/images/logos/sida.png
diff --git a/app/assets/images/logos/sidahover.png b/app/assets/images/logos/sidahover.png
diff --git a/app/assets/images/logos/specialachievement.png b/app/assets/images/logos/specialachievement.png
diff --git a/app/assets/images/logos/specialachievementhover.png b/app/assets/images/logos/specialachievementhover.png
diff --git a/app/assets/images/logos/thejanegoodallinstitute.png b/app/assets/images/logos/thejanegoodallinstitute.png
diff --git a/app/assets/images/logos/thejanegoodallinstitutehover.png b/app/assets/images/logos/thejanegoodallinstitutehover.png
diff --git a/app/assets/images/logos/thetiliafund.png b/app/assets/images/logos/thetiliafund.png
diff --git a/app/assets/images/logos/thetiliafundhover.png b/app/assets/images/logos/thetiliafundhover.png
diff --git a/app/assets/images/logos/tipos.png b/app/assets/images/logos/tipos.png
diff --git a/app/assets/images/logos/tiposhover.png b/app/assets/images/logos/tiposhover.png
diff --git a/app/assets/images/logos/ukaid.png b/app/assets/images/logos/ukaid.png
diff --git a/app/assets/images/logos/ukaidhover.png b/app/assets/images/logos/ukaidhover.png
diff --git a/app/assets/images/logos/unep.png b/app/assets/images/logos/unep.png
diff --git a/app/assets/images/logos/unephover.png b/app/assets/images/logos/unephover.png
diff --git a/app/assets/images/logos/unepwcmc.png b/app/assets/images/logos/unepwcmc.png
diff --git a/app/assets/images/logos/unepwcmchover.png b/app/assets/images/logos/unepwcmchover.png
diff --git a/app/assets/images/logos/unilever.png b/app/assets/images/logos/unilever.png
diff --git a/app/assets/images/logos/unileverhover.png b/app/assets/images/logos/unileverhover.png
diff --git a/app/assets/images/logos/universityofmaryland.png b/app/assets/images/logos/universityofmaryland.png
diff --git a/app/assets/images/logos/universityofmarylandhover.png b/app/assets/images/logos/universityofmarylandhover.png
diff --git a/app/assets/images/logos/urthecast.png b/app/assets/images/logos/urthecast.png
diff --git a/app/assets/images/logos/urthecasthover.png b/app/assets/images/logos/urthecasthover.png
diff --git a/app/assets/images/logos/usaid.png b/app/assets/images/logos/usaid.png
diff --git a/app/assets/images/logos/usaidhover.png b/app/assets/images/logos/usaidhover.png
diff --git a/app/assets/images/logos/vizzuality-big.png b/app/assets/images/logos/vizzuality-big.png
diff --git a/app/assets/images/logos/vizzuality.png b/app/assets/images/logos/vizzuality.png
diff --git a/app/assets/images/logos/vizzuality_orig.png b/app/assets/images/logos/vizzuality_orig.png
diff --git a/app/assets/images/logos/vizzualityhover.png b/app/assets/images/logos/vizzualityhover.png
diff --git a/app/assets/images/logos/whrc.png b/app/assets/images/logos/whrc.png
diff --git a/app/assets/images/logos/whrchover.png b/app/assets/images/logos/whrchover.png
diff --git a/app/assets/images/logos/wri-logo.png b/app/assets/images/logos/wri-logo.png
diff --git a/app/assets/images/logos/wri.png b/app/assets/images/logos/wri.png
diff --git a/app/assets/images/logos/wrihover.png b/app/assets/images/logos/wrihover.png
diff --git a/app/assets/images/logos/zeroextinction.png b/app/assets/images/logos/zeroextinction.png
diff --git a/app/assets/images/logos/zeroextinctionhover.png b/app/assets/images/logos/zeroextinctionhover.png
diff --git a/app/assets/images/logos/zsl.png b/app/assets/images/logos/zsl.png
diff --git a/app/assets/images/logos/zslhover.png b/app/assets/images/logos/zslhover.png
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -10,8 +10,12 @@ require([
   'home/views/sliderView',
   'home/views/launchCounter',
   'views/SourceWindowView',
-  'views/SidebarNavView'
-], function($, _, Class, Backbone, _string, sliderView, LaunchCounterView, SourceWindowView, SidebarNavView) {
+  'views/SidebarNavView',
+  // common views
+  'views/HeaderView',
+  'views/FooterView',
+
+], function($, _, Class, Backbone, _string, SliderView, LaunchCounterView, SourceWindowView, SidebarNavView, HeaderView, FooterView) {
 
   'use strict';
 
@@ -21,6 +25,7 @@ require([
 
     init: function() {
       this._initViews();
+      this._initCommonViews();
     },
 
     /**
@@ -40,9 +45,14 @@ require([
     _initViews: function() {
       new SourceWindowView();
       new LaunchCounterView();
-      new sliderView();
+      new SliderView();
       new SidebarNavView();
-    }
+    },
+
+    _initCommonViews: function() {
+      new FooterView();
+      new HeaderView();
+    },
 
   });
 

diff --git a/app/assets/javascripts/chosen.jquery.min.js b/app/assets/javascripts/chosen.jquery.min.js
diff --git a/app/assets/javascripts/compare.js b/app/assets/javascripts/compare.js
@@ -4,8 +4,12 @@
 require([
   'backbone',
   'compare/router',
-  'compare/views/CompareIndexView'
-], function(Backbone, RouterView, CompareIndexView) {
+  'compare/views/CompareIndexView',
+  // common views
+  'views/HeaderView',
+  'views/FooterView',
+
+], function(Backbone, RouterView, CompareIndexView, HeaderView, FooterView) {
 
   'use strict';
 
@@ -16,6 +20,7 @@ require([
     initialize: function() {
       this._initRouter();
       this._initViews();
+      this._initCommonViews();
       this._initApp();
     },
 
@@ -32,6 +37,11 @@ require([
       this.router = new RouterView();
     },
 
+    _initCommonViews: function() {
+      new FooterView();
+      new HeaderView();
+    },
+
     _initViews: function() {
       new CompareIndexView();
     }

diff --git a/app/assets/javascripts/countries.js b/app/assets/javascripts/countries.js
@@ -7,8 +7,12 @@ require([
   'backbone',
   'countries/router',
   'countries/views/CountryShowView',
-  'countries/views/CountryIndexView'
-], function($, _, Backbone, RouterView, CountryShowView, CountryIndexView) {
+  'countries/views/CountryIndexView',
+  // common views
+  'views/HeaderView',
+  'views/FooterView',
+
+], function($, _, Backbone, RouterView, CountryShowView, CountryIndexView, HeaderView, FooterView) {
 
   'use strict';
 
@@ -19,6 +23,7 @@ require([
     initialize: function() {
       this._initRouter();
       this._initViews();
+      this._initCommonViews();
       this._initApp();
     },
 
@@ -35,6 +40,11 @@ require([
       new CountryIndexView();
     },
 
+    _initCommonViews: function() {
+      new FooterView();
+      new HeaderView();
+    },
+
     _initRouter: function() {
       this.router = new RouterView();
     }

diff --git a/app/assets/javascripts/map.js b/app/assets/javascripts/map.js
@@ -25,6 +25,7 @@ require([
   'map/views/LegendView',
   'map/views/TimelineView',
   'map/views/NavMobileView',
+  // common views
   'views/HeaderView',
   'views/FooterView',
   'views/NotificationsView',
@@ -44,6 +45,7 @@ require([
       var router = new Router(this);
       this._cartodbHack();
       this._initViews();
+      this._initCommonViews();
       this._initApp();
 
       // For dev
@@ -82,13 +84,16 @@ require([
       new LegendView();
       new TimelineView();
       new NavMobileView();
-      new FooterView();
-      new HeaderView();
       new SourceModalView();
       new SourceMobileFriendlyView();
       new NotificationsView();
     },
 
+    _initCommonViews: function() {
+      new FooterView();
+      new HeaderView();
+    },
+
     /**
      * Cartodb Handlebars hack.
      */