Commit d43717e2 authored by Christopher S Barnett's avatar Christopher S Barnett
Browse files

Merge branch 'develop' into 'master'

-fixed bug in color specification for migration arcs (rgb to rgba)

See merge request geospatial/wpf-arms-map!1
parents 26bf2321 9e7b562c
This source diff could not be displayed because it is too large. You can view the blob instead.
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
<div id="content">
<p>This map presents a compendium of 31 cases of corruption in the
international arms trade and
broader military sector,
as part of World Peace Foundation’s ongoing program on the
<a href="http://fletcher.tufts.edu/World-Peace-Foundation/Program/Research/Global--Arms-Trade-and-Corruption"
target="_blank">
Global Arms Trade and Corruption</a>.</p>
<p>The global arms business is widely seen as one of the areas of legal
business most subject to
corruption.
<a href="https://www.caat.org.uk/resources/publications/corruption/parallel-markets-0205.pdf"
target="_blank">
One researcher</a> in 2005 estimated that 40% of corruption in
international trade was related
to the arms trade.
Andrew Feinstein’s book <a href="http://www.theshadowworldbook.com/"
target="_blank">The Shadow World</a>
(2011) is one recent work documenting the
ubiquitous corruption that
characterizes the arms business. There are several reasons why the arms
trade is ‘hardwired
for corruption’.
The high value of individual deals offer significant potential for
personal enrichment.
The ‘national security exception’ throws a veil of secrecy around arms
deals. The tendency
for the military
sector in many countries to be exempt from scrutiny by Parliament, civil
society and
investigative and judicial
institutions. Finally, the status of the arms industry in producer
countries as key
instruments of state policy
often afford them protection from prosecution.</p>
<p>The cases shown here are a selection, intended to show the diversity and
widespread nature of
corruption in the
arms trade and military sector worldwide, and are not intended to be
comprehensive. Basic
information about each case
are presented in the sidebar, along with a link to a more extensive case
record in
<a href="https://sites.tufts.edu/corruptarmsdeals" target="_blank">WPF’s
Global Arms Corruption blog.</a></p>
</div>
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
<div id="content">
<p>This map presents a compendium of 31 cases of corruption in the international arms trade and
broader military sector,
as part of World Peace Foundation’s ongoing program on the
<a href="http://fletcher.tufts.edu/World-Peace-Foundation/Program/Research/Global--Arms-Trade-and-Corruption"
target="_blank">
Global Arms Trade and Corruption</a>.</p>
</div>
</body>
</html>
\ No newline at end of file
......@@ -50,12 +50,7 @@
</div>
<div class="side-content details-parent">
<div class="intro intro-text-body">
<p>This map presents a compendium of 31 cases of corruption in the international arms trade and
broader military sector,
as part of World Peace Foundation’s ongoing program on the
<a href="http://fletcher.tufts.edu/World-Peace-Foundation/Program/Research/Global--Arms-Trade-and-Corruption"
target="_blank">
Global Arms Trade and Corruption</a>.</p>
<div id="intro-text"></div>
<div class="full-intro-button row">
<div class="col-md-4 col-md-offset-8">
<!-- Large modal -->
......@@ -70,54 +65,7 @@
<div id="splash-screen">
<h1>A compendium of arms trade corruption</h1>
<div id="splash-screen-text" class="intro-text-body">
<p>This map presents a compendium of 31 cases of corruption in the
international arms trade and
broader military sector,
as part of World Peace Foundation’s ongoing program on the
<a href="http://fletcher.tufts.edu/World-Peace-Foundation/Program/Research/Global--Arms-Trade-and-Corruption"
target="_blank">
Global Arms Trade and Corruption</a>.</p>
<p>The global arms business is widely seen as one of the areas of legal
business most subject to
corruption.
<a href="https://www.caat.org.uk/resources/publications/corruption/parallel-markets-0205.pdf"
target="_blank">
One researcher</a> in 2005 estimated that 40% of corruption in
international trade was related
to the arms trade.
Andrew Feinstein’s book <a href="http://www.theshadowworldbook.com/"
target="_blank">The Shadow World</a>
(2011) is one recent work documenting the
ubiquitous corruption that
characterizes the arms business. There are several reasons why the arms
trade is ‘hardwired
for corruption’.
The high value of individual deals offer significant potential for
personal enrichment.
The ‘national security exception’ throws a veil of secrecy around arms
deals. The tendency
for the military
sector in many countries to be exempt from scrutiny by Parliament, civil
society and
investigative and judicial
institutions. Finally, the status of the arms industry in producer
countries as key
instruments of state policy
often afford them protection from prosecution.</p>
<p>The cases shown here are a selection, intended to show the diversity and
widespread nature of
corruption in the
arms trade and military sector worldwide, and are not intended to be
comprehensive. Basic
information about each case
are presented in the sidebar, along with a link to a more extensive case
record in
<a href="https://sites.tufts.edu/corruptarmsdeals" target="_blank">WPF’s
Global Arms Corruption blog.</a></p>
</div>
<div id="splash-screen-text" class="intro-text-body"></div>
</div>
</div>
<div class="modal-footer">
......
......@@ -125,7 +125,7 @@
A.prototype.draw = function (context) {
context.save();
context.lineWidth = this.lineWidth;
context.strokeStyle = 'rgb(54,144,192, 0.5)';
context.strokeStyle = 'rgba(54,144,192, 0.5)';
context.shadowColor = context.strokeStyle;
context.shadowBlur = this.shadowBlur || 1;
context.beginPath();
......
......@@ -25,6 +25,11 @@ ConnectionMap = function () {
init: function (selType, selValue) {
var self = this;
if (L.Browser.chrome || L.Browser.safari) {
$('body').css('filter', 'saturate(135%)');
} else if (L.Browser.ie) {
$('body').css('filter', 'saturate(90%)');
}
// instantiates the Leaflet map on the div with id 'map' and sets the view to center
// point (0,0) and zoom level 2
self.home_bounds = [[90, -180], [-90, 180]];
......@@ -942,6 +947,7 @@ ConnectionMap = function () {
};
$(document).ready(function () {
$('#intro-text').load('html/intro-text.html #content');
var showIntro = true;
var selType = 'by-deal';
var selValue = '';
......@@ -965,9 +971,11 @@ $(document).ready(function () {
}
}
if (showIntro) {
$('.intro-text-modal').modal('show');
}
$('#splash-screen-text').load('html/full-text.html #content', function () {
if (showIntro) {
$('.intro-text-modal').modal('show');
}
});
var map = ConnectionMap();
map.init(selType, selValue);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment