projects / disclosr.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
unified | plain
URL formatting fixes
URL formatting fixes


Former-commit-id: 33bf0d2e055726bff60007acbd7ee78cf50880c2

file:a/about.php -> file:b/about.php
  <?php
  include_once('include/common.inc.php');
  include_header();
  ?>
  <div class="foundation-header">
  <h1><a href="about.php">About/FAQ</a></h1>
  <h4 class="subheader">Lorem ipsum.</h4>
  </div>
  <h2> Open everything </h2>
  all documents released CC-BY 3 AU
  Open source git @
   
Organisational Data Sources <h2>Organisational Data Sources</h2>
   
http://www.comlaw.gov.au/Browse/Results/ByTitle/AdministrativeArrangementsOrders/Current/Ad/0 defines departments http://www.comlaw.gov.au/Browse/Results/ByTitle/AdministrativeArrangementsOrders/Current/Ad/0 defines departments
Agencies can be found in the Schedule to an Appropriation Bill (budget), Schedule to FMA Regulations and/or Public Service Act. Agencies can be found in the Schedule to an Appropriation Bill (budget), Schedule to FMA Regulations and/or Public Service Act.
   
http://www.finance.gov.au/publications/flipchart/docs/FMACACFlipchart.pdf summarises these http://www.finance.gov.au/publications/flipchart/docs/FMACACFlipchart.pdf summarises these
   
When defining the hierachy, this system is designed towards monitoring accountablity. Thus large agencies that have registered their own ABN When defining the hierachy, this system is designed towards monitoring accountablity. Thus large agencies that have registered their own ABN
and have their own accountablity mechanisms/website recieve a seperate record as a child of their department. and have their own accountablity mechanisms/website recieve a seperate record as a child of their department.
Some small agencies will choose to simply rely on their parent department's accountablity measures. Some small agencies will choose to simply rely on their parent department's accountablity measures.
   
This flows through to organisation name and other/past names. A department that accounts for an agency will list that agency as an other child name. This flows through to organisation name and other/past names. A department that accounts for an agency will list that agency as an other child name.
As agencies themselves shift between departments, there may be scope for providing time ranges but typically the newest hierarchy will be the one recorded. As agencies themselves shift between departments, there may be scope for providing time ranges but typically the newest hierarchy will be the one recorded.
A department/agency name will be the newest active name assigned to that ABN. A department/agency name will be the newest active name assigned to that ABN.
   
Statistical information from http://www.apsc.gov.au/stateoftheservice/1011/statsbulletin/section1.html#t2total https://www.apsedii.gov.au/apsedii/CustomQueryx33.shtml Statistical information from http://www.apsc.gov.au/stateoftheservice/1011/statsbulletin/section1.html#t2total https://www.apsedii.gov.au/apsedii/CustomQueryx33.shtml
  and individual annual reports.
   
Open Government Scoring <h2>Open Government Scoring</h2>
+1 point for every true Has... attribute +1 point for every true Has... attribute
-1 point for every false Has... (ie. Has Not) attribute -1 point for every false Has... (ie. Has Not) attribute
   
  Don't like this? Make your own score, suggest a better scoring mechanism.
   
  <?php
  include_footer();
  ?>
file:a/getAgency.php -> file:b/getAgency.php
<?php <?php
   
include_once('include/common.inc.php'); include_once('include/common.inc.php');
include_header(); include_header();
   
