cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into notes

Browse source
This commit is contained in:
Tom Hughes 2013-02-02 11:00:46 +00:00
commit 56db9ca2b7
116 changed files with 2059 additions and 1069 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/browse/aerodrome.p.16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 377 B

0
app/assets/images/browse/tourist_ruin.p.16.png → app/assets/images/browse/tourist_ruins.p.16.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 315 B

Before After
Before After

20
app/assets/javascripts/edit.js
View file

@ -1,27 +1,11 @@
function maximiseMap() {
$("#left").hide();
$("#top-bar").hide();
$("#content").css("top", "0px");
if ($("html").attr("dir") == "ltr") {
$("#content").css("margin-left", "0px");
} else {
$("#content").css("margin-right", "0px");
}
$("#content").addClass("maximised");
handleResize();
}
function minimiseMap() {
$("#left").show();
$("#top-bar").show();
$("#content").css("top", "30px");
if ($("html").attr("dir") == "ltr") {
$("#content").css("margin-left", "185px");
} else {
$("#content").css("margin-right", "185px");
}
$("#content").removeClass("maximised");
handleResize();
}

6
app/assets/javascripts/index.js
View file

@ -5,7 +5,7 @@
//= require index/notes
$(document).ready(function () {
var permalinks = $("#permalink").html();
var permalinks = $("#permalink").detach().html();
var marker;
var params = OSM.mapParams();
var map = createMap("map");
@ -66,10 +66,10 @@ $(document).ready(function () {
});
function updateLocation() {
var center = map.getCenter();
var center = map.getCenter().wrap();
var zoom = map.getZoom();
var layers = getMapLayers();
var extents = map.getBounds();
var extents = map.getBounds().wrap();
updatelinks(center.lng,
center.lat,

8
app/assets/javascripts/map.js.erb
View file

@ -1,5 +1,5 @@
// Leaflet extensions
L.LatLngBounds.include({
L.extend(L.LatLngBounds.prototype, {
getSouthLat: function () {
return this._southWest.lat;
},
@ -29,10 +29,14 @@ L.LatLngBounds.include({
getSize: function () {
return (this._northEast.lat - this._southWest.lat) *
(this._northEast.lng - this._southWest.lng);
},
wrap: function () {
return new L.LatLngBounds(this._southWest.wrap(), this._northEast.wrap());
}
});
L.Bounds.include({
L.extend(L.Bounds.prototype, {
getWidth: function () {
return this.max.x - this.min.x;
},

4
app/assets/javascripts/richtext.js
View file

@ -41,8 +41,8 @@ $(document).ready(function () {
$(".richtext_dopreview").click(function (event) {
var editor = $(this).parents(".richtext_container").find("textarea");
var preview = $(this).parents(".richtext_container").find(".richtext_preview");
var width = editor.outerWidth() - preview.outerWidth() + preview.innerWidth();
var minHeight = editor.outerHeight() - preview.outerHeight() + preview.innerHeight();
var width = editor.outerWidth() - preview.outerWidth() + preview.width();
var minHeight = editor.outerHeight() - preview.outerHeight() + preview.height();
if (preview.contents().length == 0) {
preview.oneTime(500, "loading", function () {

81
app/assets/stylesheets/common.css.scss
View file

@ -469,7 +469,7 @@ table {
.site-index #tabnav a#viewanchor,
.site-edit #tabnav a#editanchor,
.changeset_list #tabnav a#historyanchor,
.changeset-list #tabnav a#historyanchor,
.site-export #tabnav a#exportanchor {
border-bottom: 1px solid #aaa;
background: #9ed485;
@ -789,6 +789,15 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
top: 30px;
}
#content.maximised {
top: 0;
left: 0;
right: 0;
bottom: 0;
border: 0;
z-index: 1000;
}
#slim_container {
width: 100%;
}
@ -805,12 +814,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
#slim_content {
margin: 10px;
margin-top: 90px;
margin-top: 95px;
max-width: 50em;
.content-heading {
margin-bottom: 15px;
}
}
#slim_header {
margin: 10px;
margin: 30px 10px;
position: absolute;
top: 0px;
margin-right: 5px;
@ -891,7 +904,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
}
}
.selected {
background-color: rgb(255, 255, 160);
background: #FFFFC0;
}
.date,
.user {
@ -1021,6 +1034,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
}
.activity-block {
clear: left;
border-bottom: 1px solid #ccc;
padding-bottom: 20px;
float: left;
@ -1139,15 +1153,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
}
ul,
ol {
margin-bottom: 20px;
font-style: italic;
margin-left: 20px;
}
ul li {
list-style: disc;
}
ol li {
list-style: decimal;
}
ul.secondary-actions { display: inline-block;}
}
@ -1436,8 +1442,8 @@ textarea {
/* Rules for user images */
img.user_image {
width: 100px;
height: 100px;
max-width: 100px;
max-height: 100px;
border: 1px solid #ccc;
margin-bottom: 20px;
float: left;
@ -1445,8 +1451,8 @@ img.user_image {
}
img.user_thumbnail {
width: 50px;
height: 50px;
max-width: 50px;
max-height: 50px;
border: 1px solid #ccc;
margin-right: 20px;
}
@ -1499,18 +1505,6 @@ ul.secondary-actions {
padding-left: 0;
}
}
.hidden li,
.hide_unless_logged_in li,
.hide_unless_administrator li {
border-left: 1px solid #ccc;
padding-left: 5px;
}
.hidden:first-child li,
.hide_unless_logged_in:first-child li,
.hide_unless_administrator:first-child li {
border-left: 0;
padding-left: 0;
}
}
/* Utility for managing inner content areas */
@ -1548,6 +1542,7 @@ a.button.submit {
background-color: #9ed485;
}
}
/* Rules for doing distinct colour of alternate table rows */
.table0,
@ -1567,55 +1562,79 @@ a.button.submit {
border: 0;
}
/* Rules for rich text */
.richtext {
ul,
ol {
margin-bottom: 20px;
margin-left: 20px;
}
ul li {
list-style: disc;
}
ol li {
list-style: decimal;
}
}
/* Rules for rich text editors */
.richtext_container {
white-space: nowrap;
.richtext_content {
display: inline-block;
vertical-align: top;
.richtext_preview {
display: inline-block;
padding: 20px;
background-color: #f4f4ff;
white-space: normal;
&.loading {
background-image: image-url("loading.gif");
background-repeat: no-repeat;
background-position: center;
}
> :first-child {
margin-top: 0px;
}
}
}
.richtext_help {
display: inline-block;
vertical-align: top;
margin-left: 15px;
background-color: #f8f8ff;
padding: 20px;
p {
margin: 0px;
}
th {
vertical-align: top;
text-align: left;
padding: 0px 15px 0px 0px !important;
}
table > thead th {
font-weight: bold;
}
td {
font-family: fixed;
line-height: 16px;
text-align: left;
padding: 0px !important;
}
input.richtext_doedit {
margin-top: 5px !important;
margin-right: 10px !important;
}
input.richtext_dopreview {
margin-top: 5px !important;
margin-left: 10px !important;

8
app/assets/stylesheets/embed.css.scss
View file

@ -17,11 +17,3 @@ body {
width: 100%;
height: 100%;
}
.leaflet-control-zoom-in {
background-image: image-url("images/zoom-in.png");
}
.leaflet-control-zoom-out {
background-image: image-url("images/zoom-out.png");
}

8
app/assets/stylesheets/leaflet-all.css.scss
View file

@ -6,14 +6,6 @@
*/
/* Override to serve images through the asset pipeline. */
.leaflet-control-zoom-in {
background-image: image-url("images/zoom-in.png");
}
.leaflet-control-zoom-out {
background-image: image-url("images/zoom-out.png");
}
.leaflet-control-layers-toggle {
background-image: image-url("images/layers.png");
}

21
app/assets/stylesheets/small.css.scss
View file

@ -3,15 +3,15 @@
/* Default rules for the body of every page */
body {
font-size: 12px;
font-size: 10px;
}
h1 {
font-size: 16px;
font-size: 12px;
}
h2, h3, h4 {
font-size: 14px;
font-size: 12px;
}
.wrapper {
@ -30,6 +30,10 @@ h2, h3, h4 {
position: relative;
}
.site-edit #content, .site-index #content, .site-export #content {
position: absolute;
}
.column-1 {
width: 100%;
}
@ -89,7 +93,7 @@ h2, h3, h4 {
#small-title h1 {
position: absolute;
font-size: 12px;
font-size: 10px;
line-height: 18px;
margin: 0;
left: 22px;
@ -106,6 +110,7 @@ h2, h3, h4 {
#browse_map ul.secondary-actions {
float: right;
font-size: 10px;
}
#map {
@ -132,7 +137,7 @@ h2, h3, h4 {
.site-index .leaflet-top,
.site-export .leaflet-top {
top: 47px !important;
top: 10px !important;
}
/* Rules for the main content area */
@ -155,14 +160,10 @@ h2, h3, h4 {
#sidebar {
border: 0px;
margin: 0px;
width: 50%;
width: 50% !important;
border-right: 1px solid #ccccdd;
}
.sidebar_title, #sidebar_content {
font-size: 10px !important;
}
p.search_results_entry {
padding: 2px 0px;
}

14
app/helpers/application_helper.rb
View file

@ -20,12 +20,12 @@ module ApplicationHelper
def style_rules
css = ""
css << ".hidden { display: none }";
css << ".hide_unless_logged_in { display: none }" unless @user;
css << ".hide_if_logged_in { display: none }" if @user;
css << ".hide_if_user_#{@user.id} { display: none }" if @user;
css << ".show_if_user_#{@user.id} { display: inline }" if @user;
css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?;
css << ".hidden { display: none !important }";
css << ".hide_unless_logged_in { display: none !important }" unless @user;
css << ".hide_if_logged_in { display: none !important }" if @user;
css << ".hide_if_user_#{@user.id} { display: none !important }" if @user;
css << ".show_if_user_#{@user.id} { display: inline !important }" if @user;
css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?;
return content_tag(:style, css, :type => "text/css")
end
@ -77,7 +77,7 @@ module ApplicationHelper
content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format)))
output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview")
output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview richtext")
end
output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do

4
app/views/browse/_map.html.erb
View file

@ -52,7 +52,7 @@
<% end -%>
</li>
<li>
<%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"),
<%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▼", :class => "menuicon"),
edit_path,
:id => "area_edit",
:data => { :editor => preferred_editor },
@ -69,7 +69,7 @@
:class => "geolink object" %>
</li>
<li>
<%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"),
<%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▼", :class => "menuicon"),
edit_path,
:id => "object_edit",
:data => { :editor => preferred_editor },

12
app/views/browse/_node_details.html.erb
View file

@ -1,8 +1,9 @@
<% if node_details.redacted? %>
<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %></p>
<% else %>
<div class="browse_details" id="<%= node_details.version %>">
<% if node_details.redacted? %>
<div class='browse-section'>
<%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %>
</div>
<% else %>
<%= render :partial => "common_details", :object => node_details %>
<% if node_details.visible -%>
@ -23,6 +24,5 @@
</ul>
</div>
<% end %>
</div>
<% end %>
</div>

12
app/views/browse/_relation_details.html.erb
View file

@ -1,8 +1,9 @@
<% if relation_details.redacted? %>
<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %></p>
<% else %>
<div class="browse_details" id="<%= relation_details.version %>">
<% if relation_details.redacted? %>
<div class='browse-section'>
<%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %><
</div>
<% else %>
<%= render :partial => "common_details", :object => relation_details %>
<% unless relation_details.relation_members.empty? %>
@ -18,6 +19,5 @@
<ul><%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %></ul>
</div>
<% end %>
</div>
<% end %>
</div>

13
app/views/browse/_way_details.html.erb
View file

@ -1,9 +1,9 @@
<% if way_details.redacted? %>
<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %></p>
<% else %>
<div class="browse_details" id="<%= way_details.version %>">
<% if way_details.redacted? %>
<div class='browse-section'>
<%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %>
</div>
<% else %>
<%= render :partial => "common_details", :object => way_details %>
<% unless way_details.way_nodes.empty? %>
@ -30,6 +30,5 @@
<%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
</ul>
<% end %>
</div>
<% end %>
</div>

8
app/views/diary_entry/_diary_comment.html.erb
View file

@ -1,8 +1,8 @@
<div class='clearfix diary-comment'>
<div class="clearfix diary-comment">
<%= user_thumbnail diary_comment.user %>
<p class='deemphasize comment-heading' id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %></p>
<%= diary_comment.body.to_html %>
<p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %></p>
<div class="richtext"><%= diary_comment.body.to_html %></div>
<%= if_administrator(:span) do %>
<%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %>
<% end %>
</div>
</div>

11
app/views/diary_entry/_diary_entry.html.erb
View file

@ -6,7 +6,8 @@
<h2><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></h2>
</div>
<div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
<div class="richtext" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
<%= diary_entry.body.to_html %>
</div>
@ -25,12 +26,12 @@
<li><%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %></li>
<% end %>
<%= if_user(diary_entry.user, :span) do %>
<li><%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></li>
<%= if_user(diary_entry.user, :li) do %>
<%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
<% end %>
<%= if_administrator(:span) do %>
<li><%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %></li>
<%= if_administrator(:li) do %>
<%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %>
<% end %>
</ul>
</div>

4
app/views/diary_entry/comments.html.erb
View file

@ -13,7 +13,7 @@
<tr class="<%= cl %>">
<td width="25%"><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td>
<td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>
<td width="50%"><%= comment.body.to_html %></td>
<td width="50%" class="richtext"><%= comment.body.to_html %></td>
</tr>
<% end -%>
</table>
@ -21,4 +21,4 @@
<ul class='secondary-actions clearfix'>
<li><%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %></li>
<li><%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></li>
</ul>
</ul>

2
app/views/geocoder/results.html.erb
View file

@ -3,7 +3,7 @@
<% else %>
<ul class='results-list'>
<% @results.each do |result| %>
<li><p class="inner12 search_results_entry deemphasize"><%= result_to_html(result) %></p></li>
<li><p class="inner12 search_results_entry"><%= result_to_html(result) %></p></li>
<% end %>
</ul>
<% if @more_params %>

2
app/views/layouts/site.html.erb
View file

@ -100,7 +100,7 @@
:title => t('layouts.view_tooltip'),
:class => 'geolink llz layers'
} %></li>
<li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, {
<li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▼", :class => "menuicon"), edit_path, {
:id => 'editanchor',
:title => t('javascripts.site.edit_tooltip'),
:data => { :minzoom => 13, :editor => preferred_editor },

16
app/views/layouts/slim.html.erb
View file

@ -1,17 +1,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>">
<%= render :partial => "layouts/head" %>
<body class="slim">
<div id="slim_container">
<div id="slim_container_content">
<div id="slim_header">
<h1><%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %></h1>
</div>
<div id="slim_content">
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
<%= yield %>
</div>
<% if content_for? :heading %>
<div class="content-heading">
<%= yield :heading %>
</div>
<% end %>
<div id="slim_header">
<h1><%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %></h1>
<%= yield %>
</div>
</div>
</div>

6
app/views/message/read.html.erb
View file

@ -13,7 +13,7 @@
</div>
</div>
<%= @message.body.to_html %></td>
<div class="richtext"><%= @message.body.to_html %></div>
<%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
@ -29,8 +29,8 @@
</div>
</div>
<%= @message.body.to_html %></td>
<div class="richtext"><%= @message.body.to_html %></div>
<%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
<% end %>
<% end %>

2
app/views/redactions/show.html.erb
View file

@ -7,7 +7,7 @@
<b><%= t 'redaction.show.user' %></b>
<%= link_to(@redaction.user.display_name, {:controller => 'user', :action => 'view', :display_name => @redaction.user.display_name}) %>
</p>
<p>
<p class="richtext">
<b><%= t 'redaction.show.description' %></b>
<%= @redaction.description.to_html %>
</p>

2
app/views/trace/_trace.html.erb
View file

@ -20,7 +20,7 @@
<%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %>
<span class="trace_<%= trace.visibility %>"><%= t('trace.trace.' + trace.visibility) %></span>
<br />
<%= t('trace.list.description') %>
<%= trace.description %>
<br />
<%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
<% if !trace.tags.empty? %>

14
app/views/trace/list.html.erb
View file

@ -26,11 +26,15 @@
<%= render :partial => 'trace_paging_nav' %>
<table id="trace_list" cellpadding="3">
<tr>
<th></th>
<th></th>
</tr>
<%= render :partial => 'trace', :collection => @traces unless @traces.nil? %>
<thead>
<tr>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
<%= render :partial => 'trace', :collection => @traces unless @traces.nil? %>
</tbody>
</table>
<%= render :partial => 'trace_paging_nav' %>

24
app/views/user/_contact.html.erb
View file

@ -1,15 +1,13 @@
<div class='contact-activity clearfix'>
<%
user_data = {
:lon => contact.home_lon,
:lat => contact.home_lat,
:icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
:description => render(:partial => "popup", :object => contact, :locals => {:type => type})
}
%>
<%= content_tag "td", :rowspan => 3, :data => {:user => user_data} do %>
<%= user_thumbnail contact %>
<% end %>
<%
user_data = {
:lon => contact.home_lon,
:lat => contact.home_lat,
:icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
:description => render(:partial => "popup", :object => contact, :locals => {:type => type})
}
%>
<%= content_tag :div, :class => "contact-activity clearfix", :data => {:user => user_data} do %>
<%= user_thumbnail contact %>
<div class='activity-details'>
<p class='deemphasize'>
<%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %>
@ -47,4 +45,4 @@
</li>
</ul>
</div>
</div>
<% end %>

2
app/views/user/_user.html.erb
View file

@ -19,7 +19,7 @@
%>
<% end %>
</p>
<%= user.description.to_html %>
<div class="richtext"><%= user.description.to_html %></div>
</td>
<td>
<%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>

6
app/views/user/login.html.erb
View file

@ -10,8 +10,8 @@
<p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
<table id="loginForm">
<tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %></td></tr>
<tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field_tag "password", "", :size => 28, :maxlength => 255, :tabindex => 2 %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
<tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %></td></tr>
<tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
<tr>
<td></td>
<td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
@ -43,7 +43,7 @@
<%= raw t 'user.login.openid', :logo => openid_logo %>
</td>
<td>
<%= url_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
<%= url_field_tag("openid_url", "", { :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
<span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
</td>
</tr>

2
app/views/user/view.html.erb
View file

@ -152,7 +152,7 @@
</p>
</div>
<div class='user-description'><%= @this_user.description.to_html %></div>
<div class="user-description richtext"><%= @this_user.description.to_html %></div>
</div>

2
app/views/user_blocks/show.html.erb
View file

@ -33,4 +33,4 @@
<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
<p><b><%= t'user_block.show.reason' %></b></p>
<%= @user_block.reason.to_html %>
<div class="richtext"><%= @user_block.reason.to_html %></div>