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

cosmetic tweaks to diary interface. icon for new entries link

Browse source
This commit is contained in:
Harry Wood 2008-11-24 00:40:04 +00:00
parent 783528830a
commit 152cb13a02
4 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/views/diary_entry/edit.rhtml
View file

@ -5,24 +5,28 @@
<% form_for :diary_entry do |f| %> <% form_for :diary_entry do |f| %>
<table> <table>
<tr valign="top"> <tr valign="top">
<th>Subject</th> <td class="fieldName">Subject:</td>
<td><%= f.text_field :title, :size => 60 %></td> <td><%= f.text_field :title, :size => 60 %></td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<th>Body</th> <td class="fieldName">Body:</td>
<td><%= f.text_area :body, :cols => 80 %></td> <td><%= f.text_area :body, :cols => 80 %></td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<th>Location</th> <td class="fieldName">Location:</td>
<td> <td>
<div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 400px; display: none;"></div> <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> <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> <a href="javascript:openMap()" id="usemap">use map</a>
<br/><br/>
</td> </td>
</tr> </tr>
<tr> <tr>
<th></th> <td></td>
<td><%= submit_tag 'Save' %></td> <td>
<%= submit_tag 'Save' %>
<%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
</td>
</tr> </tr>
</table> </table>
<% end %> <% end %>

33
app/views/diary_entry/list.rhtml
View file

@ -4,29 +4,40 @@
<%= image_tag url_for_file_column(@this_user, "image") %> <%= image_tag url_for_file_column(@this_user, "image") %>
<% end %> <% end %>
<br />
<% if @this_user %> <% if @this_user %>
<% if @user == @this_user %> <% if @user == @this_user %>
<%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> <%= link_to image_tag("new.png", :border=>0) + 'New diary entry', {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => 'Compose a new entry in your user diary'} %>
<% end %> <% end %>
<% else %> <% else %>
<% if @user %> <% if @user %>
<%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> <%= link_to image_tag("new.png", :border=>0) + 'New diary entry', {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => 'Compose a new entry in your user diary'} %>
<% end %> <% end %>
<% end %> <% end %>
<h3>Recent diary entries:</h3>
<%= render :partial => 'diary_entry', :collection => @entries %> <% if @entries.empty? %>
<p>No diary entries</p>
<%= link_to "Older Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %> <% else %>
<% if @entry_pages.current.next and @entry_pages.current.previous %>
| <p>Recent diary entries:</p>
<hr />
<%= render :partial => 'diary_entry', :collection => @entries %>
<%= link_to "Older Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %>
<% if @entry_pages.current.next and @entry_pages.current.previous %>
|
<% end %>
<%= link_to "Newer Entries", { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
<br />
<% end %> <% end %>
<%= link_to "Newer Entries", { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
<br />
<%= rss_link_to :action => 'rss' %> <%= rss_link_to :action => 'rss' %>
<%= auto_discovery_link_tag :atom, :action => 'rss' %> <%= auto_discovery_link_tag :atom, :action => 'rss' %>
<br />
<br />

BIN
public/images/new.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 991 B

6
public/stylesheets/site.css
View file

@ -277,6 +277,12 @@ hides rule from IE5-Mac \*/
font-size: 10px; font-size: 10px;
} }
hr {
border: none;
background-color: #ccc;
color: #ccc;
height: 1px;
}
.gpxsummary { .gpxsummary {
font-size: 12px; font-size: 12px;