--- a/documents/template.inc.php +++ b/documents/template.inc.php @@ -46,8 +46,10 @@ <!-- All JavaScript at the bottom, except this Modernizr build. Modernizr enables HTML5 elements & feature detects for optimal performance. - Create your own custom Modernizr build: www.modernizr.com/download/ --> - <script src="js/libs/modernizr-2.5.3.min.js"></script> + Create your own custom Modernizr build: www.modernizr.com/download/ + <script src="js/libs/modernizr-2.5.3.min.js"></script>--> + <script src="js/jquery.js"></script> + <script type="text/javascript" src="js/flotr2.min.js"></script> </head> <body> @@ -106,8 +108,8 @@ </script> <!-- Le javascript ================================================== --> - <!-- Placed at the end of the document so the pages load faster - <script src="js/jquery.js"></script> + <!-- Placed at the end of the document so the pages load faster --> +<!-- <script src="js/bootstrap-transition.js"></script> <script src="js/bootstrap-alert.js"></script> <script src="js/bootstrap-modal.js"></script> @@ -121,27 +123,30 @@ <script src="js/bootstrap-carousel.js"></script> <script src="js/bootstrap-typeahead.js"></script>--> + </body> </html> <?php } function displayLogEntry($row, $idtoname) { - echo "<div><h2>".$row->value->date.": ".$row->value->title." (".$idtoname[$row->value->agencyID].")</h2> <p>".$row->value->description; + $result = ""; + $result .= "<div><h2>".$row->value->date.": ".$row->value->title." (".$idtoname[$row->value->agencyID].")</h2> <p>".str_replace("\n","<br>",$row->value->description); if (isset($row->value->notes)) { -echo " <br>Note: ".$row->value->notes; +$result .= " <br>Note: ".$row->value->notes; } -echo "</p>"; +$result .= "</p>"; if (isset($row->value->links)){ -echo "<h3>Links/Documents</h3><ul>"; +$result .= "<h3>Links/Documents</h3><ul>"; foreach ($row->value->links as $link) { - echo "<li><a href='$link'>".$link."</a></li>"; + $result .= "<li><a href='$link'>".$link."</a></li>"; } - echo "</ul>"; + $result .= "</ul>"; } - echo "<small><A href='".$row->value->url."'>View original source...</a> ID: ".$row->value->docID."</small>"; -echo"</div>"; + $result .= "<small><A href='".$row->value->url."'>View original source...</a> ID: ".$row->value->docID."</small>"; +$result .= "</div>"; +return $result; }