layout 'site', :except => :rss
before_filter :authorize_web
- before_filter :require_user, :only => [:new]
+ before_filter :require_user, :only => [:new, :edit]
before_filter :check_database_availability
def new
end
end
+ def edit
+ @title= 'edit diary entry'
+ @diary_entry = DiaryEntry.find(params[:id])
+ if @user != @diary_entry.user
+ redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
+ end
+ if params[:diary_entry]
+ @diary_entry.title = params[:diary_entry][:title]
+ @diary_entry.body = params[:diary_entry][:body]
+ @diary_entry.latitude = params[:diary_entry][:latitude]
+ @diary_entry.longitude = params[:diary_entry][:longitude]
+ if @diary_entry.save
+ redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
+ end
+ end
+ end
+
def comment
@entry = DiaryEntry.find(params[:id])
@diary_comment = @entry.diary_comments.build(params[:diary_comment])
<% if diary_entry.latitude and diary_entry.longitude %>
Coordinates: <div class="geo" style="display: inline"><span class="latitude"><%= diary_entry.latitude %></span>; <span class="longitude"><%= diary_entry.longitude %></span></div> (<%=link_to 'map', :controller => 'site', :action => 'index', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %> / <%=link_to 'edit', :controller => 'site', :action => 'edit', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %>)<br/>
<% end %>
-Posted by <b><%= link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name %></b> at <%= diary_entry.created_at %><br />
+Posted by <b><%= link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name %></b> at <%= diary_entry.created_at %>
<% if params[:action] == 'list' %>
+<br />
<%= link_to 'Comment on this entry', :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>
|
<%= link_to 'Reply to this entry', :controller => 'message', :action => 'new', :user_id => diary_entry.user.id, :title => "Re: #{diary_entry.title}" %>
|
<%= link_to pluralize(diary_entry.diary_comments.count, "comment"), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %>
<% end %>
+<% if @user == diary_entry.user %>
+| <%= link_to 'Edit this entry', :action => 'edit', :display_name => @user.display_name, :id => diary_entry.id %>
+<% end %>
<br />
<hr />
--- /dev/null
+<%= error_messages_for 'diary_entry' %>
+
+<% form_for :diary_entry do |f| %>
+ <table>
+ <tr valign="top">
+ <th>Subject</th>
+ <td><%= f.text_field :title, :size => 60 %></td>
+ </tr>
+ <tr valign="top">
+ <th>Body</th>
+ <td><%= f.text_area :body, :cols => 80 %></td>
+ </tr>
+ <tr valign="top">
+ <th>Location</th>
+ <td>
+ <div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 400px; display: none;"></div>
+ <span class="location">Latitude: <%= f.text_field :latitude, :size => 20, :id => "latitude" %> Longitude: <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span>
+ <a href="javascript:openMap()" id="usemap">use map</a>
+ </td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><%= submit_tag 'Save' %></td>
+ </tr>
+ </table>
+<% end %>
+
+<% if @user.home_lat.nil? or @user.home_lon.nil? %>
+ <% lon = h(params['lon'] || '-0.1') %>
+ <% lat = h(params['lat'] || '51.5') %>
+ <% zoom = h(params['zoom'] || '4') %>
+<% else %>
+ <% lon = @user.home_lon %>
+ <% lat = @user.home_lat %>
+ <% zoom = '12' %>
+<% end %>
+
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'map.js' %>
+
+<script type="text/javascript">
+ <!--
+ var marker;
+
+ function init() {
+ var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
+ var zoom = <%= zoom %>;
+
+ var map = createMap("map");
+
+ setMapCenter(centre, zoom);
+
+ map.events.register("click", map, setLocation);
+ }
+
+ function setLocation( e ) {
+ closeMapPopup();
+
+ var lonlat = getEventPosition(e);
+
+ document.getElementById('latitude').value = lonlat.lat;
+ document.getElementById('longitude').value = lonlat.lon;
+
+ if (marker) {
+ removeMarkerFromMap(marker);
+ }
+
+ marker = addMarkerToMap(lonlat, null, "Diary entry location");
+ }
+
+ function openMap() {
+ $("map").style.display = "block";
+ $("usemap").style.display = "none";
+ }
+
+ window.onload = init;
+// -->
+</script>
map.connect '/user/:display_name/diary/:id/newcomment', :controller => 'diary_entry', :action => 'comment', :id => /\d+/
map.connect '/user/:display_name/diary/rss', :controller => 'diary_entry', :action => 'rss'
map.connect '/user/:display_name/diary/newpost', :controller => 'diary_entry', :action => 'new'
+ map.connect '/user/:display_name/diary/:id/edit', :controller => 'diary_entry', :action => 'edit', :id => /\d+/
map.connect '/user/:display_name/account', :controller => 'user', :action => 'account'
map.connect '/user/:display_name/set_home', :controller => 'user', :action => 'set_home'
map.connect '/diary', :controller => 'diary_entry', :action => 'list'