richard
/
sorbetcms
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Add the markItUp editor to the Bookmarklet and some style fixes

master
pecesama 2008-10-25 00:09:28 +00:00
parent 19b0087f52
commit 6d9bde1a85
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/bm.php
View File

@ -57,10 +57,8 @@ if ($user->isAdmin()) {
$_POST["description"] = addslashes($_POST["description"]); $_POST["description"] = addslashes($_POST["description"]);
} }
$textile = new Textile(); $_POST["title"] = removeBadTags($_POST["title"],true);
$_POST["description"] = removeBadTags($_POST["description"]);
$_POST["title"] = $textile->TextileThis(removeBadTags($_POST["title"]));
$_POST["description"] = $textile->TextileThis(removeBadTags($_POST["description"]));
if ($tumble->addPost($_POST)) { if ($tumble->addPost($_POST)) {
$input = array("{type}"); $input = array("{type}");
@ -109,7 +107,17 @@ if ($user->isAdmin()) {
<meta name="generator" content="gelato cms <?php echo version();?>" /> <meta name="generator" content="gelato cms <?php echo version();?>" />
<title>gelato :: <?php echo __("bookmarklet")?></title> <title>gelato :: <?php echo __("bookmarklet")?></title>
<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" /> <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 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"> <style type="text/css" media="screen">
@import "<?php echo $conf->urlGelato;?>/admin/css/style.css"; @import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
</style> </style>

11
admin/css/style.css
View File

@ -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, 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;} 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 */ /* Feeds */
#feedlist{} #feedlist{}

7
admin/index.php
View File

@ -319,8 +319,11 @@ if ($user->isAuthenticated()) {
&nbsp;&nbsp;&nbsp;&nbsp;&lt;blockquote&gt; &nbsp;&nbsp;&nbsp;&nbsp;&lt;blockquote&gt;
&lt;code&gt; &lt;pre&gt; &lt;img&gt; &lt;code&gt; &lt;pre&gt; &lt;img&gt;
<code> <code>
<br /> <br /><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> 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> <p>
<input class="btn" type="submit" name="btnAdd" value="<?php echo ($isEdition) ? "Modify" : "Create"; ?> post" /> <input class="btn" type="submit" name="btnAdd" value="<?php echo ($isEdition) ? "Modify" : "Create"; ?> post" />
</p> </p>