function displayValue($key, $value, $mode) { function displayValue($key, $value, $mode) {
if ($mode == "view") { if ($mode == "view") {
if (is_array($value)) { if (is_array($value)) {
echo "<tr><td>$key</td><td><ol>"; echo "<tr><td>$key</td><td><ol>";
foreach ($value as $subkey => $subvalue) { foreach ($value as $subkey => $subvalue) {
echo "<li>$subvalue</li>"; echo "<li>$subvalue</li>";
} }
echo "</ol></td></tr>"; echo "</ol></td></tr>";
} else { } else {
echo "<tr><td>$key</td><td>$value</td></tr>"; echo "<tr><td>$key</td><td>$value</td></tr>";
} }
} }
if ($mode == "edit") { if ($mode == "edit") {
if (is_array($value)) { if (is_array($value)) {
echo '<div class="row"> echo '<div class="row">
<div class="seven columns"> <div class="seven columns">
<fieldset> <fieldset>
<h5>' . $key . '</h5>'; <h5>' . $key . '</h5>';
foreach ($value as $subkey => $subvalue) { foreach ($value as $subkey => $subvalue) {
echo "<label>$subkey</label><input class='input-text' type='text' id='$key$subkey' name='$key" . '[' . $subkey . "]' value='$subvalue'/></tr>"; echo "<label>$subkey</label><input class='input-text' type='text' id='$key$subkey' name='$key" . '[' . $subkey . "]' value='$subvalue'/></tr>";
} }
echo "</fieldset> echo "</fieldset>
</div> </div>
</div>"; </div>";
} else { } else {
if (strpos($key, "_") === 0) { if (strpos($key, "_") === 0) {
echo"<input type='hidden' id='$key' name='$key' value='$value'/>"; echo"<input type='hidden' id='$key' name='$key' value='$value'/>";
} if (strpos($key, "has") === 0) { } if (strpos($key, "has") === 0) {
echo "<label for='$key'><input type='checkbox' id='$key' name='$key' value='$value'> $key</label>"; echo "<label for='$key'><input type='checkbox' id='$key' name='$key' value='$value'> $key</label>";
} else { } else {
echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/></tr>"; echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/>";
  if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") {
  echo "<a href='$value'>view</a>";
  }
  if ($key == 'abn') {
  echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=33380054835'>view abn</a>";
  }
} }
} }
} }
// //
} }
   
function addDefaultFields($row) { function addDefaultFields($row) {
$defaultFields = Array("name"); $defaultFields = Array("name");
foreach ($defaultFields as $defaultField) { foreach ($defaultFields as $defaultField) {
if (!isset($row[$defaultField])) if (!isset($row[$defaultField]))
$row[$defaultField] = ""; $row[$defaultField] = "";
} }
return $row; return $row;
} }
   
$db = $server->get_db('disclosr-agencies'); $db = $server->get_db('disclosr-agencies');
   
if (isset($_REQUEST['id'])) { if (isset($_REQUEST['id'])) {
//get an agency record as json/html, search by name/abn/id //get an agency record as json/html, search by name/abn/id
// by name = startkey="Ham"&endkey="Ham\ufff0" // by name = startkey="Ham"&endkey="Ham\ufff0"
// edit? // edit?
   
$row = $db->get($_REQUEST['id']); $row = $db->get($_REQUEST['id']);
//print_r($row); //print_r($row);
if (sizeof($_POST) > 0) { if (sizeof($_POST) > 0) {
//print_r($_POST); //print_r($_POST);
if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) { if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) {
echo "Edited version was latest version, continue saving"; echo "Edited version was latest version, continue saving";
$newdoc = $_POST; $newdoc = $_POST;
$newdoc['metadata']['lastModified'] = time(); $newdoc['metadata']['lastModified'] = time();
$row = $db->save($newdoc); $row = $db->save($newdoc);
} else { } else {
echo "ALERT doc revised by someone else while editing."; echo "ALERT doc revised by someone else while editing.";
} }
} }
   
