glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clickable map cards

Browse source
This commit is contained in:
Connor Turland 2014-08-12 18:14:04 -04:00
parent 35835fcc80
commit 6422b54dc0
23 changed files with 137 additions and 3873 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/metamaps/Metamaps.Router.js
View file

@ -78,7 +78,7 @@
Metamaps.Loading.loader.show(); Metamaps.Loading.loader.show();
setTimeout(function(){ setTimeout(function(){
Metamaps.Maps[capitalize].getMaps(); // this will trigger an explore maps render Metamaps.Maps[capitalize].getMaps(); // this will trigger an explore maps render
}, 1000); // wait 500 milliseconds till the other animations are done to do the fetch }, 300); // wait 300 milliseconds till the other animations are done to do the fetch
} }
else { else {
Metamaps.Views.exploreMaps.render(); Metamaps.Views.exploreMaps.render();

23
app/assets/stylesheets/ForceDirected.css
View file

@ -1,23 +0,0 @@
#inner-details {
}
.label {
display:block;
white-space: nowrap;
padding: 2px 4px;
background:#ddd;
opacity:0.8;
border-radius:5px;
}
span.name {
cursor: pointer;
position: absolute;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

3
app/assets/stylesheets/users.css.scss → app/assets/stylesheets/admin.css
View file

@ -1,6 +1,3 @@
// Place all the styles related to the users controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
.allMetacodes { .allMetacodes {

3263
app/assets/stylesheets/animate.css vendored
View file

File diff suppressed because it is too large Load diff

10
app/assets/stylesheets/application.css
View file

@ -11,10 +11,8 @@
*= require_self *= require_self
*= require_tree . *= require_tree .
*= require base *= require base
*= require ForceDirected
*= require jquery.mCustomScrollbar *= require jquery.mCustomScrollbar
*= require jquery-ui *= require jquery-ui
*= require animate
*/ */
/* clear styles */ /* clear styles */
@ -1767,14 +1765,6 @@ div.mapInfoStat {
} }
/* --- styling the logo button ---*/ /* --- styling the logo button ---*/
.footer {
display: block;
position: fixed;
bottom: 10px;
left: 50%;
margin-left: -55px;
z-index: 15000;
}
.home_bg { .home_bg {
display: block; display: block;
height: 100%; height: 100%;

9
app/assets/stylesheets/base.css
View file

@ -546,13 +546,14 @@ font-family: 'LatoLight';
.map { .map {
display:inline-block; display:inline-block;
width:226px; width:220px;
height:320px; height:308px;
padding: 16px 0;
color:#FFF; color:#FFF;
text-align: left; text-align: left;
overflow: visible; overflow: visible;
background: #FFF; background: #424242;
border-radius:5px; border-radius:2px;
box-shadow: 6px 6px 8px rgba(0,0,0,0.4); box-shadow: 6px 6px 8px rgba(0,0,0,0.4);
margin:16px 16px 16px 19px; margin:16px 16px 16px 19px;
} }

13
app/assets/stylesheets/clean.css
View file

@ -71,6 +71,11 @@
/* logo */ /* logo */
.footer {
z-index: 3;
}
.logo { .logo {
color: #6B6B6B; color: #6B6B6B;
font-family: "vinyl", sans-serif; font-family: "vinyl", sans-serif;
@ -653,8 +658,7 @@
} }
.exploreMapsCenter { .exploreMapsCenter {
width: 700px; z-index: 3;
margin: 0 auto;
} }
.exploreMapsCenter a { .exploreMapsCenter a {
@ -664,9 +668,9 @@
font-family: 'din-medium'; font-family: 'din-medium';
font-size: 14px; font-size: 14px;
height: 14px; height: 14px;
padding-top: 16px; padding: 14px;
display: inline-block; display: inline-block;
padding-bottom: 12px; cursor: pointer;
} }
.exploreMapsCenter a.active { .exploreMapsCenter a.active {
text-decoration: none; text-decoration: none;
@ -680,6 +684,7 @@
.mapsWrapper { .mapsWrapper {
margin: 100px 60px 0 60px; margin: 100px 60px 0 60px;
display: none; display: none;
z-index: 1;
} }
.explorePage .mapsWrapper { .explorePage .mapsWrapper {
display:block; display:block;

57
app/assets/stylesheets/synapses.css.scss
View file

@ -1,57 +0,0 @@
// Place all the styles related to the synapses controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
.synapse {
display:block;
position:relative;
width:215px;
height:320px;
float:left;
margin: 30px 0 30px 50px;
}
.synapseTopic1 {
position:absolute;
top:0;
}
.topic1desc {
display: block;
width: 190px;
background: url("bg.png") repeat;
position: relative;
margin-left: 25px;
border-radius: 15px;
padding: 10px 5px 10px 28px;
color: #000;
}
.synapseTopic1 img {
position:absolute;
top: 15px;
z-index: 30;
}
.synapseTopic2 {
position:absolute;
bottom:0;
}
.synapseTopic2 img {
position:absolute;
top:-24px;
z-index:30;
}
.topic2desc {
display: block;
width: 190px;
background: url("bg.png") repeat;
position: relative;
margin-left: 25px;
border-radius: 15px;
padding: 10px 5px 10px 28px;
color: #000;
}

2
app/controllers/mappings_controller.rb
View file

@ -4,8 +4,6 @@ class MappingsController < ApplicationController
respond_to :json respond_to :json
#skip_before_filter :verify_authenticity_token, :only => [:create]
# GET /mappings/1.json # GET /mappings/1.json
def show def show
@mapping = Mapping.find(params[:id]) @mapping = Mapping.find(params[:id])

2
app/controllers/synapses_controller.rb
View file

@ -64,7 +64,7 @@ class SynapsesController < ApplicationController
@synapse.delete if @synapse @synapse.delete if @synapse
respond_to do |format| respond_to do |format|
format.json { render :json => "success" } format.json { head :no_content }
end end
end end
end end

4
app/controllers/users_controller.rb
View file

@ -11,14 +11,14 @@ class UsersController < ApplicationController
render json: @user render json: @user
end end
# GET /user/edit # GET /users/:id/edit
def edit def edit
@user = current_user @user = current_user
respond_with(@user) respond_with(@user)
end end
# PUT /user # PUT /users/:id
def update def update
@user = current_user @user = current_user
@user.attributes = params[:user] @user.attributes = params[:user]

98
app/helpers/topics_helper.rb
View file

@ -55,102 +55,4 @@ module TopicsHelper
return array return array
end end
end end
#return a json object containing all of a users added synapses
def synapses_as_json(current, synapses)
Jbuilder.encode do |json|
@topics = Array.new
synapses.each do |synapse|
@topics.push(synapse.topic1) if (not @topics.include?(synapse.topic1)) && synapse.topic1.authorize_to_view(current)
@topics.push(synapse.topic2) if (not @topics.include?(synapse.topic2)) && synapse.topic2.authorize_to_view(current)
end
json.array!(@topics) do |topic|
json.adjacencies topic.synapses2.delete_if{|synapse| not @topics.include?(Topic.find_by_id(synapse.node1_id))} do |json, synapse|
json.nodeTo synapse.node1_id
json.nodeFrom synapse.node2_id
@synapsedata = Hash.new
@synapsedata['$desc'] = synapse.desc
@synapsedata['$showDesc'] = false
@synapsedata['$category'] = synapse.category
@synapsedata['$id'] = synapse.id
@synapsedata['$userid'] = synapse.user.id
@synapsedata['$username'] = synapse.user.name
@synapsedata['$direction'] = [synapse.node1_id.to_s(), synapse.node2_id.to_s()]
@synapsedata['$permission'] = synapse.permission
json.data @synapsedata
end
@inmaps = Array.new
topic.maps.each do |map|
@inmaps.push(map.id)
end
@topicdata = Hash.new
@topicdata['$desc'] = topic.desc
@topicdata['$link'] = topic.link
@topicdata['$metacode'] = topic.metacode.name
@topicdata['$inmaps'] = @inmaps
@topicdata['$userid'] = topic.user.id
@topicdata['$username'] = topic.user.name
@topicdata['$permission'] = topic.permission
json.data @topicdata
json.id topic.id
json.name topic.name
end
end
end
def all_as_json(current, user)
# current is current user
Jbuilder.encode do |json|
if user.nil?
@topics = Topic.visibleToUser(current, nil)
@synapses = Synapse.visibleToUser(current, nil)
else
@topics = Topic.visibleToUser(current, user)
@synapses = Synapse.visibleToUser(current, user)
end
json.array!(@topics) do |topic|
json.adjacencies topic.synapses2.delete_if{|synapse| (not @topics.include?(Topic.find_by_id(synapse.node1_id))) || (not @synapses.include?(synapse))} do |json, synapse|
json.nodeTo synapse.node1_id
json.nodeFrom synapse.node2_id
@synapsedata = Hash.new
@synapsedata['$desc'] = synapse.desc
@synapsedata['$showDesc'] = false
@synapsedata['$category'] = synapse.category
@synapsedata['$id'] = synapse.id
@synapsedata['$userid'] = synapse.user.id
@synapsedata['$username'] = synapse.user.name
@synapsedata['$direction'] = [synapse.node1_id.to_s(), synapse.node2_id.to_s()]
@synapsedata['$permission'] = synapse.permission
json.data @synapsedata
end
@inmaps = Array.new
topic.maps.each do |map|
@inmaps.push(map.id)
end
@topicdata = Hash.new
@topicdata['$desc'] = topic.desc
@topicdata['$link'] = topic.link
@topicdata['$metacode'] = topic.metacode.name
@topicdata['$inmaps'] = @inmaps
@topicdata['$userid'] = topic.user.id
@topicdata['$username'] = topic.user.name
@topicdata['$permission'] = topic.permission
json.data @topicdata
json.id topic.id
json.name topic.name
end
end
end
end end

14
app/models/map.rb
View file

@ -55,20 +55,6 @@ end
##### PERMISSIONS ###### ##### PERMISSIONS ######
scope :visibleToUser, lambda { |current, user|
if user != nil
if user != current
Map.find_all_by_user_id_and_permission(user.id, "commons") | Map.find_all_by_user_id_and_permission(user.id, "public")
elsif user == current
Map.find_all_by_user_id_and_permission(user.id, "commons") | Map.find_all_by_user_id_and_permission(user.id, "public") | current.maps.where(:permission => "private")
end
elsif (current != nil && user == nil)
Map.find_all_by_permission("commons") | Map.find_all_by_permission("public") | current.maps.where(:permission => "private")
elsif (current == nil)
Map.find_all_by_permission("commons") | Map.find_all_by_permission("public")
end
}
# returns false if user not allowed to 'show' Topic, Synapse, or Map # returns false if user not allowed to 'show' Topic, Synapse, or Map
def authorize_to_show(user) def authorize_to_show(user)
if (self.permission == "private" && self.user != user) if (self.permission == "private" && self.user != user)

84
app/models/synapse.rb
View file

@ -39,82 +39,8 @@ has_many :maps, :through => :mappings
end end
end end
##### JSON ######
def self_as_json
Jbuilder.encode do |json|
@synapsedata = Hash.new
@synapsedata['$desc'] = self.desc
@synapsedata['$showDesc'] = false
@synapsedata['$category'] = self.category
@synapsedata['$id'] = self.id
@synapsedata['$userid'] = self.user.id
@synapsedata['$username'] = self.user.name
@synapsedata['$direction'] = [self.node1_id.to_s(), self.node2_id.to_s()]
@synapsedata['$permission'] = self.permission
json.data @synapsedata
end
end
def selfplusnodes_as_json
Jbuilder.encode do |json|
@topics = Array.new
@topics.push(self.topic1)
@topics.push(self.topic2)
json.array!(@topics) do |topic|
json.adjacencies topic.synapses1.delete_if{|synapse| not @topics.include?(Topic.find_by_id(synapse.node2_id))} do |json, synapse|
json.nodeTo synapse.node2_id
json.nodeFrom synapse.node1_id
@synapsedata = Hash.new
@synapsedata['$desc'] = synapse.desc
@synapsedata['$showDesc'] = false
@synapsedata['$category'] = synapse.category
@synapsedata['$id'] = synapse.id
@synapsedata['$userid'] = synapse.user.id
@synapsedata['$username'] = synapse.user.name
@synapsedata['$direction'] = [synapse.node1_id.to_s(), synapse.node2_id.to_s()]
@synapsedata['$permission'] = synapse.permission
json.data @synapsedata
end
@inmaps = Array.new
topic.maps.each do |map|
@inmaps.push(map.id)
end
@topicdata = Hash.new
@topicdata['$desc'] = topic.desc
@topicdata['$link'] = topic.link
@topicdata['$metacode'] = topic.metacode.name
@topicdata['$inmaps'] = @inmaps
@topicdata['$userid'] = topic.user.id
@topicdata['$username'] = topic.user.name
@topicdata['$permission'] = topic.permission
json.data @topicdata
json.id topic.id
json.name topic.name
end
end
end
##### PERMISSIONS ###### ##### PERMISSIONS ######
scope :visibleToUser, lambda { |current, user|
if user != nil
if user != current
Synapse.find_all_by_user_id_and_permission(user.id, "commons") | Synapse.find_all_by_user_id_and_permission(user.id, "public")
elsif user == current
Synapse.find_all_by_user_id_and_permission(user.id, "commons") | Synapse.find_all_by_user_id_and_permission(user.id, "public") | current.synapses.where(:permission => "private")
end
elsif (current != nil && user == nil)
Synapse.find_all_by_permission("commons") | Synapse.find_all_by_permission("public") | current.synapses.where(:permission => "private")
elsif (current == nil)
Synapse.find_all_by_permission("commons") | Synapse.find_all_by_permission("public")
end
}
# returns false if user not allowed to 'show' Topic, Synapse, or Map # returns false if user not allowed to 'show' Topic, Synapse, or Map
def authorize_to_show(user) def authorize_to_show(user)
if (self.permission == "private" && self.user != user) if (self.permission == "private" && self.user != user)
@ -141,14 +67,4 @@ has_many :maps, :through => :mappings
return true return true
end end
# returns Boolean based on whether user has permissions to edit or not
def authorize_linkto_edit(user)
if (self.user == user)
return true
elsif (self.permission == "commons")
return true
end
return false
end
end end

163
app/models/topic.rb
View file

@ -1,5 +1,4 @@
class Topic < ActiveRecord::Base class Topic < ActiveRecord::Base
include TopicsHelper include TopicsHelper
belongs_to :user belongs_to :user
@ -95,159 +94,8 @@ has_many :maps, :through => :mappings
return result return result
end end
###### JSON ######
def self_as_json
Jbuilder.encode do |json|
@inmaps = Array.new
@mapsString = ""
self.maps.each_with_index do |map, index|
@inmaps.push(map.id)
@mapsString += map.name
@mapsString += (index+1) == self.maps.count ? "" : ", "
end
@topicdata = Hash.new
@topicdata['$desc'] = self.desc
@topicdata['$link'] = self.link
@topicdata['$metacode'] = self.metacode.name
@topicdata['$inmaps'] = @inmaps
@topicdata['$inmapsString'] = @mapsString
@topicdata['$synapseCount'] = self.synapses.count
@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
end
end
def selfonmap_as_json(mapid)
Jbuilder.encode do |json|
@inmaps = Array.new
@mapsString = ""
self.maps.each_with_index do |map, index|
@inmaps.push(map.id)
@mapsString += map.name
@mapsString += (index+1) == self.maps.count ? "" : ", "
end
@topicdata = Hash.new
@topicdata['$desc'] = self.desc
@topicdata['$link'] = self.link
@topicdata['$metacode'] = self.metacode.name
@topicdata['$inmaps'] = @inmaps
@topicdata['$inmapsString'] = @mapsString
@topicdata['$synapseCount'] = self.synapses.count
@topicdata['$userid'] = self.user.id
@topicdata['$username'] = self.user.name
@mapping = Mapping.find_by_topic_id_and_map_id(self.id,mapid)
@topicdata['$xloc'] = @mapping.xloc
@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
end
end
#build a json object of everything connected to a specified node
def network_as_json(current)
Jbuilder.encode do |json|
@topics = network(self,nil,1)
if @topics.count > 1
json.array!(@topics.delete_if{|topic| (not topic.authorize_to_view(current)) || (not topic.has_viewable_synapses(current))}) do |topic|
json.adjacencies topic.synapses1.delete_if{|synapse| (not @topics.include?(synapse.topic2)) || (not synapse.authorize_to_view(current)) || (not synapse.topic2.authorize_to_view(current)) } do |json, synapse|
json.nodeTo synapse.node2_id
json.nodeFrom synapse.node1_id
@synapsedata = Hash.new
@synapsedata['$alpha'] = 0.4
@synapsedata['$desc'] = synapse.desc
@synapsedata['$showDesc'] = false
@synapsedata['$category'] = synapse.category
@synapsedata['$id'] = synapse.id
@synapsedata['$userid'] = synapse.user.id
@synapsedata['$username'] = synapse.user.name
@synapsedata['$direction'] = [synapse.node1_id.to_s(), synapse.node2_id.to_s()]
@synapsedata['$permission'] = synapse.permission
json.data @synapsedata
end
@inmaps = Array.new
@mapsString = ""
topic.maps.each_with_index do |map, index|
@inmaps.push(map.id)
@mapsString += map.name
@mapsString += (index+1) == topic.maps.count ? "" : ", "
end
@topicdata = Hash.new
@topicdata['$desc'] = topic.desc
@topicdata['$link'] = topic.link
@topicdata['$metacode'] = topic.metacode.name
@topicdata['$inmaps'] = @inmaps
@topicdata['$inmapsString'] = @mapsString
@topicdata['$synapseCount'] = topic.synapses.count
@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
end
elsif @topics.count == 1
json.array!(@topics) do |topic|
@inmaps = Array.new
@mapsString = ""
topic.maps.each_with_index do |map, index|
@inmaps.push(map.id)
@mapsString += map.name
@mapsString += (index+1) == topic.maps.count ? "" : ", "
end
@topicdata = Hash.new
@topicdata['$desc'] = topic.desc
@topicdata['$link'] = topic.link
@topicdata['$metacode'] = topic.metacode.name
@topicdata['$inmaps'] = @inmaps
@topicdata['$inmapsString'] = @mapsString
@topicdata['$synapseCount'] = topic.synapses.count
@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
end
end
end
end
##### PERMISSIONS ###### ##### PERMISSIONS ######
scope :visibleToUser, lambda { |current, user|
if user != nil
if user != current
Topic.find_all_by_user_id_and_permission(user.id, "commons") | Topic.find_all_by_user_id_and_permission(user.id, "public")
elsif user == current
Topic.find_all_by_user_id_and_permission(user.id, "commons") | Topic.find_all_by_user_id_and_permission(user.id, "public") | current.topics.where(:permission => "private")
end
elsif (current != nil && user == nil)
Topic.find_all_by_permission("commons") | Topic.find_all_by_permission("public") | current.topics.where(:permission => "private")
elsif (current == nil)
Topic.find_all_by_permission("commons") | Topic.find_all_by_permission("public")
end
}
# returns false if user not allowed to 'show' Topic, Synapse, or Map # returns false if user not allowed to 'show' Topic, Synapse, or Map
def authorize_to_show(user) def authorize_to_show(user)
if (self.permission == "private" && self.user != user) if (self.permission == "private" && self.user != user)
@ -273,15 +121,4 @@ has_many :maps, :through => :mappings
end end
return true return true
end end
# returns Boolean based on whether user has permissions to edit or not
def authorize_linkto_edit(user)
if (self.user == user)
return true
elsif (self.permission == "commons")
return true
end
return false
end
end end

1
app/models/user.rb
View file

@ -42,7 +42,6 @@ has_many :mappings
def as_json(options={}) def as_json(options={})
{ :id => self.id, { :id => self.id,
:name => self.name, :name => self.name,
:email => self.email,
:image => self.image.url :image => self.image.url
} }
end end

7
app/views/layouts/_templates.html.erb
View file

@ -7,23 +7,19 @@
<script type="text/template" id="mapCardTemplate"> <script type="text/template" id="mapCardTemplate">
<a href="/maps/{{id}}">
<div class="permission {{editPermission}}"> <!-- must be canEdit or cannotEdit --> <div class="permission {{editPermission}}"> <!-- must be canEdit or cannotEdit -->
<div class="mapCard"> <div class="mapCard">
<span class="title"> <span class="title">
<span class="best_in_place best_in_place_name" id="best_in_place_map_{{id}}_name" data-url="/maps/{{id}}" data-object="map" data-attribute="name" data-type="textarea">{{name}}</span> <span class="best_in_place best_in_place_name" id="best_in_place_map_{{id}}_name" data-url="/maps/{{id}}" data-object="map" data-attribute="name" data-type="textarea">{{name}}</span>
</span> </span>
<div class="links"> <div class="links">
<div class="linkItem icon">
<div class="metacodeImage" style="background-image:url(/assets/map.png);"></div>
</div>
<div class="linkItem contributor hoverForTip"> <div class="linkItem contributor hoverForTip">
<div class="tip">Created by {{username}} on {{createdAt}}</div> <div class="tip">Created by {{username}} on {{createdAt}}</div>
</div> </div>
<div class="linkItem topicCount">{{topicCount}}</div> <div class="linkItem topicCount">{{topicCount}}</div>
<div class="linkItem synapseCount">{{synapseCount}}</div> <div class="linkItem synapseCount">{{synapseCount}}</div>
<div class="linkItem mapPerm {{mkPermission}}"></div> <div class="linkItem mapPerm {{mkPermission}}"></div>
<a href="/maps/{{id}}" class="linkItem topicPopout"></a>
<div class="clearfloat"></div>
</div> </div>
<div class="scroll"> <div class="scroll">
<div class="desc"> <div class="desc">
@ -34,6 +30,7 @@
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>
</div> </div>
</a>
</script> </script>
<script type="text/template" id="topicSearchTemplate"> <script type="text/template" id="topicSearchTemplate">

2
app/views/layouts/_upperelements.html.erb
View file

@ -4,7 +4,7 @@
<div class="upperLeftUI"> <div class="upperLeftUI">
<!-- home button --> <!-- home button -->
<div class="homeButton"> <div class="homeButton">
<a href="<%= root_url %>"></a> <a href="<%= root_url %>" <% if !authenticated? %><%= 'data-bypass=true' %><% end %>></a>
</div> <!-- end homeButton --> </div> <!-- end homeButton -->
<!-- search box --> <!-- search box -->

6
app/views/maps/_map.html.erb
View file

@ -4,6 +4,7 @@
# Any list of maps uses this rendering. # Any list of maps uses this rendering.
#%> #%>
<%= div_for map do %> <%= div_for map do %>
<a href="/maps/<%= map.id %>">
<div class="permission <%= map.authorize_to_edit(user) ? "canEdit" : "cannotEdit" %>"> <div class="permission <%= map.authorize_to_edit(user) ? "canEdit" : "cannotEdit" %>">
<div class="mapCard"> <div class="mapCard">
@ -11,16 +12,12 @@
<%= best_in_place map, :name, :type => :textarea, :classes => 'best_in_place_name' %> <%= best_in_place map, :name, :type => :textarea, :classes => 'best_in_place_name' %>
</span> </span>
<div class="links"> <div class="links">
<div class="linkItem icon">
<div class="metacodeImage" style="background-image:url(/assets/map.png);"></div>
</div>
<div class="linkItem contributor hoverForTip"> <div class="linkItem contributor hoverForTip">
<div class="tip">Created by <%= map.user.name %> on <%= map.created_at.strftime("%m/%d/%Y") %></div> <div class="tip">Created by <%= map.user.name %> on <%= map.created_at.strftime("%m/%d/%Y") %></div>
</div> </div>
<div class="linkItem topicCount"><%= map.topics.count %></div> <div class="linkItem topicCount"><%= map.topics.count %></div>
<div class="linkItem synapseCount"><%= map.synapses.count %></div> <div class="linkItem synapseCount"><%= map.synapses.count %></div>
<div class="linkItem mapPerm <%= map.mk_permission %>"></div> <div class="linkItem mapPerm <%= map.mk_permission %>"></div>
<a href="/maps/<%= map.id %>" class="linkItem topicPopout"></a>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>
<div class="scroll"> <div class="scroll">
@ -33,4 +30,5 @@
</div> </div>
</div> </div>
</a>
<% end %> <% end %>

12
config/routes.rb
View file

@ -2,14 +2,16 @@ Metamaps::Application.routes.draw do
root to: 'main#home', via: :get root to: 'main#home', via: :get
get '/join', to: redirect('/users/sign_up') devise_scope :user do
get "join" => "devise/registrations#new"
end
match 'request', to: 'main#requestinvite', via: :get, as: :request match 'request', to: 'main#requestinvite', via: :get, as: :request
match '/search/topics', to: 'main#searchtopics', via: :get, as: :searchtopics match 'search/topics', to: 'main#searchtopics', via: :get, as: :searchtopics
match '/search/maps', to: 'main#searchmaps', via: :get, as: :searchmaps match 'search/maps', to: 'main#searchmaps', via: :get, as: :searchmaps
match '/search/mappers', to: 'main#searchmappers', via: :get, as: :searchmappers match 'search/mappers', to: 'main#searchmappers', via: :get, as: :searchmappers
match '/search/synapses', to: 'main#searchsynapses', via: :get, as: :searchsynapses match 'search/synapses', to: 'main#searchsynapses', via: :get, as: :searchsynapses
resources :mappings, except: [:index, :new, :edit] resources :mappings, except: [:index, :new, :edit]
resources :metacode_sets, :except => [:show] resources :metacode_sets, :except => [:show]

20
public/famous/main.js
View file

@ -112,11 +112,17 @@ define(function(require, exports, module) {
// EXPLORE MAPS BAR // EXPLORE MAPS BAR
f.explore = {}; f.explore = {};
f.explore.surf = new Surface({ f.explore.surf = new Surface({
size: [undefined, 94], size: [true, 42],
content: templates.mineContent, content: templates.mineContent,
classes: ['exploreMapsCenter']
});
f.explore.surfBg = new Surface({
size: [undefined, 94],
content: '<div class="exploreMapsMenu"></div>',
classes: ['exploreMapsBar', 'exploreElement'] classes: ['exploreMapsBar', 'exploreElement']
}); });
f.explore.mod = new Modifier({ f.explore.mod = new Modifier({
size: [undefined, 94],
origin: [0.5, 0], origin: [0.5, 0],
transform: Transform.translate(0, -94, 0) transform: Transform.translate(0, -94, 0)
}); });
@ -136,14 +142,22 @@ define(function(require, exports, module) {
var loggedIn = Metamaps.Active.Mapper ? 'Auth' : ''; var loggedIn = Metamaps.Active.Mapper ? 'Auth' : '';
f.explore.surf.setContent(templates[section + loggedIn + 'Content']); f.explore.surf.setContent(templates[section + loggedIn + 'Content']);
}; };
f.mainContext.add(f.explore.mod).add(f.explore.surf); var exploreMod = f.mainContext.add(f.explore.mod);
exploreMod.add(new Modifier({
size: [undefined, 42],
origin: [0.5, 1]
})).add(new Modifier({
origin: [0.5, 1]
})).add(f.explore.surf);
exploreMod.add(f.explore.surfBg);
// LOGO // LOGO
f.logo = {}; f.logo = {};
f.logo.surf = new Surface({ f.logo.surf = new Surface({
size: [258, 56], size: [258, 56],
content: templates.logoContent, content: templates.logoContent,
classes: [] classes: ['footer']
}); });
f.logo.mod = new Modifier({ f.logo.mod = new Modifier({

49
public/famous/templates.js
View file

@ -11,73 +11,38 @@ t.logoContent += '<li class="openLightbox" data-open="getInvolved">Get Involved!
t.logoContent += '</ul>'; t.logoContent += '</ul>';
/* logged out explore maps bars */ /* logged out explore maps bars */
t.activeContent = '<div class="exploreMapsMenu">'; t.activeContent = '<a href="/explore/active" class="active">Recently Active</a>';
t.activeContent += '<div class="exploreMapsCenter">';
t.activeContent += '<a href="/explore/active" class="active">Recently Active</a>';
t.activeContent += '<a href="/explore/featured">Featured</a>'; t.activeContent += '<a href="/explore/featured">Featured</a>';
t.activeContent += '<a href="/explore/new">New</a>'; t.activeContent += '<a href="/explore/new">New</a>';
t.activeContent += '<div class="clearfloat"></div>';
t.activeContent += '</div';
t.activeContent += '</div>';
t.featuredContent = '<div class="exploreMapsMenu">'; t.featuredContent = '<a href="/explore/active">Recently Active</a>';
t.featuredContent += '<div class="exploreMapsCenter">';
t.featuredContent += '<a href="/explore/active">Recently Active</a>';
t.featuredContent += '<a href="/explore/featured" class="active">Featured</a>'; t.featuredContent += '<a href="/explore/featured" class="active">Featured</a>';
t.featuredContent += '<a href="/explore/new">New</a>'; t.featuredContent += '<a href="/explore/new">New</a>';
t.featuredContent += '<div class="clearfloat"></div>';
t.featuredContent += '</div';
t.featuredContent += '</div>';
t.newContent = '<div class="exploreMapsMenu">'; t.newContent = '<a href="/explore/active">Recently Active</a>';
t.newContent += '<div class="exploreMapsCenter">';
t.newContent += '<a href="/explore/active">Recently Active</a>';
t.newContent += '<a href="/explore/featured">Featured</a>'; t.newContent += '<a href="/explore/featured">Featured</a>';
t.newContent += '<a href="/explore/new" class="active">New</a>'; t.newContent += '<a href="/explore/new" class="active">New</a>';
t.newContent += '<div class="clearfloat"></div>';
t.newContent += '</div';
t.newContent += '</div>';
/* logged in explore maps bars */ /* logged in explore maps bars */
t.mineAuthContent = '<div class="exploreMapsMenu">'; t.mineAuthContent = '<a href="/" class="active">My Maps</a>';
t.mineAuthContent += '<div class="exploreMapsCenter">';
t.mineAuthContent += '<a href="/" class="active">My Maps</a>';
t.mineAuthContent += '<a href="/explore/active">Recently Active</a>'; t.mineAuthContent += '<a href="/explore/active">Recently Active</a>';
t.mineAuthContent += '<a href="/explore/featured">Featured</a>'; t.mineAuthContent += '<a href="/explore/featured">Featured</a>';
t.mineAuthContent += '<a href="/explore/new">New</a>'; t.mineAuthContent += '<a href="/explore/new">New</a>';
t.mineAuthContent += '<div class="clearfloat"></div>';
t.mineAuthContent += '</div';
t.mineAuthContent += '</div>';
t.activeAuthContent = '<div class="exploreMapsMenu">'; t.activeAuthContent = '<a href="/">My Maps</a>';
t.activeAuthContent += '<div class="exploreMapsCenter">';
t.activeAuthContent += '<a href="/">My Maps</a>';
t.activeAuthContent += '<a href="/explore/active" class="active">Recently Active</a>'; t.activeAuthContent += '<a href="/explore/active" class="active">Recently Active</a>';
t.activeAuthContent += '<a href="/explore/featured">Featured</a>'; t.activeAuthContent += '<a href="/explore/featured">Featured</a>';
t.activeAuthContent += '<a href="/explore/new">New</a>'; t.activeAuthContent += '<a href="/explore/new">New</a>';
t.activeAuthContent += '<div class="clearfloat"></div>';
t.activeAuthContent += '</div';
t.activeAuthContent += '</div>';
t.featuredAuthContent = '<div class="exploreMapsMenu">'; t.featuredAuthContent = '<a href="/">My Maps</a>';
t.featuredAuthContent += '<div class="exploreMapsCenter">';
t.featuredAuthContent += '<a href="/">My Maps</a>';
t.featuredAuthContent += '<a href="/explore/active">Recently Active</a>'; t.featuredAuthContent += '<a href="/explore/active">Recently Active</a>';
t.featuredAuthContent += '<a href="/explore/featured" class="active">Featured</a>'; t.featuredAuthContent += '<a href="/explore/featured" class="active">Featured</a>';
t.featuredAuthContent += '<a href="/explore/new">New</a>'; t.featuredAuthContent += '<a href="/explore/new">New</a>';
t.featuredAuthContent += '<div class="clearfloat"></div>';
t.featuredAuthContent += '</div';
t.featuredAuthContent += '</div>';
t.newAuthContent = '<div class="exploreMapsMenu">'; t.newAuthContent = '<a href="/">My Maps</a>';
t.newAuthContent += '<div class="exploreMapsCenter">';
t.newAuthContent += '<a href="/">My Maps</a>';
t.newAuthContent += '<a href="/explore/active">Recently Active</a>'; t.newAuthContent += '<a href="/explore/active">Recently Active</a>';
t.newAuthContent += '<a href="/explore/featured">Featured</a>'; t.newAuthContent += '<a href="/explore/featured">Featured</a>';
t.newAuthContent += '<a href="/explore/new" class="active">New</a>'; t.newAuthContent += '<a href="/explore/new" class="active">New</a>';
t.newAuthContent += '<div class="clearfloat"></div>';
t.newAuthContent += '</div';
t.newAuthContent += '</div>';
module.exports = t; module.exports = t;
}); });