Commit 2d2a29ff

mo k <m@mokhan.ca>
2011-09-17 16:28:16
fix add creation page. it looks like the page wasn't properly merged and checked in.
master
1 parent 32ca9f0
Changed files (2)
app
views
creations
_form.html.erb
layouts
application.html.erb
app/views/creations/_form.html.erb
@@ -23,22 +23,15 @@
     
     <%= f.label :remote_image_url, "Or Image URL", 'data-editable' => 'false'  %>
     <%= f.text_field :remote_image_url, :class => "forms", 'data-editable' => 'false'  %>
-<<<<<<< HEAD
-    
-=======
-        </td>
-      </tr>
-    </table>
+
     <% for category in Category.all %>
     <div>
       <%= check_box_tag "creation[category_ids][]", category.id, @creation.categories.include?(category) %>
       <%= category.name %>
     </div>
     <% end %>
->>>>>>> 14662b4931b60767612fd42baeef7c21e83a80d4
     <%= f.label :story %>
     <%= f.text_area :story, :class => "forms"  %>
-	<label></label>
     <input type="image" id="submit" name="submit" src="/images/template/button_submit.gif" title="Submit Message" />
   </fieldset>
 <% end %>
app/views/layouts/application.html.erb
@@ -77,7 +77,6 @@
               <% end %>
 							</ul>
 						</li>
-						<li class="level_1"><span class="fright"><img src="assets/arx/icon-no-red.png" /></span><a href="">Finalize</a></li>
 					</ul>
 				</div><!-- /.menu -->
 			</div>
@@ -223,7 +222,7 @@
 				<h3>Quick Links</h3>
 				<ul class="nojot">
           <li><a href="/privacy.html">Privacy Policy</a></li>
-					<li><a href="">Terms and Conditions</a></li>
+					<li><a href="/terms.html">Terms and Conditions</a></li>
 				</ul>
 			</div>
 		</div>