Changeset 23489 for extensions/bbcode_bar/template

Timestamp:

Jun 24, 2013, 1:32:14 AM (11 years ago)

Author:

mistic100

Message:

avoid conflicts with core language keys

File:

• extensions/bbcode_bar/template/bbcode_bar.tpl (modified) (2 diffs)

extensions/bbcode_bar/template/bbcode_bar.tpl

@@ -1 @@
-{combine_script id="markitup" require='jquery' path=$BBCODE_PATH|@cat:"template/markitup/jquery.markitup.js"}
-{combine_css path=$BBCODE_PATH|@cat:"template/markitup/style.markitup.css"}
+{combine_script id='markitup' require='jquery' load='footer' path=$BBCODE_PATH|@cat:'template/markitup/jquery.markitup.js'}
+{combine_css path=$BBCODE_PATH|@cat:'template/markitup/style.markitup.css'}
 
-{footer_script require='jquery'}
+{footer_script require='markitup'}
 BBCodeBar = {strip}{ldelim}
   markupSet: [
@@ -36 +36 @@
     {ldelim}name:'{'Font size : [size=X]text[/size]'|@translate}', className:'miuIcon miuSize',
       dropMenu :[
-        {ldelim}name:'{'tiny'|@translate}', openWith:'[size=7]', closeWith:'[/size]', className:'miuSizeTiny' },
-        {ldelim}name:'{'small'|@translate}', openWith:'[size=9]', closeWith:'[/size]', className:'miuSizeSmall' },
-        {ldelim}name:'{'normal'|@translate}', openWith:'[size=12]', closeWith:'[/size]', className:'miuSizeNormal' },
-        {ldelim}name:'{'large'|@translate}', openWith:'[size=18]', closeWith:'[/size]', className:'miuSizeLarge' },
-        {ldelim}name:'{'huge'|@translate}', openWith:'[size=24]', closeWith:'[/size]', className:'miuSizeHuge' },
+        {ldelim}name:'{'tiny font'|@translate}', openWith:'[size=7]', closeWith:'[/size]', className:'miuSizeTiny' },
+        {ldelim}name:'{'small font'|@translate}', openWith:'[size=9]', closeWith:'[/size]', className:'miuSizeSmall' },
+        {ldelim}name:'{'normal font'|@translate}', openWith:'[size=12]', closeWith:'[/size]', className:'miuSizeNormal' },
+        {ldelim}name:'{'large font'|@translate}', openWith:'[size=18]', closeWith:'[/size]', className:'miuSizeLarge' },
+        {ldelim}name:'{'huge font'|@translate}', openWith:'[size=24]', closeWith:'[/size]', className:'miuSizeHuge' },
       ]
     },