OpenSpending csv updates
--- /dev/null
+++ b/.gitignore
@@ -1,1 +1,3 @@
-
+/admin/neo4jimporter/target/
+/admin/neo4jimporter/.settings/
+/nbproject/private/
--- a/about.php
+++ b/about.php
@@ -1,25 +1,24 @@
<?php
-
-
include('./lib/common.inc.php');
include_header("Map");
?>
<div class="msg_list">
-<p class="msg_head">Header-1 </p>
-<div class="msg_body">
-orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
+ <p class="msg_head">Header-1 </p>
+ <div class="msg_body">
+ orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
+ </div>
+ <p class="msg_head">Header-2</p>
+ <div class="msg_body">
+ orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
+ </div>
+ <p class="msg_head">Header-3</p>
+ <div class="msg_body">
+ orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
+ </div>
</div>
-<p class="msg_head">Header-2</p>
-<div class="msg_body">
-orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
-</div>
-<p class="msg_head">Header-3</p>
-<div class="msg_body">
-orem ipsum dolor sit amet, consectetuer adipiscing elit orem ipsum dolor sit amet, consectetuer adipiscing elit
-</div>
-</div>
-<?php CNDistributionGraph();
+<?php
+CNDistributionGraph();
// select distinct cnid, "publishDate" from (select ("CNID" - MOD("CNID",100)) as cnid from contractnotice where "CNID" < 999999) as a, contractnotice where a.cnid = contractNotice."CNID" order by cnid
?>
@@ -35,29 +34,25 @@
FROM contractnotice WHERE "childCN" is null AND "parentCN" is null AND DATE("importDate") = (select * from (SELECT DATE("importDate")
FROM contractnotice ORDER BY "importDate" DESC limit 1) alias) GROUP BY DATE("importDate")';
$query = $conn->prepare($query);
- $query->execute();
- if (!$query) {
- databaseError($conn->errorInfo());
- }
+$query->execute();
+databaseError($conn->errorInfo());
echo "<div>";
$stats = $query->fetch(PDO::FETCH_ASSOC);
-echo $stats["count"] . " new records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";
+echo $stats["count"] . " new records in period " . $stats["start"] . " to " . $stats["end"] . "<br>";
$query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end
FROM contractnotice WHERE ("childCN" is not null OR "parentCN" is not null) AND DATE("importDate") = (select * from (SELECT DATE("importDate")
FROM contractnotice ORDER BY "importDate" DESC limit 1) alias) GROUP BY DATE("importDate")';
$query = $conn->prepare($query);
- $query->execute();
- if (!$query) {
- databaseError($conn->errorInfo());
- }
+$query->execute();
+databaseError($conn->errorInfo());
echo "<div>";
-$stats = $query->fetch(PDO::FETCH_ASSOC);
-echo $stats["count"] . " updated records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";
+$stats = $query->fetch(PDO::FETCH_ASSOC);
+echo $stats["count"] . " updated records in period " . $stats["start"] . " to " . $stats["end"] . "<br>";
-echo "Last updated: ". $stats["importday"]."<br>";
+echo "Last updated: " . $stats["importday"] . "<br>";
/* Check for null Procurement method and 0 ABN when not ABN exempt */
--- a/admin/fixoldamend.php
+++ b/admin/fixoldamend.php
@@ -20,7 +20,7 @@
echo "$oldCN => $newCN (from parent CN $parentCN) <br>\n";
}
else {
- echo "parent CN unexpected - $oldCN doesn't look like child of {$record['parentCN']} <br>\n";
+// echo "parent CN unexpected - $oldCN doesn't look like child of {$record['parentCN']} <br>\n";
}
}
--- a/admin/linkAmendments.php
+++ b/admin/linkAmendments.php
@@ -2,12 +2,10 @@
include_once ("../lib/common.inc.php");
$query = 'SELECT c."CNID",c."parentCN",p."childCN" FROM contractnotice as c LEFT OUTER JOIN contractnotice as p on c."parentCN" = p."CNID"
WHERE
-c."parentCN" > 0 AND p."childCN" IS NULL ';
+c."parentCN" IS NOT NULL AND p."childCN" IS NULL ';
$query = $conn->prepare($query);
$query->execute();
- if (!$query) {
databaseError($conn->errorInfo());
- }
foreach ($query->fetchAll() as $row) {
$conn->exec('UPDATE contractnotice SET "childCN" = \'' .
$row['CNID'] . '\' where "CNID" = \'' .
@@ -30,15 +28,13 @@
FROM contractnotice
GROUP BY "parentCN"
HAVING COUNT(*) > 1
- AND "parentCN" != 0
+ AND "parentCN" IS NOT NULL
)
-AND "childCN" = 0
+AND "childCN" IS NULL
GROUP BY "parentCN" having count(*) > 1';
$query = $conn->prepare($query);
$query->execute();
- if (!$query) {
databaseError($conn->errorInfo());
- }
foreach ($query->fetchAll() as $row) {
$cnids = explode(",",str_replace(Array("{","}"),"",$row['array_agg']));
$last_cnid = array_pop($cnids);
--- a/admin/partialdata/scraper.php
+++ /dev/null
@@ -1,74 +1,1 @@
-<?php
-date_default_timezone_set('Australia/Melbourne');
-$split = false;
-function format_bytes($size) {
- $units = array(' B', ' KB', ' MB', ' GB', ' TB');
- for ($i = 0; $size >= 1024 && $i < 4; $i++) $size /= 1024;
- return round($size, 2).$units[$i];
-}
-$days = 4;
-if (isset($_REQUEST['days'])) $days = $_REQUEST['days'];
-$startDate = strtotime("05-Jun-2008");
-if (isset($_REQUEST['startDate'])) $startDate = $_REQUEST['startDate'];
-
-function getFile($startDate, $days, $minVal, $maxVal) {
-global $split;
- $endDate = strtotime(date("Y-m-d", $startDate)." +".$days." days");
-$file = date("dMY",$startDate).'to'.date("dMY",$endDate).'val'.$minVal.'to'.$maxVal.'.xls';
-echo "Fetching $file ($days days) ($minVal < value < $maxVal )... ";
-$url = "https://www.tenders.gov.au/?event=public.advancedsearch.CNSONRedirect&type=cnEvent&atmType=archived%2Cclosed%2Cpublished%2Cproposed&agencyUUID=&agencyStatus=-1&portfolioUUID=&keyword=&KeywordTypeSearch=AllWord&CNID=&dateType=Publish+Date&dateStart=".date("d-M-Y",$startDate)."&dateEnd=".date("d-M-Y",$endDate)."&supplierName=&supplierABN=&valueFrom=".$minVal."&valueTo=".$maxVal."&ATMID=&AgencyRefId=&consultancy=&download=Download+results";
-echo "<!-- $url -->";
-$current = file_get_contents($url);
-if (strpos($current,"There are no results that match your selection.")> 0 ) {
- echo "<font color=red>Empty file!</font><br>";
-}
-if (strpos($current,"Your search returned more than 1000 results.") === false) {
- file_put_contents($file, $current);
- echo "$file saved<br>";
- echo format_bytes(filesize($file))."<br>";
- echo '<a href="?startDate='.$endDate.'&days='.$days.'">Load next '.($days).' days </a><br>';
- echo '<a href="?startDate='.$endDate.'&days='.($days*2).'">Load next '.($days*2).' days </a><br>';
- echo '<a href="?startDate='.$endDate.'&days='.$days.'&split=yes">Load next '.($days).' days with split</a><br>';
- flush();
-if (!isset($_REQUEST['split']) && !$split) {
-echo "Success so fetching next $days... <br>";
-getFile($endDate, $days, "" , "");
-}
- return true;
-} else {
- echo "<font color=red>Too many records!</font><br>";
- echo '<a href="?startDate='.$startDate.'&days='.floor($days/2).'">Load '.($days/2).' days instead?</a><br>';
- echo '<a href="?startDate='.$startDate.'&days='.$days.'&split=yes">Split instead?</a><br>';
- flush();
-if (!isset($_REQUEST['split']) && !$split) {
-echo "Failure so splitting ... <br>";
- doSplit($startDate, $days);
-}
- return false;
-}
-}
-function doSplit($startDate, $days) {
-global $split;
-$split = true;
-set_time_limit(20);
-getFile($startDate, $days, 0, 12000);
-getFile($startDate, $days, 12000, 16000);
- getFile($startDate, $days, 16000, 20000);
- getFile($startDate, $days, 20000, 30000);
- getFile($startDate, $days, 30000, 40000);
-// getFile($startDate, $days, 40000, 80000);
- getFile($startDate, $days, 40000, 60000);
- getFile($startDate, $days, 60000, 80000);
-// getFile($startDate, $days, 80000, 300000);
- getFile($startDate, $days, 80000, 150000);
- getFile($startDate, $days, 150000, 300000);
- getFile($startDate, $days, 300000, 999999999);
-}
-if (isset($_REQUEST['split'])) {
- doSplit($startDate, $days);
-} else {
- getFile($startDate, $days, "" , "");
-}
-?>
-
--- a/admin/updateReport.php
+++ b/admin/updateReport.php
@@ -1,30 +1,24 @@
<?php
-include_once("../lib/common.inc.php");
-$query = "SELECT DATE(importDate) as importday, count(*) as count, min(publishDate) as start, max(publishDate) as end
-FROM `contractnotice` WHERE childCN is null AND parentCN is null AND DATE(importDate) in (select * from (SELECT DATE(importDate)
-FROM `contractnotice` ORDER BY `importDate` DESC limit 1) alias)";
-$result = mysql_query($query);
-$stats = mysql_fetch_array($result, MYSQL_BOTH);
-echo $stats["count"] . " new records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";
+include_once('../lib/common.inc.php');
+$query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end
+FROM contractnotice WHERE "childCN" is null AND "parentCN" is null AND DATE("importDate") in (select * from (SELECT DATE("importDate")
+FROM contractnotice ORDER BY "importDate" DESC limit 1) alias)';
+ $result = $conn->query($query);
+ $stats = $result->fetch();
+echo $stats['count'] . ' new records in period ' . $stats['start'] . ' to ' . $stats['end'] .'<br>';
-$query = "SELECT DATE(importDate) as importday, count(*) as count, min(publishDate) as start, max(publishDate) as end
-FROM `contractnotice` WHERE (childCN is not null OR parentCN is not null) AND DATE(importDate) in (select * from (SELECT DATE(importDate)
-FROM `contractnotice` ORDER BY `importDate` DESC limit 1) alias)";
-$result = mysql_query($query);
-$stats = mysql_fetch_array($result, MYSQL_BOTH);
-echo $stats["count"] . " updated records in period " . $stats["start"] . " to " . $stats["end"] ."<br>";
+$query = 'SELECT DATE("importDate") as importday, count(*) as count, min("publishDate") as start, max("publishDate") as end
+FROM contractnotice WHERE ("childCN" is not null OR "parentCN" is not null) AND DATE("importDate") in (select * from (SELECT DATE("importDate")
+FROM contractnotice ORDER BY importDate DESC limit 1) alias)';
+ $result = $conn->query($query);
+ $stats = $result->fetch();
+echo $stats['count'] . ' updated records in period ' . $stats['start'] . ' to ' . $stats['end'] .'<br>';
-$query = "SELECT count(*) as count FROM `agency` WHERE `abn` = '0'";
-$result = mysql_query($query);
-$stats = mysql_fetch_array($result, MYSQL_BOTH);
-echo $stats["count"] . " agencies with no ABN<br>";
+$query = 'SELECT count(*) as count FROM agency WHERE abn = \'0\'';
+ $result = $conn->query($query);
+ $stats = $result->fetch();
+echo $stats['count'] . ' agencies with no ABN<br>';
-/*$query = "SELECT count(*) as count FROM `supplierdetails` WHERE `supplierABN` = '0' and supplierCountry LIKE 'Australia'";
-$result = mysql_query($query);
-$stats = mysql_fetch_array($result, MYSQL_BOTH);
-echo $stats["count"] . " Australian suppliers with no ABN<br>";*/
-
-
-echo "Last updated: ". $stats["importdate"]."<br>";
+echo 'Last updated: '. $stats['importdate'].'<br>';
?>
--- a/admin/updateUNSPSC.php
+++ b/admin/updateUNSPSC.php
@@ -19,12 +19,33 @@
$unspsc[$armor] = $row['UNSPSC'];
$erre = str_replace("er", "re", $row['Title']);
$unspsc[$erre] = $row['UNSPSC'];
+ $center = str_replace("center", "centre", $row['Title']);
+ $unspsc[$center] = $row['UNSPSC'];
+ $accessory = str_replace("accesor", "accessor", $row['Title']);
+ $unspsc[$accessory] = $row['UNSPSC'];
$lyslyz = str_replace("lyz", "lys", $row['Title']);
$unspsc[$lyslyz] = $row['UNSPSC'];
+ $tire = str_replace("ire", "yre", $row['Title']);
+ $unspsc[$tire] = $row['UNSPSC'];
+
+ $pe = str_replace("pe", "pae", $row['Title']);
+ $unspsc[$pe] = $row['UNSPSC'];
+ $ane = str_replace("ane", "anae", $row['Title']);
+ $unspsc[$ane] = $row['UNSPSC'];
+ $airo = str_replace("airplane", "aeroplane", $row['Title']);
+ $unspsc[$airo] = $row['UNSPSC'];
// some divergence from standard
+ $forensicit = str_replace("Information technology consultation services", "Forensic IT Services", $row['Title']);
+ $unspsc[$forensicit] = $row['UNSPSC'];
+ $powercable = str_replace( "Power cable", "Power cable installation and supply", $row['Title']);
+ $unspsc[$powercable] = $row['UNSPSC'];
$tobacco = str_replace("Food Beverage and Tobacco Products", "Food and Beverage Products", $row['Title']);
$unspsc[$tobacco] = $row['UNSPSC'];
$architect = str_replace("Building and Construction and Maintenance Services", "Architectural services", $row['Title']);
+ $unspsc[$architect] = $row['UNSPSC'];
+ $powercable = str_replace("Power cable", "Power cable installation and supply", $row['Title']);
+ $unspsc[$powercable] = $row['UNSPSC'];
+ $forensicIT = str_replace("Building and Construction and Maintenance Services", "Architectural services", $row['Title']);
$unspsc[$architect] = $row['UNSPSC'];
// some just plain wrong
$noOilRigs = str_replace("Building and Construction and Maintenance Services", "Management and provision of all facilities engineering modification and maintenance services for a site or platform", $row['Title']);
--- a/australian_federal_government_contract_spending.json
+++ b/australian_federal_government_contract_spending.json
@@ -1,125 +1,164 @@
{
- "dataset":{
- "name":"australian_federal_government_contract_spending",
- "label":"Australian Federal Government Contract Spending",
- "description":"Spending by Australian Federal Government agencies on goods and services from 2007 onwards.",
- "currency":"AUD",
- "unique_keys":[
- "id"
- ],
- "temporal_granularity":"year"
- },
- "mapping":{
- "category": {
- "fields": [ {
- "column": "category",
- "datatype": "string",
- "name": "label"
- } ],
-
- "type": "classifier",
- "description": "",
- "taxonomy": "unspsc",
- "label": "Contract Goods/Services Category"
+ "dataset": {
+ "languages": [
+ "en"
+ ],
+ "currency": "AUD",
+ "name": "australian_federal_government_contract_spending",
+ "territories": [],
+ "default_time": null,
+ "description": "Spending by Australian Federal Government agencies on goods and services from 2007 onwards.",
+ "schema_version": "2011-12-07",
+ "label": "Australian Federal Government Contract Spending"
},
- "from":{
- "fields":[
- {
- "column":"agencyABN",
- "datatype":"string",
- "name":"id"
- },
- {
- "column":"agencyName",
- "datatype":"string",
- "name":"label"
- }
- ],
- "type":"entity",
- "description":"",
- "label":"Government Agency Australian Business Number"
- },
- "description":{
- "column":"description",
- "datatype":"string",
- "type":"value",
- "description":"Contract as described by agency",
- "label":"Contract Description"
- },
- "to":{
- "fields":[
- {
- "column":"supplierName",
- "datatype":"string",
- "name":"label"
- },
- {
- "column":"supplierID",
- "datatype":"string",
- "name":"id"
- }
- ],
- "type":"entity",
- "description":"Government Supplier",
- "label":"Supplier Name"
- },
- "currency":{
- "default_value":"AUD",
- "description":"All entries in AUD, foreign transactions are converted at the time of their payment",
- "column":"",
- "label":"",
- "datatype":"currency",
- "type":"value"
- },
- "amount":{
- "column":"value",
- "datatype":"float",
- "type":"value",
- "description":"The total value of the contract including all variations/amendments/extensions",
- "label":"Contract Value"
- },
- "time":{
- "column":"contractStart",
- "datatype":"date",
- "type":"value",
- "description":"Start of the contract period (goods or services being received)",
- "label":"Contract Start Date"
- },
- "id":{
-"column": "CNID",
- "datatype": "string",
- "name": "label",
- "type": "value",
- "description": "",
- "label": "Contract Notice ID"
- }
- },
-
-"views": [
+ "mapping": {
+ "category": {
+ "description": "Contract Goods/Services Category",
+ "datatype": "string",
+ "label": "category",
+ "column": "cat1",
+ "type": "attribute",
+ "dimension": "category"
+ },
+ "sourceurl": {
+ "description": "Source Document URL",
+ "datatype": "string",
+ "label": "sourceurl",
+ "column": "sourceurl",
+ "type": "attribute",
+ "dimension": "sourceurl"
+ },
+ "from": {
+ "attributes": {
+ "name": {
+ "column": "agencyABN",
+ "datatype": "id",
+ "type": "id",
+ "description": null
+ },
+ "label": {
+ "column": "agencyName",
+ "datatype": "string",
+ "type": "attribute",
+ "description": null
+ }
+ },
+ "label": "Government Agency",
+ "type": "compound",
+ "dimension": "from",
+ "description": "Government Agency"
+ },
+ "description": {
+ "description": null,
+ "datatype": "string",
+ "label": "description",
+ "column": "description",
+ "type": "attribute",
+ "dimension": "description"
+ },
+ "publishdate": {
+ "description": null,
+ "format": null,
+ "datatype": "date",
+ "label": "publishDate",
+ "column": "publishDate",
+ "type": "date",
+ "dimension": "publishdate"
+ },
+ "to": {
+ "attributes": {
+ "name": {
+ "column": "supplierid",
+ "datatype": "id",
+ "type": "id"
+ },
+ "label": {
+ "column": "supplierName",
+ "datatype": "string",
+ "type": "attribute"
+ }
+ },
+ "label": "Supplier Name",
+ "type": "compound",
+ "dimension": "to",
+ "description": "Government Supplier"
+ },
+ "amount": {
+ "description": "The total value of the contract including all variations/amendments/extensions",
+ "datatype": "float",
+ "label": "value",
+ "column": "value",
+ "type": "measure",
+ "dimension": "amount"
+ },
+ "cnid": {
+ "description": "Contract Notice ID",
+ "datatype": "string",
+ "label": "CNID",
+ "column": "CNID",
+ "key": true,
+ "type": "attribute",
+ "dimension": "cnid"
+ },
+ "contractend": {
+ "description": "End of the contract period (goods or services being received)",
+ "format": null,
+ "datatype": "date",
+ "label": "contractEnd",
+ "column": "contractEnd",
+ "type": "date",
+ "dimension": "contractend"
+ },
+ "time": {
+ "description": "Start of the contract period (goods or services being received)",
+ "format": null,
+ "datatype": "date",
+ "label": "contractStart",
+ "column": "contractStart",
+ "type": "date",
+ "dimension": "time"
+ }
+ },
+ "views": [
{
- "name": "default",
- "entity": "dataset",
- "label": "Default breakdown by Category",
- "dimension": "dataset",
- "breakdown": "category",
- "filters" : {"name": "australian_federal_government_contract_spending" }
- },
- {
- "name":"default",
- "entity": "classifier",
- "label":"Breakdown of Spending Areas by Supplier Company",
- "dimension": "category",
- "breakdown": "to",
- "filters": {"taxonomy": "unspsc"}
- },
- {
- "name":"default",
- "entity": "classifier",
- "label":"Breakdown of Spending Areas by Government Agency",
- "dimension": "category",
- "breakdown": "from",
- "filters": {"taxonomy": "unspsc"}
- }
-]
+ "name": "default",
+ "label": "Breakdown by Category",
+ "cuts": {},
+ "drilldown": "category",
+ "entity": "dataset",
+ "dimension": "dataset"
+ },
+ {
+ "name": "by_supplier",
+ "label": "Breakdown by Supplier",
+ "cuts": {},
+ "drilldown": "to",
+ "entity": "dataset",
+ "dimension": "dataset"
+ },
+ {
+ "name": "by_agency",
+ "label": "Breakdown by Agency",
+ "cuts": {},
+ "drilldown": "from",
+ "entity": "dataset",
+ "dimension": "dataset"
+ },
+ {
+ "name": "default",
+ "label": "Agency spending breakdown by supplier",
+ "cuts": {},
+ "drilldown": "to",
+ "entity": "dimension",
+ "dimension": "from"
+ },
+ {
+ "name": "default",
+ "label": "Supplier contracts breakdown by procuring agency",
+ "cuts": {},
+ "drilldown": "from",
+ "entity": "dimension",
+ "dimension": "to"
+ }
+ ]
}
-
--- /dev/null
+++ b/bootstrap.min.css
@@ -1,1 +1,357 @@
+html,body{margin:0;padding:0;}
+h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;}
+table{border-collapse:collapse;border-spacing:0;}
+ol,ul{list-style:none;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted;}
+a:hover,a:active{outline:0;}
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{border:0;-ms-interpolation-mode:bicubic;}
+button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;}
+button,input{line-height:normal;*overflow:visible;}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}
+button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
+input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
+input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+body{background-color:#ffffff;margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#404040;}
+.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;}
+.container:after{clear:both;}
+.container-fluid{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;}
+.container-fluid:after{clear:both;}
+.container-fluid>.sidebar{position:absolute;top:0;left:20px;width:220px;}
+.container-fluid>.content{margin-left:240px;}
+a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;}
+.row:after{clear:both;}
+.row>[class*="span"]{display:inline;float:left;margin-left:20px;}
+.span1{width:40px;}
+.span2{width:100px;}
+.span3{width:160px;}
+.span4{width:220px;}
+.span5{width:280px;}
+.span6{width:340px;}
+.span7{width:400px;}
+.span8{width:460px;}
+.span9{width:520px;}
+.span10{width:580px;}
+.span11{width:640px;}
+.span12{width:700px;}
+.span13{width:760px;}
+.span14{width:820px;}
+.span15{width:880px;}
+.span16{width:940px;}
+.span17{width:1000px;}
+.span18{width:1060px;}
+.span19{width:1120px;}
+.span20{width:1180px;}
+.span21{width:1240px;}
+.span22{width:1300px;}
+.span23{width:1360px;}
+.span24{width:1420px;}
+.row>.offset1{margin-left:80px;}
+.row>.offset2{margin-left:140px;}
+.row>.offset3{margin-left:200px;}
+.row>.offset4{margin-left:260px;}
+.row>.offset5{margin-left:320px;}
+.row>.offset6{margin-left:380px;}
+.row>.offset7{margin-left:440px;}
+.row>.offset8{margin-left:500px;}
+.row>.offset9{margin-left:560px;}
+.row>.offset10{margin-left:620px;}
+.row>.offset11{margin-left:680px;}
+.row>.offset12{margin-left:740px;}
+.span-one-third{width:300px;}
+.span-two-thirds{width:620px;}
+.row>.offset-one-third{margin-left:340px;}
+.row>.offset-two-thirds{margin-left:660px;}
+p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
+h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
+h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
+h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
+h3,h4,h5,h6{line-height:36px;}
+h3{font-size:18px;}h3 small{font-size:14px;}
+h4{font-size:16px;}h4 small{font-size:12px;}
+h5{font-size:14px;}
+h6{font-size:13px;color:#bfbfbf;text-transform:uppercase;}
+ul,ol{margin:0 0 18px 25px;}
+ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
+ul{list-style:disc;}
+ol{list-style:decimal;}
+li{line-height:18px;color:#808080;}
+ul.unstyled{list-style:none;margin-left:0;}
+dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
+dl dt{font-weight:bold;}
+dl dd{margin-left:9px;}
+hr{margin:20px 0 19px;border:0;border-bottom:1px solid #eee;}
+strong{font-style:inherit;font-weight:bold;}
+em{font-style:italic;font-weight:inherit;line-height:inherit;}
+.muted{color:#bfbfbf;}
+blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;}
+blockquote small{display:blo