conflicto con botones mich al actualizar a 3.0.8
Publicado: 03 Dic 2010, 20:01
Hola! Cuando estoy actualizando a 3.0.8 me sale un archivo en conflicto:
styles/subsilver2/template/
posting_buttons.html
Número de conflictos: 1
Creo que el error es porque tengo instalado los botones mich, me salen 4 opciones:
Unir modificaciones (elimina el código modificado dentro del bloque conflictivo)
[Mostrar diferencias integradas]','
var imageTag = false;
// Helpline messages
var help_line = {
b: '{LA_BBCODE_B_HELP}',
i: '{LA_BBCODE_I_HELP}',
u: '{LA_BBCODE_U_HELP}',
q: '{LA_BBCODE_Q_HELP}',
c: '{LA_BBCODE_C_HELP}',
l: '{LA_BBCODE_L_HELP}',
o: '{LA_BBCODE_O_HELP}',
p: '{LA_BBCODE_P_HELP}',
w: '{LA_BBCODE_W_HELP}',
a: '{LA_BBCODE_A_HELP}',
s: '{LA_BBCODE_S_HELP}',
f: '{LA_BBCODE_F_HELP}',
e: '{LA_BBCODE_E_HELP}',
d: '{LA_BBCODE_D_HELP}',
t: '{LA_BBCODE_T_HELP}',
// Botones en imagenes por mitch
font: 'Tipo de fuente: Texto',
align_left: 'Alinear a la Izquierda:
align_center: 'Centrar:
align_right: 'Alinear a la Derecha:
align_justify: 'Justificar:
sup: 'Superíndice: Texto',
sub: 'Subíndice: Texto',
strike: 'Texto Tachado:Texto',
highlight: 'Toque de luz (highlight): [highlight=#COLOR]Texto[/highlight]',
hr: 'Línea Horizontal:
',
ot: 'Offtopic:',
marquee_down: 'Desplazar texto hacia abajo: Texto',
marquee_up: 'Desplazar texto hacia arriba: Texto',
marquee_left: 'Desplazar texto hacia la izquierda: Texto',
marquee_right: 'Desplazar texto hacia la derecha: Texto',
spoiler: 'Spoiler:',
mail: 'Correo: [mail]Correo[/mail]',
video: 'Video (avi/wmv/mpg): [video width=ancho height=alto]URL del archivo[/video]',
mp3: 'Archivo de audio (mp3): ',
quick: 'Video Quicktime: [quick width=ancho height=alto]URL del archivo[/quick]',
ram: 'Archivo Real Media: [ram width=ancho height=alto]URL del archivo[/ram]',
googlevideo: 'Video google: [googlevideo]ID del video[/googlevideo]',
youtube: 'Video youtube: ',
// fin botones en imagenes por mitch
tip: '{L_STYLES_TIP}'
<!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
<!-- END custom_tags -->
}
// ]]>
</script>
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
<!-- IF S_BBCODE_ALLOWED -->
<select class="gensmall" style="height: 18px;" name="fuentes" onchange="bbfontstyle('[font=' + this.form.fuentes.options[this.form.fuentes.selectedIndex].value + ']', '[/font]');this.selectedIndex=0;" onmouseover="helpline('font')">
<option value="" class="genmed" style="font-family: Verdana;" selected="selected">Fuente</option>
<option value="Arial" class="genmed" style="font-family: Arial;">Arial</option>
<option value="Comic Sans MS" class="genmed" style="font-family: 'Comic Sans MS';">Comic Sans MS</option>
<option value="Courier New" class="genmed" style="font-family: 'Courier New';">Courier New</option>
<option value="Impact" class="genmed" style="font-family: Impact;">Impact</option>
<option value="Lucida Console" class="genmed" style="font-family: 'Lucida Console';">Lucida Console</option>
<option value="Lucida Sans Unicode" class="genmed" style="font-family: 'Lucida Sans Unicode';">Lucida Sans Unicode</option>
<option value="Microsoft Sans Serif" class="genmed" style="font-family: 'Microsoft Sans Serif';">Microsoft Sans Serif</option>
<option value="Symbol" class="genmed" style="font-family: Symbol;">Symbol</option>
<option value="Tahoma" class="genmed" style="font-family: Tahoma;">Tahoma</option>
<option value="Times New Roman" class="genmed" style="font-family: 'Times New Roman';">Times New Roman</option>
<option value="Traditional Arabic" class="genmed" style="font-family: 'Traditional Arabic';">Traditional Arabic</option>
<option value="Trebuchet MS" class="genmed" style="font-family: 'Trebuchet MS';">Trebuchet MS</option>
<option value="Verdana" class="genmed" style="font-family: Verdana;">Verdana</option>
<option value="Webdings" class="genmed" style="font-family: Webdings;">Webdings</option>
<option value="Wingdings" class="genmed" style="font-family: Wingdings;">Wingdings</option>
</select>
<select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 0;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
<option value="" selected="selected">Tamaño</option>
<option value="50">{L_FONT_TINY}</option>
<option value="85">{L_FONT_SMALL}</option>
<option value="100">{L_FONT_NORMAL}</option>
<option value="150">{L_FONT_LARGE}</option>
<option value="200">{L_FONT_HUGE}</option>
</select>
<br>
<img src="./images/posting/left.gif" border="0" alt="align=left" onclick="bbfontstyle('
<img src="./images/posting/center.gif" border="0" alt="align=right" onclick="bbfontstyle('
<img src="./images/posting/right.gif" border="0" alt="align=right" onclick="bbfontstyle('
<img src="./images/posting/justify.gif" border="0" alt="align=justify" onclick="bbfontstyle('
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/bold.gif" border="0" alt="b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/italic.gif" border="0" alt="i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/under.gif" border="0" alt="u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/strike.gif" border="0" alt="strike" onclick="bbfontstyle('','')" onmouseover="helpline('strike')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/sup.gif" border="0" alt="sup" onclick="bbfontstyle('','')" onmouseover="helpline('sup')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/sub.gif" border="0" alt="sub" onclick="bbfontstyle('','')" onmouseover="helpline('sub')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/listb.gif" border="0" alt="list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/listo.gif" border="0" alt="list" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/listitem.gif" border="0" alt="[*]" accesskey="t" name="addlitsitem" value="[*]" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/highlight=.gif" alt="highlight" border="0" onclick="bbfontstyle('','')" onmouseover="helpline('highlight')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/hr.gif" border="0" alt="hr" onclick="bbfontstyle('
')" onmouseover="helpline('hr')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/ot.gif" border="0" alt="ot" onclick="bbfontstyle('')" onmouseover="helpline('ot')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/marqd.gif" border="0" alt="marquee=down" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_down')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marqu.gif" border="0" alt="marquee=up" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_up')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marql.gif" border="0" alt="marquee=left" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_left')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marqr.gif" border="0" alt="marquee=right" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_right')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_QUOTE -->
<img src="./images/posting/quote.gif" border="0" alt="quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/code.gif" border="0" alt="code"<input type="button" class="btnbbcode" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/spoiler.gif" border="0" alt="spoiler" onclick="bbfontstyle('')" onmouseover="helpline('spoiler')"/>
<input type="button" class="btnbbcode" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_IMG -->
<img src="./images/posting/img.gif" border="0" alt="img" accesskey="p" name="addbbcode14" value="Img" onclick="BBcodeimg()" onmouseover="helpline('p')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<!-- IF S_LINKS_ALLOWED -->
<img src="./images/posting/url.gif" border="0" alt="URL" accesskey="w" name="addbbcode16" value="URL" onclick="BBcodeurl()" onmouseover="helpline('w')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/email.gif" border="0" alt="email" onclick="BBcodeemail()" onmouseover="helpline('mail')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_FLASH -->
<img src="./images/posting/flash.gif" border="0" alt="Flash" accesskey="d" name="addbbcode18" value="Flash" onclick="BBcodeflash()" onmouseover="helpline('d')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/video.gif" border="0" alt="video" onclick="BBcodevideo()" onmouseover="helpline('video')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/mp3.gif" border="0" alt="mp3" onclick="BBcodemp3()" onmouseover="helpline('mp3')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/quick.gif" border="0" alt="quick" onclick="BBcodequick()" onmouseover="helpline('quick')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/ram.gif" border="0" alt="ram" onclick="BBcoderam()" onmouseover="helpline('ram')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/googlevideo.gif" border="0" alt="googlevideo" onclick="BBcodegooglevideo()" onmouseover="helpline('googlevideo')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/youtube.gif" border="0" alt="youtube" onclick="BBcodeyoutube()" onmouseover="helpline('youtube')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
<br>
<!-- BEGIN custom_tags -->
<img src="./images/posting/{custom_tags.BBCODE_TAG}.gif" border="0" alt="{custom_tags.BBCODE_TAG}" title="{custom_tags.BBCODE_TAG}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> class="bbimages"/>
<!-- END custom_tags -->
<!-- ENDIF -->
<!-- ENDIF -->
</td>
</tr>
<!-- IF S_BBCODE_ALLOWED -->
<tr>
<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" class="helpline" value="{L_STYLES_TIP}" /></td>
<!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT -->
<td class="genmed" align="center">{L_FONT_COLOR}</td>
<!-- ENDIF -->
</tr>
<!-- ENDIF -->[/code]
Unir modificaciones (elimina el nuevo código phpBB dentro del bloque conflictivo)
[Mostrar diferencias integradas]','
var imageTag = false;
// Helpline messages
var help_line = {
b: '{LA_BBCODE_B_HELP}',
i: '{LA_BBCODE_I_HELP}',
u: '{LA_BBCODE_U_HELP}',
q: '{LA_BBCODE_Q_HELP}',
c: '{LA_BBCODE_C_HELP}',
l: '{LA_BBCODE_L_HELP}',
o: '{LA_BBCODE_O_HELP}',
p: '{LA_BBCODE_P_HELP}',
w: '{LA_BBCODE_W_HELP}',
a: '{LA_BBCODE_A_HELP}',
s: '{LA_BBCODE_S_HELP}',
f: '{LA_BBCODE_F_HELP}',
e: '{LA_BBCODE_E_HELP}',
d: '{LA_BBCODE_D_HELP}',
t: '{LA_BBCODE_T_HELP}',
// Botones en imagenes por mitch
font: 'Tipo de fuente: Texto',
align_left: 'Alinear a la Izquierda:
align_center: 'Centrar:
align_right: 'Alinear a la Derecha:
align_justify: 'Justificar:
sup: 'Superíndice: Texto',
sub: 'Subíndice: Texto',
strike: 'Texto Tachado:Texto',
highlight: 'Toque de luz (highlight): [highlight=#COLOR]Texto[/highlight]',
hr: 'Línea Horizontal:
',
ot: 'Offtopic:',
marquee_down: 'Desplazar texto hacia abajo: Texto',
marquee_up: 'Desplazar texto hacia arriba: Texto',
marquee_left: 'Desplazar texto hacia la izquierda: Texto',
marquee_right: 'Desplazar texto hacia la derecha: Texto',
spoiler: 'Spoiler:',
mail: 'Correo: [mail]Correo[/mail]',
video: 'Video (avi/wmv/mpg): [video width=ancho height=alto]URL del archivo[/video]',
mp3: 'Archivo de audio (mp3): ',
quick: 'Video Quicktime: [quick width=ancho height=alto]URL del archivo[/quick]',
ram: 'Archivo Real Media: [ram width=ancho height=alto]URL del archivo[/ram]',
googlevideo: 'Video google: [googlevideo]ID del video[/googlevideo]',
youtube: 'Video youtube: ',
// fin botones en imagenes por mitch
tip: '{L_STYLES_TIP}'
<!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
<!-- END custom_tags -->
}
// ]]>
</script>
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
<!-- IF S_BBCODE_ALLOWED -->
<select class="gensmall" style="height: 18px;" name="fuentes" onchange="bbfontstyle('[font=' + this.form.fuentes.options[this.form.fuentes.selectedIndex].value + ']', '[/font]');this.selectedIndex=0;" onmouseover="helpline('font')">
<option value="" class="genmed" style="font-family: Verdana;" selected="selected">Fuente</option>
<option value="Arial" class="genmed" style="font-family: Arial;">Arial</option>
<option value="Comic Sans MS" class="genmed" style="font-family: 'Comic Sans MS';">Comic Sans MS</option>
<option value="Courier New" class="genmed" style="font-family: 'Courier New';">Courier New</option>
<option value="Impact" class="genmed" style="font-family: Impact;">Impact</option>
<option value="Lucida Console" class="genmed" style="font-family: 'Lucida Console';">Lucida Console</option>
<option value="Lucida Sans Unicode" class="genmed" style="font-family: 'Lucida Sans Unicode';">Lucida Sans Unicode</option>
<option value="Microsoft Sans Serif" class="genmed" style="font-family: 'Microsoft Sans Serif';">Microsoft Sans Serif</option>
<option value="Symbol" class="genmed" style="font-family: Symbol;">Symbol</option>
<option value="Tahoma" class="genmed" style="font-family: Tahoma;">Tahoma</option>
<option value="Times New Roman" class="genmed" style="font-family: 'Times New Roman';">Times New Roman</option>
<option value="Traditional Arabic" class="genmed" style="font-family: 'Traditional Arabic';">Traditional Arabic</option>
<option value="Trebuchet MS" class="genmed" style="font-family: 'Trebuchet MS';">Trebuchet MS</option>
<option value="Verdana" class="genmed" style="font-family: Verdana;">Verdana</option>
<option value="Webdings" class="genmed" style="font-family: Webdings;">Webdings</option>
<option value="Wingdings" class="genmed" style="font-family: Wingdings;">Wingdings</option>
</select>
<select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 0;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
<option value="" selected="selected">Tamaño</option>
<option value="50">{L_FONT_TINY}</option>
<option value="85">{L_FONT_SMALL}</option>
<option value="100">{L_FONT_NORMAL}</option>
<option value="150">{L_FONT_LARGE}</option>
<option value="200">{L_FONT_HUGE}</option>
</select>
<br>
<img src="./images/posting/left.gif" border="0" alt="align=left" onclick="bbfontstyle('
<img src="./images/posting/center.gif" border="0" alt="align=right" onclick="bbfontstyle('
<img src="./images/posting/right.gif" border="0" alt="align=right" onclick="bbfontstyle('
<img src="./images/posting/justify.gif" border="0" alt="align=justify" onclick="bbfontstyle('
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/bold.gif" border="0" alt="b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/italic.gif" border="0" alt="i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/under.gif" border="0" alt="u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/strike.gif" border="0" alt="strike" onclick="bbfontstyle('','')" onmouseover="helpline('strike')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/sup.gif" border="0" alt="sup" onclick="bbfontstyle('','')" onmouseover="helpline('sup')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/sub.gif" border="0" alt="sub" onclick="bbfontstyle('','')" onmouseover="helpline('sub')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/listb.gif" border="0" alt="list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/listo.gif" border="0" alt="list" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/listitem.gif" border="0" alt="[*]" accesskey="t" name="addlitsitem" value="[*]" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/highlight=.gif" alt="highlight" border="0" onclick="bbfontstyle('','')" onmouseover="helpline('highlight')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/hr.gif" border="0" alt="hr" onclick="bbfontstyle('
')" onmouseover="helpline('hr')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/ot.gif" border="0" alt="ot" onclick="bbfontstyle('')" onmouseover="helpline('ot')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/marqd.gif" border="0" alt="marquee=down" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_down')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marqu.gif" border="0" alt="marquee=up" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_up')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marql.gif" border="0" alt="marquee=left" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_left')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marqr.gif" border="0" alt="marquee=right" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_right')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_QUOTE -->
<img src="./images/posting/quote.gif" border="0" alt="quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/code.gif" border="0" alt="code" accesskey="c" name="addbbcode8" value="Code" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/spoiler.gif" border="0" alt="spoiler" onclick="bbfontstyle('')" onmouseover="helpline('spoiler')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_IMG -->
<img src="./images/posting/img.gif" border="0" alt="img" accesskey="p" name="addbbcode14" value="Img" onclick="BBcodeimg()" onmouseover="helpline('p')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<!-- IF S_LINKS_ALLOWED -->
<img src="./images/posting/url.gif" border="0" alt="URL" accesskey="w" name="addbbcode16" value="URL" onclick="BBcodeurl()" onmouseover="helpline('w')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/email.gif" border="0" alt="email" onclick="BBcodeemail()" onmouseover="helpline('mail')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_FLASH -->
<img src="./images/posting/flash.gif" border="0" alt="Flash" accesskey="d" name="addbbcode18" value="Flash" onclick="BBcodeflash()" onmouseover="helpline('d')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/video.gif" border="0" alt="video" onclick="BBcodevideo()" onmouseover="helpline('video')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/mp3.gif" border="0" alt="mp3" onclick="BBcodemp3()" onmouseover="helpline('mp3')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/quick.gif" border="0" alt="quick" onclick="BBcodequick()" onmouseover="helpline('quick')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/ram.gif" border="0" alt="ram" onclick="BBcoderam()" onmouseover="helpline('ram')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/googlevideo.gif" border="0" alt="googlevideo" onclick="BBcodegooglevideo()" onmouseover="helpline('googlevideo')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/youtube.gif" border="0" alt="youtube" onclick="BBcodeyoutube()" onmouseover="helpline('youtube')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
<br>
<!-- BEGIN custom_tags -->
<img src="./images/posting/{custom_tags.BBCODE_TAG}.gif" border="0" alt="{custom_tags.BBCODE_TAG}" title="{custom_tags.BBCODE_TAG}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> class="bbimages"/>
<!-- END custom_tags -->
<!-- ENDIF -->
<!-- ENDIF -->
</td>
</tr>
<!-- IF S_BBCODE_ALLOWED -->
<tr>
<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" class="helpline" value="{L_STYLES_TIP}" /></td>
<!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT -->
<td class="genmed" align="center">{L_FONT_COLOR}</td>
<!-- ENDIF -->
</tr>
<!-- ENDIF -->
[/code]
No insertar - usar archivo nuevo
[Mostrar archivo resultante]','
var imageTag = false;
// Helpline messages
var help_line = {
b: '{LA_BBCODE_B_HELP}',
i: '{LA_BBCODE_I_HELP}',
u: '{LA_BBCODE_U_HELP}',
q: '{LA_BBCODE_Q_HELP}',
c: '{LA_BBCODE_C_HELP}',
l: '{LA_BBCODE_L_HELP}',
o: '{LA_BBCODE_O_HELP}',
p: '{LA_BBCODE_P_HELP}',
w: '{LA_BBCODE_W_HELP}',
a: '{LA_BBCODE_A_HELP}',
s: '{LA_BBCODE_S_HELP}',
f: '{LA_BBCODE_F_HELP}',
e: '{LA_BBCODE_E_HELP}',
d: '{LA_BBCODE_D_HELP}',
t: '{LA_BBCODE_T_HELP}',
tip: '{L_STYLES_TIP}'
<!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
<!-- END custom_tags -->
}
// ]]>
</script>
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
<!-- IF S_BBCODE_ALLOWED -->
<input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
<!-- IF S_BBCODE_QUOTE -->
<input type="button" class="btnbbcode" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
<!-- ENDIF -->
<input type="button" class="btnbbcode" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
<!-- IF S_BBCODE_IMG -->
<input type="button" class="btnbbcode" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
<!-- ENDIF -->
<!-- IF S_LINKS_ALLOWED -->
<input type="button" class="btnbbcode" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
<!-- ENDIF -->
<!-- IF S_BBCODE_FLASH -->
<input type="button" class="btnbbcode" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
<!-- ENDIF -->
<span class="genmed nowrap">{L_FONT_SIZE}: <select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
<option value="50">{L_FONT_TINY}</option>
<option value="85">{L_FONT_SMALL}</option>
<option value="100" selected="selected">{L_FONT_NORMAL}</option>
<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
<option value="150">{L_FONT_LARGE}</option>
<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
<option value="200">{L_FONT_HUGE}</option>
<!-- ENDIF -->
<!-- ENDIF -->
</select></span>
<!-- ENDIF -->
</td>
</tr>
<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
<td colspan="2">
<!-- BEGIN custom_tags -->
<input type="button" class="btnbbcode" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
<!-- END custom_tags -->
</td>
</tr>
<!-- ENDIF -->
<!-- IF S_BBCODE_ALLOWED -->
<tr>
<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" class="helpline" value="{L_STYLES_TIP}" /></td>
<!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT -->
<td class="genmed" align="center">{L_FONT_COLOR}</td>
<!-- ENDIF -->
</tr>
<!-- ENDIF -->
[/code]
styles/subsilver2/template/
posting_buttons.html
Número de conflictos: 1
Creo que el error es porque tengo instalado los botones mich, me salen 4 opciones:
Unir modificaciones (elimina el código modificado dentro del bloque conflictivo)
[Mostrar diferencias integradas]
Código: Seleccionar todo
<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
<td colspan="2">
<script type="text/javascript">
// <![CDATA[
// Define the bbCode tags
var bbcode = new Array();
var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','
- ','
- ','
var imageTag = false;
// Helpline messages
var help_line = {
b: '{LA_BBCODE_B_HELP}',
i: '{LA_BBCODE_I_HELP}',
u: '{LA_BBCODE_U_HELP}',
q: '{LA_BBCODE_Q_HELP}',
c: '{LA_BBCODE_C_HELP}',
l: '{LA_BBCODE_L_HELP}',
o: '{LA_BBCODE_O_HELP}',
p: '{LA_BBCODE_P_HELP}',
w: '{LA_BBCODE_W_HELP}',
a: '{LA_BBCODE_A_HELP}',
s: '{LA_BBCODE_S_HELP}',
f: '{LA_BBCODE_F_HELP}',
e: '{LA_BBCODE_E_HELP}',
d: '{LA_BBCODE_D_HELP}',
t: '{LA_BBCODE_T_HELP}',
// Botones en imagenes por mitch
font: 'Tipo de fuente: Texto',
align_left: 'Alinear a la Izquierda:
Texto
',align_center: 'Centrar:
Texto
',align_right: 'Alinear a la Derecha:
Texto
',align_justify: 'Justificar:
Texto
',sup: 'Superíndice: Texto',
sub: 'Subíndice: Texto',
strike: 'Texto Tachado:
highlight: 'Toque de luz (highlight): [highlight=#COLOR]Texto[/highlight]',
hr: 'Línea Horizontal:
',
ot: 'Offtopic:
Off Topic:
Texto
marquee_down: 'Desplazar texto hacia abajo: Texto',
marquee_up: 'Desplazar texto hacia arriba: Texto',
marquee_left: 'Desplazar texto hacia la izquierda: Texto',
marquee_right: 'Desplazar texto hacia la derecha: Texto',
spoiler: 'Spoiler:
Spoiler
Texto
mail: 'Correo: [mail]Correo[/mail]',
video: 'Video (avi/wmv/mpg): [video width=ancho height=alto]URL del archivo[/video]',
mp3: 'Archivo de audio (mp3): ',
quick: 'Video Quicktime: [quick width=ancho height=alto]URL del archivo[/quick]',
ram: 'Archivo Real Media: [ram width=ancho height=alto]URL del archivo[/ram]',
googlevideo: 'Video google: [googlevideo]ID del video[/googlevideo]',
youtube: 'Video youtube: ',
// fin botones en imagenes por mitch
tip: '{L_STYLES_TIP}'
<!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
<!-- END custom_tags -->
}
// ]]>
</script>
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
<!-- IF S_BBCODE_ALLOWED -->
<select class="gensmall" style="height: 18px;" name="fuentes" onchange="bbfontstyle('[font=' + this.form.fuentes.options[this.form.fuentes.selectedIndex].value + ']', '[/font]');this.selectedIndex=0;" onmouseover="helpline('font')">
<option value="" class="genmed" style="font-family: Verdana;" selected="selected">Fuente</option>
<option value="Arial" class="genmed" style="font-family: Arial;">Arial</option>
<option value="Comic Sans MS" class="genmed" style="font-family: 'Comic Sans MS';">Comic Sans MS</option>
<option value="Courier New" class="genmed" style="font-family: 'Courier New';">Courier New</option>
<option value="Impact" class="genmed" style="font-family: Impact;">Impact</option>
<option value="Lucida Console" class="genmed" style="font-family: 'Lucida Console';">Lucida Console</option>
<option value="Lucida Sans Unicode" class="genmed" style="font-family: 'Lucida Sans Unicode';">Lucida Sans Unicode</option>
<option value="Microsoft Sans Serif" class="genmed" style="font-family: 'Microsoft Sans Serif';">Microsoft Sans Serif</option>
<option value="Symbol" class="genmed" style="font-family: Symbol;">Symbol</option>
<option value="Tahoma" class="genmed" style="font-family: Tahoma;">Tahoma</option>
<option value="Times New Roman" class="genmed" style="font-family: 'Times New Roman';">Times New Roman</option>
<option value="Traditional Arabic" class="genmed" style="font-family: 'Traditional Arabic';">Traditional Arabic</option>
<option value="Trebuchet MS" class="genmed" style="font-family: 'Trebuchet MS';">Trebuchet MS</option>
<option value="Verdana" class="genmed" style="font-family: Verdana;">Verdana</option>
<option value="Webdings" class="genmed" style="font-family: Webdings;">Webdings</option>
<option value="Wingdings" class="genmed" style="font-family: Wingdings;">Wingdings</option>
</select>
<select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 0;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
<option value="" selected="selected">Tamaño</option>
<option value="50">{L_FONT_TINY}</option>
<option value="85">{L_FONT_SMALL}</option>
<option value="100">{L_FONT_NORMAL}</option>
<option value="150">{L_FONT_LARGE}</option>
<option value="200">{L_FONT_HUGE}</option>
</select>
<br>
<img src="./images/posting/left.gif" border="0" alt="align=left" onclick="bbfontstyle('
','
')" onmouseover="helpline('align_left')" onmouseout="helpline('tip')" class="bbimages"/><img src="./images/posting/center.gif" border="0" alt="align=right" onclick="bbfontstyle('
','
')" onmouseover="helpline('align_center')" onmouseout="helpline('tip')" class="bbimages"/><img src="./images/posting/right.gif" border="0" alt="align=right" onclick="bbfontstyle('
','
')" onmouseover="helpline('align_right')" onmouseout="helpline('tip')" class="bbimages"/><img src="./images/posting/justify.gif" border="0" alt="align=justify" onclick="bbfontstyle('
','
')" onmouseover="helpline('align_justify')" onmouseout="helpline('tip')" class="bbimages"/><img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/bold.gif" border="0" alt="b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/italic.gif" border="0" alt="i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/under.gif" border="0" alt="u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/strike.gif" border="0" alt="strike" onclick="bbfontstyle('
<img src="./images/posting/sup.gif" border="0" alt="sup" onclick="bbfontstyle('','')" onmouseover="helpline('sup')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/sub.gif" border="0" alt="sub" onclick="bbfontstyle('','')" onmouseover="helpline('sub')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/listb.gif" border="0" alt="list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/listo.gif" border="0" alt="list" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/listitem.gif" border="0" alt="[*]" accesskey="t" name="addlitsitem" value="[*]" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/highlight=.gif" alt="highlight" border="0" onclick="bbfontstyle('','')" onmouseover="helpline('highlight')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/hr.gif" border="0" alt="hr" onclick="bbfontstyle('
')" onmouseover="helpline('hr')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/ot.gif" border="0" alt="ot" onclick="bbfontstyle('
Off Topic:
','
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/marqd.gif" border="0" alt="marquee=down" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_down')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marqu.gif" border="0" alt="marquee=up" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_up')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marql.gif" border="0" alt="marquee=left" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_left')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marqr.gif" border="0" alt="marquee=right" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_right')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_QUOTE -->
<img src="./images/posting/quote.gif" border="0" alt="quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/code.gif" border="0" alt="code"<input type="button" class="btnbbcode" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/spoiler.gif" border="0" alt="spoiler" onclick="bbfontstyle('
Spoiler
','
<input type="button" class="btnbbcode" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_IMG -->
<img src="./images/posting/img.gif" border="0" alt="img" accesskey="p" name="addbbcode14" value="Img" onclick="BBcodeimg()" onmouseover="helpline('p')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<!-- IF S_LINKS_ALLOWED -->
<img src="./images/posting/url.gif" border="0" alt="URL" accesskey="w" name="addbbcode16" value="URL" onclick="BBcodeurl()" onmouseover="helpline('w')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/email.gif" border="0" alt="email" onclick="BBcodeemail()" onmouseover="helpline('mail')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_FLASH -->
<img src="./images/posting/flash.gif" border="0" alt="Flash" accesskey="d" name="addbbcode18" value="Flash" onclick="BBcodeflash()" onmouseover="helpline('d')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/video.gif" border="0" alt="video" onclick="BBcodevideo()" onmouseover="helpline('video')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/mp3.gif" border="0" alt="mp3" onclick="BBcodemp3()" onmouseover="helpline('mp3')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/quick.gif" border="0" alt="quick" onclick="BBcodequick()" onmouseover="helpline('quick')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/ram.gif" border="0" alt="ram" onclick="BBcoderam()" onmouseover="helpline('ram')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/googlevideo.gif" border="0" alt="googlevideo" onclick="BBcodegooglevideo()" onmouseover="helpline('googlevideo')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/youtube.gif" border="0" alt="youtube" onclick="BBcodeyoutube()" onmouseover="helpline('youtube')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
<br>
<!-- BEGIN custom_tags -->
<img src="./images/posting/{custom_tags.BBCODE_TAG}.gif" border="0" alt="{custom_tags.BBCODE_TAG}" title="{custom_tags.BBCODE_TAG}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> class="bbimages"/>
<!-- END custom_tags -->
<!-- ENDIF -->
<!-- ENDIF -->
</td>
</tr>
<!-- IF S_BBCODE_ALLOWED -->
<tr>
<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" class="helpline" value="{L_STYLES_TIP}" /></td>
<!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT -->
<td class="genmed" align="center">{L_FONT_COLOR}</td>
<!-- ENDIF -->
</tr>
<!-- ENDIF -->[/code]
Unir modificaciones (elimina el nuevo código phpBB dentro del bloque conflictivo)
[Mostrar diferencias integradas]
Código: Seleccionar todo
<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
<td colspan="2">
<script type="text/javascript">
// <![CDATA[
// Define the bbCode tags
var bbcode = new Array();
var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','
- ','
- ','
var imageTag = false;
// Helpline messages
var help_line = {
b: '{LA_BBCODE_B_HELP}',
i: '{LA_BBCODE_I_HELP}',
u: '{LA_BBCODE_U_HELP}',
q: '{LA_BBCODE_Q_HELP}',
c: '{LA_BBCODE_C_HELP}',
l: '{LA_BBCODE_L_HELP}',
o: '{LA_BBCODE_O_HELP}',
p: '{LA_BBCODE_P_HELP}',
w: '{LA_BBCODE_W_HELP}',
a: '{LA_BBCODE_A_HELP}',
s: '{LA_BBCODE_S_HELP}',
f: '{LA_BBCODE_F_HELP}',
e: '{LA_BBCODE_E_HELP}',
d: '{LA_BBCODE_D_HELP}',
t: '{LA_BBCODE_T_HELP}',
// Botones en imagenes por mitch
font: 'Tipo de fuente: Texto',
align_left: 'Alinear a la Izquierda:
Texto
',align_center: 'Centrar:
Texto
',align_right: 'Alinear a la Derecha:
Texto
',align_justify: 'Justificar:
Texto
',sup: 'Superíndice: Texto',
sub: 'Subíndice: Texto',
strike: 'Texto Tachado:
highlight: 'Toque de luz (highlight): [highlight=#COLOR]Texto[/highlight]',
hr: 'Línea Horizontal:
',
ot: 'Offtopic:
Off Topic:
Texto
marquee_down: 'Desplazar texto hacia abajo: Texto',
marquee_up: 'Desplazar texto hacia arriba: Texto',
marquee_left: 'Desplazar texto hacia la izquierda: Texto',
marquee_right: 'Desplazar texto hacia la derecha: Texto',
spoiler: 'Spoiler:
Spoiler
Texto
mail: 'Correo: [mail]Correo[/mail]',
video: 'Video (avi/wmv/mpg): [video width=ancho height=alto]URL del archivo[/video]',
mp3: 'Archivo de audio (mp3): ',
quick: 'Video Quicktime: [quick width=ancho height=alto]URL del archivo[/quick]',
ram: 'Archivo Real Media: [ram width=ancho height=alto]URL del archivo[/ram]',
googlevideo: 'Video google: [googlevideo]ID del video[/googlevideo]',
youtube: 'Video youtube: ',
// fin botones en imagenes por mitch
tip: '{L_STYLES_TIP}'
<!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
<!-- END custom_tags -->
}
// ]]>
</script>
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
<!-- IF S_BBCODE_ALLOWED -->
<select class="gensmall" style="height: 18px;" name="fuentes" onchange="bbfontstyle('[font=' + this.form.fuentes.options[this.form.fuentes.selectedIndex].value + ']', '[/font]');this.selectedIndex=0;" onmouseover="helpline('font')">
<option value="" class="genmed" style="font-family: Verdana;" selected="selected">Fuente</option>
<option value="Arial" class="genmed" style="font-family: Arial;">Arial</option>
<option value="Comic Sans MS" class="genmed" style="font-family: 'Comic Sans MS';">Comic Sans MS</option>
<option value="Courier New" class="genmed" style="font-family: 'Courier New';">Courier New</option>
<option value="Impact" class="genmed" style="font-family: Impact;">Impact</option>
<option value="Lucida Console" class="genmed" style="font-family: 'Lucida Console';">Lucida Console</option>
<option value="Lucida Sans Unicode" class="genmed" style="font-family: 'Lucida Sans Unicode';">Lucida Sans Unicode</option>
<option value="Microsoft Sans Serif" class="genmed" style="font-family: 'Microsoft Sans Serif';">Microsoft Sans Serif</option>
<option value="Symbol" class="genmed" style="font-family: Symbol;">Symbol</option>
<option value="Tahoma" class="genmed" style="font-family: Tahoma;">Tahoma</option>
<option value="Times New Roman" class="genmed" style="font-family: 'Times New Roman';">Times New Roman</option>
<option value="Traditional Arabic" class="genmed" style="font-family: 'Traditional Arabic';">Traditional Arabic</option>
<option value="Trebuchet MS" class="genmed" style="font-family: 'Trebuchet MS';">Trebuchet MS</option>
<option value="Verdana" class="genmed" style="font-family: Verdana;">Verdana</option>
<option value="Webdings" class="genmed" style="font-family: Webdings;">Webdings</option>
<option value="Wingdings" class="genmed" style="font-family: Wingdings;">Wingdings</option>
</select>
<select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 0;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
<option value="" selected="selected">Tamaño</option>
<option value="50">{L_FONT_TINY}</option>
<option value="85">{L_FONT_SMALL}</option>
<option value="100">{L_FONT_NORMAL}</option>
<option value="150">{L_FONT_LARGE}</option>
<option value="200">{L_FONT_HUGE}</option>
</select>
<br>
<img src="./images/posting/left.gif" border="0" alt="align=left" onclick="bbfontstyle('
','
')" onmouseover="helpline('align_left')" onmouseout="helpline('tip')" class="bbimages"/><img src="./images/posting/center.gif" border="0" alt="align=right" onclick="bbfontstyle('
','
')" onmouseover="helpline('align_center')" onmouseout="helpline('tip')" class="bbimages"/><img src="./images/posting/right.gif" border="0" alt="align=right" onclick="bbfontstyle('
','
')" onmouseover="helpline('align_right')" onmouseout="helpline('tip')" class="bbimages"/><img src="./images/posting/justify.gif" border="0" alt="align=justify" onclick="bbfontstyle('
','
')" onmouseover="helpline('align_justify')" onmouseout="helpline('tip')" class="bbimages"/><img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/bold.gif" border="0" alt="b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/italic.gif" border="0" alt="i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/under.gif" border="0" alt="u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/strike.gif" border="0" alt="strike" onclick="bbfontstyle('
<img src="./images/posting/sup.gif" border="0" alt="sup" onclick="bbfontstyle('','')" onmouseover="helpline('sup')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/sub.gif" border="0" alt="sub" onclick="bbfontstyle('','')" onmouseover="helpline('sub')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/listb.gif" border="0" alt="list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/listo.gif" border="0" alt="list" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/listitem.gif" border="0" alt="[*]" accesskey="t" name="addlitsitem" value="[*]" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/highlight=.gif" alt="highlight" border="0" onclick="bbfontstyle('','')" onmouseover="helpline('highlight')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/hr.gif" border="0" alt="hr" onclick="bbfontstyle('
')" onmouseover="helpline('hr')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/ot.gif" border="0" alt="ot" onclick="bbfontstyle('
Off Topic:
','
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<img src="./images/posting/marqd.gif" border="0" alt="marquee=down" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_down')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marqu.gif" border="0" alt="marquee=up" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_up')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marql.gif" border="0" alt="marquee=left" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_left')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/marqr.gif" border="0" alt="marquee=right" onclick="bbfontstyle('','')" onmouseover="helpline('marquee_right')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_QUOTE -->
<img src="./images/posting/quote.gif" border="0" alt="quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/code.gif" border="0" alt="code" accesskey="c" name="addbbcode8" value="Code" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/spoiler.gif" border="0" alt="spoiler" onclick="bbfontstyle('
Spoiler
','
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_IMG -->
<img src="./images/posting/img.gif" border="0" alt="img" accesskey="p" name="addbbcode14" value="Img" onclick="BBcodeimg()" onmouseover="helpline('p')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<!-- IF S_LINKS_ALLOWED -->
<img src="./images/posting/url.gif" border="0" alt="URL" accesskey="w" name="addbbcode16" value="URL" onclick="BBcodeurl()" onmouseover="helpline('w')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/email.gif" border="0" alt="email" onclick="BBcodeemail()" onmouseover="helpline('mail')" onmouseout="helpline('tip')" class="bbimages"/>
<img src="./images/posting/dots.gif" border="0" style="padding-left: 5px; padding-right: 5px;" />
<!-- IF S_BBCODE_FLASH -->
<img src="./images/posting/flash.gif" border="0" alt="Flash" accesskey="d" name="addbbcode18" value="Flash" onclick="BBcodeflash()" onmouseover="helpline('d')" onmouseout="helpline('tip')" class="bbimages"/>
<!-- ENDIF -->
<img src="./images/posting/video.gif" border="0" alt="video" onclick="BBcodevideo()" onmouseover="helpline('video')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/mp3.gif" border="0" alt="mp3" onclick="BBcodemp3()" onmouseover="helpline('mp3')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/quick.gif" border="0" alt="quick" onclick="BBcodequick()" onmouseover="helpline('quick')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/ram.gif" border="0" alt="ram" onclick="BBcoderam()" onmouseover="helpline('ram')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/googlevideo.gif" border="0" alt="googlevideo" onclick="BBcodegooglevideo()" onmouseover="helpline('googlevideo')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<img src="./images/posting/youtube.gif" border="0" alt="youtube" onclick="BBcodeyoutube()" onmouseover="helpline('youtube')" onmouseout="helpline('tip')" border="0" class="bbimages"/>
<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
<br>
<!-- BEGIN custom_tags -->
<img src="./images/posting/{custom_tags.BBCODE_TAG}.gif" border="0" alt="{custom_tags.BBCODE_TAG}" title="{custom_tags.BBCODE_TAG}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> class="bbimages"/>
<!-- END custom_tags -->
<!-- ENDIF -->
<!-- ENDIF -->
</td>
</tr>
<!-- IF S_BBCODE_ALLOWED -->
<tr>
<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" class="helpline" value="{L_STYLES_TIP}" /></td>
<!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT -->
<td class="genmed" align="center">{L_FONT_COLOR}</td>
<!-- ENDIF -->
</tr>
<!-- ENDIF -->
[/code]
No insertar - usar archivo nuevo
[Mostrar archivo resultante]
Código: Seleccionar todo
<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
<td colspan="2">
<script type="text/javascript">
// <![CDATA[
// Define the bbCode tags
var bbcode = new Array();
var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','
- ','
- ','
var imageTag = false;
// Helpline messages
var help_line = {
b: '{LA_BBCODE_B_HELP}',
i: '{LA_BBCODE_I_HELP}',
u: '{LA_BBCODE_U_HELP}',
q: '{LA_BBCODE_Q_HELP}',
c: '{LA_BBCODE_C_HELP}',
l: '{LA_BBCODE_L_HELP}',
o: '{LA_BBCODE_O_HELP}',
p: '{LA_BBCODE_P_HELP}',
w: '{LA_BBCODE_W_HELP}',
a: '{LA_BBCODE_A_HELP}',
s: '{LA_BBCODE_S_HELP}',
f: '{LA_BBCODE_F_HELP}',
e: '{LA_BBCODE_E_HELP}',
d: '{LA_BBCODE_D_HELP}',
t: '{LA_BBCODE_T_HELP}',
tip: '{L_STYLES_TIP}'
<!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
<!-- END custom_tags -->
}
// ]]>
</script>
<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
<!-- IF S_BBCODE_ALLOWED -->
<input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
<!-- IF S_BBCODE_QUOTE -->
<input type="button" class="btnbbcode" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
<!-- ENDIF -->
<input type="button" class="btnbbcode" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
<input type="button" class="btnbbcode" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
<!-- IF S_BBCODE_IMG -->
<input type="button" class="btnbbcode" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
<!-- ENDIF -->
<!-- IF S_LINKS_ALLOWED -->
<input type="button" class="btnbbcode" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
<!-- ENDIF -->
<!-- IF S_BBCODE_FLASH -->
<input type="button" class="btnbbcode" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
<!-- ENDIF -->
<span class="genmed nowrap">{L_FONT_SIZE}: <select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
<option value="50">{L_FONT_TINY}</option>
<option value="85">{L_FONT_SMALL}</option>
<option value="100" selected="selected">{L_FONT_NORMAL}</option>
<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
<option value="150">{L_FONT_LARGE}</option>
<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
<option value="200">{L_FONT_HUGE}</option>
<!-- ENDIF -->
<!-- ENDIF -->
</select></span>
<!-- ENDIF -->
</td>
</tr>
<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
<td colspan="2">
<!-- BEGIN custom_tags -->
<input type="button" class="btnbbcode" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
<!-- END custom_tags -->
</td>
</tr>
<!-- ENDIF -->
<!-- IF S_BBCODE_ALLOWED -->
<tr>
<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" class="helpline" value="{L_STYLES_TIP}" /></td>
<!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT -->
<td class="genmed" align="center">{L_FONT_COLOR}</td>
<!-- ENDIF -->
</tr>
<!-- ENDIF -->
[/code]