Permalink
Browse files

Update bio, copyright

  • Loading branch information...
1 parent eb0bfe7 commit a6d0aed282b0817c4f2bcb546bd51112407ae2ff @dcbriccetti committed Feb 14, 2010
Showing with 22 additions and 10 deletions.
  1. +13 −6 README.md
  2. +4 −2 src/main/scala/birdshow/model/flickr/FlickrUser.scala
  3. +4 −1 src/main/webapp/about.html
  4. +1 −1 src/main/webapp/galleries.html
View
19 README.md
@@ -8,17 +8,24 @@ Sample Flickr results:
flickr.photosets.getList
<photosets>
- <photoset videos="0" photos="8" farm="3" server="2496" secret="8d139755e9" primary="4066356073" id="72157622981109326">
+ <photoset videos="0" photos="8" farm="3" server="2496"
+ secret="8d139755e9" primary="4066356073" id="72157622981109326">
<title>Home</title>
<description></description>
</photoset>
</photosets>
flickr.photosets.getPhotos
-<photoset total="4" pages="1" perpage="500" per_page="500" page="1" ownername="Eleanor Briccetti" owner="57485651@N00" primary="4069502958" id="72157622856302615">
- <photo isprimary="1" title="Africa" farm="3" server="2480" secret="f75a5c4289" id="4069502958"></photo>
- <photo isprimary="0" title="Galapagos Islands" farm="2" server="1104" secret="a40aa41dfc" id="707890860"></photo>
- <photo isprimary="0" title="Birds" farm="3" server="2157" secret="46a5b04bf8" id="1544234263"></photo>
- <photo isprimary="0" title="Antarctica" farm="3" server="2499" secret="9037025f04" id="4075313703"></photo>
+<photoset total="4" pages="1" perpage="500" per_page="500" page="1"
+ ownername="Eleanor Briccetti" owner="57485651@N00" primary="4069502958"
+ id="72157622856302615">
+ <photo isprimary="1" title="Africa" farm="3" server="2480"
+ secret="f75a5c4289" id="4069502958"></photo>
+ <photo isprimary="0" title="Galapagos Islands" farm="2" server="1104"
+ secret="a40aa41dfc" id="707890860"></photo>
+ <photo isprimary="0" title="Birds" farm="3" server="2157"
+ secret="46a5b04bf8" id="1544234263"></photo>
+ <photo isprimary="0" title="Antarctica" farm="3" server="2499"
+ secret="9037025f04" id="4075313703"></photo>
</photoset>
View
6 src/main/scala/birdshow/model/flickr/FlickrUser.scala
@@ -6,7 +6,8 @@ import java.util.Date
/**
* A Flickr user, upon which an instance of this application is based. In a future
- * version, multiple instances will be supported.
+ * version, multiple instances will be supported. Contains all the relevant
+ * photo information for the user, from Flickr.
*/
case class FlickrUser(val userName: String, val topCollectionTitle: String,
val homeSetTitle: String, val showSetTitle: String) {
@@ -37,7 +38,8 @@ case class FlickrUser(val userName: String, val topCollectionTitle: String,
Flickr.getFromFlickr("collections.getTree&user_id=" + userId) \\ "collection"
val topCollectionSetIds: Seq[String] = ((collections filter (
- c => (c \ "@title") == topCollectionTitle)) \\ "set").map(set => (set \ "@id").text)
+ c => (c \ "@title") == topCollectionTitle)) \\ "set").
+ map(set => (set \ "@id").text)
allPhotoSets = (Flickr.getFromFlickr("photosets.getList&user_id=" + userId) \
"photosets" \ "photoset").map(PhotoSet.apply)
View
5 src/main/webapp/about.html
@@ -30,6 +30,7 @@
<li>Sea Ranch Lodge and Gualala Arts Center on the Northern California coast</li>
<li>Several Bay Area locations:</li>
<ul>
+ <li>Bocanova Restaurant</li>
<li>Albany Arts Gallery</li>
<li>Berkeley Store Gallery</li>
<li>Los Medanos College</li>
@@ -40,6 +41,7 @@
<p>She is a member of Bay Area Bird Photographers and North American Nature Photographers Association.
Publications include:</p>
<ul>
+ <li><em>National Audubon Magazine</em></li>
<li><em>Birder’s World</em></li>
<li><em>Wildlife Refuge Magazine</em></li>
<li><em>American Bird Conservancy Magazine</em></li>
@@ -59,7 +61,8 @@
2003 <em>Birder’s World</em> photo contest, and won 2nd place in the international category of
<em>Wildbird</em>’s 2005 photo contest. Eleanor was a winner in the North American Nature
Photographers Association Member Showcase competition, and her image will be published
- in the Association’s 2010 <em>Expressions</em> magazine.</p>
+ in the Association’s 2010 <em>Expressions</em> magazine. She also won a photography award in National
+ Audubon Society’s first-ever photo competition.</p>
</lift:surround>
View
2 src/main/webapp/galleries.html
@@ -38,7 +38,7 @@
</table>
</lift:Galleries.showGalleries>
- <div2009 Eleanor Briccetti</div>
+ <div2010 Eleanor Briccetti</div>
</lift:surround>

0 comments on commit a6d0aed

Please sign in to comment.