diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js b/app/assets/javascripts/src/Metamaps.GlobalUI.js index 3a52961d..b93c6ab4 100644 --- a/app/assets/javascripts/src/Metamaps.GlobalUI.js +++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js @@ -165,6 +165,9 @@ Metamaps.GlobalUI = { clearTimeout(self.notifyTimeOut); Metamaps.Famous.toast.hide(); + }, + shareInvite: function(inviteLink) { + window.prompt("To copy the invite link, press: Ctrl+C, Enter", inviteLink); } }; diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 5d31e22b..5b5475e8 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1335,7 +1335,7 @@ Metamaps.SynapseCard = { add_user_info: function (synapse) { var u = '
'; u += '' - u += '
Created by ' + synapse.get("user_name") + '
'; + u += '
' + synapse.get("user_name") + '
'; $('#editSynLowerBar').append(u); // get mapper image @@ -4503,7 +4503,7 @@ Metamaps.Map.InfoBox = { isOpen: false, changing: false, selectingPermission: false, - changePermissionText: "
As the creator, you can change the permission of this map, but the permissions of the topics and synapses on it must be changed independently.
", + changePermissionText: "
As the creator, you can change the permission of this map, but the permissions of the topics and synapses on it must be changed independently.
", nameHTML: '{{name}}', descHTML: '{{desc}}', init: function () { @@ -4631,9 +4631,17 @@ Metamaps.Map.InfoBox = { createContributorList: function () { var self = Metamaps.Map.InfoBox; - var mapperNames = Metamaps.Mappers.pluck("name"); + var string = ""; - return mapperNames.length > 0 ? mapperNames.join(", ") : "No one has added anything yet."; + string += ""; + + return string; }, updateNumbers: function () { var self = Metamaps.Map.InfoBox; diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 7454b665..3dccdd10 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -531,7 +531,7 @@ input[type="submit"]:active { background: #FFFFFF; height: 14px; margin: 0; - padding: 10px 6px; + padding: 14px 6px; border: none; border-radius: 2px; outline: none; @@ -1360,9 +1360,14 @@ float: left; #new_topic .tt-suggestion, #new_synapse .tt-suggestion { background: #F5F5F5; - width: 270px; position: relative; } +#new_topic .tt-suggestion { + width: 256px; +} +#new_synapse .tt-suggestion { + width: 270px; +} #new_topic .autocompleteSection { float: left; } @@ -1460,25 +1465,25 @@ float: left; #new_topic .topicOriginatorIcon img { border-radius: 12px; } -#new_topic .topicOriginatorIcon:hover .tip, -#new_synapse .synapseOriginatorIcon:hover .tip { - display: block; +#new_topic .topicOriginatorIcon .tooltips { + left: 32px; + top: -2px; + right: auto; } -#new_topic .tip, -#new_synapse .tip { - display: none; +#new_topic .topicOriginatorIcon .tooltips:after { + content: ''; position: absolute; - background: white; - width: auto; - top: 0; - left: 23px; - color: black; - white-space: nowrap; - border-radius: 4px; - font-size: 15px !important; - line-height: 15px; - padding: 2px 5px 2px; - z-index: 100; + top: 57%; + left: -4px; + margin-top: -6px; + width: 0; + height: 0; + border-right: 4px solid #000000; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; +} +#new_topic .topicOriginatorIcon:hover .tooltips { + display:block; } #new_synapse .tt-dropdown-menu { @@ -1509,7 +1514,7 @@ float: left; top: 4px; } #new_synapse .synapseOriginatorIcon .tooltips { - right: 36px; + right: 32px; top: -2px; } #new_synapse .synapseOriginatorIcon .tooltips:after { @@ -1609,7 +1614,6 @@ float: left; margin: 9px 0px 9px 56px; padding: 0; width: 64px; - cursor: pointer; } #mapContribs { float: left; @@ -1647,8 +1651,6 @@ float: left; background: #202020; min-width: 180px; max-width: 250px; - min-height: 44px; - max-height: 188px; text-align: center; color: black; border-radius: 4px; @@ -1663,6 +1665,11 @@ float: left; left: -10px; } +.mapContributors .tip ul { + max-height: 188px; + overflow-y: auto; +} + .mapContributors .tip li { list-style-type: none; white-space: nowrap; @@ -1682,7 +1689,7 @@ float: left; .mapContributors div:after { content: ''; position: absolute; - margin-top: -124px; + top: -4px; left: 21px; width: 0; height: 0; @@ -1699,14 +1706,32 @@ float: left; border-radius: 14px; } -.mapInfoBox .mapPermission .tip { - top: 0; - right: 32px; -} .mapInfoBox .hoverForTip:hover .tip { display: block; } +.mapInfoBox .mapPermission .tooltips { + top: -20px; + right: 36px; + width: 155px; + white-space: normal; + text-align: center; +} +.mapInfoBox .mapPermission .tooltips:after { + content: ''; + position: absolute; + right: -4px; + top: 24px; + width: 0; + height: 0; + border-left: 4px solid black; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; +} +.mapInfoBox.yourMap .mapPermission.hoverForTip:hover .tooltips { + display: block; +} + .mapTopics { background-image: url(topic32.png); background-position: 13px center; @@ -2318,6 +2343,9 @@ and it won't be important on password protected instances */ #joinCodesBox { margin-top: 30px; } +#joinCodesBox button { + margin: 16px 198px 0; +} /* new map */ .new_map { diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 9e6c20ce..81461c06 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -227,12 +227,13 @@

SHARE INVITE

-

The Metamaps platform is currently in an invite-only beta with the express purpose of creating a high value knowledge ecosystem, as well as building an active community of contributors and healthy culture. As a valued beta tester, you have the ability to invite your peers, colleagues and collaborators onto the platform.

-

Copy and send the link + access code below. The access code below is your personal code and can be used multiple times.

+

The Metamaps platform is currently in an invite-only beta with the express purpose of creating a high value knowledge ecosystem, a diverse community of contributors and a culture of collaboration and curiosity.

+

As a valued beta tester, you have the ability to invite your peers, colleagues and collaborators onto the platform.

+

Below is a personal invite link containing your unique access code, which can be used multiple times.

-

HTTP://METAMAPS.CC/JOIN

- <% mapper = current_user %> -

ACCESS CODE: <%= mapper.code %>

+ <% mapper = current_user %> +

http://metamaps.cc/join?code=<%= mapper.code %>

+
diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb index aa0c5378..25f4d024 100644 --- a/app/views/layouts/_templates.html.erb +++ b/app/views/layouts/_templates.html.erb @@ -13,7 +13,7 @@ {{contributor_count}} -
{{contributor_list}}
+
{{{contributor_list}}}
{{topic_count}} @@ -177,7 +177,7 @@
{{synapseCount}}
- {{originator}} + {{originator}}
diff --git a/app/views/maps/_mapinfobox.html.erb b/app/views/maps/_mapinfobox.html.erb index 4f592e3f..1aeda2b2 100644 --- a/app/views/maps/_mapinfobox.html.erb +++ b/app/views/maps/_mapinfobox.html.erb @@ -23,17 +23,9 @@ <% end %> <%= @map.contributors.count %> - <% contributorList = '' - @map.contributors.each_with_index do |c, index| - comma = (index+1) == @map.contributors.count ? '' : ', ' - contributorList += c.name + comma - end - if @map.contributors.count == 0 - contributorList = 'No one has added anything yet.' - end %> -
@@ -44,9 +36,7 @@ <%= @map.synapses.count %>
- <% if @map.user == user %> -
As the creator, you can change the permission of this map, but the permissions of the topics and synapses on it must be changed independently.
- <% end %> +
As the creator, you can change the permission of this map, but the permissions of the topics and synapses on it must be changed independently.