diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/views/kohana_profiler.php | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/views/kohana_profiler.php')
| -rw-r--r-- | system/views/kohana_profiler.php | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/system/views/kohana_profiler.php b/system/views/kohana_profiler.php deleted file mode 100644 index da77a669..00000000 --- a/system/views/kohana_profiler.php +++ /dev/null @@ -1,37 +0,0 @@ -<?php defined('SYSPATH') OR die('No direct access allowed.'); ?> -<style type="text/css"> -#kohana-profiler -{ - font-family: Monaco, 'Courier New'; - background-color: #F8FFF8; - margin-top: 20px; - clear: both; - padding: 10px 10px 0; - border: 1px solid #E5EFF8; - text-align: left; -} -#kohana-profiler pre -{ - margin: 0; - font: inherit; -} -#kohana-profiler .kp-meta -{ - margin: 0 0 10px; - padding: 4px; - background: #FFF; - border: 1px solid #E5EFF8; - color: #A6B0B8; - text-align: center; -} -<?php echo $styles ?> -</style> -<div id="kohana-profiler"> -<?php -foreach ($profiles as $profile) -{ - echo $profile->render(); -} -?> -<p class="kp-meta">Profiler executed in <?php echo number_format($execution_time, 3) ?>s</p> -</div>
\ No newline at end of file |