From: <chi...@us...> - 2013-02-28 15:00:06
|
Revision: 45006 http://sourceforge.net/p/tikiwiki/code/45006 Author: chibaguy Date: 2013-02-28 14:59:58 +0000 (Thu, 28 Feb 2013) Log Message: ----------- [REF] Update break tag syntax from <br /> to HTML5-permitted <br> - 1167 items in 1082 files in templates directory in this commit. Modified Paths: -------------- trunk/templates/addreference.tpl trunk/templates/admin/include_articles.tpl trunk/templates/admin/include_connect.tpl trunk/templates/admin/include_fgal.tpl trunk/templates/admin/include_freetags.tpl trunk/templates/admin/include_gal.tpl trunk/templates/admin/include_general.tpl trunk/templates/admin/include_intertiki.tpl trunk/templates/admin/include_login.tpl trunk/templates/admin/include_payment.tpl trunk/templates/admin/include_performance.tpl trunk/templates/admin/include_profiles.tpl trunk/templates/admin/include_search.tpl trunk/templates/admin/include_security.tpl trunk/templates/admin/include_sefurl.tpl trunk/templates/admin/include_socialnetworks.tpl trunk/templates/admin/include_textarea.tpl trunk/templates/admin/include_trackers.tpl trunk/templates/admin/include_userfiles.tpl trunk/templates/admin/include_video.tpl trunk/templates/admin/include_wiki.tpl trunk/templates/admin_modules_form.tpl trunk/templates/article.tpl trunk/templates/attachments_tracker.tpl trunk/templates/blog_heading.tpl trunk/templates/blog_post_heading.tpl trunk/templates/comment-body.tpl trunk/templates/comment-header.tpl trunk/templates/comments.tpl trunk/templates/confirm.tpl trunk/templates/contribution.tpl trunk/templates/copyrights.tpl trunk/templates/debug/tiki-debug_console_help.tpl trunk/templates/debug/tiki-debug_console_tab.tpl trunk/templates/debug/tiki-debug_dmsg_tab.tpl trunk/templates/debug/tiki-debug_watch_tab.tpl trunk/templates/edit_file_gallery.tpl trunk/templates/error.tpl trunk/templates/error_raw.tpl trunk/templates/error_simple.tpl trunk/templates/error_ticket.tpl trunk/templates/fgal_listing_conf.tpl trunk/templates/freetag.tpl trunk/templates/list_file_gallery.tpl trunk/templates/list_file_gallery_content.tpl trunk/templates/mail/report.tpl trunk/templates/mail/user_watch_token.tpl trunk/templates/map/tiki-map.tpl trunk/templates/map/tiki-map_download.tpl trunk/templates/map/tiki-map_edit.tpl trunk/templates/map/tiki-map_history.tpl trunk/templates/map/tiki-map_upload.tpl trunk/templates/messu-archive.tpl trunk/templates/messu-broadcast.tpl trunk/templates/messu-compose.tpl trunk/templates/messu-mailbox.tpl trunk/templates/messu-read.tpl trunk/templates/messu-read_archive.tpl trunk/templates/messu-read_sent.tpl trunk/templates/messu-sent.tpl trunk/templates/modules/mod-assistant.tpl trunk/templates/modules/mod-cart.tpl trunk/templates/modules/mod-contributors.tpl trunk/templates/modules/mod-directory_stats.tpl trunk/templates/modules/mod-google.tpl trunk/templates/modules/mod-groups_emulation.tpl trunk/templates/modules/mod-live_support.tpl trunk/templates/modules/mod-login_box.tpl trunk/templates/modules/mod-rsslist.tpl trunk/templates/modules/mod-since_last_visit.tpl trunk/templates/modules/mod-terminology.tpl trunk/templates/modules/mod-top_visited_blogs.tpl trunk/templates/modules/mod-trackerhelp.tpl trunk/templates/modules/mod-translation.tpl trunk/templates/modules/mod-twitter.tpl trunk/templates/modules/mod-upcoming_events.tpl trunk/templates/modules/mod-user_tasks_public.tpl trunk/templates/modules/mod-webmail_inbox.tpl trunk/templates/modules/mod-who_is_there.tpl trunk/templates/pagehistory.tpl trunk/templates/sent_newsletters.tpl trunk/templates/show_copyright.tpl trunk/templates/styles/mobile/tiki.tpl trunk/templates/tiki-accounting.tpl trunk/templates/tiki-accounting_account_deleted.tpl trunk/templates/tiki-accounting_account_form.tpl trunk/templates/tiki-accounting_account_view.tpl trunk/templates/tiki-accounting_books.tpl trunk/templates/tiki-accounting_cancel.tpl trunk/templates/tiki-accounting_entry.tpl trunk/templates/tiki-accounting_export.tpl trunk/templates/tiki-accounting_stack.tpl trunk/templates/tiki-accounting_stacklist.tpl trunk/templates/tiki-admin.tpl trunk/templates/tiki-admin_actionlog.tpl trunk/templates/tiki-admin_banning.tpl trunk/templates/tiki-admin_calendars.tpl trunk/templates/tiki-admin_categories.tpl trunk/templates/tiki-admin_content_templates.tpl trunk/templates/tiki-admin_cookies.tpl trunk/templates/tiki-admin_credits.tpl trunk/templates/tiki-admin_forums.tpl trunk/templates/tiki-admin_html_pages.tpl trunk/templates/tiki-admin_integrator_rules.tpl trunk/templates/tiki-admin_layout.tpl trunk/templates/tiki-admin_links.tpl trunk/templates/tiki-admin_mailin.tpl trunk/templates/tiki-admin_menu_options.tpl trunk/templates/tiki-admin_menus.tpl trunk/templates/tiki-admin_modules.tpl trunk/templates/tiki-admin_newsletter_subscriptions.tpl trunk/templates/tiki-admin_newsletters.tpl trunk/templates/tiki-admin_notifications.tpl trunk/templates/tiki-admin_poll_options.tpl trunk/templates/tiki-admin_polls.tpl trunk/templates/tiki-admin_rssmodules.tpl trunk/templates/tiki-admin_security.tpl trunk/templates/tiki-admin_structures.tpl trunk/templates/tiki-admin_survey_questions.tpl trunk/templates/tiki-admin_surveys.tpl trunk/templates/tiki-admin_system.tpl trunk/templates/tiki-admin_tokens.tpl trunk/templates/tiki-admin_toolbars.tpl trunk/templates/tiki-admingroups.tpl trunk/templates/tiki-adminusers.tpl trunk/templates/tiki-article_types.tpl trunk/templates/tiki-assignuser.tpl trunk/templates/tiki-backlinks.tpl trunk/templates/tiki-batch_upload.tpl trunk/templates/tiki-batch_upload_files.tpl trunk/templates/tiki-blog_post.tpl trunk/templates/tiki-browse_categories.tpl trunk/templates/tiki-browse_freetags.tpl trunk/templates/tiki-browse_gallery.tpl trunk/templates/tiki-browse_image.tpl trunk/templates/tiki-calendar_box.tpl trunk/templates/tiki-calendar_box_multiple.tpl trunk/templates/tiki-calendar_edit_item.tpl trunk/templates/tiki-calendar_import.tpl trunk/templates/tiki-calendar_listmode.tpl trunk/templates/tiki-calendar_params_ical.tpl trunk/templates/tiki-calendar_weekmode.tpl trunk/templates/tiki-contacts.tpl trunk/templates/tiki-directory_add_site.tpl trunk/templates/tiki-directory_admin.tpl trunk/templates/tiki-directory_admin_categories.tpl trunk/templates/tiki-directory_admin_related.tpl trunk/templates/tiki-directory_browse.tpl trunk/templates/tiki-directory_ranking.tpl trunk/templates/tiki-directory_search.tpl trunk/templates/tiki-directory_validate_sites.tpl trunk/templates/tiki-discount.tpl trunk/templates/tiki-edit_article.tpl trunk/templates/tiki-edit_banner.tpl trunk/templates/tiki-edit_blog.tpl trunk/templates/tiki-edit_help.tpl trunk/templates/tiki-edit_help_plugins.tpl trunk/templates/tiki-edit_help_wiki_wysiwyg.tpl trunk/templates/tiki-edit_help_wysiwyg.tpl trunk/templates/tiki-edit_image.tpl trunk/templates/tiki-edit_invoice.tpl trunk/templates/tiki-edit_programmed_content.tpl trunk/templates/tiki-edit_quiz.tpl trunk/templates/tiki-edit_submission.tpl trunk/templates/tiki-edit_translation.tpl trunk/templates/tiki-editpage.tpl trunk/templates/tiki-export-sheets.tpl trunk/templates/tiki-export_tracker_item.tpl trunk/templates/tiki-faq_questions.tpl trunk/templates/tiki-featured_link.tpl trunk/templates/tiki-file_info_box.tpl trunk/templates/tiki-forum_import.tpl trunk/templates/tiki-forum_queue.tpl trunk/templates/tiki-forums.tpl trunk/templates/tiki-friends.tpl trunk/templates/tiki-galleries.tpl trunk/templates/tiki-ical.tpl trunk/templates/tiki-import-sheets.tpl trunk/templates/tiki-import_structuredtext.tpl trunk/templates/tiki-importer.tpl trunk/templates/tiki-information.tpl trunk/templates/tiki-install.tpl trunk/templates/tiki-invite.tpl trunk/templates/tiki-lastchanges.tpl trunk/templates/tiki-likepages.tpl trunk/templates/tiki-list_blogs.tpl trunk/templates/tiki-list_comments.tpl trunk/templates/tiki-list_file_gallery.tpl trunk/templates/tiki-list_invite.tpl trunk/templates/tiki-list_invoice_clients.tpl trunk/templates/tiki-list_kaltura_entries.tpl trunk/templates/tiki-list_object_permissions.tpl trunk/templates/tiki-listpages.tpl trunk/templates/tiki-listpages_content.tpl trunk/templates/tiki-live_support_admin.tpl trunk/templates/tiki-live_support_chat_window.tpl trunk/templates/tiki-live_support_client.tpl trunk/templates/tiki-minical.tpl trunk/templates/tiki-mods.tpl trunk/templates/tiki-mods_config.tpl trunk/templates/tiki-my_tiki.tpl trunk/templates/tiki-newsletter_archives.tpl trunk/templates/tiki-newsletters.tpl trunk/templates/tiki-objectpermissions.tpl trunk/templates/tiki-page_contribution_form.tpl trunk/templates/tiki-pagehistory.tpl trunk/templates/tiki-payment-single.tpl trunk/templates/tiki-pick_avatar.tpl trunk/templates/tiki-plugins.tpl trunk/templates/tiki-poll.tpl trunk/templates/tiki-poll_results.tpl trunk/templates/tiki-poll_results_bar.tpl trunk/templates/tiki-print_forum_thread.tpl trunk/templates/tiki-quiz_result_stats.tpl trunk/templates/tiki-quiz_stats_quiz.tpl trunk/templates/tiki-received_pages.tpl trunk/templates/tiki-register_site.tpl trunk/templates/tiki-remind_password.tpl trunk/templates/tiki-search_replace.tpl trunk/templates/tiki-send_newsletters.tpl trunk/templates/tiki-send_objects.tpl trunk/templates/tiki-share.tpl trunk/templates/tiki-shoutbox.tpl trunk/templates/tiki-show_page.tpl trunk/templates/tiki-show_page_raw.tpl trunk/templates/tiki-socialnetworks.tpl trunk/templates/tiki-sqllog.tpl trunk/templates/tiki-stats.tpl trunk/templates/tiki-survey_stats_survey.tpl trunk/templates/tiki-syslog.tpl trunk/templates/tiki-take_quiz.tpl trunk/templates/tiki-take_survey.tpl trunk/templates/tiki-tell_a_friend.tpl trunk/templates/tiki-theme_control.tpl trunk/templates/tiki-theme_control_objects.tpl trunk/templates/tiki-theme_control_sections.tpl trunk/templates/tiki-timesheet.tpl trunk/templates/tiki-tracker_reports.tpl trunk/templates/tiki-upload_file.tpl trunk/templates/tiki-upload_file_progress.tpl trunk/templates/tiki-upload_image.tpl trunk/templates/tiki-user_assigned_modules.tpl trunk/templates/tiki-user_bookmarks.tpl trunk/templates/tiki-user_information.tpl trunk/templates/tiki-user_tasks.tpl trunk/templates/tiki-user_tasks_edit.tpl trunk/templates/tiki-user_tasks_view.tpl trunk/templates/tiki-user_watches.tpl trunk/templates/tiki-userfiles.tpl trunk/templates/tiki-usermenu.tpl trunk/templates/tiki-userversions.tpl trunk/templates/tiki-view_articles-titleonly.tpl trunk/templates/tiki-view_articles.tpl trunk/templates/tiki-view_cache.tpl trunk/templates/tiki-view_faq.tpl trunk/templates/tiki-view_forum.tpl trunk/templates/tiki-view_forum_thread.tpl trunk/templates/tiki-view_invoice.tpl trunk/templates/tiki-view_sheets.tpl trunk/templates/tiki-view_tracker.tpl trunk/templates/tiki-view_tracker_item.tpl trunk/templates/tiki-webmail.tpl trunk/templates/tiki-webmail_contacts.tpl trunk/templates/trackerinput/category.tpl trunk/templates/trackerinput/dropdown.tpl trunk/templates/trackerinput/file.tpl trunk/templates/trackerinput/image.tpl trunk/templates/trackerinput/textarea.tpl trunk/templates/trackerinput/userpreference.tpl trunk/templates/trackeroutput/usersubscription.tpl trunk/templates/wiki-plugins/wikiplugin_addtocart.tpl trunk/templates/wiki-plugins/wikiplugin_adjustinventory.tpl trunk/templates/wiki-plugins/wikiplugin_catorphans.tpl trunk/templates/wiki-plugins/wikiplugin_datachannel.tpl trunk/templates/wiki-plugins/wikiplugin_events.tpl trunk/templates/wiki-plugins/wikiplugin_files.tpl trunk/templates/wiki-plugins/wikiplugin_googlemap.tpl trunk/templates/wiki-plugins/wikiplugin_invite.tpl trunk/templates/wiki-plugins/wikiplugin_memberpayment.tpl trunk/templates/wiki-plugins/wikiplugin_shopperinfo.tpl trunk/templates/wiki-plugins/wikiplugin_timesheet.tpl trunk/templates/wiki-plugins/wikiplugin_trackerfilter.tpl trunk/templates/wiki-plugins/wikiplugin_trackerlist.tpl trunk/templates/wiki-plugins/wikiplugin_vote.tpl trunk/templates/wiki_authors.tpl Modified: trunk/templates/addreference.tpl =================================================================== --- trunk/templates/addreference.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/addreference.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -348,19 +348,19 @@ {if $use_references eq 1} {if $libReferencesCant gt 0} - {tr}Library References{/tr}:<br /> + {tr}Library References{/tr}:<br> <select name="lib_ref" id="lib_ref"> {section name=i loop=$libReferences} <option value="{$libReferences[i].ref_id|escape}">{$libReferences[i].biblio_code|escape}</option> {/section} </select> - <br /> + <br> <input class="wikiaction" type="submit" value="{tr}Use{/tr}" id="u_lib" name="u_lib" /> - <br /><span id="u_lib_status"></span> + <br><span id="u_lib_status"></span> {/if} {/if} {if $edit_references eq 1 && $libReferencesCant gt 0} - <br /><a href="tiki-references.php" target="_blank">{tr}Edit Library References{/tr}</a> + <br><a href="tiki-references.php" target="_blank">{tr}Edit Library References{/tr}</a> {/if} </td> @@ -410,7 +410,7 @@ <td>{tr}Style{/tr}:</td> <td> <input type="text" size="30" class="wikiedit" name="e_ref_style" id="e_ref_style" value="" /> - <br /> + <br> <small>{tr}Enter the CSS class name to be added in the 'li' tag for listing this reference.{/tr}</small> </td> </tr> @@ -418,10 +418,10 @@ <td>{tr}Template{/tr}:</td> <td> <input type="text" size="30" class="wikiedit" name="e_ref_template" id="e_ref_template" value="" /> - <br /> + <br> <small> {tr}Enter template format in which you want to display the reference details in the bibliography listing. For example{/tr}: ~title~ (~year~) ~author~ - <br /> + <br> {tr}All the codes must be in lower case letters separated with spaces.{/tr} </small> </td> Modified: trunk/templates/admin/include_articles.tpl =================================================================== --- trunk/templates/admin/include_articles.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_articles.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -103,7 +103,7 @@ <div class="adminoptionlabel"> <label for="csvlist">{tr}Batch upload (CSV file):{/tr}</label> <input type="file" name="csvlist" id="csvlist" /> - <br /> + <br> <em>{tr}File format: title,authorName,heading,body,lang,user{/tr}....</em> <div align="center"> <input type="submit" name="import" value="{tr}Import{/tr}" /> Modified: trunk/templates/admin/include_connect.tpl =================================================================== --- trunk/templates/admin/include_connect.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_connect.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -53,9 +53,9 @@ <legend>{tr}Tiki Connect{/tr}</legend> {remarksbox type="info" title="{tr}New Feature{/tr}" icon="bricks"} <p><em>{tr}Please note: Experimental - work in progress{/tr}</em></p> - <p>{tr}Tiki Connect is a way to let the Tiki project know how it is being used, and which parts people like or would like fixing (or explaining).{/tr}<br /> + <p>{tr}Tiki Connect is a way to let the Tiki project know how it is being used, and which parts people like or would like fixing (or explaining).{/tr}<br> {tr}When you click the "Send Info" below you will be connected with mother.tiki.org, which is where the data will be collected.{/tr}</p> - <p>{tr}You can also send feedback about Tiki by checking the "Feedback" checkbox above. Icons will appear next to all the preferences where you can "like", request a "fix" or ask "what's this for?"{/tr}<br /> + <p>{tr}You can also send feedback about Tiki by checking the "Feedback" checkbox above. Icons will appear next to all the preferences where you can "like", request a "fix" or ask "what's this for?"{/tr}<br> {tr}Your votes are sent when you connect with mother.tiki.org (currently only be clicking the "Send Info" button){/tr}</p> <p>{tr}For more info{/tr} <a href="http://doc.tiki.org/Connect">{tr}click here{/tr}</a></p> {/remarksbox} Modified: trunk/templates/admin/include_fgal.tpl =================================================================== --- trunk/templates/admin/include_fgal.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_fgal.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -3,7 +3,7 @@ {remarksbox type="errors" title="{tr}Errors{/tr}"} {foreach from=$errors item=error} {$error|escape} - <br /> + <br> {/foreach} {/remarksbox} {/if} @@ -11,7 +11,7 @@ {remarksbox type="note" title="{tr}Feedback{/tr}"} {foreach from=$feedbacks item=feedback} {$feedback|escape} - <br /> + <br> {/foreach} {/remarksbox} {/if} @@ -20,7 +20,7 @@ {tr}To create or remove file galleries, select{/tr} <a class="rbox-link" href="tiki-list_file_gallery.php">{tr}File Galleries{/tr}</a> {tr}from the application menu{/tr}. <hr /> {tr}If you decide to store files in a directory you must ensure that the user cannot access directly to the directory.{/tr} - {tr}You have two options to accomplish this:<br /><ul><li>Use a directory outside your document root, make sure your php script can read and write to that directory</li><li>Use a directory inside the document root and use .htaccess to prevent the user from listing the directory contents</li></ul>{/tr} + {tr}You have two options to accomplish this:<br><ul><li>Use a directory outside your document root, make sure your php script can read and write to that directory</li><li>Use a directory inside the document root and use .htaccess to prevent the user from listing the directory contents</li></ul>{/tr} {tr}To configure the directory path use UNIX like paths for example files/ or c:/foo/files or /www/files/{/tr} {/remarksbox} @@ -234,7 +234,7 @@ {remarksbox type=warning title="{tr}Missing Handlers{/tr}"} {foreach from=$missingHandlers item=mime} {$mime|escape} - <br /> + <br> {/foreach} {/remarksbox} {/if} Modified: trunk/templates/admin/include_freetags.tpl =================================================================== --- trunk/templates/admin/include_freetags.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_freetags.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -34,7 +34,7 @@ <div class="adminoptionlabel"> <label for="freetags_cloud_colors">{tr}Random tag cloud colors:{/tr}</label> <input type="text" name="freetags_cloud_colors" id="freetags_cloud_colors" value="{foreach from=$prefs.freetags_cloud_colors item=color name=colors}{$color}{if !$smarty.foreach.colors.last},{/if}{/foreach}" /> - <br /> + <br> <em>{tr}Separate colors with a comma (,){/tr}.</em> </div> </div> @@ -44,7 +44,7 @@ <div class="adminoptionboxchild"> <a class="button" href='#Browsing' onclick="$('input[name=freetags_normalized_valid_chars]').val('a-zA-Z0-9');return false;">{tr}Alphanumeric ASCII characters only{/tr}</a> ({tr}No accents or special characters{/tr}.) - <br /> + <br> <a class="button" href='#Browsing' onclick="$('input[name=freetags_normalized_valid_chars]').val('');return false;">{tr}Accept all characters{/tr}</a> </div> {preference name=freetags_lowercase_only} Modified: trunk/templates/admin/include_gal.tpl =================================================================== --- trunk/templates/admin/include_gal.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_gal.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -52,9 +52,9 @@ <td> <input type="radio" name="gal_use_db" value="n" {if $prefs.gal_use_db eq 'n'}checked="checked"{/if}/> <label>{tr}Directory path:{/tr}</label> - <br /> + <br> <input type="text" name="gal_use_dir" value="{$prefs.gal_use_dir|escape}" size="50" /> - <br /> + <br> ({tr}Note: if you change this directory, you have to move the contents to the new directory. You can also use the 'Mover' below.{/tr}) </td> </tr> @@ -84,7 +84,7 @@ </tr> <tr> <td colspan="2"><b>{tr}Directory Batch Loading{/tr}</b> - <br /> + <br> {tr}If you enable Directory Batch Loading, you need to setup a web-readable directory (outside of your web space is better). Then setup a way to upload images in that dir, either by scp, ftp, or other protocols{/tr} </td> </tr> Modified: trunk/templates/admin/include_general.tpl =================================================================== --- trunk/templates/admin/include_general.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_general.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -251,7 +251,7 @@ {preference name='permission_denied_login_box' mode='invert'} <div class="adminoptionboxchild" id="permission_denied_login_box_childcontainer"> {tr}or{/tr} - <br /> + <br> {preference name=permission_denied_url} </div> {preference name='url_anonymous_page_not_found'} Modified: trunk/templates/admin/include_intertiki.tpl =================================================================== --- trunk/templates/admin/include_intertiki.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_intertiki.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -10,7 +10,7 @@ <tr> <td> {tr}InterTiki Slave mode{/tr} - <br /> + <br> <small>{tr}Warning: overrides manually registered local users{/tr}</small> </td> <td> @@ -36,13 +36,13 @@ </select> <div id="admin-slavemode-options" style="display: {if $prefs.feature_intertiki_mymaster eq ''}none{else}block{/if}"> <input type="checkbox" name="feature_intertiki_import_preferences" {if $prefs.feature_intertiki_import_preferences eq 'y'}checked="checked"{/if}/> - {tr}Import user preferences{/tr}<br /> + {tr}Import user preferences{/tr}<br> <input type="checkbox" name="feature_intertiki_import_groups" {if $prefs.feature_intertiki_import_groups eq 'y'}checked="checked"{/if}/> {tr}Import user groups{/tr} - <br /> + <br> {tr}Limit group import (comma-separated list of imported groups, leave empty to avoid limitation){/tr} - <br /> + <br> <input type="text" name="feature_intertiki_imported_groups" value="{$prefs.feature_intertiki_imported_groups}" /> </div> </td> Modified: trunk/templates/admin/include_login.tpl =================================================================== --- trunk/templates/admin/include_login.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_login.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -65,7 +65,7 @@ <div class="adminoptionbox"> <div class="adminoptionlabel"> <label for="registration_choices">{tr}Users can select a group to join at registration:{/tr}</label> - <br /> + <br> <em>{tr}By default, new users automatically join the Registered group{/tr}.</em> </div> <div class="adminoptionlabel"> Modified: trunk/templates/admin/include_payment.tpl =================================================================== --- trunk/templates/admin/include_payment.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_payment.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -13,9 +13,9 @@ {tabset} {tab name="{tr}Payment{/tr}"} {remarksbox title="{tr}Choose payment system{/tr}"} - {tr}You can use only one payment method: PayPal or Cclite or Tiki User Credits{/tr}<br /> - {tr}PayPal is working at the moment. See PayPal.com{/tr}<br /> - {tr}Cclite: Community currency accounting for local exchange trading systems (LETS). See {/tr}<a href="http://sourceforge.net/projects/cclite/">{tr}sourceforge.net{/tr}</a><br /> + {tr}You can use only one payment method: PayPal or Cclite or Tiki User Credits{/tr}<br> + {tr}PayPal is working at the moment. See PayPal.com{/tr}<br> + {tr}Cclite: Community currency accounting for local exchange trading systems (LETS). See {/tr}<a href="http://sourceforge.net/projects/cclite/">{tr}sourceforge.net{/tr}</a><br> {tr}Tiki User Credits: Requires this other feature to be configured{/tr} {/remarksbox} Modified: trunk/templates/admin/include_performance.tpl =================================================================== --- trunk/templates/admin/include_performance.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_performance.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -23,7 +23,7 @@ {if $gzip_handler ne 'none'} <div class="highlight" style="margin-left:30px;"> {tr}Output compression is active.{/tr} - <br /> + <br> {tr}Compression is handled by:{/tr} {$gzip_handler}. </div> {/if} Modified: trunk/templates/admin/include_profiles.tpl =================================================================== --- trunk/templates/admin/include_profiles.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_profiles.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -264,25 +264,25 @@ <p> {assign var=profilesFilterUrlFeaturedProfiles value='Featured+profiles'} <a href="{$profilesFilterUrlStart}{$tikiMajorVersion}{$profilesFilterUrlMid}{$profilesFilterUrlFeaturedProfiles}{$profilesFilterUrlEnd}">{tr}Featured Profiles{/tr}</a> - <br />{tr}Featured Profiles is a list of applications that are maintained by the Tiki community and are a great way to get started.{/tr} + <br>{tr}Featured Profiles is a list of applications that are maintained by the Tiki community and are a great way to get started.{/tr} </p> <p> {assign var=profilesFilterUrlFullProfiles value='Full+profile+(out+of+the+box+%26+ready+to+go)'} <a href="{$profilesFilterUrlStart}{$tikiMajorVersion}{$profilesFilterUrlMid}{$profilesFilterUrlFullProfiles}{$profilesFilterUrlEnd}">{tr}Full Profiles{/tr}</a> - <br />{tr}Full Profiles are full featured out of the box solutions.{/tr} + <br>{tr}Full Profiles are full featured out of the box solutions.{/tr} </p> <p> {assign var=profilesFilterUrlMiniProfiles value='Mini-profile+(can+be+included+in+other)'} <a href="{$profilesFilterUrlStart}{$tikiMajorVersion}{$profilesFilterUrlMid}{$profilesFilterUrlMiniProfiles}{$profilesFilterUrlEnd}">{tr}Mini Profiles{/tr}</a> - <br />{tr}Mini Profiles will configure specific features and are a great way to add more functionality to an existing configuration.{/tr} + <br>{tr}Mini Profiles will configure specific features and are a great way to add more functionality to an existing configuration.{/tr} </p> <p> {assign var=profilesFilterUrlLearningProfiles value='Learning+profile+(just+to+show+off+feature)'} <a href="{$profilesFilterUrlStart}{$tikiMajorVersion}{$profilesFilterUrlMid}{$profilesFilterUrlLearningProfiles}{$profilesFilterUrlEnd}">{tr}Learning Profiles{/tr}</a> - <br />{tr}Learning Profiles will allow you to quickly evaluate specific features in Tiki.{/tr} + <br>{tr}Learning Profiles will allow you to quickly evaluate specific features in Tiki.{/tr} </p> </td> @@ -334,7 +334,7 @@ </div> </form> <a name="step2"></a> - <br /> + <br> {if isset($result) && $result|@count != '0'} @@ -499,7 +499,7 @@ <fieldset><legend>{tr}Profile tester{/tr}</legend> <form action="tiki-admin.php?page=profiles" method="post"> {remarksbox type="warning" title="{tr}Warning{/tr}"} - {tr}Paste or type wiki markup and YAML (with or without the {literal}{CODE}{/literal} tags) into the text area below{/tr}<br /> + {tr}Paste or type wiki markup and YAML (with or without the {literal}{CODE}{/literal} tags) into the text area below{/tr}<br> <em><strong>{tr}This will run the profile and make potentially unrecoverable changes in your database!{/tr}</strong></em> <div class="adminoptionbox"> <div class="adminoptionlabel"> Modified: trunk/templates/admin/include_search.tpl =================================================================== --- trunk/templates/admin/include_search.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_search.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -70,10 +70,10 @@ <ul> <li><a href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a> {tr}From the command line:{/tr} <kbd>php lib/search/shell.php optimize</kbd></li> <li> - <a href="tiki-admin.php?page=search&rebuild=now" id="rebuild-link">{tr}Rebuild Index{/tr}</a> {tr}From the command line:{/tr} <kbd>php lib/search/shell.php rebuild</kbd><br /> + <a href="tiki-admin.php?page=search&rebuild=now" id="rebuild-link">{tr}Rebuild Index{/tr}</a> {tr}From the command line:{/tr} <kbd>php lib/search/shell.php rebuild</kbd><br> <label for="log-rebuild">{tr}Log rebuild?{/tr}</label> <input type="checkbox" id="log-rebuild" /> - <span class="description">{tr}Log file is saved as temp/Search_Indexer.log{/tr}</span> <br /> {tr}From the command line:{/tr} <kbd>php lib/search/shell.php rebuild log</kbd><br /> + <span class="description">{tr}Log file is saved as temp/Search_Indexer.log{/tr}</span> <br> {tr}From the command line:{/tr} <kbd>php lib/search/shell.php rebuild log</kbd><br> {jq} $("#log-rebuild").click(function(){ if ($(this).prop("checked")) { @@ -108,7 +108,7 @@ {jq} setTimeout(function() { history.go(0); }, 1000); {/jq} <li><strong><a href="tiki-admin.php?page=search&process=">{tr}Stop{/tr}</a></strong></li> {else} - <li><em><a href="tiki-admin.php?page=search&process=all">{tr}All{/tr}</a></em> <br /><span class="description">{tr}Uses JavaScript to reload this page until queue is processed{/tr}</span></li> + <li><em><a href="tiki-admin.php?page=search&process=all">{tr}All{/tr}</a></em> <br><span class="description">{tr}Uses JavaScript to reload this page until queue is processed{/tr}</span></li> {/if} </ul> {/if} Modified: trunk/templates/admin/include_security.tpl =================================================================== --- trunk/templates/admin/include_security.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_security.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -128,11 +128,11 @@ {preference name=openpgp_gpg_signer_passphrase_store} <div class="adminoptionboxchild openpgp_gpg_signer_passphrase_store_childcontainer preferences"> {preference name=openpgp_gpg_signer_passphrase} - <br /><em>{tr}If you use preferences option for the signer passphrase, clear the file option just for security{/tr}</em> + <br><em>{tr}If you use preferences option for the signer passphrase, clear the file option just for security{/tr}</em> </div> <div class="adminoptionboxchild openpgp_gpg_signer_passphrase_store_childcontainer file"> {preference name=openpgp_gpg_signer_passfile} - <br /><em>{tr}If you use file for the signer passphrase, clear the preferences option just for security{/tr}</em> + <br><em>{tr}If you use file for the signer passphrase, clear the preferences option just for security{/tr}</em> </div> {remarksbox type="tip" title="{tr}Note{/tr}"} {tr}The email of preference <a href="tiki-admin.php?page=general&alt=General">'sender_email'</a> is used as signer key ID, and it must have both private and public key in the gnupg keyring.{/tr} Modified: trunk/templates/admin/include_sefurl.tpl =================================================================== --- trunk/templates/admin/include_sefurl.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_sefurl.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -32,7 +32,7 @@ {/remarksbox} {elseif $configurationFile eq 'unexpected reference' or $configurationFile eq 'unexpected enabled'} {remarksbox type="warning" title="{tr}Warning{/tr}"} - {tr _0=$enabledFileName}%0 is not in the expected format.{/tr} {tr}Unable to verify that your URL rewriting configuration is up to date.{/tr} {tr}SEFURL may not work completely or correctly if Tiki URL rewriting configuration is not current.{/tr}<br /> + {tr _0=$enabledFileName}%0 is not in the expected format.{/tr} {tr}Unable to verify that your URL rewriting configuration is up to date.{/tr} {tr}SEFURL may not work completely or correctly if Tiki URL rewriting configuration is not current.{/tr}<br> {tr _0=$enabledFileName}%0 may simply be outdated.{/tr} {tr _0="<strong>$referenceFileName</strong>" _1="<strong>$enabledFileName</strong>"}To update this file, if it was not customized, copy the %0 file (located in the main directory of your Tiki installation) to %1, overwriting the latter.{/tr} {/remarksbox} Modified: trunk/templates/admin/include_socialnetworks.tpl =================================================================== --- trunk/templates/admin/include_socialnetworks.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_socialnetworks.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -13,7 +13,7 @@ {remarksbox type="note" title="{tr}Note{/tr}"} <p>{tr}To use Twitter integration, you must register this site as an application at{/tr} <a href="http://twitter.com/oauth_clients/" target="_blank">http://twitter.com/oauth_clients/</a> - {tr}and allow write access for the application{/tr}.<br /> + {tr}and allow write access for the application{/tr}.<br> {tr}Enter <your site URL>tiki-socialnetworks.php as callback URL{/tr}.</p> {/remarksbox} <div class="adminoptionbox"> @@ -27,7 +27,7 @@ {remarksbox type="note" title="{tr}Note{/tr}"} <p>{tr}To use Facebook integration, you must register this site as an application at{/tr} <a href="http://developers.facebook.com/setup/" target="_blank">http://developers.facebook.com/setup/</a> - {tr}and allow extended access for the application{/tr}.<br /> + {tr}and allow extended access for the application{/tr}.<br> {tr}Enter <your site URL>tiki-socialnetworks.php?request_facebook as Site URL and <your site> as Site Domain{/tr}.</p> {/remarksbox} <div class="adminoptionbox"> @@ -50,8 +50,8 @@ <fieldset class="admin"> <legend>{tr}bit.ly Settings{/tr}</legend> {remarksbox type="note" title="{tr}Note{/tr}"} - <p>{tr}There is no need to set up a site-wide bit.ly account; every user can have his or her own, but this allows for site-wide statistics{/tr}<br /> - {tr}Go to{/tr} <a href="http://bit.ly/a/sign_up">http://bit.ly/a/sign_up</a> {tr}to sign up for an account{/tr}.<br /> + <p>{tr}There is no need to set up a site-wide bit.ly account; every user can have his or her own, but this allows for site-wide statistics{/tr}<br> + {tr}Go to{/tr} <a href="http://bit.ly/a/sign_up">http://bit.ly/a/sign_up</a> {tr}to sign up for an account{/tr}.<br> {tr}Go to{/tr} <a href="http://bit.ly/a/your_api_key">http://bit.ly/a/your_api_key</a> {tr}to retrieve the API key{/tr}.</p> {/remarksbox} <div class="adminoptionbox"> Modified: trunk/templates/admin/include_textarea.tpl =================================================================== --- trunk/templates/admin/include_textarea.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_textarea.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -120,7 +120,7 @@ {/remarksbox} {if !isset($disabled)} {button href="?page=textarea&disabled=y" _text="{tr}Check disabled plugins used in wiki pages{/tr}"} - <br /><br /> + <br><br> {else} {remarksbox type=errors title="{tr}Disabled used plugins{/tr}"} {if empty($disabled)} @@ -170,7 +170,7 @@ {tab name="{tr}Plugin Aliases{/tr}"} {remarksbox type="note" title="{tr}About plugin aliases{/tr}"} - {tr}Tiki plugin aliases allow you to define your own custom configurations of existing plugins.<br />Find out more here: {help url="Plugin+Alias"}{/tr} + {tr}Tiki plugin aliases allow you to define your own custom configurations of existing plugins.<br>Find out more here: {help url="Plugin+Alias"}{/tr} {/remarksbox} {if $prefs.feature_jquery neq 'y'} {remarksbox type="tip" title="{tr}Tip{/tr}"} Modified: trunk/templates/admin/include_trackers.tpl =================================================================== --- trunk/templates/admin/include_trackers.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_trackers.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -48,7 +48,7 @@ {tr}Use a directory to store files:{/tr}</td> <td> <input type="radio" name="t_use_db" value="n" {if $prefs.t_use_db eq 'n'}checked="checked"{/if}/> {tr}Path:{/tr} - <br /> + <br> <input type="text" name="t_use_dir" value="{$prefs.t_use_dir|escape}" size="50" /> </td> </tr> Modified: trunk/templates/admin/include_userfiles.tpl =================================================================== --- trunk/templates/admin/include_userfiles.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_userfiles.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -25,7 +25,7 @@ <td>{tr}Use a directory to store userfiles:{/tr}</td> <td> <input type="radio" name="uf_use_db" value="n" {if $prefs.uf_use_db eq 'n'}checked="checked"{/if}/> {tr}Path:{/tr} - <br /> + <br> <input type="text" name="uf_use_dir" value="{$prefs.uf_use_dir|escape}" size="50" /> </td> </tr> Modified: trunk/templates/admin/include_video.tpl =================================================================== --- trunk/templates/admin/include_video.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_video.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -34,7 +34,7 @@ {preference name=kaltura_secret} </fieldset> -<br /> +<br> <fieldset class="admin"> <legend>{tr}Kaltura Dynamic Player{/tr}</legend> @@ -43,7 +43,7 @@ {$kplayerlist} </fieldset> -<br /> +<br> <fieldset class="admin"> <legend>{tr}Kaltura Contribution Wizard{/tr}</legend> @@ -51,14 +51,14 @@ {tr}You can manually edit these values in lib/videogals/standardTikiKcw.xml{/tr} </fieldset> -<br /> +<br> <fieldset class="admin"> <legend>{tr}Legacy support{/tr}</legend> {preference name=kaltura_legacyremix} </fieldset> -<br /> +<br> <div align="center" style="padding:1em;"><input type="submit" name="video" value="{tr}Change preferences{/tr}" /></div> </form> Modified: trunk/templates/admin/include_wiki.tpl =================================================================== --- trunk/templates/admin/include_wiki.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin/include_wiki.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -109,7 +109,7 @@ {preference name=wiki_edit_minor} <div class="adminoptionboxchild" id="wiki_edit_minor_childcontainer"> {remarksbox type=note title="{tr}Note{/tr}"}{tr}Minor edits do not flag new content for translation and do not send watch notifications (unless "Watch minor edits" is enabled).{/tr} - <br /> + <br> {tr}Only user groups granted the tiki_p_minor permission (and admins) will be able to save minor edits when this is enabled.{/tr} <a class="link" href="tiki-objectpermissions.php?permType=wiki&textFilter=minor&show_disabled_features=y" title="{tr}Permission{/tr}">{icon _id="key" alt="{tr}Permission{/tr}"}</a> {/remarksbox} @@ -196,7 +196,7 @@ {preference name=feature_filegals_manager} {button href="tiki-admin.php?page=wiki&rmvunusedpic=1" _text="{tr}Remove unused pictures{/tr}"} {button href="tiki-admin.php?page=wiki&moveWikiUp=1" _text="{tr}Move images from wiki_up to the home file gallery{/tr}"} - <br /><em>{tr}If you use these buttons please make sure to have a backup of the database and the directory wiki_up{/tr}</em> + <br><em>{tr}If you use these buttons please make sure to have a backup of the database and the directory wiki_up{/tr}</em> </div> {preference name=feature_wiki_export} @@ -434,8 +434,8 @@ {/if} {tab name="{tr}Tools{/tr}"} - <a href="tiki-search_replace.php">{tr}Mass search and replace{/tr}</a><br /> - <a href="tiki-report_direct_object_perms.php">{tr}Report wiki pages with direct object permissions{/tr}</a><br /> + <a href="tiki-search_replace.php">{tr}Mass search and replace{/tr}</a><br> + <a href="tiki-report_direct_object_perms.php">{tr}Report wiki pages with direct object permissions{/tr}</a><br> {/tab} {/tabset} Modified: trunk/templates/admin_modules_form.tpl =================================================================== --- trunk/templates/admin_modules_form.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/admin_modules_form.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -67,7 +67,7 @@ <div class="simplebox"> {icon _id=information style="vertical-align:middle;float:left"} {tr}The{/tr} <a class="rbox-link" href="tiki-admin.php?page=module">{tr}Display Modules to All Groups{/tr}</a> {tr}setting will override your selection of specific groups.{/tr} </div> - <br /> + <br> {/if} </div> </div> @@ -104,7 +104,7 @@ </div> <div class="description q234"> <input type="text" id="assign_params[{$name|escape}]" name="assign_params[{$name|escape}]" value="{$param.value|escape}"{if !empty($param.filter)} class="{$param.filter}" {/if}/> - <br /> + <br> {$param.description|escape} {if !empty($param.default)} - {tr}Default:{/tr} {$param.default|escape}{/if} </div> Modified: trunk/templates/article.tpl =================================================================== --- trunk/templates/article.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/article.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -91,7 +91,7 @@ {if $article_attributes} <div class="articleattributes"> {foreach from=$article_attributes key=attname item=attvalue} - {$attname|escape}: {$attvalue|escape}<br /> + {$attname|escape}: {$attvalue|escape}<br> {/foreach} </div> {/if} Modified: trunk/templates/attachments_tracker.tpl =================================================================== --- trunk/templates/attachments_tracker.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/attachments_tracker.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -9,7 +9,7 @@ <table class="formcolor"> <tr> <td>{tr}Upload file{/tr}</td> - <td>{if $attach_file}{tr}Edit:{/tr} {/if}<input type="hidden" name="MAX_FILE_SIZE" value="1000000000" /><input name="userfile1" type="file" />{if $attach_file}<br />{$attach_file|escape}{/if}</td> + <td>{if $attach_file}{tr}Edit:{/tr} {/if}<input type="hidden" name="MAX_FILE_SIZE" value="1000000000" /><input name="userfile1" type="file" />{if $attach_file}<br>{$attach_file|escape}{/if}</td> </tr> <tr> <td>{tr}Comment{/tr}</td> Modified: trunk/templates/blog_heading.tpl =================================================================== --- trunk/templates/blog_heading.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/blog_heading.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -10,8 +10,8 @@ {* example code to add more info to the default blog heading if desired * remove the line above (starting curly bracket then asterisk) and the last line to enable <div class="bloginfo"> -{tr}Created by{/tr} {$creator|userlink} {$created|tiki_short_datetime:on}<br /> -{tr}Last post{/tr} {$lastModif|tiki_short_datetime}<br /> +{tr}Created by{/tr} {$creator|userlink} {$created|tiki_short_datetime:on}<br> +{tr}Last post{/tr} {$lastModif|tiki_short_datetime}<br> ({$posts} {tr}Posts{/tr} | {$hits} {tr}Visits{/tr} | {tr}Activity={/tr}{$activity|string_format:"%.2f"}) </div> Modified: trunk/templates/blog_post_heading.tpl =================================================================== --- trunk/templates/blog_post_heading.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/blog_post_heading.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -7,7 +7,7 @@ {* example code to add more info to the default blog heading if desired * remove the line above (starting curly bracket then asterisk) and the last line to enable <div class="bloginfo"> -{tr}Created by{/tr} {$post_info.user|userlink} {$post_info.created|tiki_short_datetime:on}<br /> -{tr}Last post{/tr} {$post_info.lastModif|tiki_short_datetime}<br /> +{tr}Created by{/tr} {$post_info.user|userlink} {$post_info.created|tiki_short_datetime:on}<br> +{tr}Last post{/tr} {$post_info.lastModif|tiki_short_datetime}<br> </div> *} Modified: trunk/templates/comment-body.tpl =================================================================== --- trunk/templates/comment-body.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/comment-body.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -87,7 +87,7 @@ {/if} >{icon _id='cross' alt="{tr}Remove{/tr}"}</a> {/if} - <br /> + <br> {/section} </div> {/if} Modified: trunk/templates/comment-header.tpl =================================================================== --- trunk/templates/comment-header.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/comment-header.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -49,7 +49,7 @@ <a href="tiki-object_watches.php?objectId={$comments_parentId|escape:"url"}&watch_event=forum_post_thread&objectType=forum&objectName={$comment.title|escape:"url"}&objectHref={'tiki-view_forum_thread.php?comments_parentId='|cat:$comments_parentId|cat:'&forumId='|cat:$forumId|escape:"url"}" class="icon">{icon _id='eye_group' alt="{tr}Group Monitor{/tr}"}</a> {/if} {/if} - <br /> + <br> {if $category_watched eq 'y'} {tr}Watched by categories:{/tr} {section name=i loop=$watching_categories} Modified: trunk/templates/comments.tpl =================================================================== --- trunk/templates/comments.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/comments.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -120,7 +120,7 @@ {section name=rep loop=$comments_coms} {include file='comment.tpl' comment=$comments_coms[rep]} - {if $thread_style != 'commentStyle_plain'}<br />{/if} + {if $thread_style != 'commentStyle_plain'}<br>{/if} {/section} </form> @@ -144,7 +144,7 @@ {/if} {if $prefs.direct_pagination eq 'y' && $display eq ''} - <br /> + <br> {section loop=$comments_cant_pages name=foo} {assign var=selector_offset value=$smarty.section.foo.index|times:$comments_per_page} <a class="prevnext" href="{$comments_complete_father}comments_threshold={$comments_threshold}&comments_parentId={$comments_parentId}&comments_offset={$selector_offset}{$thread_sort_mode_param}&comments_per_page={$comments_per_page}&thread_style={$thread_style}"> @@ -160,7 +160,7 @@ {if !empty($errors)} {remarksbox type="warning" title="{tr}Errors{/tr}"} {foreach from=$errors item=error name=error} - {if !$smarty.foreach.error.first}<br />{/if} + {if !$smarty.foreach.error.first}<br>{/if} {$error|escape} {/foreach} {/remarksbox} @@ -169,7 +169,7 @@ {remarksbox type="note"} {foreach from=$feedbacks item=feedback name=feedback} {$feedback|escape} - {if !$smarty.foreach.feedback.first}<br />{/if} + {if !$smarty.foreach.feedback.first}<br>{/if} {/foreach} {/remarksbox} {/if} @@ -224,7 +224,7 @@ <tr> <td> <label for="anonymous_email"> - {tr}If you would like to be notified when someone replies to this topic<br />please tell us your e-mail address{/tr} + {tr}If you would like to be notified when someone replies to this topic<br>please tell us your e-mail address{/tr} </label> </td> <td> @@ -307,7 +307,7 @@ </table> </form> - <br /> + <br> {assign var=tips_title value="{tr}Posting replies{/tr}"} </div> Modified: trunk/templates/confirm.tpl =================================================================== --- trunk/templates/confirm.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/confirm.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -6,7 +6,7 @@ {if !empty($confirm_detail)} {$confirm_detail} {/if} - <br /> + <br> <div class="cbox-data"> <form id='confirm' action="{$confirmaction|escape}" method="post"> <div> Modified: trunk/templates/contribution.tpl =================================================================== --- trunk/templates/contribution.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/contribution.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -8,7 +8,7 @@ <select id="contributions" name="contributions[]" multiple="multiple" size="5"> {section name=ix loop=$contributions} <option value="{$contributions[ix].contributionId|escape}"{if $contributions[ix].selected eq 'y'} selected="selected"{/if} >{if $contributions[ix].contributionId > 0}{$contributions[ix].name|escape}{/if}</option> - {assign var="help" value=$help|cat:$contributions[ix].name|cat:": "|cat:$contributions[ix].description|cat:"<br />"} + {assign var="help" value=$help|cat:$contributions[ix].name|cat:": "|cat:$contributions[ix].description|cat:"<br>"} {/section} </select> <a {popup text=$help|replace:'"':"'" width=500}>{icon _id='help'}</a> Modified: trunk/templates/copyrights.tpl =================================================================== --- trunk/templates/copyrights.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/copyrights.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -44,7 +44,7 @@ </td> <td align="right"> <input type="submit" name="editcopyright" value="{tr}Edit{/tr}" /> - <br /> + <br> <a title="{tr}Delete{/tr}" href="copyrights.php?page={$page|escape:"url"}&action=delete&copyrightId={$copyrights[i].copyrightId}" >{icon _id='cross' alt="{tr}Remove{/tr}"}</a> <a href="copyrights.php?page={$page|escape:"url"}&action=up&copyrightId={$copyrights[i].copyrightId}">{icon _id='resultset_up'}</a> <a href="copyrights.php?page={$page|escape:"url"}&action=down&copyrightId={$copyrights[i].copyrightId}">{icon _id='resultset_down'}</a> Modified: trunk/templates/debug/tiki-debug_console_help.tpl =================================================================== --- trunk/templates/debug/tiki-debug_console_help.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/debug/tiki-debug_console_help.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -9,12 +9,12 @@ <td width="15%"><code>{$command_result.name}</code></td> <td>{$command_result.description} </td> </tr> - <tr><td><br /></td></tr> + <tr><td><br></td></tr> <tr> <td></td> <td> {tr}Syntax:{/tr} <pre>{$command_result.syntax}</pre> </td> </tr> - <tr><td><br /></td></tr> + <tr><td><br></td></tr> <tr> <td></td> <td> {tr}Example:{/tr} <pre>{$command_result.example}</pre> </td> Modified: trunk/templates/debug/tiki-debug_console_tab.tpl =================================================================== --- trunk/templates/debug/tiki-debug_console_tab.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/debug/tiki-debug_console_tab.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -11,7 +11,7 @@ {* Show text in PRE section *} <pre>{strip} - {$command_result|escape:"html"|wordwrap:90:"\n":true|replace:"\n":"<br />"} + {$command_result|escape:"html"|wordwrap:90:"\n":true|replace:"\n":"<br>"} {/strip}</pre> {elseif $result_type == 2}{*HTML_RESULT*} @@ -26,5 +26,5 @@ {/if}{* Check result type *} -<br /> +<br> {/if}{* We have smth to show as result *} Modified: trunk/templates/debug/tiki-debug_dmsg_tab.tpl =================================================================== --- trunk/templates/debug/tiki-debug_dmsg_tab.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/debug/tiki-debug_dmsg_tab.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -5,7 +5,7 @@ {section name=i loop=$messages} <tr> <td > {$messages[i].timestamp|date_format:"%H:%M:%S"} </td> - <td> <pre>{$messages[i].msg|escape:"html"|wordwrap:90:"\n":true|replace:"\n":"<br />"}</pre> </td> + <td> <pre>{$messages[i].msg|escape:"html"|wordwrap:90:"\n":true|replace:"\n":"<br>"}</pre> </td> </tr> {/section} </table> Modified: trunk/templates/debug/tiki-debug_watch_tab.tpl =================================================================== --- trunk/templates/debug/tiki-debug_watch_tab.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/debug/tiki-debug_watch_tab.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -13,7 +13,7 @@ <code>{$watchlist[i].var}</code> </td> <td class="{cycle}"{if $smarty.section.i.index == 0} id="firstrow"{/if}> - <pre>{$watchlist[i].value|escape:"html"|wordwrap:60:"\n":true|replace:"\n":"<br />"}</pre> + <pre>{$watchlist[i].value|escape:"html"|wordwrap:60:"\n":true|replace:"\n":"<br>"}</pre> </td> </tr> {/section} Modified: trunk/templates/edit_file_gallery.tpl =================================================================== --- trunk/templates/edit_file_gallery.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/edit_file_gallery.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -1,7 +1,7 @@ {* $Id$ *} {if $tiki_p_create_file_galleries eq 'y'} {if isset($individual) and $individual eq 'y'} - <br /> + <br> <a class="fgallink" href="tiki-objectpermissions.php?objectName={$name|escape:"url"}&objectType=file+gallery&permType=file+galleries&objectId={$galleryId}"> {tr}There are individual permissions set for this file gallery{/tr} </a> @@ -114,7 +114,7 @@ <td> <input type="checkbox" id="public" name="public" {if isset($gal_info.public) and $gal_info.public eq 'y'}checked="checked"{/if}/> - <br /> + <br> <em>{tr}Any user with permission (not only the gallery owner) can upload files{/tr}.</em> </td> </tr> @@ -140,7 +140,7 @@ </td> <td> <input size="5" type="text" id="archives" name="archives" value="{$gal_info.archives|escape}" /> - <br /> + <br> <em>{tr}Use{/tr} 0={tr}unlimited{/tr}, -1={tr}none{/tr}.</em> {if $galleryId neq $treeRootId} </td> @@ -177,15 +177,15 @@ <td>{tr}Quota{/tr}</td> <td> <input type="text" id="quota" name="quota" value="{$gal_info.quota}" size="5" />{tr}Mb{/tr} <i>{tr}(0 for unlimited){/tr}</i> - {if $gal_info.usedSize}<br />{tr}Used:{/tr} {$gal_info.usedSize|kbsize}{/if} + {if $gal_info.usedSize}<br>{tr}Used:{/tr} {$gal_info.usedSize|kbsize}{/if} {if !empty($gal_info.quota)} {capture name='use'} {math equation="round((100*x)/(1024*1024*y))" x=$gal_info.usedSize y=$gal_info.quota} {/capture} {quotabar length='100' value=$smarty.capture.use} {/if} - {if !empty($gal_info.maxQuota)}<br />{tr}Max:{/tr} {$gal_info.maxQuota} {tr}Mb{/tr}{/if} - {if !empty($gal_info.minQuota)}<br />{tr}Min:{/tr} {$gal_info.minQuota} {tr}Mb{/tr}{/if} + {if !empty($gal_info.maxQuota)}<br>{tr}Max:{/tr} {$gal_info.maxQuota} {tr}Mb{/tr}{/if} + {if !empty($gal_info.minQuota)}<br>{tr}Min:{/tr} {$gal_info.minQuota} {tr}Mb{/tr}{/if} </td> </tr> {/if} @@ -217,7 +217,7 @@ </td> <td> <input size="5" type="text" name="image_max_size_x" value="{$gal_info.image_max_size_x|escape}" /> px - <br /> + <br> <i>{tr}If an image is wider than this, it will be resized.{/tr} {tr}Attention: In this case, the original image will be lost.{/tr} (0={tr}unlimited{/tr})</i> </td> </tr> @@ -227,7 +227,7 @@ </td> <td> <input size="5" type="text" name="image_max_size_y" value="{$gal_info.image_max_size_y|escape}" /> px - <br /> + <br> <i>{tr}If an image is higher than this, it will be resized.{/tr} {tr}Attention: In this case, the original image will be lost.{/tr} (0={tr}unlimited{/tr})</i> </td> </tr> @@ -237,7 +237,7 @@ </td> <td> <input size="80" type="text" name="wiki_syntax" value="{$gal_info.wiki_syntax|escape}" /> - <br /> + <br> <i>{tr}The default is {/tr}"{literal}{img fileId="%fileId%" thumb="y" rel="box[g]"}{/literal}")</i> <i>{tr}Field names will be replaced when enclosed in % chars. e.g. %fileId%, %name%, %filename%, %description%{/tr}</i> </td> @@ -259,10 +259,10 @@ <option value="{$item|escape}" {if $sortorder == $item} selected="selected"{/if}>{$key}</option> {/foreach} </select> - <br /> + <br> <input type="radio" id="sortdirection2" name="sortdirection" value="asc" {if $sortdirection == 'asc'}checked="checked"{/if} /> <label for="sortdirection2">{tr}Ascending{/tr}</label> - <br /> + <br> <input type="radio" id="sortdirection1" name="sortdirection" value="desc" {if $sortdirection == 'desc'}checked="checked"{/if} /> <label for="sortdirection1">{tr}Descending{/tr}</label> </td> @@ -294,5 +294,5 @@ <input type="submit" value="{tr}Save{/tr}" name="edit" /> </form> </div> - <br /> + <br> {/if} Modified: trunk/templates/error.tpl =================================================================== --- trunk/templates/error.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/error.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -31,7 +31,7 @@ {/remarksbox} {elseif $errortype eq "404" and isset($page)} {remarksbox type='errors' title=$errortitle} - {tr}Page not found{/tr}<br />{$page|escape} + {tr}Page not found{/tr}<br>{$page|escape} {/remarksbox} {if $prefs.feature_likePages eq 'y'} {if $likepages} @@ -97,12 +97,12 @@ {if isset($page) and $page and $create eq 'y' and ($tiki_p_admin eq 'y' or $tiki_p_admin_wiki eq 'y' or $tiki_p_edit eq 'y')} {button href="tiki-editpage.php?page=$page" _text="{tr}Create this page{/tr}"} {tr}(page will be orphaned){/tr} - <br /><br /> + <br><br> {/if} {if $prefs.javascript_enabled eq 'y'} {button _onclick="javascript:history.back();return false;" _text="{tr}Go back{/tr}" _ajax="n"} - <br /><br /> + <br><br> {/if} {button href=$prefs.tikiIndex _text="{tr}Return to home page{/tr}"} Modified: trunk/templates/error_raw.tpl =================================================================== --- trunk/templates/error_raw.tpl 2013-02-28 14:18:52 UTC (rev 45005) +++ trunk/templates/error_raw.tpl 2013-02-28 14:59:58 UTC (rev 45006) @@ -6,7 +6,7 @@ <div class="cbox"> <div class="cbox-title">{icon _id=exclamation alt="{tr}Error{/tr}" style="vertical-align:middle"} {tr}Error{/tr}</div> <div class="cbox-data"> - {$msg}<br /><br /> + {$msg}<br><br> </div> </div> </div> Modified: trunk/... [truncated message content] |