$mode = "edit"; $mode = "edit";
$row = addDefaultFields(object_to_array($row)); $row = addDefaultFields(object_to_array($row));
if ($mode == "view") { if ($mode == "view") {
echo '<table width="100%">'; echo '<table width="100%">';
echo '<tr> <td colspan="2"><h3>' . $row['name'] . "</h3></td></tr>"; echo '<tr> <td colspan="2"><h3>' . $row['name'] . "</h3></td></tr>";
echo "<tr><th>Field Name</th><th>Field Value</th></tr>"; echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
} }
if ($mode == "edit") { if ($mode == "edit") {
?> ?>
<input id="addfield" type="button" value="Add Field"/> <input id="addfield" type="button" value="Add Field"/>
<script> <script>
window.onload = function() { window.onload = function() {
$(document).ready(function() { $(document).ready(function() {
// put all your jQuery goodness in here. // put all your jQuery goodness in here.
// http://charlie.griefer.com/blog/2009/09/17/jquery-dynamically-adding-form-elements/ // http://charlie.griefer.com/blog/2009/09/17/jquery-dynamically-adding-form-elements/
$('#addfield').click(function() { $('#addfield').click(function() {
var field_name=window.prompt("fieldname?",""); var field_name=window.prompt("fieldname?","");
if (field_name !="") { if (field_name !="") {
$('#submitbutton').before($('<span></span>') $('#submitbutton').before($('<span></span>')
.append("<label>"+field_name+"</label>") .append("<label>"+field_name+"</label>")
.append("<input class='input-text' type='text' id='"+field_name+"' name='"+field_name+"'/>") .append("<input class='input-text' type='text' id='"+field_name+"' name='"+field_name+"'/>")
); );
} }
}); });
}); });
}; };
</script> </script>
<form id="editform" class="nice" method="post"> <form id="editform" class="nice" method="post">
<?php <?php
   
} }
foreach ($row as $key => $value) { foreach ($row as $key => $value) {
echo displayValue($key, $value, $mode); echo displayValue($key, $value, $mode);
} }
if ($mode == "view") { if ($mode == "view") {
echo "</table>"; echo "</table>";
} }
if ($mode == "edit") { if ($mode == "edit") {
echo '<input id="submitbutton" type="submit"/></form>'; echo '<input id="submitbutton" type="submit"/></form>';
} }
} else { } else {
   
try { try {
$rows = $db->get_view("app", "showNamesABNs")->rows; $rows = $db->get_view("app", "showNamesABNs")->rows;
//print_r($rows); //print_r($rows);
foreach ($rows as $row) { foreach ($rows as $row) {
// print_r($row); // print_r($row);
echo '<li><a href="getAgency.php?id=' . $row->key . '">' . echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
(isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn) (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
. '</a></li>'; . '</a></li>';
} }
} catch (SetteeRestClientException $e) { } catch (SetteeRestClientException $e) {
setteErrorHandler($e); setteErrorHandler($e);
} }
} }
include_footer(); include_footer();
?> ?>
file:a/include/template.inc.php -> file:b/include/template.inc.php
<?php <?php
   
function include_header() { function include_header() {
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
   
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ --> <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]--> <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]--> <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]--> <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html lang="en"> <!--<![endif]--> <!--[if gt IE 8]><!--> <html lang="en"> <!--<![endif]-->
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
   
<!-- Set the viewport width to device width for mobile --> <!-- Set the viewport width to device width for mobile -->
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
   
<title>Disclosr</title> <title>Disclosr</title>
   
<!-- Included CSS Files --> <!-- Included CSS Files -->
<link rel="stylesheet" href="stylesheets/foundation.css"> <link rel="stylesheet" href="stylesheets/foundation.css">
<link rel="stylesheet" href="stylesheets/app.css"> <link rel="stylesheet" href="stylesheets/app.css">
   
<!--[if lt IE 9]> <!--[if lt IE 9]>
<link rel="stylesheet" href="stylesheets/ie.css"> <link rel="stylesheet" href="stylesheets/ie.css">
<![endif]--> <![endif]-->
   
   
<!-- IE Fix for HTML5 Tags --> <!-- IE Fix for HTML5 Tags -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
   
</head> </head>
<body> <body>
   
<!-- navBar --> <!-- navBar -->
<div id="navbar" class="container"> <div id="navbar" class="container">
<div class="row"> <div class="row">
<div class="four columns"> <div class="four columns">
<h1><a href="/">Disclosr</a></h1> <h1><a href="/">Disclosr</a></h1>
</div> </div>
<div class="eight columns hide-on-phones"> <div class="eight columns hide-on-phones">
<strong class="right"> <strong class="right">
<a href="getAgency.php">Agencies</a> <a href="getAgency.php">Agencies</a>
<a href="getAgency.php">About</a> <a href="about.php">About/FAQ</a>
</strong> </strong>
</div> </div>
</div> </div>
</div> </div>
<!-- /navBar --> <!-- /navBar -->
   
