diff --git a/admin/admin.php b/admin/admin.php index 7e134ac..10ce1bd 100755 --- a/admin/admin.php +++ b/admin/admin.php @@ -4,16 +4,13 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ -require_once('../entry.php'); +require_once '../entry.php'; global $user, $conf, $tumble; if ($user->isAdmin()) { @@ -21,14 +18,14 @@ if ($user->isAdmin()) { - gelato :: <?php echo __("admin users")?> + sorbet :: <?php echo __("admin users")?> - - - - - + + + + + @@ -51,10 +48,10 @@ if ($user->isAdmin()) {
@@ -62,10 +59,10 @@ if ($user->isAdmin()) {

    Manage

    -
    • -
    • -
    • -
    • +
    • +
    • +
    • +

 

@@ -143,7 +140,7 @@ if ($user->isAdmin()) {
@@ -151,6 +148,6 @@ if ($user->isAdmin()) { urlGelato."/login.php"); + header("Location: ".$conf->urlSorbet."/login.php"); } ?> diff --git a/admin/ajax.php b/admin/ajax.php index 64556cb..083ed32 100755 --- a/admin/ajax.php +++ b/admin/ajax.php @@ -4,19 +4,16 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> isAdmin()) { if ($_GET["action"]) { if ($_GET["action"] == "close") { @@ -26,7 +23,7 @@ if (!defined('entry')) { echo __(" failure ending session…"); } } // $_GET["action"] == "close" - + if ($_GET["action"] == "verify") { if ($_GET["login"]=="") { echo "
".__("Required field cannot be left blank.")."
"; @@ -40,4 +37,4 @@ if (!defined('entry')) { } // $_GET["action"] == "verify" } // $_GET["action"] } // $user->isAdmin() -?> \ No newline at end of file +?> diff --git a/admin/bm.php b/admin/bm.php index 22437c8..a9a5c0a 100755 --- a/admin/bm.php +++ b/admin/bm.php @@ -4,18 +4,15 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> isAdmin()) { if (isset($_POST["url"]) && $_POST["url"]!="") { $photoName = $util_class->getFileName($_POST["url"]); if (!$tumble->savePhoto($_POST["url"])) { - header("Location: ".$conf->urlGelato."/admin/index.php?photo=false"); + header("Location: ".$conf->urlSorbet."/admin/index.php?photo=false"); die(); } $_POST["url"] = "../uploads/".$util_class->sanitizeName($photoName); @@ -41,11 +38,11 @@ if ($user->isAdmin()) { set_time_limit(300); $mp3Name = $util_class->getFileName($_POST["url"]); if (!$tumble->saveMP3($_POST["url"])) { - header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false"); + header("Location: ".$conf->urlSorbet."/admin/index.php?mp3=false"); die(); } if (isMP3($remoteFileName)) { - $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name; + $_POST["url"] = $conf->urlSorbet."/uploads/".$mp3Name; } } @@ -53,7 +50,7 @@ if ($user->isAdmin()) { $_POST["title"] = addslashes($_POST["title"]); $_POST["description"] = addslashes($_POST["description"]); } - + $_POST["title"] = $util_class->removeBadTags($_POST["title"], true); $_POST["description"] = $util_class->removeBadTags($_POST["description"]); @@ -65,7 +62,7 @@ if ($user->isAdmin()) { $template->mostrarPlantilla(); die(); } else { - header("Location: ".$conf->urlGelato."/admin/index.php?error=2&des=".$this->merror); + header("Location: ".$conf->urlSorbet."/admin/index.php?error=2&des=".$this->merror); die(); } } else { @@ -97,22 +94,22 @@ if ($user->isAdmin()) { - - gelato :: <?php echo __("bookmarklet")?> - - - - - - - + + sorbet :: <?php echo __("bookmarklet")?> + + + + + + + @@ -224,7 +221,7 @@ if ($user->isAdmin()) { } ?> @@ -233,6 +230,6 @@ if ($user->isAdmin()) { } else { $target = (isset($_GET["url"]))? "/login.php?redirect_url=".$_GET["url"]."&sel=".$_GET["sel"] : "/login.php"; - header("Location: ".$conf->urlGelato.$target); + header("Location: ".$conf->urlSorbet.$target); } ?> diff --git a/admin/close.php b/admin/close.php index 1a1781a..19588e8 100755 --- a/admin/close.php +++ b/admin/close.php @@ -4,17 +4,14 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> closeSession(); @@ -22,36 +19,36 @@ $closed = $user->closeSession(); - gelato :: <?php echo __("logout")?> + sorbet :: <?php echo __("logout")?> - + - -
-
- +
+

- +

+ ?>

closeSession(); +?>

@@ -69,8 +66,8 @@ $closed = $user->closeSession();
- \ No newline at end of file + diff --git a/admin/comments.php b/admin/comments.php index 463ccc8..b388b6b 100755 --- a/admin/comments.php +++ b/admin/comments.php @@ -4,17 +4,14 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> urlFriendly) ? "/" : ""; if ($comment->addComment($_POST)) { - header("Location: ".$conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd); + header("Location: ".$conf->urlSorbet.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd); die(); } else { - header("Location: ".$conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd); + header("Location: ".$conf->urlSorbet.($conf->urlFriendly?"/post/":"/index.php?post=").$_POST["id_post"].$strEnd); die(); } } @@ -70,12 +67,12 @@ if ($isAdmin) { - gelato :: <?php echo __("comments")?> + sorbet :: <?php echo __("comments")?> - - - - + + + + @@ -92,9 +89,9 @@ if ($isAdmin) {
@@ -136,7 +133,7 @@ if ($isAdmin) { $date = strtotime($row["comment_date"]); $input = array("{User}", "{Email}", "{Web}", "{Comment}", "{Id_Post}", "{Date_Added}", "{Id_Comment}", "{Form_Action}"); - $output = array($row["username"], $row["email"], $row["web"], $row["content"], $row["id_post"], $date, $row["id_comment"], $conf->urlGelato."/admin/comments.php"); + $output = array($row["username"], $row["email"], $row["web"], $row["content"], $row["id_post"], $date, $row["id_comment"], $conf->urlSorbet."/admin/comments.php"); $template->cargarPlantilla($input, $output, "template_comment_post"); $template->mostrarPlantilla(); @@ -168,7 +165,7 @@ if ($isAdmin) { $commentAuthor = ($rowComment["web"]=="") ? $rowComment["username"]." | ".$rowComment["email"] : "".$rowComment["username"]." | ".$rowComment["email"]; $input = array("{Permalink}", "{URL_Tumble}", "{Id_Comment}", "{Comment_Author}", "{Comment}"); - $output = array($conf->urlGelato."/index.php/post/".$rowComment["id_post"]."#comment-".$rowComment["id_comment"], $conf->urlGelato, $rowComment["id_comment"], $commentAuthor, $rowComment["content"]); + $output = array($conf->urlSorbet."/index.php/post/".$rowComment["id_post"]."#comment-".$rowComment["id_comment"], $conf->urlSorbet, $rowComment["id_comment"], $commentAuthor, $rowComment["content"]); $template->cargarPlantilla($input, $output, "template_comment"); $template->mostrarPlantilla(); @@ -187,7 +184,7 @@ if ($isAdmin) {
@@ -195,6 +192,6 @@ if ($isAdmin) { urlGelato."/login.php"); + header("Location: ".$conf->urlSorbet."/login.php"); } ?> diff --git a/admin/css/archive.css b/admin/css/archive.css index 96f7789..2be3740 100755 --- a/admin/css/archive.css +++ b/admin/css/archive.css @@ -1,157 +1 @@ -*{ outline:none;} -body { - background: white; - font-family: "Lucida Sans"; - font-size: 15px; - letter-spacing: 2px; - line-height: 30px; - background: transparent url('../../images/bg.jpg') top center no-repeat; - padding:0; - margin:0; -} - -#dash { - margin: 0 auto; - padding: 0; - position:relative; -} - - -#options { - position:fixed; - height:37px; - width:100%; - text-align: center; - border-bottom: thin solid #000; - background: transparent url('../../images/top_ribbon.png') top left repeat-x; - z-index:999; - padding-top:8px; - margin:0; - left:0; -} - -#context_help{ display:block; margin:0; padding:3px 5px; position: absolute; border: 1px solid #222; background-color: #444; color:#fff; font-size: 11px;} - - -li { - list-style: none; -} - -ul { - padding: 0px; - margin: 0px; -} - -h4 { - margin-top: 0px; - font-size: 12px; - font-weight: bold; - font-variant: small-caps; - text-align: center; -} - -#options li { - display: inline; - color: #999; - font-variant: small-caps; -} - -#options li a { - text-decoration: none; - padding:10px 20px; - color: #666; -} - -#options li a:hover, #options li a.selected { - color: #000; - text-decoration: underline; -} - - -#content { - text-align: left; - padding:20px 0 0 130px; - width:600px; - margin: 0 auto; -} -html > body div#content{ padding:60px 25px 0 25px;} - - -.item { - height: 110px; - width: 110px; - padding: 5px; - overflow: hidden; - border: 1px solid #CCC; - margin: 10px; - color: #222; - text-align: left; - background-color: #FEFEFE; - font-size: 11px; - line-height: normal; - -} - -.link { - font-size: 12px; -} -.link a, .link a:visited, .link a:active, .link a:link{ color:#000; text-decoration:none;} - -#user_hover { - background-color:#000000; - color:#FFFFFF; - display:none; - font-family:Helvetica,sans-serif; - font-size:18px; - font-size-adjust:none; - font-stretch:normal; - font-style:normal; - font-variant:normal; - font-weight:bold; - line-height:normal; - opacity:0.75; - padding:5px; - position:absolute; - text-align:center; - z-index:10; - height:113px; - width: 112px; - cursor: pointer; -} - -ul.item_list { - margin:10px; -} - -ul.item_list li{ - display:block; - float:left; - margin-top:1px; - cursor:pointer; -} - -ul.item_list li.selected{ - background-color: #8db1de; position: relative; border:none; -} - -li.selected div.crnr{ display:block; position: absolute; width:5px; height:5px;} -li.selected div.wn{background:none; display:none;} -html > body li.selected div.wn{background: #FFF url('../../images/round-wn.png') no-repeat top left; top:0; left:0; display:block;} -li.selected div.en{background:none; display:none;} -html > body li.selected div.en{background: #FFF url('../../images/round-en.png') no-repeat top left; top:0; right:0;display:block;} -li.selected div.es{background:none; display:none;} -html > body li.selected div.es{background: #FFF url('../../images/round-es.png') no-repeat top left; bottom:0; right:0;display:block;} -li.selected div.ws{background:none; display:none;} -html > body li.selected div.ws{background: #FFF url('../../images/round-ws.png') no-repeat top left; bottom:0; left:0;display:block;} - - -#timeline {position:fixed; top: 60px; right: 40px; line-height:auto; margin: 10px; float:right; width:90px;} - -#timewrap { position:relative;} -#timewrap h4{ float:right;} -#bubble{ line-height:10px; position:absolute; left: -90px; width:80px; display:none; font-size:10px; color:#444; font-family: Arial, "MS Trebuchet", sans-serif; text-align:right; } -#timeline li{ background-color: #222;height:7px; margin:1px; display:block; float:right; clear:right;} -#timeline li span{display:none;} -li.year{ width:60px;} -li.month{ width:40px;} -li.day{ width:20px;} \ No newline at end of file +#dash,body,ul{padding:0}#options,body,ul{margin:0}#options,h4{text-align:center}#options li,h4{font-variant:small-caps}#user_hover,h4{font-weight:700}*{outline:0}body{font-family:"Lucida Sans";font-size:15px;letter-spacing:2px;line-height:30px;background:url(../../images/bg.jpg) top center no-repeat}#dash{margin:0 auto;position:relative}#options{position:fixed;height:37px;width:100%;border-bottom:thin solid #000;background:url(../../images/top_ribbon.png) top left repeat-x;z-index:999;padding-top:8px;left:0}#context_help{display:block;margin:0;padding:3px 5px;position:absolute;border:1px solid #222;background-color:#444;color:#fff;font-size:11px}li{list-style:none}h4{margin-top:0;font-size:12px}#content,.item{text-align:left}#options li{display:inline;color:#999}#options li a{text-decoration:none;padding:10px 20px;color:#666}#options li a.selected,#options li a:hover{color:#000;text-decoration:underline}#content{padding:20px 0 0 130px;width:600px;margin:0 auto}.item,ul.item_list{margin:10px}html>body div#content{padding:60px 25px 0}#user_hover,.item{line-height:normal;padding:5px}.item{height:110px;width:110px;overflow:hidden;border:1px solid #CCC;color:#222;background-color:#FEFEFE;font-size:11px}.link{font-size:12px}.link a,.link a:active,.link a:link,.link a:visited{color:#000;text-decoration:none}#user_hover{background-color:#000;color:#FFF;display:none;font-family:Helvetica,sans-serif;font-size:18px;font-size-adjust:none;font-stretch:normal;font-style:normal;font-variant:normal;opacity:.75;position:absolute;text-align:center;z-index:10;height:113px;width:112px;cursor:pointer}ul.item_list li{display:block;float:left;margin-top:1px;cursor:pointer}#timeline,#timewrap h4{float:right}ul.item_list li.selected{background-color:#8db1de;position:relative;border:none}li.selected div.crnr{display:block;position:absolute;width:5px;height:5px}li.selected div.wn{background:0 0;display:none}html>body li.selected div.wn{background:url(../../images/round-wn.png) top left no-repeat #FFF;top:0;left:0;display:block}li.selected div.en{background:0 0;display:none}html>body li.selected div.en{background:url(../../images/round-en.png) top left no-repeat #FFF;top:0;right:0;display:block}li.selected div.es{background:0 0;display:none}html>body li.selected div.es{background:url(../../images/round-es.png) top left no-repeat #FFF;bottom:0;right:0;display:block}li.selected div.ws{background:0 0;display:none}html>body li.selected div.ws{background:url(../../images/round-ws.png) top left no-repeat #FFF;bottom:0;left:0;display:block}#bubble,#timeline li span{display:none}#timeline{position:fixed;top:60px;right:40px;line-height:auto;margin:10px;width:90px}#timewrap{position:relative}#bubble{line-height:10px;position:absolute;left:-90px;width:80px;font-size:10px;color:#444;font-family:Arial,"MS Trebuchet",sans-serif;text-align:right}#timeline li{background-color:#222;height:7px;margin:1px;display:block;float:right;clear:right}li.year{width:60px}li.month{width:40px}li.day{width:20px} diff --git a/admin/css/images/gelato-logo.png b/admin/css/images/gelato-logo.png deleted file mode 100755 index e30cc44..0000000 Binary files a/admin/css/images/gelato-logo.png and /dev/null differ diff --git a/admin/css/images/sorbet-logo.png b/admin/css/images/sorbet-logo.png new file mode 100755 index 0000000..83f3362 Binary files /dev/null and b/admin/css/images/sorbet-logo.png differ diff --git a/admin/css/lightbox.css b/admin/css/lightbox.css index 9da5cfa..7df10f3 100755 --- a/admin/css/lightbox.css +++ b/admin/css/lightbox.css @@ -1,92 +1 @@ - - -#lightbox{ - position: absolute; - left: 0; - width: 100%; - z-index: 100; - text-align: center; - line-height: 0; - } - -#lightbox a img{ border: none; } - -#outerImageContainer{ - position: relative; - background-color: #fff; - width: 250px; - height: 250px; - margin: 0 auto; - } - -#imageContainer{ - padding: 10px; - } - -#loading{ - position: absolute; - top: 40%; - left: 0%; - height: 25%; - width: 100%; - text-align: center; - line-height: 0; - } -#hoverNav{ - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - z-index: 10; - } -#imageContainer>#hoverNav{ left: 0;} -#hoverNav a{ outline: none;} - -#prevLink, #nextLink{ - width: 49%; - height: 100%; - background: transparent url(../images/blank.gif) no-repeat; /* Trick IE into showing hover */ - display: block; - } -#prevLink { left: 0; float: left;} -#nextLink { right: 0; float: right;} -#prevLink:hover, #prevLink:visited:hover { background: url(../images/prevlabel.gif) left 15% no-repeat; } -#nextLink:hover, #nextLink:visited:hover { background: url(../images/nextlabel.gif) right 15% no-repeat; } - - -#imageDataContainer{ - font: 10px Verdana, Helvetica, sans-serif; - background-color: #fff; - margin: 0 auto; - line-height: 1.4em; - overflow: auto; - width: 100% - } - -#imageData{ padding:0 10px; color: #666; } -#imageData #imageDetails{ width: 70%; float: left; text-align: left; } -#imageData #caption{ font-weight: bold; } -#imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em; } -#imageData #bottomNavClose{ width: 66px; float: right; margin: 1.0em;} - - - - -#overlay{ - position: absolute; - top: 0; - left: 0; - z-index: 90; - width: 100%; - height: 500px; - background-color: #000; - } - - -/* * * * * V 0.3 * * * * * / -/* html,body thanks to Torben - http://blog.schreiter.info/ */ -html, body { - height:100%; - min-height:100%; -} \ No newline at end of file +#lightbox,#loading{text-align:center;line-height:0}#hoverNav,#overlay{position:absolute;top:0;left:0;width:100%}#lightbox{position:absolute;left:0;width:100%;z-index:100}#lightbox a img{border:none}#outerImageContainer{position:relative;background-color:#fff;width:250px;height:250px;margin:0 auto}#imageContainer{padding:10px}#loading{position:absolute;top:40%;left:0;height:25%;width:100%}#hoverNav{height:100%;z-index:10}#imageContainer>#hoverNav{left:0}#hoverNav a{outline:0}#nextLink,#prevLink{width:49%;height:100%;background:url(../images/blank.gif) no-repeat;display:block}#prevLink{left:0;float:left}#nextLink{right:0;float:right}#prevLink:hover,#prevLink:visited:hover{background:url(../images/prevlabel.gif) left 15% no-repeat}#nextLink:hover,#nextLink:visited:hover{background:url(../images/nextlabel.gif) right 15% no-repeat}#imageDataContainer{font:10px Verdana,Helvetica,sans-serif;background-color:#fff;margin:0 auto;line-height:1.4em;overflow:auto;width:100%}#imageData{padding:0 10px;color:#666}#imageData #imageDetails{width:70%;float:left;text-align:left}#imageData #caption{font-weight:700}#imageData #numberDisplay{display:block;clear:left;padding-bottom:1em}#imageData #bottomNavClose{width:66px;float:right;margin:1em}#overlay{z-index:90;height:500px;background-color:#000}body,html{height:100%;min-height:100%} diff --git a/admin/css/style.css b/admin/css/style.css index 2604c42..13bcf98 100755 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -1,198 +1 @@ -/* =========================== - - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ - - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana - - =========================== */ - - -/************ BASICS *************/ - -div, p, ul, ol, li, h1, h2, h3, h4, h5, h6, h7,form, span, pre, a{margin:0; padding:0;} - -h1, h2, h3, h4, h5, h6, h7{ font-weight:normal;} - -a, a:link, a:visited, a:active{ color:#000000; text-decoration:none; outline:none;} -a:hover{ text-decoration:underline; color:#000000; outline:none;} - -.inslnl a{ text-decoration:underline; } - -acronym{ border-bottom: 1px dotted #666; cursor:help;} -fieldset{ border:none; margin:0; padding:0;} - -.gelato{color:#006699; font-weight:bold; font-family:'Trebuchet Ms', Verdad, Tahoma;} -.option{ color:#666666; font-style:italic; font-size:0.9em} - -/*********** LAYOUT *************/ - -body{ background-color: #e0e0e0; text-align:center; font-family:"Trebuchet Ms", Verdana, Tahoma; font-size:1em;} - -#cont{ width:600px; margin:30px auto 20px auto; text-align:left; border: 1px solid #999; background-color: #FFF; padding:10px 0 0 0;} - -#head{ background: #fff url(images/head_bg.png) bottom center no-repeat; position: relative; padding:10px 0 20px 20px; height:73px;} - h1 a{ display:block; height:77px; width:161px; background:#fff url(images/gelato-logo.png) top left no-repeat; text-indent:-9999px; overflow:hidden;} - -#nav{ position:absolute; right:1px; font-size:0.75em; line-height:normal; margin:0; padding:0 20px 0 0; list-style:none;bottom:34px;} - - #nav li{ margin:0; padding:0; text-align:right;} - - #nav li a:link, #nav li a:visited, #nav li a:active, #nav li a:focus{ color:#777; text-decoration: none;} - #nav li a:hover{ text-decoration:underline;} - - -#main{ background: #fff url(images/main_bg.png) top left repeat-y; text-align:left; padding:0 0 40px 0;} - h2{ font-size:1.56em; margin:4px; text-indent:20px;} - h3{font-size:1.12em; margin:4px; color:#333333; text-indent:20px;} - -.box{ background:#fff url(images/bg-box.png) center top repeat-y; width:600px;} -.footer-box{background:#fff url(images/bg-foot-box.png) center top no-repeat;} -.install_box{padding:20px;} -.install_box a{ text-decoration:underline;} - -.box h3{float:left; color:#444444; font-weight:bold; padding:5px 10px 0 0;} -.box p{ margin:2px auto auto 15px;} -.menu{ background:transparent url(images/bg-top-box.png) top center no-repeat; height:40px; width:570px; list-style-type:none; padding-right:30px;} -.menu li{ display:inline;} -.menu li.selected a{background: transparent url(images/bg-top-box-hover.png) left top repeat-x; text-decoration:underline;} -.menu li a{ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:0.7em; display:block; float:right; height:28px; padding:12px 3px 0 3px;} -.menu li a:hover{ background: transparent url(images/bg-top-box-hover.png) left top repeat-x; text-decoration:underline;} -.menu li a img{border:none; vertical-align:bottom;} - -.manage li a{ padding:14px 6px 0 6px;} - -/* New post menu and form*/ -div.newpost{background:none;} -div.newpost h3{color:#444; margin:10px 0 0 10px;} - -#post_types{ background: transparent url(images/new_post_nav.png) top center no-repeat; height:51px; position: relative; margin-bottom:20px;} -#head_nav{ background: transparent url(images/head_nav.png) top center no-repeat; height:66px; width:80px; position:absolute; top:-7px; display:none;} -#head_nav_sel{ display:none; background: transparent url(images/head_nav.png) bottom center no-repeat;height:66px; width:80px;} -#post_types ul{ background:none; position: absolute; padding:5px 0 0 0;} -#post_types ul li{} -#post_types ul li.selected a{ background:none;} -#post_types ul li a{ text-align: center; padding:0px 9px; height:auto;} -#post_types ul li a:hover{ background:none;} -#post_types ul li a img{ display: block;} - -#context_help{ display:block; margin:0; padding:5px; position: absolute; border: 1px solid #222; background-color: #444; color:#fff; font-size: 12px;} - -form.newpost{ width:500px; margin:20px auto 0 auto; padding:0;} -form.newpost ul{ list-style-type:none; margin:20px 0 10px 0; padding:0;} -form.newpost li{ margin:4px 0; padding:0; position:relative;} -form.newpost li.select{ margin:6px 0;} -form.newpost label{} -form.newpost input{ margin-bottom:10px;} -form.newpost input.txt{ background: #fff url(images/grad-small.png) top left repeat-x; border:1px solid #999; width:490px; padding:5px;} -form.newpost input.btn{ } -form.newpost input.check{ vertical-align:middle;} -form.newpost textarea{background: #fff url(images/grad-big.png) top left repeat-x; height:190px; border:1px solid #999; width:490px; padding:5px; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:0.8em;} -form.newpost select{ position:absolute; right:10px; top:1px;} -html > body form.newpost select{min-width:100px;} - -legend.install{font: normal 16.5px/17px georgia, "times new roman", serif; border: 1px solid #ddd; margin-top: 0px; padding:5px; margin-bottom: 0; color: #c60; margin-bottom: 5px; background-color:#fff;} -fieldset.install{border:1px solid #dfdfdf; padding:10px;} -fieldset.install input.txt{width:468px;} - -.tabla{ margin:15px 15px; } -.entry{ background-color:#efefef; border:1px solid #ccc; margin:20px auto; width:550px;} -.info{ border-bottom:1px solid #aaa; position:relative; display:block; padding:4px 10px; height:20px; } -.info p{font-size:0.8em; color:#297aab; display:inline;} - -.compact{ float:right; margin:-2px 0 0 0; padding:0;} -.compact img{ border:0px; } -.compact a { color:#297aab; font-size:0.8em; } -.compact a:link { color:#297aab; font-size:0.8em; } -.compact a:visited { color:#297aab; font-size:0.8em; } -.compact a:active { color:#297aab; font-size:0.8em; } -.compact a:hover { color:#297aab; font-size:0.8em; } - -.post{ padding:10px;} -.post h4{ font-style:italic; font-weight:bold; } -.post p{ font-size:0.9em; text-indent:20px;} -.post img{} -.post blockqoute{} -.post .video{} -.post .audio{} - - -#foot { border-top:1px solid #999999; color:#000000; font-size:10px; padding:5px 10px; text-align:center; background-color: #e0e0e0;} - - #footer a { color: #000; } - -#div-process { top:0px; padding-left: 22px; font: normal 14.5px/17px georgia, "times new roman", serif; background: url('../../images/proceso.gif') no-repeat 0% 10%; float: right; height: 20px; width: 150px; border: 1px solid #000066; background-color:#FFFFCC; color:#011940; } - -a.linkFrm, a.linkFrm:link, a.linkFrm:visited, a.linkFrm:active{ color:#297aab; text-decoration:none; outline:none;} -a.linkFrm:hover{ text-decoration:underline; color:#297aab; outline:none;} - -.bookmarklet { - font-weight:bold; padding: 1px 2px; - border: 2px solid #888; - background-color: #eee; text-decoration:none; -} - -.bookmarklet:hover { - background-color: #6FA6EA; text-decoration:none; -} - - -/* Feeds */ - -#feedlist{} -#feedlist ul{ list-style-type:none;} -#feedlist li{ border-bottom:1px solid #999; font-size:12px; padding:2px 4px 2px 4px; margin:0 2px 0 2px;} -#feedlist li span{ font-weight:bold;} -#feedlist li.feederror{ background-color:#FFCCCC;} -#feedlist li.feederror span{ color:#CC0000;} -#feedlist li a img{border:none; padding:0 2px 2px 2px; vertical-align:middle;} - -/* User messages */ - -.error { width:80%; background: #FFF7F2 url('../../images/error.png') 15px center no-repeat; border-top: 2px solid #CC0000; border-bottom: 2px solid #CC0000; margin: 0 auto; padding: 5px 20px 5px 45px; } -.exito { width:80%; background: #F4FBF5 url('../../images/information.png') 15px center no-repeat; border-top: 2px solid #006600; border-bottom: 2px solid #006600; margin: 0 auto; padding: 5px 20px 5px 45px; } -.information { width:80%; background: #FFF6BF url('../../images/icon_info.gif') 15px center no-repeat; border-top: 2px solid #FFD324; border-bottom: 2px solid #FFD324; margin: 0 auto;padding: 5px 20px 5px 45px; } - - -#update { text-align:center; font-size: 10px; color: #000; } - #update a { color: #000; text-decoration:underline; } - #update a:visited { color: #000; text-decoration:underline; } - #update a:active { color: #000; text-decoration:underline; } - #update a:hover { color: #F00; text-decoration:underline; } - -/* Pagination */ - -div.pagination { text-align:center; padding:3px; margin:3px; } -div.pagination a { padding: 2px 5px 2px 5px; margin-right: 2px; border: 1px solid #ddd; text-decoration: none; color: #aaa; } -div.pagination a:hover, div.pagination a:active { padding: 2px 5px 2px 5px; margin-right: 2px; border: 1px solid #a0a0a0; } -div.pagination span.current { padding: 2px 5px 2px 5px; margin-right: 2px; border: 1px solid #e0e0e0; font-weight: bold; background-color: #f0f0f0; color: #aaa; } -div.pagination span.disabled { padding: 2px 5px 2px 5px; margin-right: 2px; border: 1px solid #f3f3f3; color: #ccc; } - -/* Conversation Post */ - -div.conversation ul { list-style-type: none; margin: 0px; padding: 0px 0px 0px 1px; border-left: solid 5px #555; } - div.conversation ul li { font-size: 12px; padding: 4px 0px 4px 8px; color: #000; margin-bottom: 1px; } - div.conversation ul li span.label { font-weight: bold; } - div.conversation ul li.odd { background-color: #f4f4f4; } - div.conversation ul li.even { background-color: #e8e8e8; } - -/* Tables design */ -#admin-table {background-color:#F3F5F7; margin:0 auto; width:95%; text-align:left; font-size:12px; border:1px solid #EAECEE;} - #admin-table thead tr th, #admin-table tfoot tr th {background-color:#BDD3E7; padding:6px;} - #admin-table thead tr .header {background-image: url(images/bg.gif); background-repeat: no-repeat; background-position: center right; cursor: pointer;} - #admin-table tbody td {color:#3D3D3D; padding:6px; background-color:#FFF; background: url(images/td_back.gif) repeat-x; vertical-align:top;} - #admin-table a {color: #3A4856; text-decoration: none; border-bottom: 1px solid #C6C8CB; } - #admin-table tbody a:visited {color: #777; text-decoration: none; } - #admin-table tbody a:hover {color: #000; text-decoration: none; } - /*#admin-table tbody tr.odd td {background-color:#F0F0F6;}*/ - #admin-table tbody tr:hover {background: #EAECEE; color: #111; } - #admin-table thead tr .headerSortUp {background-image: url(images/asc.gif);} - #admin-table thead tr .headerSortDown {background-image: url(images/desc.gif);} - #admin-table thead tr .headerSortDown, #admin-table thead tr .headerSortUp {background-color:#8dbdd8;} - -/* validation */ -form.newpost input.validate_span {border:1px solid #ca3402; float:none;} - form.newpost span.validate_span {color:#ca3402; padding-left:10px; border:0; float:right;} - +#nav li,a,div,fieldset,form,h1,h2,h3,h4,h5,h6,h7,li,ol,p,pre,span,ul{margin:0;padding:0}#cont,#main{text-align:left}#head,#post_types{position:relative}#context_help,#head_nav,#nav,#post_types ul{position:absolute}#feedlist ul,.menu,div.conversation ul,form.newpost ul{list-style-type:none}h2,h3{margin:4px}h1,h2,h3,h4,h5,h6,h7{font-weight:400}.box h3,.sorbet{font-weight:700}a,a:active,a:link,a:visited{color:#000;text-decoration:none;outline:0}.inslnl a,a:hover{text-decoration:underline}a:hover{color:#000;outline:0}acronym{border-bottom:1px dotted #666;cursor:help}fieldset{border:none}.sorbet{color:#069;font-family:'Trebuchet Ms',Verdad,Tahoma}.option{color:#666;font-style:italic;font-size:.9em}body{background-color:#e0e0e0;text-align:center;font-family:"Trebuchet Ms",Verdana,Tahoma;font-size:1em}.menu li a,form.newpost textarea{font-family:Verdana,Arial,Helvetica,sans-serif}#cont{width:600px;margin:30px auto 20px;border:1px solid #999;background-color:#FFF;padding:10px 0 0}#head{background:url(images/head_bg.png) bottom center no-repeat #fff;padding:10px 0 20px 20px;height:73px}h1 a{display:block;height:77px;width:161px;background:url(images/sorbet-logo.png) top left no-repeat #fff;text-indent:-9999px;overflow:hidden}.post p,h2,h3{text-indent:20px}#nav{right:1px;font-size:.75em;line-height:normal;margin:0;padding:0 20px 0 0;list-style:none;bottom:34px}#nav li{text-align:right}#nav li a:active,#nav li a:focus,#nav li a:link,#nav li a:visited{color:#777;text-decoration:none}#nav li a:hover,.install_box a{text-decoration:underline}#main{background:url(images/main_bg.png) top left repeat-y #fff;padding:0 0 40px}#foot,#update,div.pagination{text-align:center}h2{font-size:1.56em}h3{font-size:1.12em;color:#333}.box{background:url(images/bg-box.png) center top repeat-y #fff;width:600px}.footer-box{background:url(images/bg-foot-box.png) center top no-repeat #fff}.install_box{padding:20px}.box h3{float:left;color:#444;padding:5px 10px 0 0}.box p{margin:2px auto auto 15px}.menu{background:url(images/bg-top-box.png) top center no-repeat;height:40px;width:570px;padding-right:30px}.menu li a:hover,.menu li.selected a{background:url(images/bg-top-box-hover.png) left top repeat-x;text-decoration:underline}.menu li{display:inline}.menu li a{font-size:.7em;display:block;float:right;height:28px;padding:12px 3px 0}#head_nav,#head_nav_sel{display:none;height:66px;width:80px}#post_types ul,#post_types ul li a:hover,#post_types ul li.selected a,div.newpost{background:0 0}.menu li a img{border:none;vertical-align:bottom}#feedlist li a img,form.newpost input.check{vertical-align:middle}.manage li a{padding:14px 6px 0}div.newpost h3{color:#444;margin:10px 0 0 10px}#post_types{background:url(images/new_post_nav.png) top center no-repeat;height:51px;margin-bottom:20px}#head_nav{background:url(images/head_nav.png) top center no-repeat;top:-7px}#head_nav_sel{background:url(images/head_nav.png) bottom center no-repeat}#context_help,#post_types ul li a img,.info{display:block}#post_types ul{padding:5px 0 0}#post_types ul li a{text-align:center;padding:0 9px;height:auto}#context_help{margin:0;padding:5px;border:1px solid #222;background-color:#444;color:#fff;font-size:12px}form.newpost input.txt,form.newpost textarea{border:1px solid #999;width:490px;padding:5px}form.newpost{width:500px;margin:20px auto 0;padding:0}form.newpost ul{margin:20px 0 10px;padding:0}form.newpost li{margin:4px 0;padding:0;position:relative}form.newpost li.select{margin:6px 0}form.newpost input{margin-bottom:10px}form.newpost input.txt{background:url(images/grad-small.png) top left repeat-x #fff}form.newpost textarea{background:url(images/grad-big.png) top left repeat-x #fff;height:190px;font-size:.8em}form.newpost select{position:absolute;right:10px;top:1px}html>body form.newpost select{min-width:100px}legend.install{font:400 16.5px/17px georgia,"times new roman",serif;border:1px solid #ddd;margin-top:0;padding:5px;color:#c60;margin-bottom:5px;background-color:#fff}.compact a,.compact a:active,.compact a:hover,.compact a:link,.compact a:visited,.info p{color:#297aab;font-size:.8em}fieldset.install{border:1px solid #dfdfdf;padding:10px}fieldset.install input.txt{width:468px}.tabla{margin:15px}.entry{background-color:#efefef;border:1px solid #ccc;margin:20px auto;width:550px}.info{border-bottom:1px solid #aaa;position:relative;padding:4px 10px;height:20px}.info p{display:inline}.compact{float:right;margin:-2px 0 0;padding:0}.compact img{border:0}#foot,#footer a{color:#000}.post{padding:10px}.post h4{font-style:italic;font-weight:700}.post p{font-size:.9em}#foot{border-top:1px solid #999;font-size:10px;padding:5px 10px;background-color:#e0e0e0}#div-process{top:0;padding-left:22px;font:400 14.5px/17px georgia,"times new roman",serif;background:url(../../images/proceso.gif) 0 10% no-repeat #FFC;float:right;height:20px;width:150px;border:1px solid #006;color:#011940}#feedlist li span,.bookmarklet,div.conversation ul li span.label{font-weight:700}a.linkFrm,a.linkFrm:active,a.linkFrm:link,a.linkFrm:visited{color:#297aab;text-decoration:none;outline:0}a.linkFrm:hover{text-decoration:underline;color:#297aab;outline:0}.bookmarklet{padding:1px 2px;border:2px solid #888;background-color:#eee;text-decoration:none}.bookmarklet:hover{background-color:#6FA6EA;text-decoration:none}#feedlist li{border-bottom:1px solid #999;font-size:12px;padding:2px 4px;margin:0 2px}#feedlist li.feederror{background-color:#FCC}#feedlist li.feederror span{color:#C00}#feedlist li a img{border:none;padding:0 2px 2px}.error,.exito,.information{width:80%;margin:0 auto;padding:5px 20px 5px 45px}.error{background:url(../../images/error.png) 15px center no-repeat #FFF7F2;border-top:2px solid #C00;border-bottom:2px solid #C00}.exito{background:url(../../images/information.png) 15px center no-repeat #F4FBF5;border-top:2px solid #060;border-bottom:2px solid #060}.information{background:url(../../images/icon_info.gif) 15px center no-repeat #FFF6BF;border-top:2px solid #FFD324;border-bottom:2px solid #FFD324}#update{font-size:10px;color:#000}#update a,#update a:active,#update a:visited{color:#000;text-decoration:underline}#update a:hover{color:red;text-decoration:underline}div.pagination{padding:3px;margin:3px}div.pagination a{padding:2px 5px;margin-right:2px;border:1px solid #ddd;text-decoration:none;color:#aaa}div.pagination a:active,div.pagination a:hover{padding:2px 5px;margin-right:2px;border:1px solid #a0a0a0}div.pagination span.current{padding:2px 5px;margin-right:2px;border:1px solid #e0e0e0;font-weight:700;background-color:#f0f0f0;color:#aaa}div.pagination span.disabled{padding:2px 5px;margin-right:2px;border:1px solid #f3f3f3;color:#ccc}div.conversation ul{margin:0;padding:0 0 0 1px;border-left:solid 5px #555}div.conversation ul li{font-size:12px;padding:4px 0 4px 8px;color:#000;margin-bottom:1px}div.conversation ul li.odd{background-color:#f4f4f4}div.conversation ul li.even{background-color:#e8e8e8}#admin-table{background-color:#F3F5F7;margin:0 auto;width:95%;text-align:left;font-size:12px;border:1px solid #EAECEE}#admin-table tfoot tr th,#admin-table thead tr th{background-color:#BDD3E7;padding:6px}#admin-table thead tr .header{background-image:url(images/bg.gif);background-repeat:no-repeat;background-position:center right;cursor:pointer}#admin-table tbody td{color:#3D3D3D;padding:6px;background:url(images/td_back.gif) repeat-x;vertical-align:top}#admin-table a{color:#3A4856;text-decoration:none;border-bottom:1px solid #C6C8CB}#admin-table tbody a:visited{color:#777;text-decoration:none}#admin-table tbody a:hover{color:#000;text-decoration:none}#admin-table tbody tr:hover{background:#EAECEE;color:#111}#admin-table thead tr .headerSortUp{background-image:url(images/asc.gif)}#admin-table thead tr .headerSortDown{background-image:url(images/desc.gif)}#admin-table thead tr .headerSortDown,#admin-table thead tr .headerSortUp{background-color:#8dbdd8}form.newpost input.validate_span{border:1px solid #ca3402;float:none}form.newpost span.validate_span{color:#ca3402;padding-left:10px;border:0;float:right} diff --git a/admin/feeds.php b/admin/feeds.php index 98856be..c0b570e 100755 --- a/admin/feeds.php +++ b/admin/feeds.php @@ -2,14 +2,11 @@ if (!defined('entry')) { define('entry', true); } - /* =========================== +/* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> @@ -27,7 +24,7 @@ if ($user->isAdmin()) { $messageStatus = 'exito'; } } - + if (isset($_GET['delete']) && is_numeric($_GET['delete'])) { if ($f->removeFeed((int)$_GET['delete'])) { $message = __('Feed deleted'); @@ -37,13 +34,13 @@ if ($user->isAdmin()) { - gelato :: <?php echo __("Feeds")?> + sorbet :: <?php echo __("Feeds")?> - - - - - + + + + + - - +
-
- +
+

- + '.$message.'
' : ''); ?>
@@ -126,7 +123,7 @@ if ($user->isAdmin()) { -
+
    getFeedList(); @@ -145,7 +142,7 @@ if ($user->isAdmin()) {
@@ -153,6 +150,6 @@ if ($user->isAdmin()) { urlGelato."/login.php"); + header("Location: ".$conf->urlSorbet."/login.php"); } -?> \ No newline at end of file +?> diff --git a/admin/index.php b/admin/index.php index e9da8f3..da7e7ec 100755 --- a/admin/index.php +++ b/admin/index.php @@ -4,17 +4,14 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> isAuthenticated()) { if (isset($_POST["url"]) && $_POST["url"]!="") { $photoName = $util_class->getFileName($_POST["url"]); if (!$tumble->savePhoto($_POST["url"])) { - header("Location: ".$conf->urlGelato."/admin/index.php?photo=false"); + header("Location: ".$conf->urlSorbet."/admin/index.php?photo=false"); die(); } $_POST["url"] = "../uploads/".$util_class->sanitizeName($photoName); @@ -66,11 +63,11 @@ if ($user->isAuthenticated()) { set_time_limit(300); $mp3Name = $util_class->getFileName($_POST["url"]); if (!$tumble->saveMP3($_POST["url"])) { - header("Location: ".$conf->urlGelato."/admin/index.php?mp3=false"); + header("Location: ".$conf->urlSorbet."/admin/index.php?mp3=false"); die(); } if ($util_class->isMP3($remoteFileName)) { - $_POST["url"] = $conf->urlGelato."/uploads/".$mp3Name; + $_POST["url"] = $conf->urlSorbet."/uploads/".$mp3Name; } } @@ -93,10 +90,10 @@ if ($user->isAuthenticated()) { $tumble->modifyPost($_POST, $_POST["id_post"]); } else { if ($tumble->addPost($_POST)) { - header("Location: ".$conf->urlGelato."/admin/index.php?added=true"); + header("Location: ".$conf->urlSorbet."/admin/index.php?added=true"); die(); } else { - header("Location: ".$conf->urlGelato."/admin/index.php?error=2&des=".$tumble->merror); + header("Location: ".$conf->urlSorbet."/admin/index.php?error=2&des=".$tumble->merror); die(); } } @@ -110,7 +107,7 @@ if ($user->isAuthenticated()) { $theme->set('version', $util_class->version()); $theme->set('conf', array( - 'urlGelato'=>$conf->urlGelato, + 'urlSorbet'=>$conf->urlSorbet, 'richText'=>$conf->richText )); $theme->set('new', isset($_GET['new'])?$_GET['new']:''); @@ -119,9 +116,9 @@ if ($user->isAuthenticated()) { if ($conf->check_version) { $present = $util_class->version(); - $lastest = $util_class->_file_get_contents("http://www.gelatocms.com/vgel.txt"); + $lastest = "1.0";//$util_class->_file_get_contents(""); if ($present < $lastest) { - $theme->set('information', __("A new gelato version has been released and is ready for download.")); + $theme->set('information', __("A new version has been released and is ready for download.")); } } @@ -192,7 +189,7 @@ if ($user->isAuthenticated()) { $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_post.htm')); break; case "photo": - $url = str_replace("../", $conf->urlGelato."/", $url); + $url = str_replace("../", $conf->urlSorbet."/", $url); $form->set('editUrl', $url); $theme->set('form', $form->fetch(Absolute_Path.'admin/themes/admin/template_add_photo.htm')); break; @@ -245,7 +242,7 @@ if ($user->isAuthenticated()) { $formatedDate = gmdate("M d", strtotime($register["date"]) + $util_class->transform_offset($conf->offsetTime)); $strEnd=($conf->urlFriendly) ? "/" : ""; - $permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd; + $permalink = $conf->urlSorbet.($conf->urlFriendly?"/post/":"/index.php?post=").$register["id_post"].$strEnd; $register["title"] = stripslashes($register["title"]); $register["description"] = stripslashes($register["description"]); @@ -264,12 +261,12 @@ if ($user->isAuthenticated()) { $x = @getimagesize($fileName); if ($x[0] > 100) { - $photoPath = $conf->urlGelato."/classes/imgsize.php?w=100&img=".$register["url"]; + $photoPath = $conf->urlSorbet."/classes/imgsize.php?w=100&img=".$register["url"]; } else { $photoPath = $register["url"]; } - $effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\""; + $effect = " href=\"".str_replace("../", $conf->urlSorbet."/", $register["url"])."\" rel=\"lightbox\""; $row['PhotoURL'] = $photoPath; $row['PhotoAlt'] = strip_tags($register["description"]); @@ -321,6 +318,6 @@ if ($user->isAuthenticated()) { $theme->display(Absolute_Path.'admin/themes/admin/index.htm'); } } else { - header("Location: ".$conf->urlGelato."/login.php"); + header("Location: ".$conf->urlSorbet."/login.php"); } ?> diff --git a/admin/options.php b/admin/options.php index 69593fe..330a3f3 100755 --- a/admin/options.php +++ b/admin/options.php @@ -4,105 +4,102 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> isAdmin()) { if (isset($_POST["btnsubmit"])) { if (!$tumble->saveOption($_POST["rich_text"], "rich_text")) { - header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror); + header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror); die(); } if (!$tumble->saveOption($_POST["url_friendly"], "url_friendly")) { - header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror); + header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror); die(); } - + $off_r= split(",", $_POST['time_offsets']); $_POST['offset_time'] = $off_r[0]; $_POST['offset_city'] = $off_r[1]; unset($_POST['time_offsets']); if (!$tumble->saveOption($_POST["offset_city"], "offset_city")) { - header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror); + header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror); die(); } if (!$tumble->saveOption($_POST["offset_time"], "offset_time")) { - header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror); - die(); - } - - if (!$tumble->saveOption($_POST["allow_comments"], "allow_comments")) { - header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror); - die(); - } - - if (!$tumble->saveOption($_POST["shorten_links"], "shorten_links")) { - header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror); - die(); - } - - if (!$tumble->saveOption($_POST["rss_import_frec"], "rss_import_frec")) { - header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror); - die(); - } - - if (!$tumble->saveOption($_POST["check_version"], "check_version")) { - header("Location: ".$conf->urlGelato."/admin/options.php?error=1&des=".$conf->merror); + header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror); die(); } - header("Location: ".$conf->urlGelato."/admin/options.php?modified=true"); + if (!$tumble->saveOption($_POST["allow_comments"], "allow_comments")) { + header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror); + die(); + } + + if (!$tumble->saveOption($_POST["shorten_links"], "shorten_links")) { + header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror); + die(); + } + + if (!$tumble->saveOption($_POST["rss_import_frec"], "rss_import_frec")) { + header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror); + die(); + } + + if (!$tumble->saveOption($_POST["check_version"], "check_version")) { + header("Location: ".$conf->urlSorbet."/admin/options.php?error=1&des=".$conf->merror); + die(); + } + + header("Location: ".$conf->urlSorbet."/admin/options.php?modified=true"); die(); } else { ?> - gelato :: <?php echo __("options")?> + sorbet :: <?php echo __("options")?> - - - + + + - - +
-
- +
+

    -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
isAdmin()) { } ?>
-
-
-
    + +
    +
      • call('add_options_panel'); ?> + $trigger->call('add_options_panel'); ?>

    " class="submit"/>

    - - + +
 
@@ -301,6 +298,6 @@ if ($user->isAdmin()) { } } else { - header("Location: ".$conf->urlGelato."/login.php"); + header("Location: ".$conf->urlSorbet."/login.php"); } -?> \ No newline at end of file +?> diff --git a/admin/plugins.php b/admin/plugins.php index c55a040..cda50dd 100755 --- a/admin/plugins.php +++ b/admin/plugins.php @@ -4,17 +4,14 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> isAdmin()) { } closedir($handle); } - + $actives = json_decode($conf->active_plugins, 1); - + $actives = $actives[1]; - + if (isset($_POST["btnsubmit"])) { $actives = array(); foreach ($_POST['plugins'] as $plugin => $val) { @@ -41,47 +38,47 @@ if ($user->isAdmin()) { $actives[$plugin] = $file; } } - + if (!$tumble->saveOption(json_encode(array(array('total'=>count($actives)),$actives)), "active_plugins")) { - header("Location: ".$conf->urlGelato."/admin/plugins.php?error=1&desc=".$conf->merror); + header("Location: ".$conf->urlSorbet."/admin/plugins.php?error=1&desc=".$conf->merror); die(); } - header("Location: ".$conf->urlGelato."/admin/plugins.php?modified=true"); + header("Location: ".$conf->urlSorbet."/admin/plugins.php?modified=true"); die(); } else { ?> - gelato :: <?php echo __("Plugins")?> + sorbet :: <?php echo __("Plugins")?> - - - - + + + + - - +
-
- +
+

    @@ -104,14 +101,14 @@ if ($user->isAdmin()) { } ?>
    -
    +
    here'); + echo __('You dont have any plugin installed'); } else { foreach ($plugins as $key => $plugin) { - + //FIXME terminar esto asi se lee la info desde el archivo 'a la' WP /* $plugin_data = implode( '', file( Absolute_Path."plugins/".$plugin.'.php' )); @@ -129,8 +126,8 @@ if ($user->isAdmin()) { $plugin_data = array('Name' => trim($plugin_name[1]), 'URI' => trim($plugin_uri[1]), 'Description' => trim($description[1]), 'Author' => trim($author_name[1]), 'Author_uri' => trim($author_uri[1]), 'Version' => $version); */ $desc = __("There is no info for this plugin jet"); - $activated = array_key_exists($plugin, $actives); ?> -
      + $activated = array_key_exists($plugin, $actives); ?> +
      • " class="submit"/>

        -
        • - + +
     
@@ -170,6 +167,6 @@ if ($user->isAdmin()) { } } else { - header("Location: ".$conf->urlGelato."/login.php"); + header("Location: ".$conf->urlSorbet."/login.php"); } -?> \ No newline at end of file +?> diff --git a/admin/scripts/markitup/sets/html/set.js b/admin/scripts/markitup/sets/html/set.js index 6f265e9..1db1e2e 100755 --- a/admin/scripts/markitup/sets/html/set.js +++ b/admin/scripts/markitup/sets/html/set.js @@ -1,35 +1 @@ -// ---------------------------------------------------------------------------- -// markItUp! -// ---------------------------------------------------------------------------- -// Copyright (C) 2008 Jay Salvat -// http://markitup.jaysalvat.com/ -// ---------------------------------------------------------------------------- -// Html tags -// http://en.wikipedia.org/wiki/html -// ---------------------------------------------------------------------------- -// Basic set. Feel free to add more tags -// ---------------------------------------------------------------------------- -my_html = { - nameSpace: "my_html", // Used to prevent multi-instances CSS conflict - onShiftEnter: {keepDefault:false, replaceWith:'
\n'}, - onCtrlEnter: {keepDefault:false, openWith:'\n

', closeWith:'

\n'}, - onTab: {keepDefault:false, openWith:' '}, - markupSet: [ - {name:'Paragraph', openWith:'', closeWith:'

' }, - {separator:'---------------' }, - {name:'Bold', key:'B', openWith:'(!(|!|)!)', closeWith:'(!(|!|)!)' }, - {name:'Italic', key:'I', openWith:'(!(|!|)!)', closeWith:'(!(|!|)!)' }, - {name:'Stroke through', key:'S', openWith:'', closeWith:'' }, - {separator:'---------------' }, - {name:'Ul', openWith:'
    \n', closeWith:'
\n' }, - {name:'Ol', openWith:'
    \n', closeWith:'
\n' }, - {name:'Li', openWith:'
  • ', closeWith:'
    • ' }, - {separator:'---------------' }, - {name:'Link', key:'L', openWith:'', closeWith:'', placeHolder:'Your text to link...' }, - {separator:'---------------' }, - {name:'Quote block', openWith:'
    \n', closeWith:'
    \n' }, - {name:'Code block', openWith:'\n', closeWith:'\n' }, - {separator:'---------------' }, - {name:'Clean', replaceWith:function(h) { return h.selection.replace(/<(.*?)>/g, "") } } - ] -} \ No newline at end of file +my_html={nameSpace:"my_html",onShiftEnter:{keepDefault:!1,replaceWith:"
    \n"},onCtrlEnter:{keepDefault:!1,openWith:"\n

    ",closeWith:"

    \n"},onTab:{keepDefault:!1,openWith:"\t "},markupSet:[{name:"Paragraph",openWith:'',closeWith:"

    "},{separator:"---------------"},{name:"Bold",key:"B",openWith:"(!(|!|)!)",closeWith:"(!(|!|)!)"},{name:"Italic",key:"I",openWith:"(!(|!|)!)",closeWith:"(!(|!|)!)"},{name:"Stroke through",key:"S",openWith:"",closeWith:""},{separator:"---------------"},{name:"Ul",openWith:"
      \n",closeWith:"
    \n"},{name:"Ol",openWith:"
      \n",closeWith:"
    \n"},{name:"Li",openWith:"
  • ",closeWith:"
    • "},{separator:"---------------"},{name:"Link",key:"L",openWith:'',closeWith:"",placeHolder:"Your text to link..."},{separator:"---------------"},{name:"Quote block",openWith:"
    \n",closeWith:"
    \n"},{name:"Code block",openWith:"\n",closeWith:"\n"},{separator:"---------------"},{name:"Clean",replaceWith:function(e){return e.selection.replace(/<(.*?)>/g,"")}}]}; diff --git a/admin/scripts/markitup/sets/html/style.css b/admin/scripts/markitup/sets/html/style.css index ee9c5b0..50acb8b 100755 --- a/admin/scripts/markitup/sets/html/style.css +++ b/admin/scripts/markitup/sets/html/style.css @@ -1,39 +1 @@ -/* ------------------------------------------------------------------- -// markItUp! -// By Jay Salvat - http://markitup.jaysalvat.com/ -// ------------------------------------------------------------------*/ -.markItUpButton1 a { - background-image:url(images/paragraph.png); -} -.markItUpButton2 a { - background-image:url(images/bold.png); -} -.markItUpButton3 a { - background-image:url(images/italic.png); -} -.markItUpButton4 a { - background-image:url(images/stroke.png); -} -.markItUpButton5 a { - background-image:url(images/list-bullet.png); -} -.markItUpButton6 a { - background-image:url(images/list-numeric.png); -} -.markItUpButton7 a { - background-image:url(images/list-item.png); -} - -.markItUpButton8 a { - background-image:url(images/link.png); -} -.markItUpButton9 a { - background-image:url(images/quotes.png); -} -.markItUpButton10 a { - background-image:url(images/code.png); -} - -.markItUpButton11 a { - background-image:url(images/clean.png); -} \ No newline at end of file +.markItUpButton1 a{background-image:url(images/paragraph.png)}.markItUpButton2 a{background-image:url(images/bold.png)}.markItUpButton3 a{background-image:url(images/italic.png)}.markItUpButton4 a{background-image:url(images/stroke.png)}.markItUpButton5 a{background-image:url(images/list-bullet.png)}.markItUpButton6 a{background-image:url(images/list-numeric.png)}.markItUpButton7 a{background-image:url(images/list-item.png)}.markItUpButton8 a{background-image:url(images/link.png)}.markItUpButton9 a{background-image:url(images/quotes.png)}.markItUpButton10 a{background-image:url(images/code.png)}.markItUpButton11 a{background-image:url(images/clean.png)} diff --git a/admin/scripts/markitup/skins/simple/style.css b/admin/scripts/markitup/skins/simple/style.css index f14b1c4..d94ab94 100755 --- a/admin/scripts/markitup/skins/simple/style.css +++ b/admin/scripts/markitup/skins/simple/style.css @@ -1,131 +1 @@ -#poststuff { - position: relative !important; -} - -#submitpost { - position: absolute !important; - right: 0px !important; - float: none !important; -} - -.markItUp * { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; -} -.markItUp a:link, -.markItUp a:visited { - color:#000; - text-decoration:none; -} -.markItUp { - width:700px; - margin:5px 0 5px 0; -} -.markItUpContainer { - font:11px Verdana, Arial, Helvetica, sans-serif; -} -.markItUpEditor { - font:12px 'Courier New', Courier, monospace; - padding:5px; - width:690px; - height:320px; - clear:both; display:block; - line-height:18px; - overflow:auto; -} -.markItUpPreviewFrame { - overflow:auto; - background-color:#FFF; - width:99.9%; - height:300px; - margin:5px 0; -} -.markItUpFooter { - width:100%; -} -.markItUpResizeHandle { - overflow:hidden; - width:22px; height:5px; - margin-left:auto; - margin-right:auto; - background-image:url(images/handle.png); - cursor:n-resize; -} -/***************************************************************************************/ -/* first row of buttons */ -.markItUpHeader ul li { - list-style:none; - float:left; - position:relative; -} -.markItUpHeader ul li:hover > ul{ - display:block; -} -.markItUpHeader ul .markItUpDropMenu { - background:transparent url(images/menu.png) no-repeat 115% 50%; - margin-right:5px; -} -.markItUpHeader ul .markItUpDropMenu li { - margin-right:0px; -} -/* next rows of buttons */ -.markItUpHeader ul ul { - display:none; - position:absolute; - top:18px; left:0px; - background:#FFF; - border:1px solid #000; -} -.markItUpHeader ul ul li { - float:none; - border-bottom:1px solid #000; -} -.markItUpHeader ul ul .markItUpDropMenu { - background:#FFF url(images/submenu.png) no-repeat 100% 50%; -} -.markItUpHeader ul .markItUpSeparator { - margin:0 10px; - width:1px; - height:16px; - overflow:hidden; - background-color:#CCC; -} -.markItUpHeader ul ul .markItUpSeparator { - width:auto; height:1px; - margin:0px; -} -/* next rows of buttons */ -.markItUpHeader ul ul ul { - position:absolute; - top:-1px; left:150px; -} -.markItUpHeader ul ul ul li { - float:none; -} -.markItUpHeader ul a { - display:block; - width:16px; height:16px; - text-indent:-10000px; - background-repeat:no-repeat; - padding:3px; - margin:0px; -} -.markItUpHeader ul ul a { - display:block; - padding-left:0px; - text-indent:0; - width:120px; - padding:5px 5px 5px 25px; - background-position:2px 50%; -} -.markItUpHeader ul ul a:hover { - color:#FFF; - background-color:#000; -} +#poststuff{position:relative!important}#submitpost{position:absolute!important;right:0!important;float:none!important}.markItUp *{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}.markItUp a:link,.markItUp a:visited{color:#000;text-decoration:none}.markItUp{width:700px;margin:5px 0}.markItUpContainer{font:11px Verdana,Arial,Helvetica,sans-serif}.markItUpEditor{font:12px 'Courier New',Courier,monospace;padding:5px;width:690px;height:320px;clear:both;display:block;line-height:18px;overflow:auto}.markItUpPreviewFrame{overflow:auto;background-color:#FFF;width:99.9%;height:300px;margin:5px 0}.markItUpFooter{width:100%}.markItUpResizeHandle{overflow:hidden;width:22px;height:5px;margin-left:auto;margin-right:auto;background-image:url(images/handle.png);cursor:n-resize}.markItUpHeader ul li{list-style:none;float:left;position:relative}.markItUpHeader ul li:hover>ul{display:block}.markItUpHeader ul .markItUpDropMenu{background:url(images/menu.png) 115% 50% no-repeat;margin-right:5px}.markItUpHeader ul .markItUpDropMenu li{margin-right:0}.markItUpHeader ul ul{display:none;position:absolute;top:18px;left:0;background:#FFF;border:1px solid #000}.markItUpHeader ul ul li{float:none;border-bottom:1px solid #000}.markItUpHeader ul ul .markItUpDropMenu{background:url(images/submenu.png) 100% 50% no-repeat #FFF}.markItUpHeader ul .markItUpSeparator{margin:0 10px;width:1px;height:16px;overflow:hidden;background-color:#CCC}.markItUpHeader ul ul .markItUpSeparator{width:auto;height:1px;margin:0}.markItUpHeader ul ul ul{position:absolute;top:-1px;left:150px}.markItUpHeader ul ul ul li{float:none}.markItUpHeader ul a{display:block;width:16px;height:16px;text-indent:-10000px;background-repeat:no-repeat;padding:3px;margin:0}.markItUpHeader ul ul a{display:block;text-indent:0;width:120px;padding:5px 5px 5px 25px;background-position:2px 50%}.markItUpHeader ul ul a:hover{color:#FFF;background-color:#000} diff --git a/admin/settings.php b/admin/settings.php index f833af5..34fd10a 100755 --- a/admin/settings.php +++ b/admin/settings.php @@ -4,16 +4,13 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ -require_once('../entry.php'); +require_once '../entry.php'; global $user, $conf, $tumble; if ($user->isAdmin()) { @@ -26,41 +23,41 @@ if ($user->isAdmin()) { - gelato :: <?php echo __("settings")?> + sorbet :: <?php echo __("settings")?> - - - + + + - - +
    -
    - +
    +

      -
      • -
      • -
      • -
      • +
      • +
      • +
      • +
    isAdmin()) { } ?>
    -
    -
    -
      + +
      +
      • -
        • +
        • -call('add_settings_panel'); ?>

      " class="submit"/>

      - - + +
     
    @@ -131,6 +128,6 @@ if ($user->isAdmin()) { } } else { - header("Location: ".$conf->urlGelato."/login.php"); + header("Location: ".$conf->urlSorbet."/login.php"); } -?> \ No newline at end of file +?> diff --git a/admin/themes/admin/api.xml b/admin/themes/admin/api.xml index 1fd4826..aaa34e6 100755 --- a/admin/themes/admin/api.xml +++ b/admin/themes/admin/api.xml @@ -1,6 +1,6 @@ {header Content-type: text/xml; charset=utf-8} - + {conf.description} @@ -8,7 +8,7 @@ {/block} - + {if $totalRegistros} {block $posts as $post} @@ -42,15 +42,15 @@ {$post.tit} {$post.url} - {$post.desc} + {$post.desc} {elseif $post.type=='mp3'} {$post.tit} - {$post.desc} + {$post.desc} {/if} {/block} {/if} - + diff --git a/admin/themes/admin/index.htm b/admin/themes/admin/index.htm index 07d61be..36de8cc 100755 --- a/admin/themes/admin/index.htm +++ b/admin/themes/admin/index.htm @@ -2,13 +2,13 @@ - - gelato :: {__("control panel")} - - - - - + + sorbet :: {__("control panel")} + + + + + {if $conf.richText} - + {else} - - - - + + + + {/if} {admin_includes} @@ -45,9 +45,9 @@
    @@ -56,13 +56,13 @@

     

    @@ -85,7 +85,7 @@ <code> <pre> <img>

    - Bookmarklet - {__("add to gelato")} + Bookmarklet - {__("add to sorbet")}

    @@ -100,12 +100,12 @@
    @@ -113,7 +113,7 @@ {if $Posts_Number} {block $rows as $row}
    -
    Link   +
    Link  

    {$row.Date_Added}

    @@ -134,10 +134,10 @@
    {$row.Conversation}
    {elseif $row.postType=='video'} {$row.Caption} -

    Watch video {__('Watch')}

    +

    Watch video {__('Watch')}

    {elseif $row.postType=='mp3'} {$row.Caption} -

    Play song {__('Play')}

    +

    Play song {__('Play')}

    {/if}
    @@ -150,7 +150,7 @@
    diff --git a/admin/themes/admin/install.htm b/admin/themes/admin/install.htm index 253d4d3..00909eb 100755 --- a/admin/themes/admin/install.htm +++ b/admin/themes/admin/install.htm @@ -2,8 +2,8 @@ - - gelato :: installation + + sorbet :: installation - +
    -
    - +
    +
    - +
    @@ -69,7 +69,7 @@ {if $error==1}
    - {__(" You must be registered to use gelato.")} + {__(" You must be registered to use Sorbet CMS.")}
    {elseif $error==2}
    @@ -82,7 +82,7 @@
    diff --git a/admin/themes/admin/template_bm.htm b/admin/themes/admin/template_bm.htm index 7a0b3d7..665aa1e 100755 --- a/admin/themes/admin/template_bm.htm +++ b/admin/themes/admin/template_bm.htm @@ -3,7 +3,7 @@ - gelato bookmarklet + sorbet bookmarklet - +
    -
    - +
    +

      @@ -75,7 +72,7 @@ if ($user->isAdmin()) {
    - +
    @@ -95,7 +92,7 @@ if ($user->isAdmin()) { if (!$isEdition) { ?>
    - + @@ -122,25 +119,25 @@ if ($user->isAdmin()) {
  • " /> -
    • +

  • - -
    • + +
  • user" />
    • - +
     
    @@ -149,6 +146,6 @@ if ($user->isAdmin()) { } } else { - header("Location: ".$conf->urlGelato."/login.php"); + header("Location: ".$conf->urlSorbet."/login.php"); } -?> \ No newline at end of file +?> diff --git a/api.php b/api.php index eaba14c..0e15359 100755 --- a/api.php +++ b/api.php @@ -4,12 +4,9 @@ if (!defined('entry')) { } /* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> @@ -43,7 +40,7 @@ if (!defined('entry')) { } $user = new user(); $userData = $user->getUserByID(1); - $username = ($userData["name"] == "") ? "gelato" : $userData["name"]; + $username = ($userData["name"] == "") ? "sorbet" : $userData["name"]; $theme->set("username", $username); $theme->set("conf", array( @@ -81,7 +78,7 @@ if (!defined('entry')) { while ($post = $rs->fetch()) { $post['desc'] = util::trimString($post["description"]); $strEnd = ($conf->urlFriendly) ? "/" : ""; - $post['url'] = $conf->urlGelato.($conf->urlFriendly ? "/post/" : "/index.php?post=").$post["id_post"].$strEnd; + $post['url'] = $conf->urlSorbet.($conf->urlFriendly ? "/post/" : "/index.php?post=").$post["id_post"].$strEnd; $post['formatedDate'] = gmdate("D, d M Y H:i:s", strtotime($post["date"]) + util::transform_offset($conf->offsetTime)); $post["type"] = util::type2Text($post["type"]); @@ -91,7 +88,7 @@ if (!defined('entry')) { $post['tit'] = (empty($post["title"])) ? $post['desc'] : strip_tags($post["title"]); break; case "photo": - $post['photoPath'] = str_replace("../", $conf->urlGelato."/", $post["url"]); + $post['photoPath'] = str_replace("../", $conf->urlSorbet."/", $post["url"]); $post['tit'] = stripslashes(((empty($post["description"])) ? "Photo" : $post['desc'])); break; case "quote": diff --git a/archive.php b/archive.php index 2ebd7b1..1f2ede7 100755 --- a/archive.php +++ b/archive.php @@ -2,14 +2,11 @@ if (!defined('entry')) { define('entry', true); } - /* =========================== +/* =========================== - gelato CMS - A PHP based tumblelog CMS - development version - http://www.gelatocms.com/ + Sorbet CMS - A PHP based tumblelog CMS forked from Gelato CMS - gelato CMS is a free software licensed under the GPL 2.0 - Copyright (C) 2007 by Pedro Santana + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> @@ -98,9 +95,9 @@ function handleNode($node) $fileName = "uploads/".$util_class->getFileName($node["url"]); $x = @getimagesize($fileName); if ($x[0] > 500) { - $photoPath = $conf->urlGelato."/classes/imgsize.php?w=500&img=".$node["url"]; + $photoPath = $conf->urlSorbet."/classes/imgsize.php?w=500&img=".$node["url"]; } else { - $photoPath = str_replace("../", $conf->urlGelato."/", $node["url"]); + $photoPath = str_replace("../", $conf->urlSorbet."/", $node["url"]); } $output['caption'] = $node["description"]; $output['photo'] = $photoPath; @@ -129,13 +126,13 @@ function handleNode($node) - version().")"; ?>" /> - - "/> + version().")"; ?>" /> + + "/> <?php echo $conf->title." » ".__(" archive"); ?> - - - + + + @@ -180,7 +180,7 @@

    {__("archive")}  /  {__("subscribe via")} rss  /  - {__("powered by")} gelato cms + {__("powered by")} sorbet cms

    diff --git a/themes/Dreamscape/style.css b/themes/Dreamscape/style.css index 5d3e767..c7ff01f 100755 --- a/themes/Dreamscape/style.css +++ b/themes/Dreamscape/style.css @@ -1,378 +1 @@ - body { - color: #fff; - margin: 0px; - background: #002c43 url('images/bg.gif'); - font-family: 'Lucida Grande', Helvetica, sans-serif; - } - - #content { - width: 510px; - margin: auto; - padding: 35px; - position: relative; - background: #005885 url('images/content_bg.png'); - border-left: solid 10px #003955; - border-right: solid 10px #003955; - } - - a { - color: #ff9900; - } - - h1 { - padding: 25px 0px 65px 0px; - margin: 0px; - text-align: center; - font: Normal 65px Georgia, serif; - line-height: 60px; - letter-spacing: -1px; - opacity: 0.9; - -moz-opacity: 0.9; - filter: alpha(opacity=90); - } - - h1 a { - color: #fff; - text-decoration: none; - } - - div#content { - position: relative; - } - - div#description { - position: absolute; - left: 605px; - font: Normal 12px Verdana,sans-serif; - line-height: 20px; - width: 150px; - color: #568; - } - - div#search { - text-align: right; - } - - div#description div a { - color: #568; - } - - div#searchresultcount { - text-align: center; - } - - .post { - position: relative; - margin-bottom: 50px; - } - - .post .permalink { - position: absolute; - top: 8px; - right: 3px; - display: none; - font-weight: bold; - font-size: 24px; - line-height: 0px; - } - - .post:hover .permalink { - display: block; - } - - .post .permalink a { - text-decoration: none; - } - - .post .date { - position: absolute; - right: 565px; - text-align: right; - width: 200px; - white-space: nowrap; - font: Bold 20px Helvetica, sans-serif; - text-align: right; - letter-spacing: -1px; - color: #888; - padding: 5px 5px 5px 5px; - line-height: 20px; - text-transform: uppercase; - } - - .post .date em { - font-style: normal; - color: #4075a2; - } - - .post .date big { - font-size: 30px; - } - - .post h2 { - font: Normal 20px Georgia, serif; - color: #fff; - letter-spacing: -1px; - margin: 0px 0px 10px 0px; - } - - .post h2 a { - color: #fff; - text-decoration: none; - } - - /* Regular Post */ - .post .regular { - font-size: 12px; - line-height: 17px; - } - - .post .regular blockquote { - font-style: italic; - } - - /* Photo Post */ - .post .photo img { - border: solid 5px #eee; - } - - .post .photo .caption { - font-size: 11px; - margin-top: 5px; - } - - .post .photo .caption a { - color: #fff; - } - - /* Quote Post */ - .post .quote span.quote { - font: Normal 28px Georgia, serif; - letter-spacing: -1px; - color: #fff; - } - - .post .quote span.quote a { - color: #fff; - } - - .post .quote span.quote big.quote { - font-weight: bold; - font-size: 60px; - line-height: 8px; - vertical-align: -20px; - } - - .post .quote span.source { - font-size: 16px; - color: #aaa; - letter-spacing: -1px; - } - - .post .quote span.source a { - color: #aaa; - } - - /* Link Post */ - .post .link a.link { - font: Bold 30px Helvetica, sans-serif; - letter-spacing: -1px; - color: #ff9900; - text-decoration: none; - border-bottom: dotted 1px #ff9900; - line-height: 33px; - } - - .post .link .description { - font-weight: normal; - font-size: 11px; - line-height: 16px; - margin-top: 5px; - } - - /* Conversation Post */ - .post .conversation ul { - background-color: #46a6e9; - list-style-type: none; - margin: 0px; - padding: 0px; - border-left: solid 5px #0070ba; - } - - .post .conversation ul li { - border-bottom: solid 1px #0070ba; - font-size: 12px; - padding: 4px 0px 4px 8px; - color: #000; - } - - .post .conversation ul li span.label { - font-weight: bold; - } - - /* Audio Post */ - .post .audio .caption { - font-size: 11px; - margin-top: 5px; - } - - .post .audio .caption a { - color: #fff; - } - - /* Video Post */ - .post .video { - width: 500px; - margin: auto; - } - - .post .video .caption { - font-size: 11px; - margin-top: 5px; - } - - .post .video .caption a { - color: #fff; - } - - /* Footer */ - #footer { - margin: 20px 0px 0px 0px; - text-align: center; - font-size: 22px; - } - - #footer a { - text-decoration: none; - color: #fff; - } - - #footer a:hover { - text-decoration: underline; - } - - #footer p.tiny { - margin: 50px 0px 0px 0px; - font-size: 11px; - font-weight: bold; - } - - #footer p.tiny a { - text-decoration: underline; - color: #fff; - } - - #footer p.tiny .dim { - filter: alpha(opacity=50); - -moz-opacity: 0.5; - opacity: 0.5; - } - - .query { - font-weight: bold; - } - - - -.containerFormComments { - margin: 25px 65px 0px 0px; - font-family: Verdana; - font-size: 0.75em; -} - -#commentForm input, #commentForm textarea { - font: 0.9em 'Lucida Grande', Verdana, Arial, Sans-Serif; -} - -#commentForm p { - font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif; - margin: 5px 0; -} - -#commentForm input { - width: 170px; - padding: 2px; - margin: 5px 5px 1px 0; -} - -#commentForm textarea { - width: 100%; - padding: 2px; - border:1px solid #fff; - background-color:#fff; -} - -#commentForm #btnAdd { - margin: 0; - float: right; -} - -.totalComments h3 { - margin: 0 10px 0 0; - font-size: 10pt; - font-weight: normal; - text-align: right; - color: #999; - font-style: italic; -} - -.totalComments a { - color: #999; -} - -/* -Plugin Name: WP-Digg Style Paginator -Plugin URI: http://www.mis-algoritmos.com/2007/09/09/wp-digg-style-pagination-plugin-v-10/ -Author: Victor De la Rocha -Author URI: http://www.mis-algoritmos.com -*/ -/*CSS Yahoo new version style pagination*/ - div.pagination { - padding: 3px; - margin: 10px 3px 3px 3px; - text-align:center; - font-family:Tahoma,Helvetica,sans-serif; - font-size:.85em; - } - - div.pagination a { - background-color:#fff; - - border: 1px solid #ccdbe4; - margin-right:3px; - padding:2px 8px; - - background-position:bottom; - text-decoration: none; - - color: #000; - } - div.pagination a:hover, div.pagination a:active { - border: 1px solid #2b55af; - background-image:none; - background-color:#3666d4; - color: #fff; - } - div.pagination span.current { - margin-right:3px; - padding:2px 6px; - - font-weight: bold; - color: #000; - } - div.pagination span.disabled { - display:none; - } - div.pagination a.next{ - border:2px solid #ccdbe4; - margin:0 0 0 10px; - } - div.pagination a.next:hover{ - border:2px solid #2b55af; - } - div.pagination a.prev{ - border:2px solid #ccdbe4; - margin:0 10px 0 0; - } - div.pagination a.prev:hover{ - border:2px solid #2b55af; - } +body,h1{margin:0}body,h1 a{color:#fff}#content,div#content{position:relative}div#searchresultcount,h1{text-align:center}.post .date,.post .link a.link,.post .quote span.quote,.post h2,h1{letter-spacing:-1px}#footer a,.post .link a.link,.post .permalink a,.post h2 a,h1 a{text-decoration:none}body{background:url(images/bg.gif) #002c43;font-family:'Lucida Grande',Helvetica,sans-serif}#content{width:510px;margin:auto;padding:35px;background:url(images/content_bg.png) #005885;border-left:solid 10px #003955;border-right:solid 10px #003955}a{color:#f90}h1{padding:25px 0 65px;font:Normal 65px Georgia,serif;line-height:60px;opacity:.9;-moz-opacity:.9;filter:alpha(opacity=90)}div#description{position:absolute;left:605px;font:Normal 12px Verdana,sans-serif;line-height:20px;width:150px;color:#568}div#search{text-align:right}div#description div a{color:#568}.post{position:relative;margin-bottom:50px}.post .permalink{position:absolute;top:8px;right:3px;display:none;font-weight:700;font-size:24px;line-height:0}.post:hover .permalink{display:block}.post .date{position:absolute;right:565px;width:200px;white-space:nowrap;font:Bold 20px Helvetica,sans-serif;text-align:right;color:#888;padding:5px;line-height:20px;text-transform:uppercase}.post .date em{font-style:normal;color:#4075a2}.post .photo .caption a,.post .quote span.quote a,.post h2,.post h2 a{color:#fff}.post .date big{font-size:30px}.post h2{font:Normal 20px Georgia,serif;margin:0 0 10px}.post .regular{font-size:12px;line-height:17px}.post .regular blockquote{font-style:italic}.post .photo img{border:5px solid #eee}.post .photo .caption{font-size:11px;margin-top:5px}.post .quote span.quote{font:Normal 28px Georgia,serif;color:#fff}.post .quote span.quote big.quote{font-weight:700;font-size:60px;line-height:8px;vertical-align:-20px}.post .quote span.source{font-size:16px;color:#aaa;letter-spacing:-1px}.post .quote span.source a{color:#aaa}.post .link a.link{font:Bold 30px Helvetica,sans-serif;color:#f90;border-bottom:dotted 1px #f90;line-height:33px}.post .link .description{font-weight:400;font-size:11px;line-height:16px;margin-top:5px}#footer p.tiny,.post .conversation ul li span.label,.query{font-weight:700}.post .conversation ul{background-color:#46a6e9;list-style-type:none;margin:0;padding:0;border-left:solid 5px #0070ba}.post .conversation ul li{border-bottom:solid 1px #0070ba;font-size:12px;padding:4px 0 4px 8px;color:#000}#footer a,#footer p.tiny a,.post .audio .caption a,.post .video .caption a{color:#fff}.post .audio .caption{font-size:11px;margin-top:5px}.post .video{width:500px;margin:auto}.post .video .caption{font-size:11px;margin-top:5px}#footer{margin:20px 0 0;text-align:center;font-size:22px}#footer a:hover,#footer p.tiny a{text-decoration:underline}#footer p.tiny{margin:50px 0 0;font-size:11px}#footer p.tiny .dim{filter:alpha(opacity=50);-moz-opacity:.5;opacity:.5}.containerFormComments{margin:25px 65px 0 0;font-family:Verdana;font-size:.75em}#commentForm input,#commentForm textarea{font:.9em 'Lucida Grande',Verdana,Arial,Sans-Serif}#commentForm p{font-family:'Lucida Grande',Verdana,Arial,Sans-Serif;margin:5px 0}#commentForm input{width:170px;padding:2px;margin:5px 5px 1px 0}#commentForm textarea{width:100%;padding:2px;border:1px solid #fff;background-color:#fff}#commentForm #btnAdd{margin:0;float:right}.totalComments h3{margin:0 10px 0 0;font-size:10pt;font-weight:400;text-align:right;color:#999;font-style:italic}.totalComments a{color:#999}div.pagination{padding:3px;margin:10px 3px 3px;text-align:center;font-family:Tahoma,Helvetica,sans-serif;font-size:.85em}div.pagination a{background-color:#fff;border:1px solid #ccdbe4;margin-right:3px;padding:2px 8px;background-position:bottom;text-decoration:none;color:#000}div.pagination a:active,div.pagination a:hover{border:1px solid #2b55af;background-image:none;background-color:#3666d4;color:#fff}div.pagination span.current{margin-right:3px;padding:2px 6px;font-weight:700;color:#000}div.pagination span.disabled{display:none}div.pagination a.next{border:2px solid #ccdbe4;margin:0 0 0 10px}div.pagination a.next:hover{border:2px solid #2b55af}div.pagination a.prev{border:2px solid #ccdbe4;margin:0 10px 0 0}div.pagination a.prev:hover{border:2px solid #2b55af} diff --git a/themes/tumblr/index.htm b/themes/tumblr/index.htm index e6c8d97..d53e540 100755 --- a/themes/tumblr/index.htm +++ b/themes/tumblr/index.htm @@ -3,7 +3,7 @@ - {Gelato_includes} + {Sorbet_includes} @@ -167,7 +167,7 @@ diff --git a/themes/tumblr/style.css b/themes/tumblr/style.css index b1083aa..7e745ed 100755 --- a/themes/tumblr/style.css +++ b/themes/tumblr/style.css @@ -1,308 +1 @@ -body { - background-color: #222; - background-image: url(img/bg.gif); - margin: 0px 0px 50px 60px; - font: Normal 13px Arial, Helvetica, sans-serif; - color: #555; - } - - #container { - width: 500px; - padding: 25px; - background-color: #fff; - border-bottom: solid 8px #aaa; - } - - img#rss { - width: 36px; - height: 19px; - border-width: 0px; - float: right; - margin-left: 30px; - margin-bottom: 10px; - } - - h1 { - color: #666; - margin: 0px 0px 10px 0px; - font-weight: normal; - font-size: 40px; - letter-spacing: -1px; - } - - h1 a { - color: #666; - text-decoration: none; - } - - #description { - color: #777; - font-size: 11px; - line-height: 18px; - padding-right: 70px; - margin-bottom: 30px; - } - - .date { - margin: 30px 0px 10px 0px; - color: #ccc; - font-size: 24px; - text-align: right; - letter-spacing: -1px; - text-transform: uppercase; - border-bottom: solid 1px #ccc; - } - - div.post { - margin-bottom: 40px; - position: relative; - } - - div.post img.permalink { - border-width: 0px; - width: 23px; - height: 9px; - position: absolute; - top: 5px; - right: 5px; - display: none; - } - - div.post:hover img.permalink { - display: block; - } - - div.post h2 { - font-size: 14px; - color: #444; - margin: 0px 0px 5px 0px; - } - - div.post h2 a { - color: #444; - text-decoration: none; - } - - a { - color: #111; - } - - /* Regular Post */ - div.post div.regular { - font: Normal 11px 'Lucida Grande', Verdana, Arial, sans-serif; - line-height: 17px; - } - - div.post div.regular blockquote { - font-style: italic; - } - - /* Photo Post */ - div.post div.photo img { - border-width: 0px; - } - - div.post div.photo div.caption { - font-size: 11px; - margin-top: 5px; - color: #888; - } - - div.post div.photo div.caption a { - color: #888; - } - - /* Quote Post */ - div.post div.quote { - padding: 0px 30px 0px 30px; - } - - div.post div.quote span.quote { - font-size: 24px; - color: #444; - } - - div.post div.quote span.quote a { - color: #444; - } - - div.post div.quote span.quote big.quote { - font: Bold 60px Georgia, serif; - line-height: 1px; - vertical-align: -23px; - opacity: 0.4; - -moz-opacity: 0.4; - filter: alpha(opacity=40); - } - - div.post div.quote span.quote big.quote a { - text-decoration: none; - } - - div.post div.quote div.source { - font-size: 16px; - color: #666; - } - - div.post div.quote div.source a { - color: #666; - } - - /* Link Post */ - div.post div.link { - color: #666; - font-size: 24px; - letter-spacing: -1px; - } - - div.post div.link a { - color: #666; - text-decoration: none; - border-bottom: dotted 1px #666; - } - - div.post div.link div.description { - font-size: 15px; - letter-spacing: 0px; - line-height: 20px; - } - - /* Conversation Post */ - div.post div.conversation ul { - list-style-type: none; - margin: 0px; - padding: 0px 0px 0px 1px; - border-left: solid 5px #555; - } - - div.post div.conversation ul li { - font-size: 12px; - padding: 4px 0px 4px 8px; - color: #000; - margin-bottom: 1px; - } - - div.post div.conversation ul li span.label { - font-weight: bold; - } - - div.post div.conversation ul li.odd { - background-color: #f4f4f4; - } - - div.post div.conversation ul li.even { - background-color: #e8e8e8; - } - - /* Video Post */ - div.post div.video div.caption { - margin-top: 5px; - color: #888; - font-size: 11px; - } - - div.post div.video div.caption a { - color: #888; - } - - #navigation { - font-size: 11px; - font-weight: bold; - } - - #navigation a { - color: #555; - text-decoration: none; - } - - #navigation a:hover { - text-decoration: underline; - } - - #footer { - margin-top: 11px; - font-size: 10px; - color: #eee; - } - - #footer a { - color: #eee; - } - -div.pagination { -text-align:center; -padding:3px; -margin:3px; -} - -div.pagination a { -padding: 2px 5px 2px 5px; -margin-right: 2px; -border: 1px solid #ddd; - -text-decoration: none; -color: #aaa; -} -div.pagination a:hover, div.pagination a:active { -padding: 2px 5px 2px 5px; -margin-right: 2px; -border: 1px solid #a0a0a0; -} -div.pagination span.current { -padding: 2px 5px 2px 5px; -margin-right: 2px; -border: 1px solid #e0e0e0; -font-weight: bold; -background-color: #f0f0f0; -color: #aaa; -} -div.pagination span.disabled { -padding: 2px 5px 2px 5px; -margin-right: 2px; -border: 1px solid #f3f3f3; -color: #ccc; -} - -.containerFormComments { - margin: 25px 65px 0px 0px; - font-family: Verdana; - font-size: 0.75em; -} - -#commentForm input, #commentForm textarea { - font: 0.9em 'Lucida Grande', Verdana, Arial, Sans-Serif; -} - -#commentForm p { - font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif; - margin: 5px 0; -} - -#commentForm input { - width: 170px; - padding: 2px; - margin: 5px 5px 1px 0; -} - -#commentForm textarea { - width: 100%; - padding: 2px; -} - -#commentForm #btnAdd { - margin: 0; - float: right; -} - -.totalComments h3 { - margin: 0 10px 0 0; - font-size: 10pt; - font-weight: normal; - text-align: right; - color: #999; - font-style: italic; -} - -.totalComments a { - color: #999; -} +h1,h1 a{color:#666}.date,div.post div.link,h1{letter-spacing:-1px}#navigation a,div.post div.link a,div.post div.quote span.quote big.quote a,div.post h2 a,h1 a{text-decoration:none}body{background-color:#222;background-image:url(img/bg.gif);margin:0 0 50px 60px;font:Normal 13px Arial,Helvetica,sans-serif;color:#555}#container{width:500px;padding:25px;background-color:#fff;border-bottom:solid 8px #aaa}img#rss{width:36px;height:19px;border-width:0;float:right;margin-left:30px;margin-bottom:10px}h1{margin:0 0 10px;font-weight:400;font-size:40px}#description{color:#777;font-size:11px;line-height:18px;padding-right:70px;margin-bottom:30px}.date{margin:30px 0 10px;color:#ccc;font-size:24px;text-align:right;text-transform:uppercase;border-bottom:solid 1px #ccc}div.post{margin-bottom:40px;position:relative}div.post img.permalink{border-width:0;width:23px;height:9px;position:absolute;top:5px;right:5px;display:none}div.post:hover img.permalink{display:block}div.post h2{font-size:14px;color:#444;margin:0 0 5px}div.post h2 a{color:#444}a{color:#111}div.post div.regular{font:Normal 11px 'Lucida Grande',Verdana,Arial,sans-serif;line-height:17px}div.post div.regular blockquote{font-style:italic}div.post div.photo img{border-width:0}div.post div.photo div.caption{font-size:11px;margin-top:5px;color:#888}div.post div.photo div.caption a{color:#888}div.post div.quote{padding:0 30px}div.post div.quote span.quote{font-size:24px;color:#444}div.post div.quote span.quote a{color:#444}div.post div.quote span.quote big.quote{font:Bold 60px Georgia,serif;line-height:1px;vertical-align:-23px;opacity:.4;-moz-opacity:.4;filter:alpha(opacity=40)}#navigation,div.post div.conversation ul li span.label{font-weight:700}div.post div.quote div.source{font-size:16px;color:#666}div.post div.quote div.source a{color:#666}div.post div.link{color:#666;font-size:24px}div.post div.link a{color:#666;border-bottom:dotted 1px #666}div.post div.link div.description{font-size:15px;letter-spacing:0;line-height:20px}div.post div.conversation ul{list-style-type:none;margin:0;padding:0 0 0 1px;border-left:solid 5px #555}div.post div.conversation ul li{font-size:12px;padding:4px 0 4px 8px;color:#000;margin-bottom:1px}div.post div.conversation ul li.odd{background-color:#f4f4f4}div.post div.conversation ul li.even{background-color:#e8e8e8}div.post div.video div.caption{margin-top:5px;color:#888;font-size:11px}div.post div.video div.caption a{color:#888}#footer,#footer a{color:#eee}#navigation{font-size:11px}#navigation a{color:#555}#navigation a:hover{text-decoration:underline}#footer{margin-top:11px;font-size:10px}div.pagination{text-align:center;padding:3px;margin:3px}div.pagination a{padding:2px 5px;margin-right:2px;border:1px solid #ddd;text-decoration:none;color:#aaa}div.pagination a:active,div.pagination a:hover{padding:2px 5px;margin-right:2px;border:1px solid #a0a0a0}div.pagination span.current{padding:2px 5px;margin-right:2px;border:1px solid #e0e0e0;font-weight:700;background-color:#f0f0f0;color:#aaa}div.pagination span.disabled{padding:2px 5px;margin-right:2px;border:1px solid #f3f3f3;color:#ccc}.containerFormComments{margin:25px 65px 0 0;font-family:Verdana;font-size:.75em}#commentForm input,#commentForm textarea{font:.9em 'Lucida Grande',Verdana,Arial,Sans-Serif}#commentForm p{font-family:'Lucida Grande',Verdana,Arial,Sans-Serif;margin:5px 0}#commentForm input{width:170px;padding:2px;margin:5px 5px 1px 0}#commentForm textarea{width:100%;padding:2px}#commentForm #btnAdd{margin:0;float:right}.totalComments h3{margin:0 10px 0 0;font-size:10pt;font-weight:400;text-align:right;color:#999;font-style:italic}.totalComments a{color:#999} diff --git a/uploads/index.php b/uploads/index.php index 0deef88..71a1493 100755 --- a/uploads/index.php +++ b/uploads/index.php @@ -1,17 +1,15 @@ + Sorbet CMS is a free software licensed under the GPL 3.0 =========================== */ ?> \ No newline at end of file +?>