From 069548ef66811a8eb219a7714a02a2c66a90b665 Mon Sep 17 00:00:00 2001 From: Bashar Jabbour Date: Sun, 21 Sep 2014 19:18:32 -0400 Subject: [PATCH 1/4] Update MacInstallation.md --- MacInstallation.md | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/MacInstallation.md b/MacInstallation.md index 1333ed77..d954c7bb 100644 --- a/MacInstallation.md +++ b/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) From f0650bb16fce347b018e3578ae3ea713a2ec3aa1 Mon Sep 17 00:00:00 2001 From: Bashar Jabbour Date: Sun, 21 Sep 2014 19:19:19 -0400 Subject: [PATCH 2/4] Update MacInstallation.md --- MacInstallation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MacInstallation.md b/MacInstallation.md index d954c7bb..a6e47436 100644 --- a/MacInstallation.md +++ b/MacInstallation.md @@ -1,4 +1,5 @@ install homebrew + \curl -sSL https://get.rvm.io | bash -s stable --rails rvm install 1.9.3 --with-gcc=clang @@ -28,13 +29,12 @@ 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) From 5e76b44b80f16752a048af59fbc9abf544ecb933 Mon Sep 17 00:00:00 2001 From: Bashar Date: Sun, 21 Sep 2014 20:47:09 -0400 Subject: [PATCH 3/4] centered reset password box --- app/assets/stylesheets/application.css | 12 ++++++++++-- app/views/users/passwords/new.html.erb | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 711d0b8f..bb0edb60 100644 --- a/app/assets/stylesheets/application.css +++ b/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"], diff --git a/app/views/users/passwords/new.html.erb b/app/views/users/passwords/new.html.erb index bdd7a8bc..88dddb4a 100644 --- a/app/views/users/passwords/new.html.erb +++ b/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! %> -

Forgot your password?

+

FORGOT PASSWORD?

-
<%= f.label :email %> +
<%= f.label :email, "Enter Your Email:" %> <%= f.email_field :email, :autofocus => true %>
-
<%= f.submit "Send me reset password instructions" %>
+
<%= f.submit "Send Reset Password Instructions" %>
<% end %>
From d115861584d10423739dd714b3a546e9ab5f3b86 Mon Sep 17 00:00:00 2001 From: Shai Mor Date: Mon, 22 Sep 2014 11:36:53 -0400 Subject: [PATCH 4/4] collabCompass img and p for content and styling --- app/assets/javascripts/src/Metamaps.js | 9 ++++----- app/assets/stylesheets/application.css | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index fcbedaf3..45c6240c 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1418,7 +1418,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) { @@ -1598,9 +1598,9 @@ Metamaps.Realtime = { $('#compass' + data.userid).remove(); $('
', { id: 'compass' + data.userid, - text: data.username, class: 'collabCompass' - }).appendTo('#wrapper'); + }).html('

'+data.username+'

').appendTo('#wrapper'); + }, newPeerOnMap: function (data) { var self = Metamaps.Realtime; @@ -1629,9 +1629,8 @@ Metamaps.Realtime = { $('#compass' + data.userid).remove(); $('
', { id: 'compass' + data.userid, - text: data.username, class: 'collabCompass' - }).appendTo('#wrapper'); + }).html('

'+data.username+'

').appendTo('#wrapper'); Metamaps.GlobalUI.notifyUser(data.username + ' just joined the map'); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 8cdea3d6..3474ec04 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1924,3 +1924,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; + +} \ No newline at end of file