<!-- container --> <!-- container -->
<div class="container"> <div class="container">
<?php } <?php }
   
function include_footer() { ?> function include_footer() { ?>
</div> </div>
<!-- container --> <!-- container -->
   
   
   
   
<!-- Included JS Files --> <!-- Included JS Files -->
<script src="javascripts/foundation.js"></script> <script src="javascripts/foundation.js"></script>
<script src="javascripts/app.js"></script> <script src="javascripts/app.js"></script>
<script src="http://code.jquery.com/jquery-1.7.1.min.js"></script> <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
   
</body> </body>
</html> </html>
   
<?php } <?php }
   
?> ?>
   
file:a/stylesheets/app.css -> file:b/stylesheets/app.css
/* Foundation v2.1.4 http://foundation.zurb.com */ /* Foundation v2.1.4 http://foundation.zurb.com */
/* Artfully masterminded by ZURB */ /* Artfully masterminded by ZURB */
   
/* ZURB bar copy*/ /* ZURB bar copy*/
#navbar { #navbar {
background: #222222; background: #222222;
border-bottom: solid 4px #00a5ff; border-bottom: solid 4px #00a5ff;
padding: 15px 20px 13px 20px; } padding: 15px 20px 13px 20px; }
@media handheld, only screen and (max-width: 767px) { @media handheld, only screen and (max-width: 767px) {
#navbar { #navbar {
padding-left: 20px; padding-left: 20px;
padding-right: 20px; } padding-right: 20px; }
} }
   
#navbar h1, #navbar h2 { #navbar h1, #navbar h2 {
margin-bottom: 0; margin-bottom: 0;
line-height: 1; } line-height: 1; }
#navbar h1 { #navbar h1 {
color: white; color: white;
font-size: 16px; font-size: 16px;
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 800; } font-weight: 800; }
#navbar h1 a { color: #fff; font-weight: bold; } #navbar a { color: #fff; font-weight: bold; }
#navbar h2 a {  
text-indent: -99999px;  
display: block;  
width: 82px;  
height: 14px;  
background: url('../images/by-zurb.png'); }  
   
   
#navbar strong { display: block; margin: 0; padding: 0; height: 14px; line-height: 14px; position: relative; bottom: 4px; } #navbar strong { display: block; margin: 0; padding: 0; height: 14px; line-height: 14px; position: relative; bottom: 4px; }
#navbar strong a { #navbar strong a {
line-height: 14px; line-height: 14px;
color: #fff; color: #fff;
font-weight: 500; font-weight: 500;
padding-right: 12px; padding-right: 12px;
} }
#navbar strong a.button { padding: 4px 10px; font-weight: bold; } #navbar strong a.button { padding: 4px 10px; font-weight: bold; }
   
  /* other zurb copied css */
  .row { max-width: 1200px; }
   
  div.foundation-header { margin: 0 0 40px 0; padding: 30px 0 0 0; border-bottom: solid 1px #ccc; }
  div.foundation-header h1 { margin-bottom: 0; padding: 0; }
  div.foundation-header h1 a { color: #181818; }
  div.foundation-header h1 a:hover { color: #181818; }
  div.foundation-header .subheader { margin-bottom: 9px; }
   
  div.highlight { margin-bottom: 12px; }
   
  img.beta { position: absolute; top: 0px; right: 0px; }
   
  /* Footer */
  footer.row {
  margin-top: 80px;
  border-top: solid 1px #e6e6e6;
  padding-top: 20px; }
  footer.row h6 {
  color: #6f6f6f;
  font-size: 14px;
  font-size: 1.4rem;
  margin-bottom: 4px; }
  footer.row p {
  color: #626262;
  font-size: 12px;
  font-size: 1.2rem;
  line-height: 18px; }
  footer.row a {
  color: #222222; }
  footer.row a:hover {
  text-decoration: underline; }