social_stream 0.3.5 → 0.3.6

data/.gitignore

@@ -6,3 +6,5 @@ Gemfile.lock
 nbproject
 .loadpath
 .project
+.DS_Store
+.yardoc/*

data/app/controllers/authentications_controller.rb

@@ -0,0 +1,17 @@
+class AuthenticationsController < ApplicationController
+  def index
+    @authentications = current_user.authentications if current_user
+  end
+  
+  def create
+    auth = request.env["omniauth.auth"]
+    current_user.authentications.find_or_create_by_provider_and_uid(auth['provider'], auth['uid'])
+    redirect_to authentications_url
+  end
+  
+  def destroy
+    @authentication = current_user.authentications.find(params[:id])
+    @authentication.destroy
+    redirect_to authentications_url
+  end
+end

data/app/controllers/omniauth_callbacks_controller.rb

@@ -0,0 +1,17 @@
+class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  def facebook
+    #print env['omniauth.auth']
+    @user = User.find_or_create_for_facebook_oauth(env['omniauth.auth'],current_user)
+    if @user.persisted?
+      sign_in_and_redirect @user, :event => :authentication
+    end
+  end
+
+  def linked_in
+    #print env['omniauth.auth']
+    @user = User.find_or_create_for_linkedin_oauth(env['omniauth.auth'],current_user)
+    if @user.persisted?
+      sign_in_and_redirect @user, :event => :authentication
+    end
+  end
+end

data/app/models/actor.rb

@@ -1,4 +1,14 @@
-# An actor is a social entity. This includes individuals, but also groups, departments, organizations even nations or states. Actors are linked by ties.
+# An {Actor} is a social entity. This includes individuals, but also groups, departments, organizations even nations or states.
+#
+# Actors are the nodes of a social network. Two actors are linked by a {Tie}. The
+# type of a {tie} is a {Relation}. Each actor can define and customize their relations.
+#
+# = Actor subtypes
+# An actor subtype is called a {SocialStream::Models::Subject Subject}.
+# {SocialStream} provides two actor subtypes, {User} and {Group}, but the
+# application developer can define as many actor subtypes as required.
+# Actors subtypes are added to +config/initializers/social_stream.rb+
+#
 class Actor < ActiveRecord::Base
   @subtypes_name = :subject
   include SocialStream::Models::Supertype

data/app/models/authentication.rb

@@ -0,0 +1,3 @@
+class Authentication < ActiveRecord::Base
+  belongs_to :user
+end

data/app/models/permission.rb

@@ -1,19 +1,81 @@
-# SocialStream provides a sophisticated and powerful system of permissions based on the relations
-# and ties of the social network.
+# SocialStream provides a sophisticated and powerful system of permissions based on the {Relation relations}
+# of the social network.
 #
-# Permissions are composed by action, objective and function. Action and objective are classical
-# in content management systems, e.g. "create" "activity", "update" "tie", "read" "post"
+# = Permissions and Relations
 #
-# function is a novel feature. It supports applying the permission to certain set of ties.
-# This set of ties changes along with the formation of ties in your website.
+# Permissions are assigned to {Relation Relations}, and through relations, to {Tie Ties}. 
+# When a sender establishes a {Tie} with a receiver, she is granting to the receiver
+# the permissions assigned to {Relation} of the {Tie} she has just established.
 #
-# Permissions are assigned to relations, and through relations, to ties. 
-# When a sender establishes a tie with a receiver, she is granting to the receiver the permissions assigned
-# to relation of the tie she has just established. For example, when Alice establishes a "friend" tie
-# to Bob, she is granting him the permissions associated with "friend" relation.
+# For example, when _Alice_ establishes a _friend_ tie to _Bob_, she is granting
+# him the permissions associated with her _friend_ relation.
 #
-# One of this permissions can be "read" "activity" "star_set". This way, Bob will have access
-# to read the activities attached to ties inside the "star_set", which are the ties from Alice to her "friends"
+# = Permissions description
+#
+# Permissions are composed by *action*, *objective* and *function*. Action and objective
+# are typical in content management systems, e.g. <tt>create activity</tt>,
+# <tt>update tie</tt>, <tt>read post</tt>
+#
+# == Actions
+#
+# Current available actions are:
+#
+# +create+:: add a new instance of something (activity, tie, post, etc)
+# +read+::   view something
+# +update+::  modify something
+# +destroy+:: delete something
+# +follow+::  get activity updates from the receiver of the tie
+# +represent+:: give the receiver rights to act as if he were us.
+#
+# == Objectives
+#
+# +activity+:: all the objects in a wall: posts, comments
+#
+# Other objectives currently not implemented could be +tie+, +post+, +comment+ or +message+
+#
+# == Functions
+#
+# Function is a novel feature. It supports applying the permission to other related ties.
+# It is required because the set of ties changes along with the establish of contacts
+# in the website, besides {SocialStream::Models::Subject subjects} can describe and
+# customize their own relations and permissions.
+#
+# Available functions are:
+#
+# +tie+:: apply the permission to the established tie only.
+#
+#         Example: if the _friend_ relation has the permission
+#         <tt>create activity tie</tt>, the _friend_ can create activities
+#         attached to this tie only.
+#
+# +weak_ties+:: apply the permission to all the related ties with a relation weaker
+#               or equal than this. When a subject establishes a strong ties,
+#               their related ties are established at the same time.
+#
+#               Example: if the _member_ relation of a group has the permission
+#               <tt>create activity weak_ties</tt>, its members
+#               can also create activities attached to the weaker ties of
+#               _acquaintance_ and _public_.
+#               This means than a group _member_ can create activities at different
+#               levels of strength hierarchy, and therefore, with different levels of
+#               access.
+#
+# +star_ties+:: the permission applies to all the ties at the same level of strength,
+#               that is, ties with the same sender and the same relation but
+#               different receivers.
+#
+#               Example: the _public_ relation has the permission
+#               <tt>read activity star_ties</tt>. If _Alice_ has a _public_ tie with
+#               _Bob_, she is granting him access to activities attached to other ties
+#               from _Alice_ to the rest of her _public_ contacts.
+#
+# +weak_star_ties+:: apply the permission to weak and star ties. This is the union of
+#                    the former.
+#            
+#                    Example: group's _admin relation has the permission
+#                    <tt>destroy activity weak_star_ties</tt>
+#                    This means that _admins_ can destroy activities from other
+#                    _members_, _acquaintances_ and _public_.
 #
 class Permission < ActiveRecord::Base
   has_many :relation_permissions, :dependent => :destroy
@@ -28,11 +90,11 @@ class Permission < ActiveRecord::Base
     :table => {
       'tie' =>
         "ties_as.sender_id = ties.sender_id AND ties_as.receiver_id = ties.receiver_id AND ties_as.relation_id = ties.relation_id",
-      'weak_set' =>
+      'weak_ties' =>
         "ties_as.sender_id = ties.sender_id AND ties_as.receiver_id = ties.receiver_id AND relations.lft BETWEEN relations_as.lft AND relations_as.rgt",
-      'star_set' =>
+      'star_ties' =>
         "ties_as.sender_id = ties.sender_id AND ties_as.relation_id = ties.relation_id",
-      'weak_star_set' =>
+      'weak_star_ties' =>
         "ties_as.sender_id = ties.sender_id AND relations.lft BETWEEN relations_as.lft AND relations_as.rgt"
     },
     :arel => {
@@ -42,18 +104,18 @@ class Permission < ActiveRecord::Base
           as[:receiver_id].eq(t.receiver_id)).and(
           as[:relation_id].eq(t.relation_id))
       },
-      'weak_set' => lambda { |as, t|
+      'weak_ties' => lambda { |as, t|
         # The same sender and receiver, but a stronger or equal relation
         as[:sender_id].eq(t.sender_id).and(
           as[:receiver_id].eq(t.receiver_id)).and(
           as[:relation_id].in(t.relation.stronger_or_equal.map(&:id)))
       },
-      'star_set' => lambda { |as, t|
+      'star_ties' => lambda { |as, t|
         # The same receiver and relation
         as[:sender_id].eq(t.sender_id).and(
           as[:relation_id].eq(t.relation_id))
       },
-      'weak_star_set' => lambda { |as, t|
+      'weak_star_ties' => lambda { |as, t|
         # The same receiver with stronger or equal relations
         as[:sender_id].eq(t.sender_id).and(
           as[:relation_id].in(t.relation.stronger_or_equal.map(&:id)))
@@ -62,6 +124,7 @@ class Permission < ActiveRecord::Base
   }
 
   class << self
+    # Builds SQL conditions based on {ParameterConditions}
     def parameter_conditions(tie = nil)
       if tie.present?
         ParameterConditions[:arel].inject([]) { |conditions, h|

data/app/models/relation.rb

@@ -1,13 +1,31 @@
-# A Relation defines a type of Tie. Relations are affective (friendship, liking, 
+# A relation defines a type of {Tie tie}. Relations are affective (friendship, liking, 
 # respect), formal or biological (authority, kinship), transfer of material 
 # resources (transactions, lending and borrowing), messages or conversations, 
 # physical connection and affiliation to same organizations.
 #
-# == Strength hierarchies
+# = Default relations
+#
+# When a new {SocialStream::Models::Subject subject} is created, a initial set
+# of relations is created for him. Afterwards, the {SocialStream::Models::Subject subject}
+# can customize them and adapt them to his own preferences.
+#
+# Default relations are defined at config/relations.yml
+#
+# = Strength hierarchies
+#
 # Relations are arranged in strength hierarchies, denoting that some ties between
-# two actors are stronger than others.
+# two actors are stronger than others. For example, a "friend" relation is stronger than 
+# an "acquaintance" relation.
+#
 # When a strong tie is established, ties with weaker relations are establised as well
 #
+# = Permissions
+#
+# {SocialStream::Models::Subject Subjects} assign {Permission permissions} to relations.
+# This way, when establishing {Tie ties}, they are granting permissions to their contacts.
+#
+# See the documentation of {Permission} for more details on permission definition.
+#
 class Relation < ActiveRecord::Base
   acts_as_nested_set
 

data/app/models/tie.rb

@@ -1,28 +1,46 @@
-# A link between two actors in a relation.
+# A tie is a link between two {Actor actors} with a {Relation relation}.
 #
-# The first Actor is the sender of the Tie. The second Actor is the receiver of the Tie.
+# The first {Actor actor} is the sender of the {Tie tie}. The second {Actor actor}
+# is the receiver of the {Tie tie}.
 #
-# == Ties and Activities
-# Activities are attached to ties. 
-# * The sender of the tie is the target of the Activity. The wall-profile of an actor is
-#   composed by the resources assigned to the ties in which the actor is the sender.
-# * The receiver actor of the tie is the author of the Activity. It is the user that uploads 
-#   a resource to the website or the social entity that originates the activity.
-# * The Relation sets up the mode in which the Activity is shared. It sets the rules,
-#    or permissions, by which actors have access to the Activity.
+# = {Tie Ties} and {Activity activities}
+# {Activity Activities} are attached to {Tie ties}. 
+# * The sender of the tie is the target of the {Activity}.
+#   The wall-profile of an {Actor} is composed by the resources assigned to
+#   the {Tie Ties} in which the {Actor} is the sender.
+# * The receiver {Actor} of the {Tie} is the author of the {Activity}.
+#   It is the user that uploads a resource to the website or the social entity that
+#   originates the {Activity}.
+# * The {Relation} sets up the mode in which the {Activity} is shared.
+#   It sets the rules, or {Permission Permissions}, by which {Actor} have access
+#   to the {Activity}.
 #
-# == Authorization
-# When an actor establishes a tie with other, she is granting a set of permissions to them
-# (posting to her wall, reading her posts, etc..) The set of permissions granted are
-# associated with the relation of the tie.
+# = Tie strengh
 #
-# == Scopes
+# Because each {Tie} belongs to a {Relation} and {Relation Relations} have strength
+# hierarchies, {Tie Ties} also have them. A {Tie} is stronger than other if its
+# {Relation} is stronger than the other's. For example, if _Alice_ has a _friend_ {Tie}
+# with _Bob_, and an _acquaintance_ {Tie} with _Charlie_, given that _friend_ {Relation}
+# is stronger than _acquaintance_, the {Tie} with _Bob_ is stronger than the {Tie} with
+# _Charlie_.
+#
+# = Authorization
+# When an {Actor} establishes a {Tie} with other, she is granting a set of
+# {Permission Permissions} to them (posting to her wall, reading her posts, etc..)
+# The set of {Permission Permissions} granted are associated with the {Relation} of
+# the {Tie}.
+#
+# Usually, stronger ties (and relations) have more permissions than weaker ones.
+#
+# = Scopes
 # There are several scopes defined:
-# * sent_by(actor), ties whose sender is actor
-# * received_by(actor), ties whose receiver is actor
-# * sent_or_received_by(actor), the union of the former
-# * related_by(relation), ties with this relation. Accepts relation, relation_name, integer, array
-# * replied, ties having at least another tie in the other way, a tie from a to b is replied if there is a tie from b to a
+# sent_by(actor):: ties whose sender is actor
+# received_by(actor):: ties whose receiver is actor
+# sent_or_received_by(actor):: the union of the former
+# related_by(relation):: ties with this relation. Accepts relation, relation_name,
+#                        integer, array
+# replied:: ties having at least another tie in the other way, a tie from a to b
+#           is replied if there is a tie from b to a
 #
 class Tie < ActiveRecord::Base
   attr_accessor :message

data/app/models/user.rb

@@ -1,6 +1,7 @@
 require 'devise/orm/active_record'
 
 class User < ActiveRecord::Base
+  has_many :authentications
   devise *SocialStream.devise_modules
 
   # Setup accessible (or protected) attributes for your model
@@ -98,5 +99,33 @@ class User < ActiveRecord::Base
       
       record
     end
+
+    def find_or_create_for_facebook_oauth(access_token,signed_in_resource=nil)
+      data = access_token['extra']['user_hash']
+      print data
+      auth = Authentication.find_by_provider_and_uid(access_token["provider"],access_token["uid"])
+      user = User.find_by_email(data["email"])
+      
+      if user == nil
+        user = User.create!(:name => data["name"], :email => data["email"], :password => Devise.friendly_token[0,20])
+      end
+      if auth == nil
+        auth = Authentication.create!(:user_id => user.id, :uid =>access_token["uid"], :provider => access_token["provider"])
+      end
+      user
+    end
+    
+    def find_or_create_for_linkedin_oauth(access_token,signed_in_resource=nil)
+      auth = Authentication.find_by_uid_and_provider(access_token["uid"],access_token["provider"])
+      if auth==nil
+        user = User.create!(:name => access_token["user_info"]["name"], :email => 'demo@socialstream.com', :password => Devise.friendly_token[0,20])
+        auth = Authentication.create!(:user_id => user.id, :uid =>access_token["uid"], :provider => access_token["provider"])
+        user
+      else
+        user = User.find_by_id(auth.user_id)
+        user
+      end
+    end
+    
   end
 end

data/app/views/frontpage/_sponsor.html.erb

@@ -1,11 +1,11 @@
 <div id="sponsor">
   <ul>
-	<li>
-    <%=link_to("DIT","http://www.dit.upm.es/")%> -
-    <%=link_to("UPM","http://www.upm.es/")%> &
-    <%=link_to("CISE","http://www.cise.espol.edu.ec/")%> -
-    <%=link_to("ESPOL","http://www.espol.edu.ec/")%>
-  </li>
+    <li>
+      <%=link_to("DIT","http://www.dit.upm.es/")%> -
+      <%=link_to("UPM","http://www.upm.es/")%> &
+      <%=link_to("CISE","http://www.cise.espol.edu.ec/")%> -
+      <%=link_to("ESPOL","http://www.espol.edu.ec/")%>
+    </li>
   </ul>
 </div>
 

data/app/views/groups/index.html.erb

@@ -33,7 +33,7 @@
 				<div id="spaces" class="tabconference_browse">
 						<div class="space_center">
 						</div>
-                                                <div><input type="text" value="Search by name" id="search_field" class="search_input" /><%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %></div>
+                                                <div class="search_field_wrapper"><input type="text" value="Search by name" id="search_field" class="search_input" /><%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %></div>
 						<div class="space_center">
 						</div>
                                                 <div class="letters" class="content_size">

data/app/views/layouts/_header.erb

@@ -39,4 +39,4 @@
         </div>
     </div>
     <br class="clearfloat" />
-</div>
+</div>

data/app/views/layouts/application.html.erb

@@ -18,13 +18,13 @@
         <%= stylesheet_link_tag "carousel", :media => "screen, projection" %>
         <%= stylesheet_link_tag "smoothness/jquery-ui-1.8.4.custom", :media => "screen, projection" %>
         <%= stylesheet_link_tag "ui.dropdownchecklist", :media => "screen, projection" %>
-		<%= stylesheet_link_tag "jquery-ui.css", :media => "screen, projection" %>
+		
 		<%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
 
-        <%= stylesheet_link_tag "edit_user", :media => "screen, projection" %> 
+        
         <%= javascript_include_tag :defaults %>
        
-        <%= javascript_include_tag 'jquery', 'jquery-ui.min', 'jquery.livequery','jquery.boxy', 'menu','ui.dropdownchecklist','jquery.form', 'jquery.validate','jquery.fcbkcomplete.min', 'jquery.ba-url' %>
+        <%= javascript_include_tag 'jquery', 'jquery.livequery','jquery.boxy', 'menu','ui.dropdownchecklist','jquery.form', 'jquery.fcbkcomplete.min', 'jquery.ba-url' %>
 
 
 

data/app/views/users/_profile.html.erb

@@ -1,5 +1,7 @@
 			
-
+      <div class="space_center"></div>
+			<div class="space_center"></div>
+			<div class="space_center"></div>
 		  <div class="future_conference" id="personal_info" >
 				<div class="future_header">
 						<div class="title_section">
@@ -132,7 +134,7 @@
                     <div class="info_left">
                         E-mail
                     </div>
-                    <div class="info_right">
+                    <div class="info_center">
                         <%=h @user.email %>
                     </div>
                 </div>
@@ -153,7 +155,7 @@
 						<div class="future_content">
 								<div class="info_post">
 										
-										<div class="info_right">
+										<div class="info_center">
 												<%=h @user.profile.experience %>
 										</div>
 								</div>

data/app/views/users/edit.html.erb

@@ -6,7 +6,11 @@
         <%= render :partial => 'middle_show' %>
         <% end %>
 				
-       
+				<% content_for :head do %>
+	        <%= stylesheet_link_tag "jquery-ui.css", :media => "screen, projection" %>
+					<%= stylesheet_link_tag "edit_user", :media => "screen, projection" %>
+	        <%= javascript_include_tag 'jquery-ui.min','jquery.validate' %>
+				<% end %>
 				
         <%= form_for(@user, :remote => true) do |f| %>
         <% if @user.errors.any? %>
@@ -21,148 +25,135 @@
             </ul>
         </div>
         <% end %>
-				<script type="text/javascript">
-              $(function() {
-                  $("#content").css('border-right', 'none');
+
+				<% content_for :javascript do %>
+              $(function() {         
 									$("#content").css('border-bottom', 'none');
-									$("#contact_info").addClass('section_normal');
-                  $("#experience_info").addClass('section_normal');
-									$("#personal_info").addClass('section_normal');
-									
-									
-                  $("#edit_user_1").validate();
-                
+                  $("#edit_user_1").validate();              
               }); 
-        </script>
+				<% end %> 
+
         <div class="field">
             <% if !params[:section].present? or params[:section].eql?("about_me") %>
-            <div class="sectionEdit">
+            <div class="section_edit">
                 Personal information
             </div>
-            <br/>
-            <%= f.label :name %>
-            <br/>
-
-            <%= f.text_field :name, :class => "required" %>
-
-            <br/>
-
-						<script type="text/javascript">
+            <div class="edit_field">
+            	<div class="edit_label">
+	             <%= f.label :name %>
+							</div>
+	             <%= f.text_field :name, :class => "required edit_text"  %>
+            </div>
 
+						<% content_for :javascript do %>
 							$(function () {
                   $( "#user_profile_attributes_birthday" ).datepicker({ yearRange: '1900:<%= Time.now.utc.to_date.year%>', 
 								                                    changeYear: true, maxDate: '+0d', defaultDate: '-30y'});
-									
-									$("#personal_info").removeClass('section_normal');
 									$("#personal_info").addClass('section_highlight');
 									
 							});
+            <% end %>
 
-					  </script>
 						<%= f.fields_for :profile do |profile_form| %>
 						
-						<div class="editField">
-              <%= profile_form.label :organization %>
-              <br/>
+						<div class="edit_field">
+							<div class="edit_label">
+                <%= profile_form.label :organization %>
+							</div>
+              <%= profile_form.text_field :organization, :class => "edit_text" %>	
             </div>
-            <%= profile_form.text_field :organization %>
-            <br/>
-						<div class="editField">
-              <%= profile_form.label :birthday %>
-              <br/>
-						</div>
-            <%= profile_form.text_field( :birthday , :class => "date") %>
-            <br/>
-						
-            
 						
-						<div class="editField">
-              <%= profile_form.label :city %>
-              <br/>
+						<div class="edit_field">
+							<div class="edit_label">
+                <%= profile_form.label :birthday %>
+						  </div>
+              <%= profile_form.text_field( :birthday , :class => "date edit_text") %>
 						</div>
-            <%= profile_form.text_field :city %>
-            <br/>
-						<div class="editField">
-              <%= profile_form.label :country %>
-              <br/>
-						</div>
-            <%= profile_form.text_field :country %>
-            <br/>
-						<div class="editField">
+						        
+						
+						<div class="edit_field">
+							<div class="edit_label">
+                <%= profile_form.label :city %>
+							</div>
+						  <%= profile_form.text_field :city, :class => "edit_text" %>
+            </div>
+						<div class="edit_field">
+							<div class="edit_label">
+                <%= profile_form.label :country %>
+							</div>					
+              <%= profile_form.text_field :country, :class => "edit_text" %>
+            </div>
+						<div class="edit_field">
               <%= profile_form.label "About me" %>
-              <br/>
+						  <%= profile_form.text_area :description, :rows =>6, :maxlength => 400, :class => "edit_text" %>
 						</div>
-            <%= profile_form.text_area :description, :rows =>6, :maxlength => 400 %>
-            <br/>
-            <br/>
+            
             <% end %>
 						<% end %>
             <% if !params[:section].present? or params[:section].eql?("contact_info") %>
-						<script type="text/javascript">
 
-              $(function() {
-
-                  $("#contact_info").removeClass('section_normal');
-                  $("#contact_info").addClass('section_highlight');
-              });
+							<% content_for :javascript do %>
+	
+	              $(function() {
+	                  $("#contact_info").addClass('section_highlight');
+	              });
+	
+	            <% end %>
 
-            </script>
-            <div class="sectionEdit">
-                My contact information
-            </div>
-						<%= f.fields_for :profile do |profile_form| %>
-            <br/>
-						<div class="editField">
-              <%= profile_form.label :phone %>
-              <br/>
-						</div>
-            <%= profile_form.text_field :phone, :class => "phone" %>
-            <br/>
-						<div class="editField">
-              <%= profile_form.label :mobile %>
-              <br/>
-						</div>
-            <%= profile_form.text_field :mobile, :class => "phone" %>
-            <br/>
-						<div class="editField">
-              <%= profile_form.label :fax %>
-              <br/>
-						</div>
-            <%= profile_form.text_field :fax, :class => "phone" %>
-            <br/>
-						<div class="editField">
-              <%= profile_form.label :address %>
-              <br/>
-						</div>
-            <%= profile_form.text_field :address %>
-            <br/>
-						<div class="editField">
-              <%= profile_form.label :website %>
-              <br/>
-						</div>
-            <%= profile_form.text_field :website, :class => "url" %>
-            <br/>
-            <br/>
-            <% end %>
-						<% end %>
+	            <div class="section_edit">
+	                Contact information
+	            </div>
+							<%= f.fields_for :profile do |profile_form| %>
+							<div class="edit_field">
+								<div class="edit_label">
+	                <%= profile_form.label :phone %>
+								</div>					
+	              <%= profile_form.text_field :phone, :class => "phone edit_text" %>
+	            </div>
+							<div class="edit_field">
+								<div class="edit_label">
+	                <%= profile_form.label :mobile %>
+								</div>
+	              <%= profile_form.text_field :mobile, :class => "phone edit_text" %>
+	            </div>
+							<div class="edit_field">
+								<div class="edit_label">
+	                <%= profile_form.label :fax %>
+								</div>
+	              <%= profile_form.text_field :fax, :class => "phone edit_text" %>
+	            </div>
+							<div class="edit_field">
+								<div class="edit_label">
+	                <%= profile_form.label :address %>
+								</div>					
+	              <%= profile_form.text_field :address, :class => "edit_text" %>
+	            </div>
+							<div class="edit_field">
+								<div class="edit_label">
+	                <%= profile_form.label :website %>
+								</div>					
+	              <%= profile_form.text_field :website, :class => "url edit_text" %>
+	            </div>
+	
+	            <% end %>
+							<% end %>
             <% if !params[:section].present? or params[:section].eql?("my_experience") %>
-						<script type="text/javascript">
-
-              $(function() {
 
-                  $("#experience_info").removeClass('section_normal');
-                  $("#experience_info").addClass('section_highlight');
-              });
+							<% content_for :javascript do %>
+	
+	              $(function() {
+	                  $("#experience_info").addClass('section_highlight');
+	              });
+	
+	            <% end %>
 
-            </script>
-	            <div class="sectionEdit">
-	                My experience
+	            <div class="section_edit">
+	                Experience
 	            </div>
-							<%= f.fields_for :profile do |profile_form| %>
-	            <br/>
-	            <%= profile_form.text_area :experience, :rows =>6, :maxlength => 500 %>
-	            <br/>
-	            <br/>
+							<div class="edit_field">
+								<%= f.fields_for :profile do |profile_form| %>
+		            <%= profile_form.text_area :experience, :rows =>6, :maxlength => 500, :class => "edit_text" %>
+							</div>
 	            <% end %>
             <% end %>
         </div>
@@ -170,7 +161,7 @@
 				<%= hidden_field_tag("section", params[:section]) %>
 				<% end %>
         <div class="actions">
-            <%= f.submit "Update" %>&nbsp;<button onclick="window.location.href='<%= user_url(@user) %>';">Cancel</button>
+            <%= f.submit "Update", :class => "button" %>&nbsp;<button onclick="window.location.href='<%= user_url(@user) %>';">Cancel</button>
         </div>
 				<br/>
         <% end %>