add positions like ministers
Former-commit-id: 530348e74a431e061f4c15a5ee6d6b37db3efed5
--- a/admin/naa-agift-tree.php
+++ b/admin/naa-agift-tree.php
@@ -31,9 +31,9 @@
<div id="tree-container"></div>
<div id="viz"></div>
-<script type="text/javascript" src="../javascripts/jquery-1.6.2.min.js"></script>
-<script type="text/javascript" src="../javascripts/d3.min.js"></script>
-<script type="text/javascript" src="../javascripts/d3.layout.min.js"></script>
+<script type="text/javascript" src="../js/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="../js/d3.min.js"></script>
+<script type="text/javascript" src="../js/d3.layout.min.js"></script>
<script>
/**
--- a/alaveteli/exportAgencies.csv.php
+++ b/alaveteli/exportAgencies.csv.php
@@ -95,6 +95,13 @@
fputcsv($fp, array_values($row));
}
}
+ if (isset($agency->value->positions)) {
+ foreach ($agency->value->positions as $position) {
+ $row['name'] = iconv("UTF-8", "ASCII//TRANSLIT",$position);
+ $row["short_name"] = shortName($position);
+ fputcsv($fp, array_values($row));
+ }
+ }
}
}
} catch (SetteeRestClientException $e) {
--- a/bubbletree.php
+++ b/bubbletree.php
@@ -5,13 +5,13 @@
<meta charset="UTF-8"/>
<title>Minimal BubbleTree Demo</title>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js"></script>
- <script type="text/javascript" src="javascripts/bubbletree/lib/jquery.history.js"></script>
- <script type="text/javascript" src="javascripts/bubbletree/lib/raphael.js"></script>
- <script type="text/javascript" src="javascripts/bubbletree/lib/vis4.js"></script>
- <script type="text/javascript" src="javascripts/bubbletree/lib/Tween.js"></script>
- <script type="text/javascript" src="javascripts/bubbletree/build/bubbletree.js"></script>
- <link rel="stylesheet" type="text/css" href="javascripts/bubbletree/build/bubbletree.css" />
- <script type="text/javascript" src="javascripts/bubbletree/styles/cofog.js"></script>
+ <script type="text/javascript" src="js/bubbletree/lib/jquery.history.js"></script>
+ <script type="text/javascript" src="js/bubbletree/lib/raphael.js"></script>
+ <script type="text/javascript" src="js/bubbletree/lib/vis4.js"></script>
+ <script type="text/javascript" src="js/bubbletree/lib/Tween.js"></script>
+ <script type="text/javascript" src="js/bubbletree/build/bubbletree.js"></script>
+ <link rel="stylesheet" type="text/css" href="js/bubbletree/build/bubbletree.css" />
+ <script type="text/javascript" src="js/bubbletree/styles/cofog.js"></script>
<script type="text/javascript">
--- a/graph.php
+++ b/graph.php
@@ -86,9 +86,9 @@
if ($format == "html") {
?>
<div id="sigma-example" width="960" style="min-height:800px;background-color: #333;"></div>
- <script src="javascripts/sigma.min.js"></script>
- <script src="javascripts/sigma/plugins/sigma.parseGexf.js"></script>
- <script src="javascripts/sigma/plugins/sigma.forceatlas2.js"></script>
+ <script src="js/sigma.min.js"></script>
+ <script src="js/sigma/plugins/sigma.parseGexf.js"></script>
+ <script src="js/sigma/plugins/sigma.forceatlas2.js"></script>
<script type="text/javascript">function init() {
// Instanciate sigma.js and customize rendering :
var sigInst = sigma.init(document.getElementById('sigma-example')).drawingProperties({
--- a/include/template.inc.php
+++ b/include/template.inc.php
@@ -66,11 +66,11 @@
<!-- Included JS Files -->
- <script src="<?php echo $basePath; ?>javascripts/foundation.js"></script>
- <script src="<?php echo $basePath; ?>javascripts/app.js"></script>
+ <script src="<?php echo $basePath; ?>js/foundation.js"></script>
+ <script src="<?php echo $basePath; ?>js/app.js"></script>
<script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
- <script type="text/javascript" src="javascripts/flotr2/flotr2.js"></script>
+ <script type="text/javascript" src="<?php echo $basePath ?>js/flotr2/flotr2.js"></script>
<?php
if (strpos($_SERVER['SERVER_NAME'], ".gs")) {
?>