Permalink
Browse files

Merge branch 'master' of git@github.com:railsrumble/teamwnn

  • Loading branch information...
2 parents 249cd66 + 4af7fbf commit 55316f4e0f5bd9ca94d3e1565fc8e316a3e8030a @kellishaver kellishaver committed Oct 19, 2008
Showing with 2 additions and 2 deletions.
  1. +1 −1 app/views/palettes/index.html.erb
  2. +1 −1 app/views/welcome/tour.html.erb
@@ -7,7 +7,7 @@
if current_project.palettes.count > 0
for palette in current_project.palettes %>
<li class="<%= cycle('normal', 'alt') %>">
- <%= link_to h(palette.name), edit_project_palette_path(project_param, palette) %> <span class="date">(<%= palette.created_at.strftime("%b, %d %Y at %I:%M %p") %>)</span>
+ <%= link_to_if owner?, h(palette.name), edit_project_palette_path(project_param, palette) %> <span class="date">(<%= palette.created_at.strftime("%b, %d %Y at %I:%M %p") %>)</span>
<div id="palette_small">
<% for swatch in palette.color_swatches %>
<div class="small_swatch" style="background:<%= swatch.hex %>"></div>
@@ -4,7 +4,7 @@
There's a lot going on behind the scenes at <strong>MyIdeaDrawer</strong>. If you'd like to take a closer look, we've set up a few sample projects that you can view, via their sharing URL.
</p>
<ul class="linklist">
- <li style="border:none;"><a href=/12FV9eQ83a">Bedroom Remodel</a> - A sample bedroom remodeling project.</li>
+ <li style="border:none;"><a href="/12FV9eQ83a">Bedroom Remodel</a> - A sample bedroom remodeling project.</li>
<li style="border:none;"><a href="/fkxc7VaHkm">Railscasts</a> - The Railscasts design project.</li>
<li style="border:none;"><a href="/EdtBE9Foje">DesignMagus</a> - The DesignMagus design project..</li>
</ul>

0 comments on commit 55316f4

Please sign in to comment.