diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2008-11-07 05:49:45 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2008-11-07 05:49:45 +0000 |
| commit | 6b5b5ec3a67c322b7566fc5e645008acf62e9dc6 (patch) | |
| tree | 8f5a655853d3ee15da0b9e4a30d93e7a30973e5a | |
| parent | c526a9cd2542ae10589f8b7736e173d720b7e794 (diff) | |
Use jquery.cookie to keep the same tab open when you refresh
Add a switch to turn profiling on/off
| -rw-r--r-- | core/controllers/welcome.php | 5 | ||||
| -rw-r--r-- | core/views/welcome.html.php | 19 | ||||
| -rw-r--r-- | lib/jquery.cookie.js | 96 |
3 files changed, 118 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> diff --git a/lib/jquery.cookie.js b/lib/jquery.cookie.js new file mode 100644 index 00000000..6df1faca --- /dev/null +++ b/lib/jquery.cookie.js @@ -0,0 +1,96 @@ +/** + * Cookie plugin + * + * Copyright (c) 2006 Klaus Hartl (stilbuero.de) + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + */ + +/** + * Create a cookie with the given name and value and other optional parameters. + * + * @example $.cookie('the_cookie', 'the_value'); + * @desc Set the value of a cookie. + * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true }); + * @desc Create a cookie with all available options. + * @example $.cookie('the_cookie', 'the_value'); + * @desc Create a session cookie. + * @example $.cookie('the_cookie', null); + * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain + * used when the cookie was set. + * + * @param String name The name of the cookie. + * @param String value The value of the cookie. + * @param Object options An object literal containing key/value pairs to provide optional cookie attributes. + * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object. + * If a negative value is specified (e.g. a date in the past), the cookie will be deleted. + * If set to null or omitted, the cookie will be a session cookie and will not be retained + * when the the browser exits. + * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie). + * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie). + * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will + * require a secure protocol (like HTTPS). + * @type undefined + * + * @name $.cookie + * @cat Plugins/Cookie + * @author Klaus Hartl/klaus.hartl@stilbuero.de + */ + +/** + * Get the value of a cookie with the given name. + * + * @example $.cookie('the_cookie'); + * @desc Get the value of a cookie. + * + * @param String name The name of the cookie. + * @return The value of the cookie. + * @type String + * + * @name $.cookie + * @cat Plugins/Cookie + * @author Klaus Hartl/klaus.hartl@stilbuero.de + */ +jQuery.cookie = function(name, value, options) { + if (typeof value != 'undefined') { // name and value given, set cookie + options = options || {}; + if (value === null) { + value = ''; + options.expires = -1; + } + var expires = ''; + if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) { + var date; + if (typeof options.expires == 'number') { + date = new Date(); + date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); + } else { + date = options.expires; + } + expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE + } + // CAUTION: Needed to parenthesize options.path and options.domain + // in the following expressions, otherwise they evaluate to undefined + // in the packed version for some reason... + var path = options.path ? '; path=' + (options.path) : ''; + var domain = options.domain ? '; domain=' + (options.domain) : ''; + var secure = options.secure ? '; secure' : ''; + document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join(''); + } else { // only name given, get cookie + var cookieValue = null; + if (document.cookie && document.cookie != '') { + var cookies = document.cookie.split(';'); + for (var i = 0; i < cookies.length; i++) { + var cookie = jQuery.trim(cookies[i]); + // Does this cookie string begin with the name we want? + if (cookie.substring(0, name.length + 1) == (name + '=')) { + cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); + break; + } + } + } + return cookieValue; + } +};
\ No newline at end of file |