From 6d9bde1a85085871395ff1313a762585789ef21e Mon Sep 17 00:00:00 2001
From: pecesama <pecesama@gmail.com>
Date: Sat, 25 Oct 2008 00:09:28 +0000
Subject: [PATCH] Add the markItUp editor to the Bookmarklet and some style
 fixes

---
 admin/bm.php        | 20 ++++++++++++++------
 admin/css/style.css | 11 +++++++++++
 admin/index.php     |  7 +++++--
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/admin/bm.php b/admin/bm.php
index f3f9277..6d52467 100644
--- a/admin/bm.php
+++ b/admin/bm.php
@@ -55,12 +55,10 @@ if ($user->isAdmin()) {
 		if (!get_magic_quotes_gpc()) {
 			$_POST["title"] = addslashes($_POST["title"]);
 			$_POST["description"] = addslashes($_POST["description"]);
-		}
-
-		$textile = new Textile();
-
-		$_POST["title"] = $textile->TextileThis(removeBadTags($_POST["title"]));
-		$_POST["description"] = $textile->TextileThis(removeBadTags($_POST["description"]));
+		}		
+		
+		$_POST["title"] = removeBadTags($_POST["title"],true);
+		$_POST["description"] = removeBadTags($_POST["description"]);
 
 		if ($tumble->addPost($_POST)) {
 			$input = array("{type}");
@@ -109,7 +107,17 @@ if ($user->isAdmin()) {
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
 		<title>gelato :: <?php echo __("bookmarklet")?></title>
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
+        <script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
+        <script type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/markitup/jquery.markitup.pack.js"></script>
+		<script type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/markitup/sets/html/set.js"></script>			
+        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlGelato;?>/admin/scripts/markitup/skins/simple/style.css" />
+        <link rel="stylesheet" type="text/css" href="<?php echo $conf->urlGelato;?>/admin/scripts/markitup/sets/html/style.css" />			
+        <script type="text/javascript" >
+           $(document).ready(function() {
+              $("#description").markItUp(my_html);
+           });
+        </script>
 		<style type="text/css" media="screen">
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
 		</style>
diff --git a/admin/css/style.css b/admin/css/style.css
index 6d2b00e..9729eb3 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -110,6 +110,17 @@ fieldset.install input.txt{width:468px;}
 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{}
diff --git a/admin/index.php b/admin/index.php
index 1fca8a5..ee2f832 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -319,8 +319,11 @@ if ($user->isAuthenticated()) {
 										&nbsp;&nbsp;&nbsp;&nbsp;&lt;blockquote&gt;
                                         &lt;code&gt; &lt;pre&gt; &lt;img&gt;
 										<code>
-										<br />
-                                        Bookmarklet - <a href="javascript:var w; setTimeout('w.focus()',100);w=window.open('<?php echo $conf->urlGelato; ?>/admin/bm.php?url='+encodeURIComponent(location.href)+'&sel='+encodeURIComponent(window.getSelection()),'bookmarklet','toolbar=0,resizable=0,status=1,width=650,height=460,dependent=yes' ); w.focus();"><?php echo __("add to gelato")?></a>                                    </span>								</p>
+										<br /><br />
+                                        Bookmarklet - <a class="bookmarklet" title="<?php echo __("Drag to the Bookmarks Toolbar")?>" href="javascript:var w; setTimeout('w.focus()',100);w=window.open('<?php echo $conf->urlGelato; ?>/admin/bm.php?url='+encodeURIComponent(location.href)+'&sel='+encodeURIComponent(window.getSelection()),'bookmarklet','toolbar=0,resizable=0,status=1,width=650,height=540,dependent=yes' ); w.focus();"><?php echo __("add to gelato")?></a>
+                                        <br /><br />
+                                	</span>
+                                </p>
 								<p>
 									<input class="btn" type="submit" name="btnAdd" value="<?php echo ($isEdition) ? "Modify" : "Create"; ?> post" />
 								</p>