admin/themes/default/images/icons/add.png admin/themes/default/images/icons/appearance.png admin/themes/default/images/icons/cancel.png admin/themes/default/images/icons/delete.png admin/themes/default/images/icons/deny.png admin/themes/default/images/icons/edit.png admin/themes/default/images/icons/error.png admin/themes/default/images/icons/failure.png admin/themes/default/images/icons/help.png admin/themes/default/images/icons/info.png admin/themes/default/images/icons/magnifier.png admin/themes/default/images/icons/notice.png admin/themes/default/images/icons/pixel.gif admin/themes/default/images/icons/save.png admin/themes/default/images/icons/success.png admin/themes/default/info.yaml admin/themes/default/layout.twig admin/themes/default/pages/bookmarklet.twig admin/themes/default/pages/content_settings.twig admin/themes/default/pages/delete_group.twig admin/themes/default/pages/delete_page.twig admin/themes/default/pages/delete_post.twig admin/themes/default/pages/delete_user.twig admin/themes/default/pages/edit_group.twig admin/themes/default/pages/edit_page.twig admin/themes/default/pages/edit_post.twig admin/themes/default/pages/edit_user.twig admin/themes/default/pages/export.twig admin/themes/default/pages/feathers.twig admin/themes/default/pages/general_settings.twig admin/themes/default/pages/import.twig admin/themes/default/pages/manage_groups.twig admin/themes/default/pages/manage_pages.twig admin/themes/default/pages/manage_posts.twig admin/themes/default/pages/manage_users.twig admin/themes/default/pages/modules.twig admin/themes/default/pages/new_group.twig admin/themes/default/pages/new_user.twig admin/themes/default/pages/route_settings.twig admin/themes/default/pages/themes.twig admin/themes/default/pages/user_settings.twig admin/themes/default/pages/write_page.twig admin/themes/default/pages/write_post.twig admin/themes/default/partials/page_fields.twig admin/themes/default/partials/post_fields.twig admin/themes/default/style.css @@ -3,7 +3,7 @@ require "yaml" require "optparse" OPTIONS = { - :project => "Chyrp v2.0 RC3", + :project => "Chyrp v2.1 git", :maintainer => "Alex Suraci <suracil.icio.us@gmail.com>", :domain => nil, :msgstr => "",#"XXX", gettext.rb @@ -19,6 +19,9 @@ * $throw_exceptions - Throw exceptions on error? */ public function __construct($sql, $query, $params = array(), $throw_exceptions = false) { + if (DEBUG) + global $time_start; + $this->sql = $sql; # Don't count config setting queries. @@ -51,7 +54,8 @@ $this->sql->debug[] = array("number" => $this->sql->queries, "file" => str_replace(MAIN_DIR."/", "", $target["file"]), "line" => $target["line"], - "query" => $logQuery); + "query" => $logQuery, + "time" => timer_stop()); } switch($this->sql->method) { includes/class/Query.php @@ -212,7 +212,7 @@ $stylesheets.= "<!--[if IE]>"; if (preg_match("/^ie([0-9\.]+)\.css/", $file, $matches)) $stylesheets.= "<!--[if IE ".$matches[1]."]>"; - elseif (preg_match("/(lt|gt)ie([0-9\.]+)\.css/", $file, $matches)) + elseif (preg_match("/(lte?|gte?)ie([0-9\.]+)\.css/", $file, $matches)) $stylesheets.= "<!--[if ".$matches[1]." IE ".$matches[2]."]>"; $stylesheets.= '<link rel="stylesheet" href="'.$config->chyrp_url.$path.'" type="text/css" media="'.($file == "print.css" ? "print" : "screen").'" charset="utf-8" />'; includes/class/Theme.php @@ -83,6 +83,10 @@ # Absolute path to /themes define('THEMES_DIR', MAIN_DIR."/themes"); + # Constant: ADMIN_THEMES_DIR + # Absolute path to /admin/themes + define('ADMIN_THEMES_DIR', MAIN_DIR."/admin/themes"); + # Constant: USE_ZLIB # Use zlib to provide GZIP compression define('USE_ZLIB', true); includes/common.php @@ -29,10 +29,17 @@ * Prepares Twig. */ private function __construct() { - $this->twig = new Twig_Loader((file_exists(THEME_DIR."/admin") ? THEME_DIR."/admin" : MAIN_DIR."/admin/theme"), - (is_writable(INCLUDES_DIR."/caches") and !DEBUG) ? - INCLUDES_DIR."/caches" : - null); + $this->admin_theme = fallback($_SESSION['admin_theme'], "default"); + + $this->theme = new Twig_Loader(MAIN_DIR."/admin/themes/".$this->admin_theme, + (is_writable(INCLUDES_DIR."/caches") and !DEBUG) ? + INCLUDES_DIR."/caches" : + null); + + $this->default = new Twig_Loader(MAIN_DIR."/admin/themes/default", + (is_writable(INCLUDES_DIR."/caches") and !DEBUG) ? + INCLUDES_DIR."/caches" : + null); } /** @@ -1749,7 +1756,7 @@ if (!$open = @opendir(THEMES_DIR)) return Flash::warning(__("Could not read themes directory.")); - while (($folder = readdir($open)) !== false) { + while (($folder = readdir($open)) !== false) { if (!file_exists(THEMES_DIR."/".$folder."/info.yaml")) continue; @@ -1765,8 +1772,8 @@ fallback($info["author"], array("name" => "", "url" => "")); $info["author"]["link"] = !empty($info["author"]["url"]) ? - '<a href="'.$info["author"]["url"].'">'.$info["author"]["name"].'</a>' : - $info["author"]["name"] ; + '<a href="'.$info["author"]["url"].'">'.$info["author"]["name"].'</a>' : + $info["author"]["name"] ; $info["description"] = preg_replace("/<code>(.+)<\/code>/se", "'<code>'.fix('\\1').'</code>'", $info["description"]); @@ -1777,11 +1784,47 @@ $this->context["themes"][] = array("name" => $folder, "screenshot" => (file_exists(THEMES_DIR."/".$folder."/screenshot.png") ? - $config->chyrp_url."/themes/".$folder."/screenshot.png" : - $config->chyrp_url."/admin/images/noscreenshot.png"), + $config->chyrp_url."/themes/".$folder."/screenshot.png" : + ""), "info" => $info); } + if (!$open = @opendir(ADMIN_THEMES_DIR)) + return Flash::warning(__("Could not read themes directory.")); + + while (($folder = readdir($open)) !== false) { + if (!file_exists(ADMIN_THEMES_DIR."/".$folder."/info.yaml")) + continue; + + if (file_exists(ADMIN_THEMES_DIR."/".$folder."/locale/".$config->locale.".mo")) + load_translator($folder, ADMIN_THEMES_DIR."/".$folder."/locale/".$config->locale.".mo"); + + $info = YAML::load(ADMIN_THEMES_DIR."/".$folder."/info.yaml"); + + fallback($info["name"], $folder); + fallback($info["version"], "0"); + fallback($info["url"]); + fallback($info["description"]); + fallback($info["author"], array("name" => "", "url" => "")); + + $info["author"]["link"] = !empty($info["author"]["url"]) ? + '<a href="'.$info["author"]["url"].'">'.$info["author"]["name"].'</a>' : + $info["author"]["name"] ; + $info["description"] = preg_replace("/<code>(.+)<\/code>/se", + "'<code>'.fix('\\1').'</code>'", + $info["description"]); + + $info["description"] = preg_replace("/<pre>(.+)<\/pre>/se", + "'<pre>'.fix('\\1').'</pre>'", + $info["description"]); + + $this->context["admin_themes"][] = array("name" => $folder, + "screenshot" => (file_exists(ADMIN_THEMES_DIR."/".$folder."/screenshot.png") ? + $config->chyrp_url."/admin/themes/".$folder."/screenshot.png" : + ""), + "info" => $info); + } + closedir($open); $this->display("themes"); @@ -1935,6 +1978,39 @@ } /** + * Function: theme + * Changes the admin theme. + */ + public function change_admin_theme() { + if (!Visitor::current()->group->can("change_settings")) + show_403(__("Access Denied"), __("You do not have sufficient privileges to change settings.")); + if (empty($_GET['theme'])) + error(__("No Theme Specified"), __("You did not specify a theme to switch to.")); + + $config = Config::current(); + + $_SESSION['admin_theme'] = $_GET['theme']; + + if (file_exists(ADMIN_THEMES_DIR."/".$_GET['theme']."/locale/".$config->locale.".mo")) + load_translator($_GET['theme'], ADMIN_THEMES_DIR."/".$_GET['theme']."/locale/".$config->locale.".mo"); + + $info = YAML::load(ADMIN_THEMES_DIR."/".$_GET['theme']."/info.yaml"); + fallback($info["notifications"], array()); + + foreach ($info["notifications"] as &$notification) + $notification = __($notification, $_GET['theme']); + + foreach ($info["notifications"] as $message) + Flash::message($message); + + # Clear the caches made by the previous theme. + foreach (glob(INCLUDES_DIR."/caches/*.cache") as $cache) + @unlink($cache); + + Flash::notice(_f("Admin theme changed to “%s”.", array($info["name"])), "/admin/?action=themes"); + } + + /** * Function: preview_theme * Previews the theme. */ @@ -2209,7 +2285,7 @@ * Renders the page. * * Parameters: - * $action - The template file to display, in /admin/theme/pages. + * $action - The template file to display, in (theme dir)/pages. * $context - Context for the template. * $title - The title for the page. Defaults to a camlelization of the action, e.g. foo_bar -> Foo Bar. */ @@ -2250,6 +2326,8 @@ $this->context["debug"] = DEBUG; $this->context["feathers"] = Feathers::$instances; $this->context["modules"] = Modules::$instances; + $this->context["admin_theme"] = $this->admin_theme; + $this->context["theme_url"] = Config::current()->chyrp_url."/admin/themes/".$this->admin_theme; $this->context["POST"] = $_POST; $this->context["GET"] = $_GET; @@ -2307,9 +2385,10 @@ $this->context["sql_debug"] = SQL::current()->debug; - $template = file_exists(THEME_DIR."/admin/theme/pages/".$action.".twig") ? - THEME_DIR."/admin/pages/".$action.".twig" : - MAIN_DIR."/admin/theme/pages/".$action.".twig" ; + $file = MAIN_DIR."/admin/themes/%s/pages/".$action.".twig"; + $template = file_exists(sprintf($file, $this->admin_theme)) ? + sprintf($file, $this->admin_theme) : + sprintf($file, "default"); $config = Config::current(); if (!file_exists($template)) { @@ -2323,14 +2402,20 @@ error(__("Template Missing"), _f("Couldn't load template: <code>%s</code>", array($template))); } + # Try the theme first try { - $this->twig->getTemplate($template)->display($this->context); - } catch (Exception $e) { - $prettify = preg_replace("/([^:]+): (.+)/", "\\1: <code>\\2</code>", $e->getMessage()); - $trace = debug_backtrace(); - $twig = array("file" => $e->filename, "line" => $e->lineno); - array_unshift($trace, $twig); - error(__("Error"), $prettify, $trace); + $this->theme->getTemplate($template)->display($this->context); + } catch (Exception $t) { + # Fallback to the default + try { + $this->default->getTemplate($template)->display($this->context); + } catch (Exception $e) { + $prettify = preg_replace("/([^:]+): (.+)/", "\\1: <code>\\2</code>", $e->getMessage()); + $trace = debug_backtrace(); + $twig = array("file" => $e->filename, "line" => $e->lineno); + array_unshift($trace, $twig); + error(__("Error"), $prettify, $trace); + } } } includes/controller/Admin.php @@ -85,7 +85,7 @@ ${ trigger.call("head") } {% for debug in sql_debug %} <li> <pre>${ debug.query | replace("\t", " ") | escape }</pre> - ${ "Called from %s on line %d." | translate | format(debug.file, debug.line) } + ${ "Called from %s on line %d at %ss." | translate | format(debug.file, debug.line, debug.time) } </li> {% endfor %} </ol> themes/stardust/layouts/default.twig @@ -1176,7 +1176,7 @@ Config::fallback("uploads_path", "/uploads/"); Config::fallback("chyrp_url", Config::get("url")); Config::fallback("sql", Config::$yaml["database"]); - Config::fallback("timezone", "America/Indiana/Indianapolis"); + Config::fallback("timezone", "America/New_York"); Config::remove("rss_posts"); Config::remove("time_offset"); upgrade.php admin/theme/images/background.gif admin/theme/images/buttons/boo.gif admin/theme/images/buttons/meh.gif admin/theme/images/buttons/yay.gif admin/theme/images/header.gif admin/theme/images/icons/add.png admin/theme/images/icons/appearance.png admin/theme/images/icons/cancel.png admin/theme/images/icons/delete.png admin/theme/images/icons/deny.png admin/theme/images/icons/edit.png admin/theme/images/icons/error.png admin/theme/images/icons/failure.png admin/theme/images/icons/help.png admin/theme/images/icons/info.png admin/theme/images/icons/magnifier.png admin/theme/images/icons/notice.png admin/theme/images/icons/pixel.gif admin/theme/images/icons/save.png admin/theme/images/icons/success.png admin/theme/images/welcome.gif admin/theme/layout.twig admin/theme/pages/bookmarklet.twig admin/theme/pages/content_settings.twig admin/theme/pages/delete_group.twig admin/theme/pages/delete_page.twig admin/theme/pages/delete_post.twig admin/theme/pages/delete_user.twig admin/theme/pages/edit_group.twig admin/theme/pages/edit_page.twig admin/theme/pages/edit_post.twig admin/theme/pages/edit_user.twig admin/theme/pages/export.twig admin/theme/pages/feathers.twig admin/theme/pages/general_settings.twig admin/theme/pages/import.twig admin/theme/pages/manage_groups.twig admin/theme/pages/manage_pages.twig admin/theme/pages/manage_posts.twig admin/theme/pages/manage_users.twig admin/theme/pages/modules.twig admin/theme/pages/new_group.twig admin/theme/pages/new_user.twig admin/theme/pages/route_settings.twig admin/theme/pages/themes.twig admin/theme/pages/user_settings.twig admin/theme/pages/write_page.twig admin/theme/pages/write_post.twig admin/theme/partials/page_fields.twig admin/theme/partials/post_fields.twig admin/theme/style.css cc2c15543c72ba16fd11b16af49c29c5cc0afe73 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/78aa173cce00f68bbb74cbc7c56916009470fe5e 78aa173cce00f68bbb74cbc7c56916009470fe5e

2009-07-26T18:27:17-07:00

Admin theming. [#1 state:resolved] One difference from the original plan; admin themes go in /admin/themes instead of /themes/admin. 6eb60e1972b01e4bb8e372023a1e4376dccf92de Alex Suraci i.am@toogeneric.com