Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31888] branches/proposals/6.x/templates
|
From: Sylvie G. <sgr...@gm...> - 2011-01-14 19:36:07
|
+1 On Thu, 2011-01-13 at 02:13 +0000, chi...@us... wrote: > Revision: 31888 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31888&view=rev > Author: chibaguy > Date: 2011-01-13 02:13:26 +0000 (Thu, 13 Jan 2011) > > Log Message: > ----------- > [bp/r31887][FIX] Slash missing from self-closed element (<br />) - validation error. > > Modified Paths: > -------------- > branches/proposals/6.x/templates/mail/report.tpl > branches/proposals/6.x/templates/modules/mod-terminology.tpl > branches/proposals/6.x/templates/styles/darkshine/tiki.tpl > branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl > branches/proposals/6.x/templates/tiki-listpages_content.tpl > branches/proposals/6.x/templates/tiki-view_tracker_item.tpl > branches/proposals/6.x/templates/tracker_item_field_input.tpl > > Modified: branches/proposals/6.x/templates/mail/report.tpl > =================================================================== > --- branches/proposals/6.x/templates/mail/report.tpl 2011-01-13 01:57:17 UTC (rev 31887) > +++ branches/proposals/6.x/templates/mail/report.tpl 2011-01-13 02:13:26 UTC (rev 31888) > @@ -1,11 +1,11 @@ > {tr}Report for{/tr} {$report_user}.{if $report_preferences.type eq 'plain'} > > -{else}<br>{/if} > +{else}<br />{/if} > {tr}Last Report sent on{/tr} {$report_last_report_date}.{if $report_preferences.type eq 'plain'} > > > -{else}<br><br>{/if} > -{if $report_preferences.type eq 'html'}<u>{/if}{tr}Changes in detail:{/tr}{if $report_preferences.type eq 'html'}</u><br>{else} > +{else}<br /><br />{/if} > +{if $report_preferences.type eq 'html'}<u>{/if}{tr}Changes in detail:{/tr}{if $report_preferences.type eq 'html'}</u><br />{else} > > ----------------------- > > > Modified: branches/proposals/6.x/templates/modules/mod-terminology.tpl > =================================================================== > --- branches/proposals/6.x/templates/modules/mod-terminology.tpl 2011-01-13 01:57:17 UTC (rev 31887) > +++ branches/proposals/6.x/templates/modules/mod-terminology.tpl 2011-01-13 02:13:26 UTC (rev 31888) > @@ -1,6 +1,6 @@ > {tikimodule title=$tpl_module_title name="terminology flip=$module_params.flip decorations=$module_params.decorations} > <div align="left"> > - <b>{tr}Find term:{/tr}</b><br> > + <b>{tr}Find term:{/tr}</b><br /> > <div id="mod-search_wiki_pager1" style="display: block" class="clearfix box-data"> > <form class="forms" method="post" action="tiki-listpages.php"> > {if $term_root_category_id != ''} > > Modified: branches/proposals/6.x/templates/styles/darkshine/tiki.tpl > =================================================================== > --- branches/proposals/6.x/templates/styles/darkshine/tiki.tpl 2011-01-13 01:57:17 UTC (rev 31887) > +++ branches/proposals/6.x/templates/styles/darkshine/tiki.tpl 2011-01-13 02:13:26 UTC (rev 31888) > @@ -95,8 +95,8 @@ > {tr}The following modules could not be loaded{/tr} > <p> > {foreach from=$module_pref_errors key=index item=pref_error} > - <b>{$pref_error.mod_name}:</b><br> > - {tr}Preference was not set{/tr}: '{$pref_error.pref_name}'<br> > + <b>{$pref_error.mod_name}:</b><br /> > + {tr}Preference was not set{/tr}: '{$pref_error.pref_name}'<br /> > {/foreach} > {/remarksbox} > {/if} > > Modified: branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl 2011-01-13 01:57:17 UTC (rev 31887) > +++ branches/proposals/6.x/templates/tiki-list_kaltura_playlists.tpl 2011-01-13 02:13:26 UTC (rev 31888) > @@ -16,7 +16,7 @@ > <td>Description</td><td><input name="playlist_description" /></td> > </tr> > </table> > -<br> > +<br /> > <input type="hidden" name="playlistId" value="0"> > <input type="submit" name="action" value="Create"> > </form> > @@ -29,9 +29,9 @@ > {assign var=cant value=$kmixlist->totalCount} > > <form name="list" action="tiki-list_kaltura_playlists.php?type=mix&action=add_entries&playlistId={$playlistId}" method="post"> > -<br> > +<br /> > {include file="tiki-list_kaltura_mix_entries.tpl"} > -<br> > +<br /> > <input type="hidden" name="playlistId" value="{$playlistId}"> > <input type="hidden" name="action" value="add_entries"> > <input type="hidden" name="type" value="mix"> > @@ -42,12 +42,12 @@ > {else} > {title}Create Kaltura Playlist: Add Media Entries{/title} > {button _text="{tr}Mix Entries{/tr}" href="tiki-list_kaltura_playlists.php?type=mix&action=add_entries&playlistId=$playlistId" } > -<br><br> > +<br /><br /> > {assign var=klist value=$kmedialist->objects} > {assign var=cant value=$kmedialist->totalCount} > <form action="tiki-list_kaltura_playlists.php?type=media&action=add_entries&playlistId={$playlistId}" method="post" > > {include file="tiki-list_kaltura_media_entries.tpl"} > -<br> > +<br /> > <input type="hidden" name="playlistId" value="{$playlistId}"> > <input type="hidden" name="action" value="add_entries"> > <input type="hidden" name="type" value="media"> > @@ -69,7 +69,7 @@ > <param name="flashvars" value="layoutId=playlistLight&uid=0&partner_id=23929&subp_id=2392900&k_pl_autoContinue=true&k_pl_autoInsertMedia=true&k_pl_0_name={$kplaylist->name}&k_pl_0_url=http%3A%2F%2Fwww.kaltura.com%2Findex.php%2Fpartnerservices2%2Fexecuteplaylist%3Fuid%3D%26partner_id%3D23929%26subp_id%3D2392900%26format%3D8%26ks%3D%7Bks%7D%26playlist_id%3D{$kplaylist->id}"/></object> > </td></tr> > <tr><td> > -<br> > +<br /> > <table class="normal"> > <tr><td width="200" class="even">Name </td><td class="even">{$kplaylist->name}</td></tr> > <tr><td width="200" class="odd">Description </td><td class="odd">{$kplaylist->description}</td></tr> > @@ -90,8 +90,8 @@ > {button _text="{tr}Media Entries{/tr}" href="tiki-list_kaltura_entries2.php?list=media&view=browse" } > <input type="submit" name="action" value="Create Playlist"/> > <input type="submit" name="action" value="Delete"/> > -<br> > -<br> > +<br /> > +<br /> > <table class="normal"> > <tr> > <th width="20"> </th> > > Modified: branches/proposals/6.x/templates/tiki-listpages_content.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-listpages_content.tpl 2011-01-13 01:57:17 UTC (rev 31887) > +++ branches/proposals/6.x/templates/tiki-listpages_content.tpl 2011-01-13 02:13:26 UTC (rev 31888) > @@ -332,7 +332,7 @@ > <tr> > <td colspan="{$cntcol}" class="odd"> > <b>{tr}No pages found{/tr}{if $find ne ''} {tr}with{/tr} "{$find|escape}"{/if}{if $initial ne ''}{tr} {if $find ne ''}and {/if}starting with{/tr} "{$initial}"{/if}.</b> > - {if $aliases_were_found == 'y'}<br><b>{tr}However, some page aliases fitting the query were found (see Aliases section above).{/tr}</b>{/if} > + {if $aliases_were_found == 'y'}<br /><b>{tr}However, some page aliases fitting the query were found (see Aliases section above).{/tr}</b>{/if} > </td> > </tr> > {/section} > > Modified: branches/proposals/6.x/templates/tiki-view_tracker_item.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-view_tracker_item.tpl 2011-01-13 01:57:17 UTC (rev 31887) > +++ branches/proposals/6.x/templates/tiki-view_tracker_item.tpl 2011-01-13 02:13:26 UTC (rev 31888) > @@ -107,13 +107,13 @@ > {if $tracker_info.showCreatedView eq 'y'} > <tr> > <td class="formlabel">{tr}Created{/tr}</td> > - <td colspan="3" class="formcontent">{$info.created|tiki_long_datetime}{if $tracker_info.showCreatedBy eq 'y'}<br>by {if $prefs.user_show_realnames eq 'y'}{if empty($info.createdBy)}Unknown{else}{$info.createdBy|username}{/if}{else}{if empty($info.createdBy)}Unknown{else}{$info.createdBy}{/if}{/if}{/if}</td> > + <td colspan="3" class="formcontent">{$info.created|tiki_long_datetime}{if $tracker_info.showCreatedBy eq 'y'}<br />by {if $prefs.user_show_realnames eq 'y'}{if empty($info.createdBy)}Unknown{else}{$info.createdBy|username}{/if}{else}{if empty($info.createdBy)}Unknown{else}{$info.createdBy}{/if}{/if}{/if}</td> > </tr> > {/if} > {if $tracker_info.showLastModifView eq 'y'} > <tr> > <td class="formlabel">{tr}LastModif{/tr}</td> > - <td colspan="3" class="formcontent">{$info.lastModif|tiki_long_datetime}{if $tracker_info.showLastModifBy eq 'y'}<br>by {if $prefs.user_show_realnames eq 'y'}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy|username}{/if}{else}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy}{/if}{/if}{/if}</td> > + <td colspan="3" class="formcontent">{$info.lastModif|tiki_long_datetime}{if $tracker_info.showLastModifBy eq 'y'}<br />by {if $prefs.user_show_realnames eq 'y'}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy|username}{/if}{else}{if empty($info.lastModifBy)}Unknown{else}{$info.lastModifBy}{/if}{/if}{/if}</td> > </tr> > {/if} > </table> > > Modified: branches/proposals/6.x/templates/tracker_item_field_input.tpl > =================================================================== > --- branches/proposals/6.x/templates/tracker_item_field_input.tpl 2011-01-13 01:57:17 UTC (rev 31887) > +++ branches/proposals/6.x/templates/tracker_item_field_input.tpl 2011-01-13 02:13:26 UTC (rev 31888) > @@ -380,7 +380,7 @@ > {elseif $field_value.type eq 'R'} > {section name=jx loop=$field_value.options_array} > {if $smarty.section.jx.first} > - {if $field_value.options_array[jx] eq '<br>' or $field_value.options_array[jx] eq '<br />'} > + {if $field_value.options_array[jx] eq '<br />' or $field_value.options_array[jx] eq '<br />'} > {assign var=sepR value='<br />'} > {else} > {assign var=sepR value=' '} > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > Protect Your Site and Customers from Malware Attacks > Learn about various malware tactics and how to avoid them. Understand > malware threats, the impact they can have on your business, and how you > can protect your company and customers by using code signing. > http://p.sf.net/sfu/oracle-sfdevnl > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |