index.jsp improvements

meetuparchive · Jul 8, 2010 · 9f5f7a1 · 9f5f7a1
1 parent f7ff8a8
commit 9f5f7a1
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 28 deletions.
diff --git a/war/css/meetupnow.css b/war/css/meetupnow.css
@@ -196,6 +196,10 @@ body {
 	#map_canvasContainerLeft {
 		width: 469px;
 		height: 264px;
+	}
+	#map_canvasContainerMain {
+		width: 726px;
+		height: 204px;
 	}
 		#map_canvas {
 			clear:both;
@@ -538,31 +542,34 @@ body {
 	}
 	#action {
 		position: relative;
-		//float: right;
-		width: 170px;
-		margin: 0 auto;
+		margin-bottom: 12px;
 	}
 	.btn_main {
-		color: #fff;
-		font-size: 1.4em;
+		color: #fff !important;
+		font-size: 1.2em;
 		font-weight: bold;
+		text-decoration: none !important;
 		display: block;
-		padding: 8px 10px;
+		padding: 4px 6px;
 		background-image: -webkit-gradient(linear, 0% 100%, 0% 0%, from(#A8252E), to(#CA3E47));
 		background-image: -moz-linear-gradient(center top , #CA3E47, #A8252E);
-		width: 150px;
+		width: 120px;
 		text-align: center;
 		border: 2px solid #A8252E;
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
 	#action span {
-		margin-bottom: 1em;
+		//margin-bottom: 1em;
 	}
 	#action a {
 		text-decoration: none;
 	}
+	#actionBtns {
+		height: 28px;
+		//margin-bottom: 12px;
+	}
 /*#contentLeft a:link,
 #contentLeft a:visited,
 #contentLeft a:hover {

diff --git a/war/index.jsp b/war/index.jsp
@@ -16,6 +16,7 @@
 	<title>MeetupNOW</title>
 	<link rel="stylesheet" href="css/reset.css" type="text/css" />
 	<link rel="stylesheet" href="css/meetupnow.css" type="text/css" />
+	<link rel="stylesheet" type="text/css" media="all" href="css/grids.css">
 	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 	<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
 	<script type="text/javascript" src="/js/index.js"></script>
@@ -240,29 +241,42 @@ if (!searchresults){
 
 <%//@ include file="jsp/ticker.jsp" %>
 <div id="main">
-	<div id="contentTop">
-		<div id="contentTopBody">
+	<div id="contentBottom">
+		<div id="contentBottomBody">
+			<div id="action">
+			
+			<% if(k.equals("empty")) { %>
+			
 			<span class="title">Get Started.</span>
 			<div id="actionDesc">
 				<span class="heading">MeetupNow is a site built so that you can find events happening locally, and happening soon. Nothing going on near you? No problem, just start something yourself, and people nearby will hear about it. Now go out and do something.</span>
 			</div> <!-- end #actionDesc -->
-		</div><!-- end contentTopBody -->
-	</div><!-- end #contentTop -->
-	<div id="contentRight">
-		<div id="contentRightBody">
-			<div id="action">
-				<a href="lucky"><span class="btn_main">Something Close and Soon</span></a>
-				<a href="CreateEvent.jsp"><span class="btn_main">Create An Event</span></a>
-				<a href="AllTopics.jsp"><span class="btn_main">Browse Events</span></a>
-			</div> <!-- end #action -->
-			<span class="title">Popular Events</span>
-		</div> <!-- end #contentRightBody -->
-	</div> <!-- end #contentRight -->
-	<div id="contentLeft">
-		<div id="contentLeftBody">
+			
+			<% } %>
+			
+			<div id="actionBtns">
+			<a href="CreateEvent.jsp" class="btn_main" style="float:right; margin-left: 12px">Create An Event</a>
+			<a href="lucky" class="btn_main" style="float:right; margin-left: 12px">Roll the Dice!</a>
+			<a href="AllTopics.jsp" class="btn_main" style="float:right; margin-left: 12px">Browse Events</a>
+			</div><!-- end #actionBtns -->
+			
+			<!-- <div class="line">
+				<div class="unit size1of3">
+					<a href="CreateEvent.jsp" class="btn_main fltlft">Create An Event</a>
+				</div>
+				<div class="unit size1of3">
+					<a href="lucky" class="btn_main" style="margin: 0 auto;">Roll the Dice!</a>
+				</div>
+				<div class="unit size1of3 lastUnit">
+					<a href="AllTopics.jsp" class="btn_main fltrt">Browse Events</a>
+				</div> 
+			</div> -->
+			</div><!-- end #action -->
+			
+			
 			<div class="map_contextLeft">
 				<span class="map_title title">Happening NOW near you...</span>
-				<div id="map_canvasContainerLeft">
+				<div id="map_canvasContainerMain">
 					<div id="map_canvas">
 
 				</div><!-- end #map_canvas -->
@@ -293,7 +307,7 @@ if (!searchresults){
 						</div> <!-- end .submit -->
 				</form>
 			</div> <!-- end #search -->
-			<span style="clear:both;"><a href="/search.jsp">Go to Topic Search</a></span>
+
 			</div> <!-- end #searchContext -->
 			<div id="mn_geoListContext">
 			<div id="mn_geoListHeader">

diff --git a/war/js/index.js b/war/js/index.js
@@ -4,7 +4,7 @@
 	var eventDescription = $('#mn_eventDescription');	
 	var events;
 	var current_page = 1;
-	var events_per_page = 5;
+	var events_per_page = 10;
 	var d = new Date();
 	var User_Lat = 0;
 	var User_Lon = 0;

diff --git a/war/jsp/header.jsp b/war/jsp/header.jsp
@@ -67,7 +67,7 @@
 		$('a[name=modal]').click(function(e) {
 			
 			// Add necessary DIVs
-			$('body').append('<div id="modal_register" class="modalRounded"><iframe src="http://www.meetup.com/register/?set_mobile=on" width="400px" height="550px" align="top" scrolling="no" frameborder="0" border="0" cellspacing="0"></iframe></div>');
+			$('body').append('<div id="modal_register" class="modalRounded"><iframe src="http://www.meetup.com/register/?set_mobile=on" width="400px" height="550px" align="top" scrolling="no" frameborder="0" border="0" cellspacing="0" class="modalRounded"></iframe></div>');
 			$('body').append('<div id="modal_login" class="modalRounded"><iframe src="/oauth?callback=success.jsp" width="400px" height="550px" align="top" scrolling="no" frameborder="0" border="0" cellspacing="0" class="modalRounded"></iframe></div>');
 			$( 'body' ).append( '<div id="mask"></div>' );
 			// If mask is clicked, hide mask and activated modal dialogue