Skip to content
Browse files

Added all Roses art

  • Loading branch information...
1 parent fce5cf8 commit 6cdc4bffbc71631462754879426ee6e14c2f215a @WiseMaestro committed Aug 24, 2011
Showing with 19 additions and 8 deletions.
  1. +2 −2 app/models/work.rb
  2. +2 −2 app/views/works/_form.html.erb
  3. +2 −2 app/views/works/show.html.erb
  4. +13 −2 public/stylesheets/style.css
  5. BIN public/system/photos/10/index/1. Belvedere (General Use)file.jpg
  6. BIN public/system/photos/10/original/1. Belvedere (General Use)file.jpg
  7. BIN public/system/photos/10/thumb/1. Belvedere (General Use)file.jpg
  8. BIN public/system/photos/11/index/2. Belvedere Railway Stationfile.jpg
  9. BIN public/system/photos/11/original/2. Belvedere Railway Stationfile.jpg
  10. BIN public/system/photos/11/thumb/2. Belvedere Railway Stationfile.jpg
  11. BIN public/system/photos/12/index/3. belvederebarfile.jpg
  12. BIN public/system/photos/12/original/3. belvederebarfile.jpg
  13. BIN public/system/photos/12/thumb/3. belvederebarfile.jpg
  14. BIN public/system/photos/13/index/4. belvederecaliforniafile.jpg
  15. BIN public/system/photos/13/original/4. belvederecaliforniafile.jpg
  16. BIN public/system/photos/13/thumb/4. belvederecaliforniafile.jpg
  17. BIN public/system/photos/14/index/5. Belvederedisambigfile.jpg
  18. BIN public/system/photos/14/original/5. Belvederedisambigfile.jpg
  19. BIN public/system/photos/14/thumb/5. Belvederedisambigfile.jpg
  20. BIN public/system/photos/15/index/6. BelvedereFCfile.jpg
  21. BIN public/system/photos/15/original/6. BelvedereFCfile.jpg
  22. BIN public/system/photos/15/thumb/6. BelvedereFCfile.jpg
  23. BIN public/system/photos/16/index/7. Belvederefictionalbldgsfile.jpg
  24. BIN public/system/photos/16/original/7. Belvederefictionalbldgsfile.jpg
  25. BIN public/system/photos/16/thumb/7. Belvederefictionalbldgsfile.jpg
  26. BIN public/system/photos/17/index/8. BelvedereRecordsfile.jpg
  27. BIN public/system/photos/17/original/8. BelvedereRecordsfile.jpg
  28. BIN public/system/photos/17/thumb/8. BelvedereRecordsfile.jpg
  29. BIN public/system/photos/18/index/9. belvidere (disambiguity) detailfile.jpg
  30. BIN public/system/photos/18/original/9. belvidere (disambiguity) detailfile.jpg
  31. BIN public/system/photos/18/thumb/9. belvidere (disambiguity) detailfile.jpg
  32. BIN public/system/photos/19/index/10. Cortiledelbelvederefile.jpg
  33. BIN public/system/photos/19/original/10. Cortiledelbelvederefile.jpg
  34. BIN public/system/photos/19/thumb/10. Cortiledelbelvederefile.jpg
  35. BIN public/system/photos/20/index/11. full installationfile.jpg
  36. BIN public/system/photos/20/original/11. full installationfile.jpg
  37. BIN public/system/photos/20/thumb/11. full installationfile.jpg
  38. BIN public/system/photos/21/index/12. untitledfile.jpg
  39. BIN public/system/photos/21/original/12. untitledfile.jpg
  40. BIN public/system/photos/21/thumb/12. untitledfile.jpg
  41. BIN public/system/photos/22/index/13. untitledfile.jpg
  42. BIN public/system/photos/22/original/13. untitledfile.jpg
  43. BIN public/system/photos/22/thumb/13. untitledfile.jpg
  44. BIN public/system/photos/23/index/14. untitled (sold)file.jpg
  45. BIN public/system/photos/23/original/14. untitled (sold)file.jpg
  46. BIN public/system/photos/23/thumb/14. untitled (sold)file.jpg
  47. BIN public/system/photos/24/index/15. detail Belvedere (General Use)file.JPG
  48. BIN public/system/photos/24/original/15. detail Belvedere (General Use)file.JPG
  49. BIN public/system/photos/24/thumb/15. detail Belvedere (General Use)file.JPG
  50. BIN public/system/photos/25/index/16. detail Belvedere FC file.JPG
  51. BIN public/system/photos/25/original/16. detail Belvedere FC file.JPG
  52. BIN public/system/photos/25/thumb/16. detail Belvedere FC file.JPG
  53. BIN public/system/photos/26/index/17. plymouthbelvedere (sold)file.jpg
  54. BIN public/system/photos/26/original/17. plymouthbelvedere (sold)file.jpg
  55. BIN public/system/photos/26/thumb/17. plymouthbelvedere (sold)file.jpg
