From: Maxious Date: Tue, 27 Dec 2011 06:44:05 +0000 Subject: Update import for better PDO statement reuse and only store name/abn/status for agencies X-Git-Url: http://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=81adc43f52498ce22c8978f059eaf5bb724641b7 --- Update import for better PDO statement reuse and only store name/abn/status for agencies --- --- a/admin/fixoldamend.php +++ b/admin/fixoldamend.php @@ -20,7 +20,7 @@ echo "$oldCN => $newCN (from parent CN $parentCN)
\n"; } else { - echo "parent CN unexpected - $oldCN doesn't look like child of {$record['parentCN']}
\n"; +// echo "parent CN unexpected - $oldCN doesn't look like child of {$record['parentCN']}
\n"; } } --- a/admin/import.php +++ b/admin/import.php @@ -1,271 +1,258 @@ "agencyName", - "Parent CN ID" => "parentCN", - "CN ID" => "CNID", - "Publish Date" => "publishDate", - "Amendment Date" => "amendDate", - "Status" => "", - "StartDate" => "contractStart", - "EndDate" => "contractEnd", - "Value" => "value", - "Description" => "description", - "Agency Ref Id" => "agencyID", - "Category" => "category", - "Procurement Method" => "procurementMethod", - "ATM ID" => "atmID", - "SON ID" => "SONID", - "Confidentiality - Contract" => "confidentialityContract", - "Confidentiality - Contract Reason(s)" => "confidentialityContractReason", - "Confidentiality - Outputs" => "confidentialityOutputs", - "Confidentiality - Outputs Reason(s)" => "confidentialityOutputsReason", - "Consultancy" => "consultancy", - "Consultancy Reason(s)" => "consultancyReason", - "Amendment Reason" => "amendmentReason", - "Supplier Name" => "supplierName", - "Supplier Address" => "supplierAddress", - "Supplier City" => "supplierCity", - "Supplier Postcode" => "supplierPostcode", - "Supplier Country" => "supplierCountry", - "Supplier ABNExempt" => "supplierABNExempt", - "Supplier ABN" => "supplierABN", - "Agency Branch" => "contactBranch", - "Agency Divison" => "contactDivision", - "Agency Postcode" => "contactPostcode", - "" => "" - ); - $headers; - $contractNoticeFields = array( - "importFile", - "agencyName", - "parentCN", - "CNID", - "publishDate", - "amendDate", - "contractStart", - "contractEnd", - "value", - "description", - "agencyID", - "category", - "procurementMethod", - "atmID", - "SONID", - "confidentialityContract", - "confidentialityContractReason", - "confidentialityOutputs", - "confidentialityOutputsReason", - "consultancy", - "consultancyReason", - "amendmentReason", - "supplierName", - "supplierAddress", - "supplierCity", - "supplierPostcode", - "supplierCountry", - "supplierABNExempt", - "supplierABN", - "contactBranch", - "contactDivision", - "contactPostcode" - ); - $agencyFields = array( - "agencyName" - ); - $supplierFields = array( - "supplierName", - "supplierAddress", - "supplierCity", - "supplierPostcode", - "supplierCountry", - "supplierABNExempt", - "supplierABN" - ); - if ($tablename == "contractnotice") { - $contractNoticeInsertQ = 'INSERT INTO contractnotice ("' . implode('" , "', $contractNoticeFields) . '") VALUES ( '; - foreach ($contractNoticeFields as $key => $f) { - $contractNoticeInsertQ.= ($key == 0 ? "" : ", ") . "?"; - } - $contractNoticeInsertQ.= ");"; - $contractNoticeInsertQ = $conn->prepare($contractNoticeInsertQ); - } - else if ($tablename == "supplierdetails") { - $supplierInsertQ = 'INSERT INTO supplierdetails ("' . implode('" , "', $supplierFields) . '") VALUES ( '; - foreach ($supplierFields as $key => $f) { - $supplierInsertQ.= ($key == 0 ? "" : ", ") . "?"; - } - $supplierInsertQ.= ");"; - $supplierInsertQ = $conn->prepare($supplierInsertQ); - } - else if ($tablename == "agency") { - $agencyInsertQ = 'INSERT INTO agency ("' . implode('" , "', $agencyFields) . '") VALUES ( '; - foreach ($agencyFields as $key => $f) { - $agencyInsertQ.= ($key == 0 ? "" : ", ") . "?"; - } - $agencyInsertQ.= ");"; - $agencyInsertQ = $conn->prepare($agencyInsertQ); - } - while (($data = fgetcsv($handle, 1000, "\t")) !== false) { - $num = count($data); - if ($row == 3) { - $headers = $data; - } - elseif ($row > 3) { - if ($num > count($datamapping0711)) { - die("Error in data import; data mapping fields out of bounds or changed
" . $fname . print_r($data)); - } - $contractNoticeInsert = Array(); - $supplierInsert = Array(); - $agencyInsert = Array(); - $contractNoticeInsert[] = $fpath; - $keys = array_keys($datamapping0711); - for ($c = 0; $c < $num; $c++) { - $data[$c] = trim($data[$c], "="); - $data[$c] = trim($data[$c], "\""); - if ($tablename == "contractnotice") { - if (in_array(($datamapping0711[$headers[$c]]) , $contractNoticeFields)) { - if (($datamapping0711[$headers[$c]]) == "parentCN" || ($datamapping0711[$headers[$c]]) == "CNID") { - $data[$c] = substr($data[$c], 2); // take off the "CN" prefix - if ($data[$c] > 0) { - $contractNoticeInsert[] = $data[$c]; - } - else { - $contractNoticeInsert[] = 0; - } - } - elseif (($datamapping0711[$headers[$c]]) == "supplierABN") { - if ($data[$c] > 0) { - $contractNoticeInsert[] = $data[$c]; - } - else { - $contractNoticeInsert[] = null; - } - } - elseif (($datamapping0711[$headers[$c]]) == "amendDate" || ($datamapping0711[$headers[$c]]) == "publishDate" || ($datamapping0711[$headers[$c]]) == "contractStart" || ($datamapping0711[$headers[$c]]) == "contractEnd") { - $contractNoticeInsert[] = date('Y-m-d H:i:s', strtotime($data[$c])); - } - else { - if (strstr("\" =", $data[$c] > 0)) { - die("Invalid Description field" . $contractNoticeInsert); - } -$colvalue = preg_replace( '/[^[:print:]]/', '',utf8_encode( $data[$c])); - - $contractNoticeInsert[] = $colvalue; - } - } - } - else if ($tablename == "supplierdetails") { - if (in_array(($datamapping0711[$headers[$c]]) , $supplierFields)) { - if (($datamapping0711[$headers[$c]]) == "supplierABN") { - if ($data[$c] > 0) { - $contractNoticeInsert[] = $data[$c]; - } - else { - $contractNoticeInsert[] = 0; - } - } - else { - $supplierInsert[] = $data[$c]; - } - } - } - else if ($tablename == "agency") { - if (in_array(($datamapping0711[$headers[$c]]) , $agencyFields)) { - $agencyInsert[] = $data[$c]; - } - } - } - flush(); - if ($tablename == "contractnotice") { - $contractNoticeInsertQ->execute($contractNoticeInsert); - $errors = $conn->errorInfo(); - if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) { - } - elseif ($errors[1] == 0) { - $success++; - } - else { - foreach ($contractNoticeFields as $key => $cnf) { - echo var_dump($contractNoticeInsert[$key]) . $cnf . "
"; - } - echo $data[2] . " failed CN insert.
" . print_r($errors, true) . "
row $row

\n"; - } - } - else if ($tablename == "supplierdetails") { - $supplierInsertQ->execute($supplierInsert); - $errors = $conn->errorInfo(); - if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) { - } - elseif ($errors[1] == 0) { - $success++; - } - else { - echo $data[2] . " failed supplier insert.
" . print_r($errors, true) . "
" . print_r($supplierInsert, true) . "
$row

\n"; - } - } - else if ($tablename == "agency") { - $agencyInsertQ->execute($agencyInsert); - $errors = $conn->errorInfo(); - if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) { - } - elseif ($errors[1] == 0) { - $success++; - } - else { - echo $data[2] . " failed agency insert.
" . print_r($errors, true) . "
" . print_r($agencyInsert, true) . "
$row

\n"; - } - } - flush(); - //echo "
\n"; - - } - $row++; - } - fclose($handle); - // run post import data processing + +$contractNoticeFields = array( + "importFile", + "agencyName", + "parentCN", + "CNID", + "publishDate", + "amendDate", + "contractStart", + "contractEnd", + "value", + "description", + "agencyID", + "category", + "procurementMethod", + "atmID", + "SONID", + "confidentialityContract", + "confidentialityContractReason", + "confidentialityOutputs", + "confidentialityOutputsReason", + "consultancy", + "consultancyReason", + "amendmentReason", + "supplierName", + "supplierAddress", + "supplierCity", + "supplierPostcode", + "supplierCountry", + "supplierABNExempt", + "supplierABN", + "contactBranch", + "contactDivision", + "contactPostcode" +); +$agencyFields = array( + "agencyName" +); +$supplierFields = array( + "supplierName", + "supplierAddress", + "supplierCity", + "supplierPostcode", + "supplierCountry", + "supplierABNExempt", + "supplierABN" +); +$contractNoticeInsertQ = 'INSERT INTO contractnotice ("' . implode('" , "', $contractNoticeFields) . '") VALUES ( '; +foreach ($contractNoticeFields as $key => $f) { + $contractNoticeInsertQ.= ($key == 0 ? "" : ", ") . "?"; +} +$contractNoticeInsertQ.= ");"; +$contractNoticeInsertQ = $conn->prepare($contractNoticeInsertQ); + +$supplierInsertQ = 'INSERT INTO supplierdetails ("' . implode('" , "', $supplierFields) . '") VALUES ( '; +foreach ($supplierFields as $key => $f) { + $supplierInsertQ.= ($key == 0 ? "" : ", ") . "?"; +} +$supplierInsertQ.= ");"; +$supplierInsertQ = $conn->prepare($supplierInsertQ); + +$agencyInsertQ = 'INSERT INTO agency_nametoabn ("' . implode('" , "', $agencyFields) . '") VALUES ( '; +foreach ($agencyFields as $key => $f) { + $agencyInsertQ.= ($key == 0 ? "" : ", ") . "?"; +} +$agencyInsertQ.= ");"; +$agencyInsertQ = $conn->prepare($agencyInsertQ); + +function processFile($fpath, $tablename) { + global $conn, $contractNoticeQ, $supplierInsertQ, $agencyInsertQ; + $row = 1; + $handle = fopen($fpath, "r"); + //"t" mode string translates windows line breaks to unix + $datamapping0711 = array( + "Agency" => "agencyName", + "Parent CN ID" => "parentCN", + "CN ID" => "CNID", + "Publish Date" => "publishDate", + "Amendment Date" => "amendDate", + "Status" => "", + "StartDate" => "contractStart", + "EndDate" => "contractEnd", + "Value" => "value", + "Description" => "description", + "Agency Ref Id" => "agencyID", + "Category" => "category", + "Procurement Method" => "procurementMethod", + "ATM ID" => "atmID", + "SON ID" => "SONID", + "Confidentiality - Contract" => "confidentialityContract", + "Confidentiality - Contract Reason(s)" => "confidentialityContractReason", + "Confidentiality - Outputs" => "confidentialityOutputs", + "Confidentiality - Outputs Reason(s)" => "confidentialityOutputsReason", + "Consultancy" => "consultancy", + "Consultancy Reason(s)" => "consultancyReason", + "Amendment Reason" => "amendmentReason", + "Supplier Name" => "supplierName", + "Supplier Address" => "supplierAddress", + "Supplier City" => "supplierCity", + "Supplier Postcode" => "supplierPostcode", + "Supplier Country" => "supplierCountry", + "Supplier ABNExempt" => "supplierABNExempt", + "Supplier ABN" => "supplierABN", + "Agency Branch" => "contactBranch", + "Agency Divison" => "contactDivision", + "Agency Postcode" => "contactPostcode", + "" => "" + ); + $headers; + + while (($data = fgetcsv($handle, 1000, "\t")) !== false) { + $num = count($data); + if ($row == 3) { + $headers = $data; + } elseif ($row > 3) { + if ($num > count($datamapping0711)) { + die("Error in data import; data mapping fields out of bounds or changed
" . $fname . print_r($data)); + } + $contractNoticeInsert = Array(); + $supplierInsert = Array(); + $agencyInsert = Array(); + $contractNoticeInsert[] = $fpath; + $keys = array_keys($datamapping0711); + for ($c = 0; $c < $num; $c++) { + $data[$c] = trim($data[$c], "="); + $data[$c] = trim($data[$c], "\""); + if ($tablename == "contractnotice") { + if (in_array(($datamapping0711[$headers[$c]]), $contractNoticeFields)) { + if (($datamapping0711[$headers[$c]]) == "parentCN" || ($datamapping0711[$headers[$c]]) == "CNID") { + $data[$c] = substr($data[$c], 2); // take off the "CN" prefix + if ($data[$c] > 0) { + $contractNoticeInsert[] = $data[$c]; + } else { + $contractNoticeInsert[] = 0; + } + } elseif (($datamapping0711[$headers[$c]]) == "supplierABN") { + if ($data[$c] > 0) { + $contractNoticeInsert[] = $data[$c]; + } else { + $contractNoticeInsert[] = null; + } + } elseif (($datamapping0711[$headers[$c]]) == "amendDate" || ($datamapping0711[$headers[$c]]) == "publishDate" || ($datamapping0711[$headers[$c]]) == "contractStart" || ($datamapping0711[$headers[$c]]) == "contractEnd") { + $contractNoticeInsert[] = date('Y-m-d H:i:s', strtotime($data[$c])); + } else { + if (strstr("\" =", $data[$c] > 0)) { + die("Invalid Description field" . $contractNoticeInsert); + } + $colvalue = preg_replace('/[^[:print:]]/', '', utf8_encode($data[$c])); + + $contractNoticeInsert[] = $colvalue; + } + } + } else if ($tablename == "supplierdetails") { + if (in_array(($datamapping0711[$headers[$c]]), $supplierFields)) { + if (($datamapping0711[$headers[$c]]) == "supplierABN") { + if ($data[$c] > 0) { + $contractNoticeInsert[] = $data[$c]; + } else { + $contractNoticeInsert[] = 0; + } + } else { + $supplierInsert[] = $data[$c]; + } + } + } else if ($tablename == "agency") { + if (in_array(($datamapping0711[$headers[$c]]), $agencyFields)) { + $agencyInsert[] = $data[$c]; + } + } + } + flush(); + if ($tablename == "contractnotice") { + $contractNoticeInsertQ->execute($contractNoticeInsert); + $errors = $conn->errorInfo(); + if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) { + + } elseif ($errors[1] == 0) { + $success++; + } else { + foreach ($contractNoticeFields as $key => $cnf) { + echo var_dump($contractNoticeInsert[$key]) . $cnf . "
"; + } + echo $data[2] . " failed CN insert.
" . print_r($errors, true) . "
row $row

\n"; + } + } else if ($tablename == "supplierdetails") { + $supplierInsertQ->execute($supplierInsert); + $errors = $conn->errorInfo(); + if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) { + + } elseif ($errors[1] == 0) { + $success++; + } else { + echo $data[2] . " failed supplier insert.
" . print_r($errors, true) . "
" . print_r($supplierInsert, true) . "
$row

\n"; + } + } else if ($tablename == "agency") { + $agencyInsertQ->execute($agencyInsert); + $errors = $conn->errorInfo(); + if ($errors[1] == 7 && strpos($errors[2], "duplicate key")) { + + } elseif ($errors[1] == 0) { + $success++; + } else { + echo $data[2] . " failed agency insert.
" . print_r($errors, true) . "
" . print_r($agencyInsert, true) . "
$row

\n"; + } + } + flush(); + //echo "
\n"; + } + $row++; + } + fclose($handle); + $contractNoticeInsertQ->closeCursor(); + $supplierInsertQ->closeCursor(); + $agencyInsertQ->closeCursor(); + + return $success; +} + +$path = 'data/'; +if ($_REQUEST["fname"] == "") { + echo "Get files from: https://www.tenders.gov.au/?event=public.reports.list
"; + $dhandle = opendir($path); + // define an array to hold the files + $files = array(); + if ($dhandle) { + // loop through all of the files + while (false !== ($fname = readdir($dhandle))) { + if (($fname != '.') && ($fname != '..')) { + echo "$fname " . filesize($path . $fname) . " " . date("c", filemtime($path . $fname)) . "
"; + } + } + } +} else { + $success = 0; + $fname = $_REQUEST["fname"]; + echo " ============== $fname ==============
"; + flush(); + $success+= processFile($path . $fname, "contractnotice"); + $success+= processFile($path . $fname, "agency"); + $success+= processFile($path . $fname, "supplier"); + echo "
$success records successfully created"; + + flush(); + // run post import data processing // cn -echo "link amend
"; -include ("linkAmendments.php"); -echo "update UNSPSC
"; -include ("updateUNSPSC.php"); + echo "link amend
"; + include ("linkAmendments.php"); + echo "update UNSPSC
"; + include ("updateUNSPSC.php"); // agency //include ("setAgencyStatus.php"); //include ("setAgencyURLABN.php"); - return $success; -} -$path = 'data/'; -if ($_REQUEST["fname"] == "") { - echo "Get files from: https://www.tenders.gov.au/?event=public.reports.list
"; - $dhandle = opendir($path); - // define an array to hold the files - $files = array(); - if ($dhandle) { - // loop through all of the files - while (false !== ($fname = readdir($dhandle))) { - if (($fname != '.') && ($fname != '..')) { - echo "$fname " . filesize($path . $fname) . " " . date("c", filemtime($path . $fname)) . "
"; - } - } - } -} -else { - $success = 0; - $fname = $_REQUEST["fname"]; - echo " ============== $fname ==============
"; - flush(); - $success+= processFile($path . $fname, "contractnotice"); - $success+= processFile($path . $fname, "agency"); - $success+= processFile($path . $fname, "supplier"); - echo "
$success records successfully created"; - flush(); -} - +} ?> --- a/admin/linkAmendments.php +++ b/admin/linkAmendments.php @@ -2,7 +2,7 @@ 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(); databaseError($conn->errorInfo()); @@ -28,9 +28,9 @@ 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(); --- a/admin/partialdata/scraper.php +++ /dev/null @@ -1,74 +1,1 @@ -= 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 ""; -$current = file_get_contents($url); -if (strpos($current,"There are no results that match your selection.")> 0 ) { - echo "Empty file!
"; -} -if (strpos($current,"Your search returned more than 1000 results.") === false) { - file_put_contents($file, $current); - echo "$file saved
"; - echo format_bytes(filesize($file))."
"; - echo 'Load next '.($days).' days
'; - echo 'Load next '.($days*2).' days
'; - echo 'Load next '.($days).' days with split
'; - flush(); -if (!isset($_REQUEST['split']) && !$split) { -echo "Success so fetching next $days...
"; -getFile($endDate, $days, "" , ""); -} - return true; -} else { - echo "Too many records!
"; - echo 'Load '.($days/2).' days instead?
'; - echo 'Split instead?
'; - flush(); -if (!isset($_REQUEST['split']) && !$split) { -echo "Failure so splitting ...
"; - 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/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:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} +address{display:block;line-height:18px;margin-bottom:18px;} +code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} +pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;} +form{margin-bottom:18px;} +fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padding-left:150px;font-size:19.5px;line-height:1;color:#404040;*padding:0 0 5px 145px;*line-height:1.5;} +form .clearfix{margin-bottom:18px;zoom:1;}form .clearfix:before,form .clearfix:after{display:table;content:"";zoom:1;} +form .clearfix:after{clear:both;} +label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} +label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} +form .input{margin-left:150px;} +input[type=checkbox],input[type=radio]{cursor:pointer;} +input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +select{padding:initial;} +input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;} +input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} +select,input[type=file]{height:27px;*height:auto;line-height:27px;*margin-top:4px;} +select[multiple]{height:inherit;background-color:#ffffff;} +textarea{height:auto;} +.uneditable-input{background-color:#ffffff;display:block;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} +:-moz-placeholder{color:#bfbfbf;} +::-webkit-input-placeholder{color:#bfbfbf;} +input,textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} +input:focus,textarea:focus{outline:0;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} +input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;} +form .clearfix.error>label,form .clearfix.error .help-block,form .clearfix.error .help-inline{color:#b94a48;} +form .clearfix.error input,form .clearfix.error textarea{color:#b94a48;border-color:#ee5f5b;}form .clearfix.error input:focus,form .clearfix.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} +form .clearfix.error .input-prepend .add-on,form .clearfix.error .input-append .add-on{color:#b94a48;background-color:#fce6e6;border-color:#b94a48;} +form .clearfix.warning>label,form .clearfix.warning .help-block,form .clearfix.warning .help-inline{color:#c09853;} +form .clearfix.warning input,form .clearfix.warning textarea{color:#c09853;border-color:#ccae64;}form .clearfix.warning input:focus,form .clearfix.warning textarea:focus{border-color:#be9a3f;-webkit-box-shadow:0 0 6px #e5d6b1;-moz-box-shadow:0 0 6px #e5d6b1;box-shadow:0 0 6px #e5d6b1;} +form .clearfix.warning .input-prepend .add-on,form .clearfix.warning .input-append .add-on{color:#c09853;background-color:#d2b877;border-color:#c09853;} +form .clearfix.success>label,form .clearfix.success .help-block,form .clearfix.success .help-inline{color:#468847;} +form .clearfix.success input,form .clearfix.success textarea{color:#468847;border-color:#57a957;}form .clearfix.success input:focus,form .clearfix.success textarea:focus{border-color:#458845;-webkit-box-shadow:0 0 6px #9acc9a;-moz-box-shadow:0 0 6px #9acc9a;box-shadow:0 0 6px #9acc9a;} +form .clearfix.success .input-prepend .add-on,form .clearfix.success .input-append .add-on{color:#468847;background-color:#bcddbc;border-color:#468847;} +.input-mini,input.mini,textarea.mini,select.mini{width:60px;} +.input-small,input.small,textarea.small,select.small{width:90px;} +.input-medium,input.medium,textarea.medium,select.medium{width:150px;} +.input-large,input.large,textarea.large,select.large{width:210px;} +.input-xlarge,input.xlarge,textarea.xlarge,select.xlarge{width:270px;} +.input-xxlarge,input.xxlarge,textarea.xxlarge,select.xxlarge{width:530px;} +textarea.xxlarge{overflow-y:auto;} +input.span1,textarea.span1{display:inline-block;float:none;width:30px;margin-left:0;} +input.span2,textarea.span2{display:inline-block;float:none;width:90px;margin-left:0;} +input.span3,textarea.span3{display:inline-block;float:none;width:150px;margin-left:0;} +input.span4,textarea.span4{display:inline-block;float:none;width:210px;margin-left:0;} +input.span5,textarea.span5{display:inline-block;float:none;width:270px;margin-left:0;} +input.span6,textarea.span6{display:inline-block;float:none;width:330px;margin-left:0;} +input.span7,textarea.span7{display:inline-block;float:none;width:390px;margin-left:0;} +input.span8,textarea.span8{display:inline-block;float:none;width:450px;margin-left:0;} +input.span9,textarea.span9{display:inline-block;float:none;width:510px;margin-left:0;} +input.span10,textarea.span10{display:inline-block;float:none;width:570px;margin-left:0;} +input.span11,textarea.span11{display:inline-block;float:none;width:630px;margin-left:0;} +input.span12,textarea.span12{display:inline-block;float:none;width:690px;margin-left:0;} +input.span13,textarea.span13{display:inline-block;float:none;width:750px;margin-left:0;} +input.span14,textarea.span14{display:inline-block;float:none;width:810px;margin-left:0;} +input.span15,textarea.span15{display:inline-block;float:none;width:870px;margin-left:0;} +input.span16,textarea.span16{display:inline-block;float:none;width:930px;margin-left:0;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} +.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;} +.help-inline,.help-block{font-size:13px;line-height:18px;color:#bfbfbf;} +.help-inline{padding-left:5px;*position:relative;*top:-5px;} +.help-block{display:block;max-width:600px;} +.inline-inputs{color:#808080;}.inline-inputs span{padding:0 2px 0 1px;} +.input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;} +.input-prepend .add-on{*margin-top:1px;} +.input-append input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;margin-right:0;margin-left:-1px;} +.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;} +.inputs-list label{display:block;float:none;width:auto;padding:0;margin-left:20px;line-height:18px;text-align:left;white-space:normal;}.inputs-list label strong{color:#808080;} +.inputs-list label small{font-size:11px;font-weight:normal;} +.inputs-list .inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} +.inputs-list:first-child{padding-top:6px;} +.inputs-list li+li{padding-top:2px;} +.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;margin-left:-20px;float:left;} +.form-stacked{padding-left:20px;}.form-stacked fieldset{padding-top:9px;} +.form-stacked legend{padding-left:0;} +.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} +.form-stacked .clearfix{margin-bottom:9px;}.form-stacked .clearfix div.input{margin-left:0;} +.form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} +.form-stacked div.clearfix.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} +.form-stacked .actions{margin-left:-20px;padding-left:20px;} +table{width:100%;margin-bottom:18px;padding:0;font-size:13px;border-collapse:collapse;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;} +table th{padding-top:9px;font-weight:bold;vertical-align:middle;} +table td{vertical-align:top;border-top:1px solid #ddd;} +table tbody th{border-top:1px solid #ddd;vertical-align:top;} +.condensed-table th,.condensed-table td{padding:5px 5px 4px;} +.bordered-table{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td{border-left:1px solid #ddd;} +.bordered-table thead tr:first-child th:first-child,.bordered-table tbody tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} +.bordered-table thead tr:first-child th:last-child,.bordered-table tbody tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} +.bordered-table tbody tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} +.bordered-table tbody tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} +table .span1{width:20px;} +table .span2{width:60px;} +table .span3{width:100px;} +table .span4{width:140px;} +table .span5{width:180px;} +table .span6{width:220px;} +table .span7{width:260px;} +table .span8{width:300px;} +table .span9{width:340px;} +table .span10{width:380px;} +table .span11{width:420px;} +table .span12{width:460px;} +table .span13{width:500px;} +table .span14{width:540px;} +table .span15{width:580px;} +table .span16{width:620px;} +.zebra-striped tbody tr:nth-child(odd) td,.zebra-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} +.zebra-striped tbody tr:hover td,.zebra-striped tbody tr:hover th{background-color:#f5f5f5;} +table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} +table .headerSortUp,table .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} +table .header:hover:after{visibility:visible;} +table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +table .blue{color:#049cdb;border-bottom-color:#049cdb;} +table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;} +table .green{color:#46a546;border-bottom-color:#46a546;} +table .headerSortUp.green,table .headerSortDown.green{background-color:#cdeacd;} +table .red{color:#9d261d;border-bottom-color:#9d261d;} +table .headerSortUp.red,table .headerSortDown.red{background-color:#f4c8c5;} +table .yellow{color:#ffc40d;border-bottom-color:#ffc40d;} +table .headerSortUp.yellow,table .headerSortDown.yellow{background-color:#fff6d9;} +table .orange{color:#f89406;border-bottom-color:#f89406;} +table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;} +table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} +table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} +.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.topbar h3 a:hover,.topbar .brand:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} +.topbar h3{position:relative;} +.topbar h3 a,.topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} +.topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;color:#ffffff;} +.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;} +.topbar form.pull-right{float:right;} +.topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;} +.topbar input::-webkit-input-placeholder{color:#e6e6e6;} +.topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} +.topbar input:focus,.topbar input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.topbar-inner,.topbar .fill{background-color:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +.topbar div>ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar div>ul>li,.nav>li{display:block;float:left;} +.topbar div>ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar div>ul a:hover,.nav a:hover{color:#ffffff;text-decoration:none;} +.topbar div>ul .active>a,.nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} +.topbar div>ul.secondary-nav,.nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.topbar div>ul.secondary-nav .menu-dropdown,.nav.secondary-nav .menu-dropdown,.topbar div>ul.secondary-nav .dropdown-menu,.nav.secondary-nav .dropdown-menu{right:0;border:0;} +.topbar div>ul a.menu:hover,.nav a.menu:hover,.topbar div>ul li.open .menu,.nav li.open .menu,.topbar div>ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover,.topbar div>ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} +.topbar div>ul .menu-dropdown,.nav .menu-dropdown,.topbar div>ul .dropdown-menu,.nav .dropdown-menu{background-color:#333;}.topbar div>ul .menu-dropdown a.menu,.nav .menu-dropdown a.menu,.topbar div>ul .dropdown-menu a.menu,.nav .dropdown-menu a.menu,.topbar div>ul .menu-dropdown .dropdown-toggle,.nav .menu-dropdown .dropdown-toggle,.topbar div>ul .dropdown-menu .dropdown-toggle,.nav .dropdown-menu .dropdown-toggle{color:#ffffff;}.topbar div>ul .menu-dropdown a.menu.open,.nav .menu-dropdown a.menu.open,.topbar div>ul .dropdown-menu a.menu.open,.nav .dropdown-menu a.menu.open,.topbar div>ul .menu-dropdown .dropdown-toggle.open,.nav .menu-dropdown .dropdown-toggle.open,.topbar div>ul .dropdown-menu .dropdown-toggle.open,.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} +.topbar div>ul .menu-dropdown li a,.nav .menu-dropdown li a,.topbar div>ul .dropdown-menu li a,.nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.topbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.topbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);color:#ffffff;} +.topbar div>ul .menu-dropdown .active a,.nav .menu-dropdown .active a,.topbar div>ul .dropdown-menu .active a,.nav .dropdown-menu .active a{color:#ffffff;} +.topbar div>ul .menu-dropdown .divider,.nav .menu-dropdown .divider,.topbar div>ul .dropdown-menu .divider,.nav .dropdown-menu .divider{background-color:#222;border-color:#444;} +.topbar ul .menu-dropdown li a,.topbar ul .dropdown-menu li a{padding:4px 15px;} +li.menu,.dropdown{position:relative;} +a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} +.menu-dropdown,.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.menu-dropdown li,.dropdown-menu li{float:none;display:block;background-color:none;} +.menu-dropdown .divider,.dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;} +.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover,.topbar .dropdown-menu a.hover,.dropdown-menu a.hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} +.open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} +.open .menu-dropdown,.dropdown.open .menu-dropdown,.open .dropdown-menu,.dropdown.open .dropdown-menu{display:block;} +.tabs,.pills{margin:0 0 18px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;} +.tabs:after,.pills:after{clear:both;} +.tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} +.tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:34px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} +.tabs .active>a,.tabs .active>a:hover{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} +.tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} +.tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;} +.tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;} +.pills a{margin:5px 3px 5px 0;padding:0 15px;line-height:30px;text-shadow:0 1px 1px #ffffff;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#00438a;} +.pills .active a{color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);background-color:#0069d6;} +.pills-vertical>li{float:none;} +.tab-content>.tab-pane,.pill-content>.pill-pane,.tab-content>div,.pill-content>div{display:none;} +.tab-content>.active,.pill-content>.active{display:block;} +.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#f5f5f5;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;} +.breadcrumb .divider{padding:0 5px;color:#bfbfbf;} +.breadcrumb .active a{color:#404040;} +.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit p{font-size:18px;font-weight:200;line-height:27px;} +footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} +.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} +.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn