diff --git a/app/assets/javascripts/Jit/onCreateLabelHandler.js b/app/assets/javascripts/Jit/onCreateLabelHandler.js index 05cdff82..1bd2bdc9 100644 --- a/app/assets/javascripts/Jit/onCreateLabelHandler.js +++ b/app/assets/javascripts/Jit/onCreateLabelHandler.js @@ -33,7 +33,9 @@ function generateShowcardHTML() { style="background-image:url($_imgsrc_$);" \ title="click and drag to move card"> \ \ -
\ +
\ +
Created by $_username_$ on $_date_$
\ +
\
$_map_count_$
\
$_synapse_count_$
\
\ @@ -131,6 +133,7 @@ function replaceVariables(html, node) { html = html.replace(/\$_name_\$/g, node.name); html = html.replace(/\$_userid_\$/g, node.getData("userid")); html = html.replace(/\$_username_\$/g, node.getData("username")); + html = html.replace(/\$_date_\$/g, node.getData("date")); html = html.replace(/\$_metacode_select_\$/g, $('#metacodeOptions').html()); html = html.replace(/\$_go_link_\$/g, go_link); html = html.replace(/\$_a_tag_\$/g, a_tag); @@ -142,7 +145,7 @@ function replaceVariables(html, node) { } else { html = html.replace(/\$_link_\$/g, node.getData("link")); } - + html = html.replace(/\$_desc_nil_\$/g, desc_nil); if (node.getData("desc") == "" && authorizeToEdit(node)) { //logged in but desc isn't there so it's invisible @@ -195,7 +198,7 @@ function populateShowCard(node) { var selectingMetacode = false; // attach the listener that shows the metacode title when you hover over the image $('.showcard .metacodeImage').mouseenter(function(){ - $('.showcard .icon').css('z-index','3'); + $('.showcard .icon').css('z-index','4'); $('.showcard .metacodeTitle').show(); }); $('.showcard .linkItem.icon').mouseleave(function() { diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 6ffbde7b..59040f9c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -2015,21 +2015,7 @@ li.meta, li.tutorial, li.exploreMaps { height:100%; } -#homeMap { -height: 350px; -width: 510px; -margin: 0 auto; -transform: rotate(18deg); --ms-transform: rotate(18deg); --webkit-transform: rotate(18deg); -} -#homeMap-label div.node{ -transform: rotate(-18deg); --ms-transform: rotate(-18deg); --webkit-transform: rotate(-18deg); -font-family: 'vinyl'; -text-transform: uppercase; -} + .home_content { width: 830px; @@ -2050,6 +2036,29 @@ text-align:center; background: url('home_bg2.png') no-repeat center -46px; } +.home_content .request { +margin: 5px auto; +background: #15bad4; +height: 40px; +font-family: 'LatoLight'; +font-size: 16px; +font-style: italic; +width: auto; +padding: 0 30px; +cursor: pointer; +color:white; +line-height:40px; +} +.home_content .request:hover{ +background: #19C8E4; +-webkit-box-shadow: none; +box-shadow: none; +} + +#homeMap { + margin-left:23px; +} + .contact { text-align: center; margin: 1em 0 1em 0; diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index 4a174b66..2874ebc1 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -159,6 +159,7 @@ position: relative; .linkItem.contributor { background-image: url(MMCCicon_mapper_black.png); margin-left:20px; + z-index:3; } .linkItem.mapCount { background-image: url(MMCCicon_map_black.png); @@ -266,7 +267,25 @@ background-color: #F8F8F8; float:left; } - +.CardOnGraph .hoverForTip:hover .tip, .mapCard .hoverForTip:hover .tip { + display:block; +} +.CardOnGraph .tip, .mapCard .tip { + display:none; + position: absolute; + background: white; + width: 155px; + bottom: 0; + left: 38px; + color: black; + border-radius: 4px; + font-size:15px !important; + font-family:'LatoLight'; + line-height:17px; + padding: 3px 5px 2px; + border: 1px solid black; + z-index:100; +} .CardOnGraph .link { diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index c08f72eb..3d936453 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -10,8 +10,8 @@ class MainController < ApplicationController # home page def home - @maps = Map.visibleToUser(@current, nil).sort! { |a,b| b.created_at <=> a.created_at } - @maps = @maps.slice(0,5) + @maps = Map.find_all_by_featured(true).shuffle! + @maps = @maps.slice(0,3) respond_with(@maps) end diff --git a/app/models/map.rb b/app/models/map.rb index 77cffb6f..b06fa7cd 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -91,6 +91,7 @@ end @topicdata['$yloc'] = @mapping.yloc @topicdata['$mappingid'] = @mapping.id @topicdata['$permission'] = topic.permission + @topicdata['$date'] = topic.created_at.strftime("%m/%d/%Y") json.data @topicdata json.id topic.id json.name topic.name diff --git a/app/models/topic.rb b/app/models/topic.rb index a0506607..e5e151f1 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -84,6 +84,7 @@ belongs_to :metacode @topicdata['$userid'] = self.user.id @topicdata['$username'] = self.user.name @topicdata['$permission'] = self.permission + @topicdata['$date'] = self.created_at.strftime("%m/%d/%Y") json.data @topicdata json.id self.id json.name self.name @@ -110,6 +111,7 @@ belongs_to :metacode @topicdata['$yloc'] = @mapping.yloc @topicdata['$mappingid'] = @mapping.id @topicdata['$permission'] = self.permission + @topicdata['$date'] = self.created_at.strftime("%m/%d/%Y") json.data @topicdata json.id self.id json.name self.name @@ -155,6 +157,7 @@ belongs_to :metacode @topicdata['$userid'] = topic.user.id @topicdata['$username'] = topic.user.name @topicdata['$permission'] = topic.permission + @topicdata['$date'] = topic.created_at.strftime("%m/%d/%Y") json.data @topicdata json.id topic.id json.name topic.name @@ -175,6 +178,7 @@ belongs_to :metacode @topicdata['$userid'] = topic.user.id @topicdata['$username'] = topic.user.name @topicdata['$permission'] = topic.permission + @topicdata['$date'] = topic.created_at.strftime("%m/%d/%Y") json.data @topicdata json.id topic.id json.name topic.name diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index bcb8c549..c09ea123 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -12,18 +12,13 @@

About Metamaps.cc

-

- Metamaps is an online interface for communities to build and visualize their shared knowledge. - It is a tool to connect people, resources, and ideas in 'big picture' views without losing context or detail. -

-

- Metamaps provide a natural window into complex systems, sparking insights, creative opportunities, and social synergy. - The platform is evolving to meet a growing range of application scenarios. -

-

- The Metamaps project is a collaborative venture powered by a passionate network of peers, - dedicated to the wealth of knowledge we find in common. -

+

Metamaps is an online interface for communities to build and visualize their shared knowledge. It is a tool to connect people, resources, and ideas in a big picture view, without losing context or detail.

+ +

Metamaps provides a window into complex systems. Maps are a natural way to spark insight, find opportunities, and create social synergy. The platform is evolving for a range of applications amidst a growing network of designers, developers, practitioners, entrepreneurs, and artists.

+ +

We're weaving a human scale web to enhance natural connectivity: the Metamaps project is a collaborative venture powered by a passionate collection of peers who have dedicated this effort to uncovering a wealth of knowledge held in common.

+ +

We are currently based between San Francisco, CA and Waterloo, Ontario, Canada. Learn more in the PAQ link below.

<%= link_to "metamaps", root_url %>
diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb index 784016a4..4f788345 100644 --- a/app/views/main/home.html.erb +++ b/app/views/main/home.html.erb @@ -14,15 +14,18 @@
+

+ Request Invite +

+
-
+
+ <% @maps.each do |map| %> + <%= render map %> + <% end %> +
-

- Status: INVITE-ONLY BETA
- request invite : visit the blog
- To get in touch, follow or tweet @metamapps, or join our Google+ community. -

@@ -30,152 +33,3 @@ Welcome - - diff --git a/app/views/maps/_map.html.erb b/app/views/maps/_map.html.erb index b8dc9a1c..50135c67 100644 --- a/app/views/maps/_map.html.erb +++ b/app/views/maps/_map.html.erb @@ -14,8 +14,8 @@
-
- +
+
Created by <%= map.user.name %> on <%= map.created_at.strftime("%m/%d/%Y") %>
<%= map.topics.count %>
<%= map.synapses.count %>