Merge tag '3.0.0'

younginnovations · Jan 12, 2018 · e8e6993 · e8e6993
2 parents 7925024 + 19844c6
commit e8e6993
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 6 deletions.
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -1,4 +1,4 @@
-lock '3.9.0'
+lock '3.10.0'
 
 # Application #
 #####################################################################################

diff --git a/ctrack/art/flag/679.png b/ctrack/art/flag/679.png
diff --git a/ctrack/art/flag/679_.png b/ctrack/art/flag/679_.png
diff --git a/ctrack/art/flag/889.png b/ctrack/art/flag/889.png
diff --git a/ctrack/art/flag/89.png b/ctrack/art/flag/89.png
diff --git a/ctrack/art/flag/global-regional.png b/ctrack/art/flag/global-regional.png
diff --git a/ctrack/art/index.css b/ctrack/art/index.css
@@ -485,9 +485,9 @@ a.country_code {
 }
 
 a.country_code .select_wrap img {
-    height: 20px;
-    max-width: 30px;
-    width: 30px;
+    /*height: 20px;*/
+    max-width: 35px;
+    /*width: 30px;*/
 }
 
 /*	Select dropdowns

diff --git a/ctrack/js/ctrack.js b/ctrack/js/ctrack.js
@@ -160,7 +160,7 @@ ctrack.setup = function (args) {
         args.country = cc[0].toLowerCase();
         args.country_select = cc.join("|");
         args.chunks["country_code"] = cc[0].toUpperCase();
-        args.chunks["country_name"] = iati_codes.country[args.country.toUpperCase()];
+        args.chunks["country_name"] = iati_codes.country[args.country.toUpperCase()] || iati_codes.region[args.country];
         if( args.chunks["country_code"] == 'GLOBAL-REGIONAL'){
             args.chunks["country_code"] = "89,679,889,WW,-1,GLOBAL";
             args.chunks["country_name"] = 'GLOBAL-REGIONAL';

diff --git a/dportal/js/undg.js b/dportal/js/undg.js
@@ -46,6 +46,8 @@ sipac.serialize(function () {
         for (var code in data) {
             if (json_iati_codes['country'].hasOwnProperty(data[code]['country_code'])) {
                 arr[data[code]['country_code']] = json_iati_codes['country'][data[code]['country_code']];
+            } else if (json_iati_codes['region'].hasOwnProperty(data[code]['country_code'])) {
+                arr[data[code]['country_code']] = json_iati_codes['region'][data[code]['country_code']];
             } else {
                 arr['global-regional'][data[code]['country_code']] = data[code]['country_code'];
             }

diff --git a/dportal/source/index.^.html b/dportal/source/index.^.html
@@ -357,8 +357,9 @@ <h2>
             var name = country_names[idx];
 
             if (idx === 'global-regional') {
-                name = 'Regional and global';
+                name = 'zzzzRegional and global';
             }
+            name = (isNaN(idx))?name:'zzzz'+name;
             if (name) {
                 rows.push({name: name, country_code: idx});
             }
@@ -560,6 +561,7 @@ <h2>
                     var v = countries.rows[i];
                     if (v.name) // must be real country
                     {
+                        v.name = v.name.replace('zzzz','');
                         var cd = (v.country_code == 'global-regional') ? 'GR' : v.country_code;
                         var t = (v.name || v.country_code )
                         if (v.count) {

diff --git a/dstore/json/iati_codes.json b/dstore/json/iati_codes.json
@@ -632,6 +632,25 @@
     "ZW": "Zimbabwe",
     "XK": "Kosovo"
   },
+  "region": {
+    "88": "States Ex-Yugoslavia unspecified",
+    "89": "Europe, regional",
+    "189": "North of Sahara, regional",
+    "289": "South of Sahara, regional",
+    "298": "Africa, regional",
+    "380": "West Indies, regional",
+    "389": "North & Central America, regional",
+    "489": "South America, regional",
+    "498": "America, regional",
+    "589": "Middle East, regional",
+    "619": "Central Asia, regional",
+    "679": "South Asia, regional",
+    "689": "South & Central Asia, regional",
+    "789": "Far East Asia, regional",
+    "798": "Asia, regional",
+    "889": "Oceania, regional",
+    "998": "Developing countries, unspecified"
+  },
   "sector_names": {
     "111": "Education",
     "121": "Health",