mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 22:57:14 +02:00
Code Issues Releases Wiki Activity

Merge pull request #512 from oxigeno2/master

Browse Source 
Plugin Gallery - Caption link, BBcode H1 heading erase
This commit is contained in:
Cameron
2014-02-11 06:04:41 -08:00
parent 88b500a273 b72e7488a6
commit 1cf530ba1d
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
e107_core/shortcodes/batch/bbcode_shortcodes.php
View File

@@ -31,16 +31,15 @@ class bbcode_shortcodes extends e_shortcode
{ {
$formats = array( $formats = array(
0 => array('[p][/p]','Paragraph'), 0 => array('[p][/p]','Paragraph'),
1 => array('[h=2][/h]','Heading 1'), 1 => array('[h=2][/h]','Heading 2'),
2 => array('[h=2][/h]','Heading 2'), 2 => array('[h=3][/h]','Heading 3'),
3 => array('[h=3][/h]','Heading 3'), 3 => array('[h=4][/h]','Heading 4'),
4 => array('[h=4][/h]','Heading 4'), 4 => array('[h=5][/h]','Heading 5'),
5 => array('[h=5][/h]','Heading 5'), 5 => array('[h=6][/h]','Heading 6'),
6 => array('[h=5][/h]','Heading 6'), 6 => array('[block][/block]','Block'),
7 => array('[block][/block]','Block'), 7 => array('[blockquote][/blockquote]', 'Quote'),
8 => array('[blockquote][/blockquote]', 'Quote'), 8 => array('[code][/code]', 'Code Block'),
9 => array('[code][/code]', 'Code Block'), 9 => array('[code=inline][/code]', 'Code Inline')
10 => array('[code=inline][/code]', 'Code Inline')
); );

4
e107_plugins/gallery/e_shortcode.php
View File

@@ -32,7 +32,7 @@ class gallery_shortcodes extends e_shortcode
function sc_gallery_caption($parm='') function sc_gallery_caption($parm='')
{ {
$tp = e107::getParser(); $tp = e107::getParser();
$text = "<a class='gallery-caption' title='".$tp->toAttribute($this->var['media_caption'])."' href='".$tp->thumbUrl($this->var['media_url'], $this->attFull)."' rel='lightbox.Gallery2' >"; $text = "<a class='gallery-caption' title='".$tp->toAttribute($this->var['media_caption'])."' href='".$tp->thumbUrl($this->var['media_url'], $this->attFull)."' rel='prettyPhoto[slide]' >"; // Erase rel"lightbox.Gallery2" - Write "prettyPhoto[slide]"
$text .= $this->var['media_caption']; $text .= $this->var['media_caption'];
$text .= "</a>"; $text .= "</a>";
return $text; return $text;
@@ -235,7 +235,7 @@ class gallery_shortcodes extends e_shortcode
{ {
$this->setVars($row) $this->setVars($row)
->addVars($cat); ->addVars($cat);
$inner .= ($count == 1) ? "\n\n<!-- SLIDE ".$count." -->\n<div class='slide' id='gallery-item-".$this->slideCount."'>\n" : ""; $inner .= ($count == 1) ? "\n\n<!-- SLIDE ".$count." -->\n<div class='slide' id='gallery-item-".$this->slideCount."'>\n" : "";
$inner .= "\n\t".$tp->parseTemplate($item_template,TRUE)."\n"; $inner .= "\n\t".$tp->parseTemplate($item_template,TRUE)."\n";
$inner .= ($count == $amount) ? "\n</div>\n\n" : ""; $inner .= ($count == $amount) ? "\n</div>\n\n" : "";