From: Maxious <maxious@lambdacomplex.org>
Date: Thu, 05 Jan 2012 11:58:29 +0000
Subject: URL formatting fixes
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=b5f933fed813742e0221b2cd833920697feaac6f
---
URL formatting fixes


Former-commit-id: 33bf0d2e055726bff60007acbd7ee78cf50880c2
---


--- a/about.php
+++ b/about.php
@@ -1,5 +1,16 @@
+<?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
 Agencies can be found in the Schedule to an Appropriation Bill (budget), Schedule to FMA Regulations and/or Public Service Act.
@@ -15,9 +26,14 @@
 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
+and individual annual reports.
 
-Open Government Scoring
+<h2>Open Government Scoring</h2>
 +1 point for every true Has... 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();
+?>

--- a/getAgency.php
+++ b/getAgency.php
@@ -33,7 +33,13 @@
             } if (strpos($key, "has") === 0) {
                 echo "<label for='$key'><input type='checkbox' id='$key' name='$key' value='$value'> $key</label>";
             } 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>";
+                }
             }
         }
     }

--- a/include/template.inc.php
+++ b/include/template.inc.php
@@ -43,7 +43,7 @@
                     <div class="eight columns hide-on-phones">
                         <strong class="right">
                             <a href="getAgency.php">Agencies</a>
-                             <a href="getAgency.php">About</a>
+                             <a href="about.php">About/FAQ</a>
                         </strong>
                     </div>
                 </div>

--- a/stylesheets/app.css
+++ b/stylesheets/app.css
@@ -21,14 +21,7 @@
   font-size: 16px;
   font-size: 1.6rem;
   font-weight: 800; }
-#navbar h1 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 a { color: #fff; font-weight: bold; }
 
 #navbar strong { display: block; margin: 0; padding: 0; height: 14px; line-height: 14px; position: relative; bottom: 4px; }
 #navbar strong a {
@@ -39,5 +32,41 @@
 }
 #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; }
+  
 
 
+.row.display { background: #f4f4f4; margin-bottom: 10px; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; }
+.row.display .column, .row.display .columns { background: #e7e7e7; font-size: 11px; text-indent: 3px; padding-top: 6px; padding-bottom: 6px; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; }
+