Changeset 15109

Show
Ignore:
Timestamp:
05/19/12 00:06:52 (12 months ago)
Author:
mistic100
Message:

fix textarea size
deal with separators

Location:
extensions/bbcode_bar/template
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • extensions/bbcode_bar/template/bbcode_bar.tpl

    r14525 r15109  
    33 
    44{footer_script require='jquery'} 
    5 BBCodeBar = {ldelim} 
     5BBCodeBar = {strip}{ldelim} 
    66  markupSet: [ 
    7     {if isset($BBC_b)}{ldelim}name:'{'Bold : [b]bold[/b]'|@translate}', key:'B', openWith:'[b]', closeWith:'[/b]', className:'markItUpBold'},{/if} 
    8     {if isset($BBC_i)}{ldelim}name:'{'Italic : [i]italic[/i]'|@translate}', key:'I', openWith:'[i]', closeWith:'[/i]', className:'markItUpItalic'},{/if} 
    9     {if isset($BBC_u)}{ldelim}name:'{'Underline : [u]underline[/u]'|@translate}', key:'U', openWith:'[u]', closeWith:'[/u]', className:'markItUpUnderline'},{/if} 
    10     {if isset($BBC_s)}{ldelim}name:'{'Striped  : [s]striped[/s]'|@translate}', key:'S', openWith:'[s]', closeWith:'[/s]', className:'markItUpStroke'},{/if} 
     7    {counter start=0 print=false assign=bbc_counter} 
    118     
    12     {if isset($BBC_p) OR isset($BBC_center) OR isset($BBC_right) OR isset($BBC_quote)}{ldelim}separator:'|'},{/if} 
     9    {if isset($BBC_b)}{counter}{ldelim}name:'{'Bold : [b]bold[/b]'|@translate}', key:'B', openWith:'[b]', closeWith:'[/b]', className:'markItUpBold'},{/if} 
     10    {if isset($BBC_i)}{counter}{ldelim}name:'{'Italic : [i]italic[/i]'|@translate}', key:'I', openWith:'[i]', closeWith:'[/i]', className:'markItUpItalic'},{/if} 
     11    {if isset($BBC_u)}{counter}{ldelim}name:'{'Underline : [u]underline[/u]'|@translate}', key:'U', openWith:'[u]', closeWith:'[/u]', className:'markItUpUnderline'},{/if} 
     12    {if isset($BBC_s)}{counter}{ldelim}name:'{'Striped  : [s]striped[/s]'|@translate}', key:'S', openWith:'[s]', closeWith:'[/s]', className:'markItUpStroke'},{/if} 
    1313     
    14     {if isset($BBC_p)}{ldelim}name:'{'Paragraph : [p]Paragraph[/p]'|@translate}', openWith:'[p]', closeWith:'[/p]', className:'markItUpParagraph'},{/if} 
    15     {if isset($BBC_center)}{ldelim}name:'{'Center : [center]center[/center]'|@translate}', openWith:'[center]', closeWith:'[/center]', className:'markItUpCenter'},{/if} 
    16     {if isset($BBC_right)}{ldelim}name:'{'Right : [right]right[/right]'|@translate}', openWith:'[right]', closeWith:'[/right]', className:'markItUpRight'},{/if} 
    17     {if isset($BBC_quote)}{ldelim}name:'{'Quote : [quote]quote[/quote]'|@translate}', openWith:'[quote]', closeWith:'[/quote]', className:'markItUpQuote'},{/if} 
     14    {if (isset($BBC_p) OR isset($BBC_center) OR isset($BBC_right) OR isset($BBC_quote)) AND $bbc_counter>0}{counter start=0 print=false assign=bbc_counter}{ldelim}separator:'|'},{/if} 
    1815     
    19     {if isset($BBC_ul) OR isset($BBC_ol) OR isset($BBC_li)}{ldelim}separator:'|'},{/if} 
     16    {if isset($BBC_p)}{counter}{ldelim}name:'{'Paragraph : [p]Paragraph[/p]'|@translate}', openWith:'[p]', closeWith:'[/p]', className:'markItUpParagraph'},{/if} 
     17    {if isset($BBC_center)}{counter}{ldelim}name:'{'Center : [center]center[/center]'|@translate}', openWith:'[center]', closeWith:'[/center]', className:'markItUpCenter'},{/if} 
     18    {if isset($BBC_right)}{counter}{ldelim}name:'{'Right : [right]right[/right]'|@translate}', openWith:'[right]', closeWith:'[/right]', className:'markItUpRight'},{/if} 
     19    {if isset($BBC_quote)}{counter}{ldelim}name:'{'Quote : [quote]quote[/quote]'|@translate}', openWith:'[quote]', closeWith:'[/quote]', className:'markItUpQuote'},{/if} 
    2020     
    21     {if isset($BBC_ul)}{ldelim}name:'{'Unordered list : [ul][li]element[/li][/ul]'|@translate}', openWith:'[ul]\n', closeWith:'\n[/ul]', className:'markItUpListUL'},{/if} 
    22     {if isset($BBC_ol)}{ldelim}name:'{'Ordered list : [ol][li]element[/li][/ol]'|@translate}', openWith:'[ol]\n', closeWith:'\n[/ol]', className:'markItUpListOL'},{/if} 
    23     {if isset($BBC_ul) OR isset($BBC_ol)}{ldelim}name:'{'List element : [li]element[/li]'|@translate}', openWith:'[li]', closeWith:'[/li]', className:'markItUpListLI'},{/if} 
     21    {if (isset($BBC_ul) OR isset($BBC_ol) OR isset($BBC_li)) AND $bbc_counter>0}{counter start=0 print=false assign=bbc_counter}{ldelim}separator:'|'},{/if} 
    2422     
    25     {if isset($BBC_img) OR isset($BBC_url) OR isset($BBC_mail)}{ldelim}separator:'|' },{/if} 
     23    {if isset($BBC_ul)}{counter}{ldelim}name:'{'Unordered list : [ul][li]element[/li][/ul]'|@translate}', openWith:'[ul]\n', closeWith:'\n[/ul]', className:'markItUpListUL'},{/if} 
     24    {if isset($BBC_ol)}{counter}{ldelim}name:'{'Ordered list : [ol][li]element[/li][/ol]'|@translate}', openWith:'[ol]\n', closeWith:'\n[/ol]', className:'markItUpListOL'},{/if} 
     25    {if isset($BBC_ul) OR isset($BBC_ol)}{counter}{ldelim}name:'{'List element : [li]element[/li]'|@translate}', openWith:'[li]', closeWith:'[/li]', className:'markItUpListLI'},{/if} 
    2626     
    27     {if isset($BBC_img)}{ldelim}name:'{'Picture : [img]picture[/img]'|@translate}', key:'P', replaceWith:'[img][![Url]!][/img]', className:'markItUpPicture'},{/if} 
    28     {if isset($BBC_url)}{ldelim}name:'{'URL : [url=URL]Title[/url]'|@translate}', key:'L', openWith:'[url=[![Url]!]]', closeWith:'[/url]', className:'markItUpLink'},{/if} 
    29     {if isset($BBC_email)}{ldelim}name:'{'E-mail : [email]Email[/email]'|@translate}', key:'M', replaceWith:'[email][![Mail]!][/email]', className:'markItUpMail'},{/if} 
     27    {if (isset($BBC_img) OR isset($BBC_url) OR isset($BBC_mail)) AND $bbc_counter>0}{counter start=0 print=false assign=bbc_counter}{ldelim}separator:'|' },{/if} 
    3028     
    31     {if isset($BBC_size) OR isset($BBC_color) OR isset($BBC_smilies)}{ldelim}separator:'|'},{/if} 
     29    {if isset($BBC_img)}{counter}{ldelim}name:'{'Picture : [img]picture[/img]'|@translate}', key:'P', replaceWith:'[img][![Url]!][/img]', className:'markItUpPicture'},{/if} 
     30    {if isset($BBC_url)}{counter}{ldelim}name:'{'URL : [url=URL]Title[/url]'|@translate}', key:'L', openWith:'[url=[![Url]!]]', closeWith:'[/url]', className:'markItUpLink'},{/if} 
     31    {if isset($BBC_email)}{counter}{ldelim}name:'{'E-mail : [email]Email[/email]'|@translate}', key:'M', replaceWith:'[email][![Mail]!][/email]', className:'markItUpMail'},{/if} 
    3232     
    33     {if isset($BBC_size)} 
     33    {if (isset($BBC_size) OR isset($BBC_color) OR isset($BBC_smilies)) AND $bbc_counter>0}{counter start=0 print=false assign=bbc_counter}{ldelim}separator:'|'},{/if} 
     34     
     35    {if isset($BBC_size)}{counter} 
    3436    {ldelim}name:'{'Font size : [size=X]text[/size]'|@translate}', className:'markItUpSize', 
    3537      dropMenu :[ 
    … …  
    4244    }, 
    4345    {/if} 
    44     {if isset($BBC_color)} 
     46    {if isset($BBC_color)}{counter} 
    4547    {ldelim}name:'{'Font color : [color=color]text[/color]'|@translate}', className:'markItUpColors', openWith:'[color=[![Color]!]]', closeWith:'[/color]',  
    4648      dropMenu: [ 
    47         {ldelim}name:'{'Yellow'|@translate}',  openWith:'[color=yellow]',   closeWith:'[/color]', className:"col1-1" }, 
    48         {ldelim}name:'{'Orange'|@translate}',  openWith:'[color=orange]',   closeWith:'[/color]', className:"col1-2" }, 
    49         {ldelim}name:'{'Red'|@translate}',   openWith:'[color=red]',   closeWith:'[/color]', className:"col1-3" }, 
     49        {ldelim}name:'{'Yellow'|@translate}', openWith:'[color=yellow]', closeWidth:'[/color]', className:"col1-1" }, 
     50        {ldelim}name:'{'Orange'|@translate}', openWith:'[color=orange]', closeWidth:'[/color]', className:"col1-2" }, 
     51        {ldelim}name:'{'Red'|@translate}', openWith:'[color=red]', closeWidth:'[/color]', className:"col1-3" }, 
    5052         
    51         {ldelim}name:'{'Blue'|@translate}',   openWith:'[color=blue]',   closeWith:'[/color]', className:"col2-1" }, 
    52         {ldelim}name:'{'Purple'|@translate}',   openWith:'[color=purple]',   closeWith:'[/color]', className:"col2-2" }, 
    53         {ldelim}name:'{'Green'|@translate}',   openWith:'[color=green]',   closeWith:'[/color]', className:"col2-3" }, 
     53        {ldelim}name:'{'Blue'|@translate}', openWith:'[color=blue]', closeWidth:'[/color]', className:"col2-1" }, 
     54        {ldelim}name:'{'Purple'|@translate}', openWith:'[color=purple]', closeWidth:'[/color]', className:"col2-2" }, 
     55        {ldelim}name:'{'Green'|@translate}', openWith:'[color=green]', closeWidth:'[/color]', className:"col2-3" }, 
    5456         
    55         {ldelim}name:'{'White'|@translate}',   openWith:'[color=white]',   closeWith:'[/color]', className:"col3-1" }, 
    56         {ldelim}name:'{'Grey'|@translate}',   openWith:'[color=gray]',   closeWith:'[/color]', className:"col3-2" }, 
    57         {ldelim}name:'{'Black'|@translate}',  openWith:'[color=black]',   closeWith:'[/color]', className:"col3-3" } 
     57        {ldelim}name:'{'White'|@translate}', openWith:'[color=white]', closeWidth:'[/color]', className:"col3-1" }, 
     58        {ldelim}name:'{'Grey'|@translate}', openWith:'[color=gray]', closeWidth:'[/color]', className:"col3-2" }, 
     59        {ldelim}name:'{'Black'|@translate}', openWith:'[color=black]', closeWidth:'[/color]', className:"col3-3" } 
    5860      ] 
    5961    }, 
    6062    {/if} 
    6163  ] 
    62 }; 
     64};{/strip} 
    6365 
    6466jQuery(document).ready(function() {ldelim} 

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

    r11295 r15109  
    11/* common */ 
    2 .markItUp { 
    3   display:inline-block; 
    4 } 
    52.markItUp * { 
    63  margin:0px; padding:0px; 
    … …  
    1310} 
    1411.markItUp textarea { 
     12  margin-top:0 !important; 
    1513  display:block; 
    1614} 
    … …  
    2321  clear:both; 
    2422  overflow:auto; 
     23} 
     24.markItUpHeader { 
     25  display:inline-block; 
    2526} 
    2627.markItUpHeader ul:first-child {