Changeset 11295

Timestamp:

06/10/11 21:03:17 (2 years ago)

Author:

mistic100

Message:

use a prefilter, works with theme 'Simple'

Location:

extensions/bbcode_bar

Files:

• bbcode_bar.inc.php (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)
• template/bbcode_bar.tpl (modified) (1 diff)
• template/markitup/style.markitup.css (modified) (1 diff)

extensions/bbcode_bar/bbcode_bar.inc.php

@@ -5 +5 @@
 {
   global $template, $conf, $pwg_loaded_plugins, $page;
+  
   load_language('plugin.lang', dirname(__FILE__) . '/');
   $conf_bbcode_bar = unserialize($conf['bbcode_bar']);
 
   // buttons
-  foreach(unserialize(BBcode_codes) as $key) {
+  foreach(unserialize(BBcode_codes) as $key) 
+  {
     if ($conf_bbcode_bar[$key]) $template->assign('BBC_'.$key, true);
   }
@@ -18 +20 @@
     // OR (isset($page['body_id']) AND $page['body_id'] == 'theCommentsPage')
   // ) {
-    // $template->assign('form_name', 'editComment');
+    // $template->assign('bbcode_texarea', 'contenteditid');
   // } else {
-    // $template->assign('form_name', 'addComment');
+    // $template->assign('bbcode_texarea', 'contentid');
   // }
-  $template->assign('form_name', 'addComment');
-
-  if (isset($pwg_loaded_plugins['SmiliesSupport'])) {
+  $template->assign('bbcode_texarea', 'contentid');
+
+  // smilies
+  if (isset($pwg_loaded_plugins['SmiliesSupport'])) 
+  {
     $template->assign('BBC_smilies', true);
   }
 
   $template->assign('BBCODE_PATH', BBcode_PATH);
-  $template->set_filename('bbcode_bar', dirname(__FILE__).'/template/bbcode_bar.tpl');
-  $template->parse('bbcode_bar', true);    
-
-  // smilies support >2.2.a ## must be parsed after bbcode_bar, because the javascript must be after bbc's one
-  if (isset($pwg_loaded_plugins['SmiliesSupport']) AND strcmp($pwg_loaded_plugins['SmiliesSupport']['version'], '2.2.a') != -1) {
+  $template->set_prefilter('picture', 'set_bbcode_bar_prefilter');    
+
+  // smilies support > 2.2.f ## must be parsed after bbcode_bar, because the javascript must be after bbc's one
+  if (isset($pwg_loaded_plugins['SmiliesSupport']) AND strcmp($pwg_loaded_plugins['SmiliesSupport']['version'], '2.2.f') != -1) {
     set_smiliessupport();
   }  
+}
+
+function set_bbcode_bar_prefilter($content, &$smarty)
+{
+  $search = "<label>{'Comment'|@translate}";
+  $replace = file_get_contents(BBcode_PATH.'/template/bbcode_bar.tpl').$search;
+  return str_replace($search, $replace, $content);
 }
 

extensions/bbcode_bar/main.inc.php

@@ -24 +24 @@
 }
 
-function add_bbcode_bar() {
+function add_bbcode_bar() 
+{
   global $page;
   
-  if (isset($page['body_id']) AND $page['body_id'] == 'thePicturePage') {
+  if (isset($page['body_id']) AND $page['body_id'] == 'thePicturePage') 
+  {
     set_bbcode_bar();
   }
@@ -46 +48 @@
   // version 2.2.a or greater of SmiliesSupport is required
   add_event_handler('loc_end_admin', 'bbcode_bar_check_smilies');
-  function bbcode_bar_check_smilies() {
+  function bbcode_bar_check_smilies() 
+  {
     global $page, $template, $pwg_loaded_plugins;
 
     if (
-      ((isset($_GET['page']) AND $_GET['page'] == 'plugins_list') OR (isset($_GET['section']) AND $_GET['section'] == 'bbcode_bar/admin.php'))
-      AND isset($pwg_loaded_plugins['SmiliesSupport']) 
-      AND strcmp($pwg_loaded_plugins['SmiliesSupport']['version'], '2.2.a') == -1
+      ( (isset($_GET['page']) AND $_GET['page'] == 'plugins_list') OR (isset($_GET['section']) AND $_GET['section'] == 'bbcode_bar/admin.php') )
+      AND isset($pwg_loaded_plugins['SmiliesSupport']) AND strcmp($pwg_loaded_plugins['SmiliesSupport']['version'], '2.2.f') == -1
     ) {
-      $page['warnings'][] = "BBCode Bar : SmiliesSupport has been detected, but is not up to date. Version 2.2.a or greater is required. Please update.";
+      array_push($page['warnings'], "BBCode Bar : SmiliesSupport has been detected, but is not up to date. Version 2.2.a or greater is required. Please update.");
       $template->assign('warnings', $page['warnings']);
     }

extensions/bbcode_bar/template/bbcode_bar.tpl

@@ -63 +63 @@
 
 jQuery(document).ready(function() {ldelim}
-  jQuery('#{$form_name} textarea').markItUp(BBCodeBar);
+  jQuery('#{$bbcode_texarea}').markItUp(BBCodeBar);
 });
 {/footer_script}

extensions/bbcode_bar/template/markitup/style.markitup.css

@@ -1 +1 @@
 /* common */
 .markItUp {
-        display:inline-block;
+  display:inline-block;
 }
 .markItUp * {
-        margin:0px; padding:0px;
-        outline:none;
+  margin:0px; padding:0px;
+  outline:none;
 }
 .markItUp a:link,
 .markItUp a:visited {
-        color:#000;
-        text-decoration:none;
+  color:#000;
+  text-decoration:none;
 }
 .markItUp textarea {
-        display:block;
+  display:block;
 }
 .markItUpContainer  {
-        font:11px Verdana, Arial, Helvetica, sans-serif;
+  font:11px Verdana, Arial, Helvetica, sans-serif;
 }
 .markItUpEditor {
-        font:12px 'Courier New', Courier, monospace;
-        padding:5px;
-        clear:both;
-        overflow:auto;
+  font:12px 'Courier New', Courier, monospace;
+  padding:5px;
+  clear:both;
+  overflow:auto;
 }
 .markItUpHeader ul:first-child {
-  padding:2px;
+  padding:2px 5px;
+  min-height:22px;
   margin-bottom:2px;
   border-radius:2px;
-        background:url('images/bg-header.png') repeat-x;
+  background:url('images/bg-header.png') repeat-x;
 }
 .markItUpFooter {
-        display:none;
+  display:none;
 }
 
 /* first row of buttons */
-.markItUpHeader ul li   {
-        list-style:none;
-        float:left;
-        position:relative;
-  margin:0;
+.markItUpHeader ul li  {
+  list-style:none;
+  float:left;
+  position:relative;
+  margin:0 !important;
 }
 .markItUpHeader ul li:hover > ul{
-        display:block;
+  display:block;
 }
 .markItUpHeader ul .markItUpDropMenu {
-        background:transparent url(images/menu.png) no-repeat 120% 100%;
-        margin-right:5px;
+  background:transparent url(images/menu.png) no-repeat 120% 100%;
+  margin-right:5px;
 }
 /* next rows of buttons */
 .markItUpHeader ul ul {
-        display:none;
-        position:absolute;
-        top:22px; left:0px;     
-        background:#FFF;
-        border:1px solid #444;
-        border-radius:5px;
+  display:none;
+  position:absolute;
+  top:22px; left:0px;  
+  background:#FFF;
+  border:1px solid #444;
+  border-radius:5px;
 }
 .markItUpHeader ul ul li {
-        float:none;
-        margin:0px;
+  float:none;
+  margin:0px;
 }
 .markItUpHeader ul .markItUpSize li {
-        border-bottom:1px solid #444;
-        border-radius:2px;
+  border-bottom:1px solid #444;
+  border-radius:2px;
 }
 .markItUpHeader ul .markItUpSeparator {
-        margin:2px 10px;
-        width:1px;
-        height:16px;
-        overflow:hidden;
-        background-color:#CCC;
-        color:#ccc;
+  margin:2px 10px !important;
+  width:1px;
+  height:16px;
+  overflow:hidden;
+  background-color:#CCC;
+  color:#ccc;
 }
 /* links */
 .markItUpHeader ul a {
-        display:block;
-        width:16px; height:16px;
-        text-indent:-10000px;
-        background-position:center center;
-        background-repeat:no-repeat;
-        padding:2px;
-        border:1px solid transparent;
+  display:block;
+  width:16px; height:16px;
+  text-indent:-10000px;
+  background-position:center center;
+  background-repeat:no-repeat;
+  padding:2px;
+  border:1px solid transparent;
 }
 .markItUpHeader ul a:hover {
-        border-color:#08e;
+  border-color:#08e;
 }
 .markItUpHeader ul ul a {
-        display:block;
-        text-indent:0;
-        border:0;
+  display:block;
+  text-indent:0;
+  border:0;
 }
 .markItUpHeader ul .markItUpSize li a {
-        width:90px; 
-        padding:2px 5px 2px 25px;
-        background-position:2px 50%;
+  width:90px; 
+  padding:2px 5px 2px 25px;
+  background-position:2px 50%;
 }
 .markItUpHeader ul ul a:hover  {
 }
 .markItUpHeader ul .markItUpSize li a:hover  {
-        color:#FFF;
-        background-color:#000;
+  color:#FFF;
+  background-color:#000;
 }
 
 /* icons definitions */
 .markItUp .markItUpBold a {
-        background-image:url(images/bold.png);
+  background-image:url(images/bold.png);
 }
 .markItUp .markItUpItalic a {
-        background-image:url(images/italic.png);
+  background-image:url(images/italic.png);
 }
 .markItUp .markItUpUnderline a {
-        background-image:url(images/underline.png);
+  background-image:url(images/underline.png);
 }
 .markItUp .markItUpStroke a {
-        background-image:url(images/stroke.png);
+  background-image:url(images/stroke.png);
 }
 
 .markItUp .markItUpParagraph a {
-        background-image:url(images/p.png);
+  background-image:url(images/p.png);
 }
 .markItUp .markItUpCenter a {
-        background-image:url(images/center.png);
+  background-image:url(images/center.png);
 }
 .markItUp .markItUpRight a {
-        background-image:url(images/right.png);
+  background-image:url(images/right.png);
 }
 
 .markItUp .markItUpListUL a {
-        background-image:url(images/list-bullet.png);
+  background-image:url(images/list-bullet.png);
 }
 .markItUp .markItUpListOL a {
-        background-image:url(images/list-numeric.png);
+  background-image:url(images/list-numeric.png);
 }
 .markItUp .markItUpListLI a {
-        background-image:url(images/list-item.png);
+  background-image:url(images/list-item.png);
 }
 
-.markItUp .markItUpPicture a    {
-        background-image:url(images/picture.png);
+.markItUp .markItUpPicture a  {
+  background-image:url(images/picture.png);
 }
 .markItUp .markItUpLink a {
-        background-image:url(images/link.png);
+  background-image:url(images/link.png);
 }
 .markItUp .markItUpMail a {
-        background-image:url(images/mail.png);
+  background-image:url(images/mail.png);
 }
 .markItUp .markItUpQuote a {
-        background-image:url(images/quote.png);
+  background-image:url(images/quote.png);
 }
 
 .markItUp .markItUpSize a {
-        background-image:url(images/fonts.png);
+  background-image:url(images/fonts.png);
 }
 .markItUp .preview a {
-        background-image:url(images/preview.png);
+  background-image:url(images/preview.png);
 }
 
 /* colors */
 .markItUp .markItUpColors a {
-        background-image:url(images/colors.png);
+  background-image:url(images/colors.png);
 }
-        .markItUp .markItUpColors ul {
-                width:81px;
-                padding:1px;    
-        }
-        .markItUp .markItUpColors  li {
-                border:1px solid white;
-                width:25px;     height:25px;
-                overflow:hidden;
-                padding:0px; margin:0px;
-                float:left;
-                border-radius:2px;
-        }
-        .markItUp .markItUpColors ul a {
-                width:25px;     height:25px;
-                color:transparent;
-        }
-        .markItUp .markItUpColors li:hover {
-                background-color:none;
-                border:1px solid #08e;
-        }
-        
-        .markItUp .markItUpColors .col1-1 a { background:yellow; }
-        .markItUp .markItUpColors .col1-2 a { background:orange; }
-        .markItUp .markItUpColors .col1-3 a { background:red; }
-        
-        .markItUp .markItUpColors .col2-1 a { background:blue; }
-        .markItUp .markItUpColors .col2-2 a { background:purple; }
-        .markItUp .markItUpColors .col2-3 a { background:green; }
-        
-        .markItUp .markItUpColors .col3-1 a { background:white; }
-        .markItUp .markItUpColors .col3-2 a { background:gray; }
-        .markItUp .markItUpColors .col3-3 a { background:black; }
+  .markItUp .markItUpColors ul {
+    width:81px;
+    padding:1px;  
+  }
+  .markItUp .markItUpColors  li {
+    border:1px solid white;
+    width:25px;  height:25px;
+    overflow:hidden;
+    padding:0px; margin:0px;
+    float:left;
+    border-radius:2px;
+  }
+  .markItUp .markItUpColors ul a {
+    width:25px;  height:25px;
+    color:transparent;
+  }
+  .markItUp .markItUpColors li:hover {
+    background-color:none;
+    border:1px solid #08e;
+  }
+  
+  .markItUp .markItUpColors .col1-1 a { background:yellow; }
+  .markItUp .markItUpColors .col1-2 a { background:orange; }
+  .markItUp .markItUpColors .col1-3 a { background:red; }
+  
+  .markItUp .markItUpColors .col2-1 a { background:blue; }
+  .markItUp .markItUpColors .col2-2 a { background:purple; }
+  .markItUp .markItUpColors .col2-3 a { background:green; }
+  
+  .markItUp .markItUpColors .col3-1 a { background:white; }
+  .markItUp .markItUpColors .col3-2 a { background:gray; }
+  .markItUp .markItUpColors .col3-3 a { background:black; }