Merge branch 'master' of git://github.com/w7cook/OpenBook into laurenyew

laurenyew · Apr 23, 2012 · 49bcef7 · 49bcef7
2 parents d078359 + e443623
commit 49bcef7
Show file tree

Hide file tree

Showing 23 changed files with 1,101 additions and 10 deletions.
diff --git a/app/controllers/Application.java b/app/controllers/Application.java
@@ -166,8 +166,8 @@ public static void account_save(User update, String old_password) {
 
   public static void edit_basic(Long userID) {
     User user = User.findById(userID);
-	Profile profile = Profile.find("owner = ?", user).first();
-	render(profile);
+	  Profile profile = Profile.find("owner = ?", user).first();
+	  render(profile);
   }
 
 

diff --git a/app/controllers/Profiles.java b/app/controllers/Profiles.java
@@ -26,7 +26,7 @@ public static void updateBio(String bio){
 	public static void updateInformation(Date birthday, String relationshipStatus, String gender, String interestedIn, 
 	Date anniversary, String language, String religion, String political){
 		User user = user();
-		Profile profile = user.profile;
+		Profile profile = Profile.find("owner = ?", user).first();
 	    profile.religion = religion;
 	    profile.birthday = birthday;
 	    profile.gender = gender;

diff --git a/app/views/Application/edit_basic.html b/app/views/Application/edit_basic.html
@@ -19,6 +19,15 @@
   });
 </script>
 
+ <script>
+  $(function() {
+	$( "#datepicker" ).datepicker({
+		changeMonth: true,
+		changeYear: true
+	});
+  });
+</script>
+
 <div class="globalContentAbout">  
   <div class="LeftColumnAbout">   
     <div class="Panel">
@@ -81,7 +90,7 @@
         <tr>
           <td><label>&{'profile.interested.in'}:</label></td>
           <td>#{select 'gender', value:profile.interestedIn} 
-              #{option 'Blank'}#{/option}
+              #{option ''}#{/option}
               #{option 'Men'}Men#{/option} 
               #{option 'Women'}Women#{/option} 
               #{option 'Both'}Both#{/option} 
@@ -153,9 +162,8 @@
           #{/if}
           #{if profile.interestedIn}
           <tr>
-            <td><label>Interested in:</label>
-            </td>
-            <td>${profile.interestedIn}</td>
+            <td><label>Interested in:</label></td>
+            <td class="data">${profile.interestedIn}</td>
           </tr>
           #{/if}
           #{if profile.relationshipStatus}
@@ -357,5 +365,5 @@
       </div>
     </div>
   </div>
-
-</div>
+  <div class="demo">
+</div>
diff --git a/app/views/main.html b/app/views/main.html
@@ -3,10 +3,12 @@
   <head>
     <title>#{get 'title' /}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <script src=@{'/public/javascripts/jquery-1.6.4.min.js'}></script>
+    <script src="/public/bootstrap/docs/assets/js/jquery.js"></script>
     <script src=@{'/public/javascripts/util.js'}></script>
     <script src=@{'/public/javascripts/jquery.autoresize.js'}></script>
 
+
+    <script type="text/javascript" src="/public/javascripts/jquery-ui-1.8.19.custom/js/jquery-ui-1.8.19.custom.min.js"></script>
     <script type="text/javascript" src="@{'/public/javascripts/calendarDateInput.js'}"></script>
     <script type="text/javascript" src="/public/javascripts/comments.js"></script>
     <script type="text/javascript" src="/public/javascripts/jquery.autoresize.js"></script>

diff --git a/public/javascripts/jquery-1.7.2.min.js b/public/javascripts/jquery-1.7.2.min.js
diff --git a/...1.8.19.custom/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/...1.8.19.custom/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/...1.8.19.custom/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/...1.8.19.custom/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/...jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/...jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
diff --git a/...query-ui-1.8.19.custom/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/...query-ui-1.8.19.custom/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/...query-ui-1.8.19.custom/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/...query-ui-1.8.19.custom/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/...jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/...jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/...ui-1.8.19.custom/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/...ui-1.8.19.custom/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/...1.8.19.custom/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/...1.8.19.custom/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/...-1.8.19.custom/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/...-1.8.19.custom/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_222222_256x240.png b/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_222222_256x240.png
diff --git a/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_228ef1_256x240.png b/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_228ef1_256x240.png
diff --git a/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_ef8c08_256x240.png b/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
diff --git a/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_ffd27a_256x240.png b/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
diff --git a/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_ffffff_256x240.png b/...pts/jquery-ui-1.8.19.custom/css/ui-lightness/images/ui-icons_ffffff_256x240.png
diff --git a/public/javascripts/jquery-ui-1.8.19.custom/css/ui-lightness/jquery-ui-1.8.19.custom.css b/public/javascripts/jquery-ui-1.8.19.custom/css/ui-lightness/jquery-ui-1.8.19.custom.css
diff --git a/public/javascripts/jquery-ui-1.8.19.custom/index.html b/public/javascripts/jquery-ui-1.8.19.custom/index.html
diff --git a/public/javascripts/jquery-ui-1.8.19.custom/js/jquery-1.7.2.min.js b/public/javascripts/jquery-ui-1.8.19.custom/js/jquery-1.7.2.min.js
diff --git a/public/javascripts/jquery-ui-1.8.19.custom/js/jquery-ui-1.8.19.custom.min.js b/public/javascripts/jquery-ui-1.8.19.custom/js/jquery-ui-1.8.19.custom.min.js