summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2008-11-07 05:49:45 +0000
committerBharat Mediratta <bharat@menalto.com>2008-11-07 05:49:45 +0000
commit6b5b5ec3a67c322b7566fc5e645008acf62e9dc6 (patch)
tree8f5a655853d3ee15da0b9e4a30d93e7a30973e5a /core
parentc526a9cd2542ae10589f8b7736e173d720b7e794 (diff)
Use jquery.cookie to keep the same tab open when you refresh
Add a switch to turn profiling on/off
Diffstat (limited to 'core')
-rw-r--r--core/controllers/welcome.php5
-rw-r--r--core/views/welcome.html.php19
2 files changed, 22 insertions, 2 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index 0106535a..791ee192 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -116,6 +116,11 @@ class Welcome_Controller extends Template_Controller {
$this->auto_render = false;
}
+ public function profiler() {
+ Session::instance()->set("use_profiler", $this->input->get("use_profiler", false));
+ url::redirect("welcome");
+ }
+
private function _get_config_errors() {
$errors = array();
if (!file_exists(VARPATH)) {
diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php
index ad58dd76..813b0ff6 100644
--- a/core/views/welcome.html.php
+++ b/core/views/welcome.html.php
@@ -110,7 +110,8 @@
text-decoration: none;
}
</style>
- <script type="text/javascript" src="<?= url::base(), "lib/jquery.js" ?>"></script>
+ <script type="text/javascript" src="<?= url::base() . "lib/jquery.js" ?>"></script>
+ <script type="text/javascript" src="<?= url::base() . "lib/jquery.cookie.js" ?>"></script>
</head>
<body>
@@ -143,10 +144,18 @@
show = function(section) {
$("div.activity").slideUp();
$(section).slideDown();
+ $.cookie("active_section", section);
}
+ $(document).ready(function(){
+ var active_section = $.cookie("active_section");
+ if (!active_section) {
+ active_section = '#configuration';
+ }
+ $(active_section).show()
+ });
</script>
- <div id="configuration" class="activity" style="display: block">
+ <div id="configuration" class="activity">
<?= $syscheck ?>
</div>
@@ -177,6 +186,12 @@
<i>(<?= $deepest_photo->level ?> levels deep)</i>
</li>
<? endif ?>
+ <li> Profiling:
+ <? if (Session::instance()->get("use_profiler", false)): ?>
+ <b>on</b> <?= html::anchor("welcome/profiler?use_profiler=0", "off") ?>
+ <? else: ?>
+ <?= html::anchor("welcome/profiler?use_profiler=1", "on") ?> <b>off</b>
+ <? endif ?>
</ul>
</div>