Merge branch 'master' of https://github.com/cimbriano/pennphoto

cimbriano · Dec 19, 2011 · 6c823b3 · 6c823b3
2 parents da5b1e1 + 937f002
commit 6c823b3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/WebContent/importXML.jsp b/WebContent/importXML.jsp
@@ -0,0 +1,13 @@
+<%@ page import=" edu.pennphoto.etl.Importer" %>
+
+<jsp:include page="partials/html-head.jsp" />
+
+
+
+	<div id="content">
+
+		<div id="all-friends"><% Importer.main(null); %></div>
+
+	</div><!-- #content -->
+
+	<jsp:include page="partials/footer.jsp" />
diff --git a/WebContent/styles.css b/WebContent/styles.css
@@ -335,33 +335,39 @@ ul.rating li{
 }
 
 .activity-feed-item{
-	width: 90%;
+	width: 95%;
 
 	margin: 10px;
 	float: left;
 
-	background: yellow;
+	border: 1px dashed;
+	border-radius: 5px;
 }
 
 #activity-feed .img-wrap {
 	height: 50px;
 	width: 50px;
     display: table-cell;
     vertical-align: middle;
-    background: white;
     float: left;
 }
 
 #activity-feed img{
 	max-height: 100%;
-	max-width: 100%;
+	max-width: 150%;
 	margin-left: auto;
 	margin-right: auto;
 	margin-top: auto;
 	margin-bottom: auto;
 	vertical-align: middle;
 	display: block;
 }
+
+.activity-desc{
+	float: right;
+    width: 70%;
+    padding-right: 5px;
+}
 
 #friendship-browser{
 	background: red;
@@ -433,4 +439,4 @@ p {
 .profile-field-name{
 	font-weight: bold;
 	padding: 5px 10px;
-}
+}
diff --git a/src/edu/pennphoto/etl/Importer.java b/src/edu/pennphoto/etl/Importer.java
@@ -81,7 +81,7 @@ public class Importer {
 	private static final String STATE_17 = "tns:state";
 	private static final String ZIP_17 = "tns:zip_code";
 
-	private static final int[] GROUP_IDS = {17};
+	private static final int[] GROUP_IDS = {8, 11, 12, 17};
 
 	private static HashMap<Integer, User> _users;
 	private static ArrayList<Photo> _photos;
@@ -136,7 +136,6 @@ private static void parseXML(String filename){
 			storeUsers();
 			storePhotos();
 			storeCircles(); 
-
 			storeTagsAndRatings();