Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new

MacInstallation.md

@@ -1 +1,40 @@
-TODO
+install homebrew
+
+    \curl -sSL https://get.rvm.io | bash -s stable --rails
+
+    rvm install 1.9.3 --with-gcc=clang
+
+    rvm use 1.9.3
+
+    gem install lunchy 
+
+(http://www.moncefbelyamani.com/how-to-install-postgresql-on-a-mac-with-homebrew-and-lunchy/)
+
+
+    brew install postgresql
+    ln -sfv /usr/local/opt/postgresql/*.plist ~/Library/LaunchAgents
+    createuser metamaps -P -s -d
+
+set a password
+
+    lunchy start postgres
+
+
+cd into the metamaps directory
+
+    bundle install
+
+
+copy the database.yml.default file and rename it database.yml
+make sure the username and password match the POSTGRES username and password you set
+
+
+http://nodejs.org/ hit install, download, open, install
+
+
+    rake db:create
+    rake db:schema:load
+    rake db:fixtures:load
+    rails s 
+    
+( to start the server) 

app/assets/javascripts/src/Metamaps.js

@@ -1458,7 +1458,7 @@ Metamaps.Realtime = {
         });
         $('body').click(self.close);
 
-        self.socket = io.connect('http://gentle-savannah-1303.herokuapp.com');   
+        self.socket = io.connect('http://localhost:5001'); 
         self.startActiveMap();
     },
     toggleBox: function (event) {
@@ -1635,6 +1635,15 @@ Metamaps.Realtime = {
             $('#mapper' + data.userid).remove();
             $('.realtimeMapperList ul').append(mapperListItem);
 
+<<<<<<< HEAD
+        // create a div for the collaborators compass
+        $('#compass' + data.userid).remove();
+        $('<div/>', {
+            id: 'compass' + data.userid,
+            class: 'collabCompass'
+        }).html('<img width="28" height="28" src="'+data.userimage+'" /><p>'+data.username+'</p>').appendTo('#wrapper');
+
+=======
             // create a div for the collaborators compass
             $('#compass' + data.userid).remove();
             $('<div/>', {
@@ -1643,6 +1652,7 @@ Metamaps.Realtime = {
                 class: 'collabCompass'
             }).appendTo('#wrapper');
         }
+>>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
     },
     newPeerOnMap: function (data) {
         var self = Metamaps.Realtime;
@@ -1659,6 +1669,35 @@ Metamaps.Realtime = {
         };
 
         // create an item for them in the realtime box
+<<<<<<< HEAD
+        var mapperListItem = '<li id="mapper' + data.userid + '" class="rtMapper littleRtOn">';
+        mapperListItem += '<img src="' + data.userimage + '" width="24" height="24" class="rtUserImage" />';
+        mapperListItem += data.username;
+        mapperListItem += '<div class="littleJuntoIcon"></div>';
+        mapperListItem += '</li>';
+        $('#mapper' + data.userid).remove();
+        $('.realtimeMapperList ul').append(mapperListItem);
+
+        // create a div for the collaborators compass
+        $('#compass' + data.userid).remove();
+        $('<div/>', {
+            id: 'compass' + data.userid,
+            class: 'collabCompass'
+        }).html('<img width="28" height="28" src="'+data.userimage+'" /><p>'+data.username+'</p>').appendTo('#wrapper');
+
+        Metamaps.GlobalUI.notifyUser(data.username + ' just joined the map');
+
+        // send this new mapper back your details, and the awareness that you've loaded the map
+        var update = {
+            userToNotify: data.userid,
+            username: Metamaps.Active.Mapper.get("name"),
+            userimage: Metamaps.Active.Mapper.get("image"),
+            userid: Metamaps.Active.Mapper.id,
+            userrealtime: self.status,
+            mapid: Metamaps.Active.Map.id
+        };
+        socket.emit('updateNewMapperList', update);
+=======
         if (data.userid !== Metamaps.Active.Mapper.id) {
             var mapperListItem = '<li id="mapper' + data.userid + '" class="rtMapper littleRtOn">';
             mapperListItem += '<img src="' + data.userimage + '" width="24" height="24" class="rtUserImage" />';
@@ -1689,6 +1728,7 @@ Metamaps.Realtime = {
             };
             socket.emit('updateNewMapperList', update);
         }
+>>>>>>> fe1f35d63eda20b39e97f11c8bb75135281d5b98
     },
     lostPeerOnMap: function (data) {
         var self = Metamaps.Realtime;

app/assets/stylesheets/application.css

@@ -183,12 +183,20 @@ input[type="submit"]:active {
 .edit_user,
 .forgotPassword {
     display: block;
-    width: 250px;
+    width: 300px;
     background-color: #E0E0E0;
-    padding: 20px;
+    padding: 16px;
     border-radius: 5px;
     color: black;
     box-shadow: 6px 6px 8px rgba(0, 0, 0, 0.4);
+    top: 50%;
+    left:50%;
+    position:absolute;
+    margin-left: -166px;
+}
+.forgotPassword {
+    height: 134px;
+    margin-top: -83px;
 }
 .centerGreyForm input[type="text"],
 .centerGreyForm input[type="email"],
@@ -2054,3 +2062,28 @@ float: left;
 .templates {
     display: none;
 }
+
+/* collabCompass section */
+.collabCompass:hover p {
+    display: block;
+}
+.collabCompass p {
+    display: none;
+    background-color: #4fb5c0;
+    color: #FFFFFF;
+    padding: 0 8px 0 8px; 
+    position: absolute;
+    top: 9px;
+    left:30px;
+    z-index: 1;
+    font-size: 14px;
+    line-height: 14px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+}
+.collabCompass img {
+    border-radius: 16px;
+    border: 2px solid #4fb5c0;
+    z-index: 2;
+
+}

app/views/users/passwords/new.html.erb

@@ -4,12 +4,12 @@
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, :class => "forgotPassword centerGreyForm" }) do |f| %>
   <%= devise_error_messages! %>
   
-  <h3>Forgot your password?</h3>
+  <h3>FORGOT PASSWORD?</h3>
 
-  <div><%= f.label :email %>
+  <div><%= f.label :email, "Enter Your Email:" %>
   <%= f.email_field :email, :autofocus => true %></div>
 
-  <div><%= f.submit "Send me reset password instructions" %></div>
+  <div><%= f.submit "Send Reset Password Instructions" %></div>
   
 <% end %>
 </div>