View
4 app/models/work.rb
@@ -9,13 +9,13 @@ class Work < ActiveRecord::Base
validates_attachment_content_type :photo, :content_type=>['image/jpeg', 'image/png', 'image/gif']
validates_attachment_size :photo, :less_than=>1.megabyte
- validates :sizex, :presence => true, :numericality => { :greater_than => 100, :less_than_or_equal_to => 500}
+ validates :sizex, :presence => true, :numericality => { :greater_than => 100, :less_than_or_equal_to => 800}
validates :sizey, :presence => true, :numericality => { :greater_than => 100, :less_than_or_equal_to => 800}
validates :name, :presence => true, :length => {:minimum => 1, :maximum => 200}
validates :artist_id, :numericality => true
validates_presence_of :artist
validates :status, :presence => true, :length => {:minimum => 3, :maximum => 200}
validates :medium, :presence => true, :length => {:minimum => 3, :maximum => 200}
validates :size, :presence => true, :length => {:minimum => 3, :maximum => 200}
- validates :date, :presence => true, :length => {:minimum => 10, :maximum => 200}
+ validates :date, :presence => true, :length => {:minimum => 4, :maximum => 200}
end
View
4 app/views/works/_form.html.erb
@@ -21,7 +21,7 @@
<%= f.text_field :name %>
</div>
<div class="field">
- <%= f.label :artist_id %><br />
+ <%= f.label :artist_id, "Artist ID: Click on yourself under artists and look in url" %><br />
<%= f.text_field :artist_id %>
</div>
<div class="field">
@@ -41,7 +41,7 @@
<%= f.text_field :date %>
</div>
<div class="field">
- <%= f.label :price %><br />
+ <%= f.label :price, "Price: Dollars" %><br />
<%= f.text_field :price %>
</div>
<div class="field">
View
4 app/views/works/show.html.erb
@@ -24,12 +24,12 @@
<b>Status:</b>
<%= @work.status %>
<br />
- <b>Price:</b>
+ <b>Price (US Dollars):</b>
<%= @work.price %>
<br />
<b>Seller:</b>
<%= @work.seller %>
-
+<br />
<!-- <%= link_to 'Edit', edit_work_path(@work) %> | -->
<%= link_to 'Back', works_path %>
View
15 public/stylesheets/style.css
@@ -192,7 +192,7 @@
table.out
{
margin-top: 0px;
- margin-left: 125px;
+ margin-left: 230px;
width: 600px;
height: 400px;
}
@@ -207,20 +207,31 @@ th.outer{
}
table.nested, table.nested, td, th
{
+ display: inline-block;
+ margin-left: auto;
+ margin-right: auto;
+
/* background-color: #EEC591; */
/* border: 0px; */
/* border-collapse: collapse; */
}
td.inner
{
+ margin-left: auto;
+ margin-right: auto;
+ padding: 10px 10px 10px 10px;
+
width: 200px;
}
td.inner div
{
+ margin-left: auto;
+ margin-right: auto;
+ padding: 10px 10px 10px 10px;
-webkit-transition: -webkit-transform 1.5s;
-moz-transition: -moz-transform 1.5s;
-o-transition: -o-transform 1.5s;
@@ -451,7 +462,7 @@ width: 1000px;
#ArtPic{
float: left;
margin-left: 60px;
- padding-top: 30px;
+ padding-top: 90px;
}
#biolist{
margin-top: 60px;
View
BIN public/system/photos/10/index/1. Belvedere (General Use)file.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/10/original/1. Belvedere (General Use)file.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/10/thumb/1. Belvedere (General Use)file.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/11/index/2. Belvedere Railway Stationfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/11/original/2. Belvedere Railway Stationfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/11/thumb/2. Belvedere Railway Stationfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/12/index/3. belvederebarfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/12/original/3. belvederebarfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/12/thumb/3. belvederebarfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/13/index/4. belvederecaliforniafile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/13/original/4. belvederecaliforniafile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/13/thumb/4. belvederecaliforniafile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/14/index/5. Belvederedisambigfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/14/original/5. Belvederedisambigfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/14/thumb/5. Belvederedisambigfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/15/index/6. BelvedereFCfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/15/original/6. BelvedereFCfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/15/thumb/6. BelvedereFCfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/16/index/7. Belvederefictionalbldgsfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/16/original/7. Belvederefictionalbldgsfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/16/thumb/7. Belvederefictionalbldgsfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/17/index/8. BelvedereRecordsfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/17/original/8. BelvedereRecordsfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/17/thumb/8. BelvedereRecordsfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/18/index/9. belvidere (disambiguity) detailfile.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/system/photos/18/original/9. belvidere (disambiguity) detailfile.jpg
Diff not rendered.
View
BIN public/system/photos/18/thumb/9. belvidere (disambiguity) detailfile.jpg
Diff not rendered.
View
BIN public/system/photos/19/index/10. Cortiledelbelvederefile.jpg
Diff not rendered.
View
BIN public/system/photos/19/original/10. Cortiledelbelvederefile.jpg
Diff not rendered.
View
BIN public/system/photos/19/thumb/10. Cortiledelbelvederefile.jpg
Diff not rendered.
View
BIN public/system/photos/20/index/11. full installationfile.jpg
Diff not rendered.
View
BIN public/system/photos/20/original/11. full installationfile.jpg
Diff not rendered.
View
BIN public/system/photos/20/thumb/11. full installationfile.jpg
Diff not rendered.
View
BIN public/system/photos/21/index/12. untitledfile.jpg
Diff not rendered.
View
BIN public/system/photos/21/original/12. untitledfile.jpg
Diff not rendered.
View
BIN public/system/photos/21/thumb/12. untitledfile.jpg
Diff not rendered.
View
BIN public/system/photos/22/index/13. untitledfile.jpg
Diff not rendered.
View
BIN public/system/photos/22/original/13. untitledfile.jpg
Diff not rendered.
View
BIN public/system/photos/22/thumb/13. untitledfile.jpg
Diff not rendered.
View
BIN public/system/photos/23/index/14. untitled (sold)file.jpg
Diff not rendered.
View
BIN public/system/photos/23/original/14. untitled (sold)file.jpg
Diff not rendered.
View
BIN public/system/photos/23/thumb/14. untitled (sold)file.jpg
Diff not rendered.
View
BIN public/system/photos/24/index/15. detail Belvedere (General Use)file.JPG
Diff not rendered.
View
BIN public/system/photos/24/original/15. detail Belvedere (General Use)file.JPG
Diff not rendered.
View
BIN public/system/photos/24/thumb/15. detail Belvedere (General Use)file.JPG
Diff not rendered.
View
BIN public/system/photos/25/index/16. detail Belvedere FC file.JPG
Diff not rendered.
View
BIN public/system/photos/25/original/16. detail Belvedere FC file.JPG
Diff not rendered.
View
BIN public/system/photos/25/thumb/16. detail Belvedere FC file.JPG
Diff not rendered.
View
BIN public/system/photos/26/index/17. plymouthbelvedere (sold)file.jpg
Diff not rendered.
View
BIN public/system/photos/26/original/17. plymouthbelvedere (sold)file.jpg
Diff not rendered.
View
BIN public/system/photos/26/thumb/17. plymouthbelvedere (sold)file.jpg
Diff not rendered.

0 comments on commit 6cdc4bf

Please sign in to comment.
Something went wrong with that request. Please try again.