@@ -53,7 +53,7 @@ <div style="float:right;"><%= avatar_for log.user, 25 if log.user %></div> <div style="clear:both;padding-left:4px;padding-right:4px;padding-top:0.2em;padding-bottom:1em;border-top:1px solid #e8e8e8;"> <% if log.body && log.body.length > 0 %> - <%= x = wrap_text( log.body.gsub(/- <strong>([^<]+)<\/strong>/) {|m| "- <strong>#{_($1)}</strong>"}, 100).gsub(/\n/, "<br>") if log.body %> + <%= x = wrap_text( log.body.gsub(/- <strong>([^<]+)<\/strong>/) {|m| "- <strong>#{_($1)}</strong>"}, 100).gsub(/\n/, "<br/>") if log.body %> <% end %> </div> </td> app/views/activities/_log_row.html.erb @@ -34,7 +34,7 @@ <%= "<small>" + log.scm_changeset.issue_num + "</small> " + link_to(h(log.scm_changeset.name), {:controller => 'scm', :action => 'edit', :id => log.scm_changeset_id}) -%><br /><%= "<span class=\"optional\">#{log.scm_changeset.full_name}</span> " %> <% end %> -<%= log.body.gsub(/\n/, "<br>") if log.body %> +<%= log.body.gsub(/\n/, "<br/>") if log.body %> </p> </div> app/views/activities/_log_row2.html.erb @@ -29,9 +29,9 @@ <div style="float:right;"><%= avatar_for log.user, 25 if log.user %></div> <div style="clear:both;padding-left:4px;padding-right:4px;padding-top:0.2em;padding-bottom:1em;border-top:1px solid #e8e8e8;"> <% if log.target.is_a?(Post) && log.target.body && log.target.body.length > 0 %> - <%= wrap_text(h(log.target.body), 100).gsub(/\n/, "<br>") %> + <%= wrap_text(h(log.target.body), 100).gsub(/\n/, "<br/>") %> <% elsif log.body && log.body.length > 0 %> - <%= wrap_text(log.body, 100).gsub(/\n/, "<br>") %> + <%= wrap_text(log.body, 100).gsub(/\n/, "<br/>") %> <% end %> </div> </td> app/views/activities/_other_row.html.erb @@ -8,7 +8,7 @@ </tr> <tr> <td colspan=2> - <div class="welcome"><%= _'Welcome to ClockingIT. To get started, follow the steps below.'%><br><%= link_to _("Don't show this splash page"), :controller => 'activities', :action => 'hide_welcome' %></div> + <div class="welcome"><%= _'Welcome to ClockingIT. To get started, follow the steps below.'%><br/><%= link_to _("Don't show this splash page"), :controller => 'activities', :action => 'hide_welcome' %></div> <div class="tutorial<%= " complete" if @projects_count > 0%>"> <%= _"The first step is to %s. Don't worry about entering real data, you can always delete the project you create and start over, once you get the hang of things.", link_to(_('create a project'), :controller => 'projects', :action => 'new') %> <br /><br /> app/views/activities/welcome.html.erb @@ -8,6 +8,6 @@ <p><label for="file_name"><%=_ 'Name' %></label><%= text_field 'file', 'name' %></p> <%= hidden_field 'file', 'project_folder_id' %> -<br> +<br/> <!--[eoform:project_files]--> app/views/project_files/_form_edit.html.erb @@ -26,7 +26,7 @@ <% end %> </div> -<br> +<br/> <!--[eoform:project]--> app/views/projects/_form.html.erb @@ -47,7 +47,7 @@ <div style="float:right;"><%= avatar_for log.user, 25 if log.user %></div> <div style="clear:both;padding-left:4px;padding-right:4px;padding-top:0.2em;padding-bottom:1em;border-top:1px solid #e8e8e8;"> <% if log.body && log.body.length > 0 %> - <%= highlight_all(wrap_text(log.body, 100).gsub(/\n/, "<br>"), @keys) if log.body %> + <%= highlight_all(wrap_text(log.body, 100).gsub(/\n/, "<br/>"), @keys) if log.body %> <% end %> </div> </td> app/views/search/_search_log.html.erb @@ -15,7 +15,7 @@ <div id="worktime_container"> <% fields_for "work_log" do |f| -%> - <label>Time spent</label><%= f.text_field :duration, :class => "text", :onclick => "jQuery('#worklog_extra').show();"%><br> + <label>Time spent</label><%= f.text_field :duration, :class => "text", :onclick => "jQuery('#worklog_extra').show();"%><br/> <div id="worklog_extra"> <%= f.label :started_at, _("Start") %><%= f.text_field :started_at, :class => "text", :value => formatted_datetime_for_current_user(Time.now) %> <%= render(:partial => "/common/custom_attributes", :locals => { :object => current_user.company.work_logs.build }) %> app/views/tasks/_new_comment.html.erb @@ -87,7 +87,7 @@ class SQL_Export $h = substr($h, 0, strlen($d) - 1); $h .= "$pkey) TYPE=InnoDB;\n\n"; - // echo "<p>--- Table data<br>$h</p>"; + // echo "<p>--- Table data<br/>$h</p>"; return($h); } dump/SQL_Export.php @@ -38,7 +38,7 @@ $table_list = array(); while($t = mysql_fetch_array($tables)) { - // echo "case '{$t[0]}' : break; ".'<br>'; + // echo "case '{$t[0]}' : break; ".'<br/>'; array_push($table_list, $t[0]); } dump/index.php a7142d53b3f7e286c587d983277d2ab003d771ed Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/1b2ec0ccb1e9ad41305ab98e7fe62d02ae5fa4ff 1b2ec0ccb1e9ad41305ab98e7fe62d02ae5fa4ff 2009-09-04T08:32:11-07:00 2009-09-04T08:32:11-07:00 Use XHTML version of <br/> everywhere. 6c6cf7864fd0deed2f54026f4eb3121550b4ac8f Aristedes Maniatis ari@Aris-MacBook-Pro.local