Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
This commit is contained in:
Bashar Jabbour
commit
a284889593
15 changed files with 110 additions and 70 deletions
BIN
app/assets/images/.DS_Store
vendored
BIN
app/assets/images/.DS_Store
vendored
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 109 KiB |
BIN
app/assets/images/homepage_bg.png
Normal file
BIN
app/assets/images/homepage_bg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 128 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 109 KiB |
BIN
app/assets/images/partner_logos.png
Normal file
BIN
app/assets/images/partner_logos.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
BIN
app/assets/images/user.png
Executable file → Normal file
BIN
app/assets/images/user.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
|
@ -89,10 +89,20 @@ Metamaps.Backbone.Map = Backbone.Model.extend({
|
|||
function capitalize(string) {
|
||||
return string.charAt(0).toUpperCase() + string.slice(1);
|
||||
}
|
||||
|
||||
var n = this.get('name');
|
||||
var d = this.get('desc');
|
||||
|
||||
var maxNameLength = 32;
|
||||
var maxDescLength = 118;
|
||||
var truncatedName = n ? (n.length > maxNameLength ? n.substring(0, maxNameLength) + "..." : n) : "";
|
||||
var truncatedDesc = d ? (d.length > maxDescLength ? d.substring(0, maxDescLength) + "..." : d) : "";
|
||||
|
||||
var obj = {
|
||||
id: this.id,
|
||||
name: this.get('name'),
|
||||
desc: this.get('desc'),
|
||||
name: truncatedName,
|
||||
fullName: n,
|
||||
desc: truncatedDesc,
|
||||
permission: this.get("permission") ? capitalize(this.get("permission")) : "Commons",
|
||||
editPermission: this.authorizeToEdit(Metamaps.Active.Mapper) ? 'canEdit' : 'cannotEdit',
|
||||
contributor_count_number: '<span class="cCountColor">' + this.get('contributor_count') + '</span>',
|
||||
|
|
|
|||
|
|
@ -1322,9 +1322,9 @@ Metamaps.JIT = {
|
|||
|
||||
var disabled = authorized ? "" : "disabled";
|
||||
|
||||
if (Metamaps.Active.Map) menustring += '<li class="rc-hide"><div class="rc-icon"></div>Hide until refresh</li>';
|
||||
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-remove ' + disabled + '"><div class="rc-icon"></div>Remove from map</li>';
|
||||
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-delete ' + disabled + '"><div class="rc-icon"></div>Delete</li>';
|
||||
if (Metamaps.Active.Map) menustring += '<li class="rc-hide"><div class="rc-icon"></div>Hide until refresh<div class="rc-keyboard">Ctrl+H</div></li>';
|
||||
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-remove ' + disabled + '"><div class="rc-icon"></div>Remove from map<div class="rc-keyboard">Ctrl+M</div></li>';
|
||||
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-delete ' + disabled + '"><div class="rc-icon"></div>Delete<div class="rc-keyboard">Ctrl+D</div></li>';
|
||||
|
||||
|
||||
if (Metamaps.Active.Topic) {
|
||||
|
|
@ -1337,6 +1337,8 @@ Metamaps.JIT = {
|
|||
<li class="changeP toPrivate"><div class="rc-perm-icon"></div>private</li> \
|
||||
</ul>';
|
||||
|
||||
menustring += '<li class="rc-spacer"></li>';
|
||||
|
||||
menustring += '<li class="rc-permission"><div class="rc-icon"></div>Change permissions' + options + '<div class="expandLi"></div></li>';
|
||||
|
||||
var metacodeOptions = $('#metacodeOptions').html();
|
||||
|
|
@ -1344,6 +1346,11 @@ Metamaps.JIT = {
|
|||
menustring += '<li class="rc-metacode"><div class="rc-icon"></div>Change metacode' + metacodeOptions + '<div class="expandLi"></div></li>';
|
||||
}
|
||||
if (Metamaps.Active.Topic) {
|
||||
|
||||
if (!Metamaps.Active.Mapper) {
|
||||
menustring += '<li class="rc-spacer"></li>';
|
||||
}
|
||||
|
||||
// set up the get sibling menu as a "lazy load"
|
||||
// only fill in the submenu when they hover over the get siblings list item
|
||||
var siblingMenu = '<ul id="fetchSiblingList"> \
|
||||
|
|
@ -1575,9 +1582,11 @@ Metamaps.JIT = {
|
|||
|
||||
var disabled = authorized ? "" : "disabled";
|
||||
|
||||
if (Metamaps.Active.Map) menustring += '<li class="rc-hide"><div class="rc-icon"></div>Hide until refresh</li>';
|
||||
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-remove ' + disabled + '"><div class="rc-icon"></div>Remove from map</li>';
|
||||
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-delete ' + disabled + '"><div class="rc-icon"></div>Delete</li>';
|
||||
if (Metamaps.Active.Map) menustring += '<li class="rc-hide"><div class="rc-icon"></div>Hide until refresh<div class="rc-keyboard">Ctrl+H</div></li>';
|
||||
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-remove ' + disabled + '"><div class="rc-icon"></div>Remove from map<div class="rc-keyboard">Ctrl+M</div></li>';
|
||||
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-delete ' + disabled + '"><div class="rc-icon"></div>Delete<div class="rc-keyboard">Ctrl+D</div></li>';
|
||||
|
||||
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-spacer"></li>';
|
||||
|
||||
if (Metamaps.Active.Mapper) {
|
||||
var permOptions = '<ul><li class="changeP toCommons"><div class="rc-perm-icon"></div>commons</li> \
|
||||
|
|
|
|||
|
|
@ -1321,7 +1321,12 @@ Metamaps.SynapseCard = {
|
|||
|
||||
//if edge data is blank or just whitespace, populate it with data_nil
|
||||
if ($('#edit_synapse_desc').html().trim() == '') {
|
||||
$('#edit_synapse_desc').html(data_nil);
|
||||
if (synapse.authorizeToEdit(Metamaps.Active.Mapper)) {
|
||||
$('#edit_synapse_desc').html(data_nil);
|
||||
}
|
||||
else {
|
||||
$('#edit_synapse_desc').html("(no description)");
|
||||
}
|
||||
}
|
||||
|
||||
$('#edit_synapse_desc').bind("ajax:success", function () {
|
||||
|
|
@ -3542,7 +3547,9 @@ Metamaps.Listeners = {
|
|||
case 69: //if e or E is pressed
|
||||
if (e.ctrlKey){
|
||||
e.preventDefault();
|
||||
Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas);
|
||||
if (Metamaps.Active.Map) {
|
||||
Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 77: //if m or M is pressed
|
||||
|
|
|
|||
|
|
@ -520,7 +520,7 @@ input[type="submit"]:active {
|
|||
left: 41px;
|
||||
z-index: 9999;
|
||||
width: 256px;
|
||||
height: 42px;
|
||||
height: 34px;
|
||||
}
|
||||
.new_topic #topic_name,
|
||||
.new_topic .tt-hint {
|
||||
|
|
@ -528,7 +528,7 @@ input[type="submit"]:active {
|
|||
background: #FFFFFF;
|
||||
height: 14px;
|
||||
margin: 0;
|
||||
padding: 14px 6px;
|
||||
padding: 10px 6px;
|
||||
border: none;
|
||||
border-radius: 2px;
|
||||
outline: none;
|
||||
|
|
@ -811,6 +811,7 @@ li.accountInvite span {
|
|||
}
|
||||
.accountImage {
|
||||
background-image: url(user.png);
|
||||
background-size: 84px 84px;
|
||||
background-repeat: no-repeat;
|
||||
height:84px;
|
||||
width:84px;
|
||||
|
|
@ -1176,6 +1177,14 @@ h3.realtimeBoxTitle {
|
|||
color: black;
|
||||
box-shadow: 0px 3px 3px rgba(0,0,0,0.12), 0 3px 3px rgba(0,0,0,0.24);
|
||||
}
|
||||
|
||||
.rightclickmenu .rc-spacer {
|
||||
width:100%;
|
||||
height:0;
|
||||
border-top:1px solid #EBEBEB;
|
||||
margin: 6px 0;
|
||||
padding: 0;
|
||||
}
|
||||
.rightclickmenu > ul {
|
||||
|
||||
}
|
||||
|
|
@ -1198,6 +1207,14 @@ h3.realtimeBoxTitle {
|
|||
background-color: transparent;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.rc-keyboard {
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
right: 12px;
|
||||
color: #757575;
|
||||
}
|
||||
|
||||
.rightclickmenu > ul > li .rc-icon {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
|
|
@ -1596,6 +1613,7 @@ float: left;
|
|||
.wrapper div.mapInfoDesc span {
|
||||
float: none !important;
|
||||
padding-bottom: 10px;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
.infoStatIcon {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -670,7 +670,7 @@ padding: 9px 7px 9px 31px;
|
|||
height: 12px;
|
||||
width: 198px;
|
||||
margin: 0 0 0 0;
|
||||
border: 1px solid #BDBDBD;
|
||||
border: none;
|
||||
outline: none;
|
||||
font-size: 12px;
|
||||
line-height: 12px;
|
||||
|
|
@ -946,6 +946,7 @@ font-family: 'din-regular', helvetica, sans-serif;
|
|||
background: #424242;
|
||||
border-radius:2px;
|
||||
margin:16px 16px 16px 19px;
|
||||
box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16);
|
||||
}
|
||||
|
||||
.mapCard {
|
||||
|
|
@ -969,8 +970,10 @@ font-family: 'din-regular', helvetica, sans-serif;
|
|||
}
|
||||
|
||||
.mapCard .title {
|
||||
word-wrap: break-word;
|
||||
font-size:18px;
|
||||
line-height:22px;
|
||||
height: 44px;
|
||||
display:block;
|
||||
padding: 0 16px;
|
||||
text-align: center;
|
||||
|
|
@ -1000,11 +1003,11 @@ font-family: 'din-regular', helvetica, sans-serif;
|
|||
-webkit-flex: 1; /* Chrome */
|
||||
-ms-flex: 1; /* IE 10 */
|
||||
flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */
|
||||
overflow-y:auto;
|
||||
padding:0 16px 8px;
|
||||
font-family: helvetica, sans-serif;
|
||||
font-style: italic;
|
||||
font-size: 12px;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
.mCS_no_scrollbar {
|
||||
padding-right: 5px;
|
||||
|
|
|
|||
|
|
@ -213,16 +213,16 @@
|
|||
outline: none;
|
||||
font-size: 14px;
|
||||
line-height: 14px;
|
||||
background: #FFFFFF;
|
||||
background: #F5F5F5;
|
||||
font-family: 'din-medium', helvetica, sans-serif;
|
||||
}
|
||||
.sidebarSearch .tt-dropdown-menu {
|
||||
top: 40px !important;
|
||||
background: #F5F5F5;
|
||||
width: 472px;
|
||||
overflow-y: visible;
|
||||
overflow-y: auto;
|
||||
overflow-x: visible;
|
||||
box-shadow: 0 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24);
|
||||
box-shadow: 0 10px 10px rgba(0,0,0,0.19), 0 6px 3px rgba(0,0,0,0.23);
|
||||
}
|
||||
|
||||
.autoOptions #mapContribs {
|
||||
|
|
@ -327,7 +327,7 @@
|
|||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
height: 32px;
|
||||
padding: 0 8px;
|
||||
padding: 0 18px 0 28px;
|
||||
}
|
||||
.sidebarSearch .tt-suggestion .icon {
|
||||
width: 32px;
|
||||
|
|
@ -338,18 +338,16 @@
|
|||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
padding: 0 0 0 8px;
|
||||
max-width: 70px;
|
||||
width: 70px;
|
||||
}
|
||||
.sidebarSearch .tt-dataset-topics .topicIcon {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
}
|
||||
.sidebarSearch .tt-dataset-topics .tt-is-under-cursor .topicIcon,
|
||||
.sidebarSearch .tt-dataset-topics .tt-is-under-mouse-cursor .topicIcon {
|
||||
margin: 0 auto;
|
||||
}
|
||||
.sidebarSearch .tt-dataset-topics .metacodeTip {
|
||||
display: none;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.sidebarSearch .tt-dataset-topics .tt-is-under-cursor .metacodeTip,
|
||||
.sidebarSearch .tt-dataset-topics .tt-is-under-mouse-cursor .metacodeTip {
|
||||
|
|
@ -362,7 +360,7 @@
|
|||
text-align: center;
|
||||
}
|
||||
.sidebarSearch .tt-dataset-mappers .tt-suggestion .icon {
|
||||
margin: 4px 9px 4px 4px;
|
||||
margin: 0px 0px 0px 0px;
|
||||
}
|
||||
.sidebarSearch .tt-dataset-mappers .resultText {
|
||||
width: 150px;
|
||||
|
|
@ -488,8 +486,7 @@
|
|||
}
|
||||
|
||||
.sidebarSearch .topicOriginatorIcon .tip {
|
||||
left: 30px;
|
||||
right: auto;
|
||||
right: 30px;
|
||||
top: 1px;
|
||||
}
|
||||
.sidebarSearch .tip {
|
||||
|
|
@ -512,8 +509,7 @@
|
|||
}
|
||||
|
||||
.sidebarSearch .mapContributorsIcon .tip {
|
||||
left: 40px;
|
||||
right: auto;
|
||||
right: 40px;
|
||||
top: -5px;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 5px;
|
||||
|
|
@ -536,7 +532,7 @@
|
|||
position: absolute;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-right: 4px solid #424242;
|
||||
border-left: 4px solid #424242;
|
||||
border-top: 5px solid transparent;
|
||||
border-bottom: 5px solid transparent;
|
||||
}
|
||||
|
|
@ -546,20 +542,16 @@
|
|||
}
|
||||
.sidebarSearch .hoverForTip.addToMap .tip:before {
|
||||
right: -4px;
|
||||
border-left: 4px solid #424242;
|
||||
border-right: none;
|
||||
}
|
||||
|
||||
.sidebarSearch .mapContributorsIcon .tip:before {
|
||||
top: 65px;
|
||||
left: -4px;
|
||||
margin-top: -53px;
|
||||
top: 12px;
|
||||
right: -4px;
|
||||
}
|
||||
|
||||
.sidebarSearch .topicOriginatorIcon .tip:before {
|
||||
top: 58px;
|
||||
left: -4px;
|
||||
margin-top: -53px;
|
||||
top: 5px;
|
||||
right: -4px;
|
||||
}
|
||||
|
||||
.sidebarSearch .mapContributorsIcon .mapContributors {
|
||||
|
|
@ -712,7 +704,7 @@
|
|||
/* homepage */
|
||||
|
||||
.homeWrapper.homeText {
|
||||
margin-top: 10%;
|
||||
margin-top: 5%;
|
||||
}
|
||||
|
||||
.fullWidthWrapper {
|
||||
|
|
@ -724,20 +716,20 @@
|
|||
}
|
||||
|
||||
.homeWrapper {
|
||||
width: 880px;
|
||||
width: 800px;
|
||||
margin: 0 auto;
|
||||
color: #424242;
|
||||
}
|
||||
|
||||
.homeTitle {
|
||||
font-size: 69px;
|
||||
font-size: 63px;
|
||||
line-height: 48px;
|
||||
text-align: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.homeIntro {
|
||||
font-size: 23px;
|
||||
font-size: 22px;
|
||||
line-height: 26px;
|
||||
text-align: justify;
|
||||
margin: 32px 0 20px;
|
||||
|
|
@ -759,7 +751,7 @@
|
|||
|
||||
.homeWrapper .callToAction {
|
||||
float: left;
|
||||
width: 220px;
|
||||
width: 216px;
|
||||
padding: 24px 0 24px 24px;
|
||||
color: #F5F5F5;
|
||||
}
|
||||
|
|
@ -767,11 +759,11 @@
|
|||
font-size: 24px;
|
||||
}
|
||||
.callToAction p {
|
||||
margin: 16px 0;
|
||||
font-size: 14px;
|
||||
margin: 8px 0 16px;
|
||||
font-size: 13px;
|
||||
line-height: 16px;
|
||||
font-family: 'din-regular', helvetica, sans-serif;
|
||||
text-align: justify;
|
||||
text-align: left;
|
||||
}
|
||||
.callToAction a, .callToAction button {
|
||||
display: block;
|
||||
|
|
@ -806,15 +798,16 @@
|
|||
background-color: #4fb5c0;
|
||||
}
|
||||
.callToAction .learnMoreCTA:hover {
|
||||
background-color: #9150bc;
|
||||
background-color: #3d8e8e;
|
||||
}
|
||||
|
||||
.fullWidthWrapper.withPartners {
|
||||
background: url(homepage-bg.png) no-repeat center -300px;
|
||||
background: url(homepage_bg.png) no-repeat center -300px;
|
||||
}
|
||||
.homeWrapper.homePartners {
|
||||
padding-bottom: 100px;
|
||||
height: 200px;
|
||||
padding: 64px 0 100px;
|
||||
height: 96px;
|
||||
background: url(partner_logos.png) no-repeat 0 64px;
|
||||
}
|
||||
|
||||
.github-fork-ribbon-wrapper {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<div id="rightAboutParms">
|
||||
<p>PRIVATE BETA</p>
|
||||
<p>2.6</p>
|
||||
<p>Aug 31, 2014</p>
|
||||
<p>Nov 29, 2014</p>
|
||||
</div>
|
||||
<div class="clearfloat">
|
||||
</div>
|
||||
|
|
@ -81,15 +81,15 @@
|
|||
<p>Iconography within Metamaps is a distinctive and subtle art. We thank the following creators of icons used throughout Metamaps for the courtesy of sharing their work under Creative Commons licenses:<p>
|
||||
|
||||
<h4 id="colophonSectionIndented">System Icons</h4>
|
||||
<p id="colophonLinks"><a href="http://thenounproject.com/r0">Ryan Oksenhorn</a>, <a href="http://thenounproject.com/leonides.dm">Leonides Delgado</a>, <a href="http://thenounproject.com/matheusanturio">Matheus Antúrio</a>, <a href="http://thenounproject.com/nl_menghini">Nicholas Menghini</a>, <a href="http://thenounproject.com/useiconic.com">useiconic.com</a>, <a href="http://thenounproject.com/Icomatic">Icomatic</a>, <a href="http://thenounproject.com/ansteydesign">AnsteyDesign</a>, <a href="http://thenounproject.com/somerandomdude">P.J. Onori</a>, <a href="http://thenounproject.com/Michzen">Michael Zenaty</a>, <a href="http://thenounproject.com/edward">Edward Boatman</a>, <a href="http://thenounproject.com/garrett.knoll">Garrett Knoll</a>, <a href="http://thenounproject.com/misirlou">misirlou</a>, <a href="http://thenounproject.com/DmitryBaranovskiy">Dmitry Baranovskiy</a>, <a href="http://thenounproject.com/waymanate">Nathan Thomson</a>, <a href="http://thenounproject.com/razerk">Alex Auda Samora</a>, <a href="http://thenounproject.com/bernar.novalyi">Bernar Novalyi</a>, <a href="http://thenounproject.com/jeremy.j.bristol">Jeremy J Bristol</a>, <a href="http://thenounproject.com/FivebyFive/">FivebyFive</a>, <a href="http://thenounproject.com/thibault.geffroy">Thibault Geffroy</a>, <a href="http://cargocollective.com/gavinkeech">Gavin Keech</a></p>
|
||||
<p id="colophonLinks"><a href="http://thenounproject.com/r0" target="_blank">Ryan Oksenhorn</a>, <a href="http://thenounproject.com/leonides.dm" target="_blank">Leonides Delgado</a>, <a href="http://thenounproject.com/matheusanturio" target="_blank">Matheus Antúrio</a>, <a href="http://thenounproject.com/nl_menghini" target="_blank">Nicholas Menghini</a>, <a href="http://thenounproject.com/useiconic.com" target="_blank">useiconic.com</a>, <a href="http://thenounproject.com/Icomatic" target="_blank">Icomatic</a>, <a href="http://thenounproject.com/ansteydesign" target="_blank">AnsteyDesign</a>, <a href="http://thenounproject.com/somerandomdude" target="_blank">P.J. Onori</a>, <a href="http://thenounproject.com/Michzen" target="_blank">Michael Zenaty</a>, <a href="http://thenounproject.com/edward" target="_blank">Edward Boatman</a>, <a href="http://thenounproject.com/garrett.knoll" target="_blank">Garrett Knoll</a>, <a href="http://thenounproject.com/misirlou" target="_blank">misirlou</a>, <a href="http://thenounproject.com/DmitryBaranovskiy" target="_blank">Dmitry Baranovskiy</a>, <a href="http://thenounproject.com/waymanate" target="_blank">Nathan Thomson</a>, <a href="http://thenounproject.com/razerk" target="_blank">Alex Auda Samora</a>, <a href="http://thenounproject.com/bernar.novalyi" target="_blank">Bernar Novalyi</a>, <a href="http://thenounproject.com/jeremy.j.bristol" target="_blank">Jeremy J Bristol</a>, <a href="http://thenounproject.com/FivebyFive/" target="_blank">FivebyFive</a>, <a href="http://thenounproject.com/thibault.geffroy" target="_blank">Thibault Geffroy</a>, <a href="http://cargocollective.com/gavinkeech" target="_blank">Gavin Keech</a></p>
|
||||
|
||||
<p>We are also indebted to <a href="http://thenounproject.com/">The Noun Project</a>, an invaluable resource for iconography on the web, and also where many of the above creators' icons can be found.</p>
|
||||
<p>We are also indebted to <a href="http://thenounproject.com/" target="_blank">The Noun Project</a>, an invaluable resource for iconography on the web, and also where many of the above creators' icons can be found.</p>
|
||||
|
||||
<h4 id="colophonSectionIndented">Metacodes:</h4>
|
||||
<p id="colophonLinks">Legacy:<a href="http://cargocollective.com/gavinkeech">Gavin Keech</a>, <a href="http://notthisbody.com/">Notthisbody</a><br><a href="http://thenounproject.com/FivebyFive/">FivebyFive</a></p>
|
||||
<p id="colophonLinks">Legacy:<a href="http://cargocollective.com/gavinkeech" target="_blank">Gavin Keech</a>, <a href="http://notthisbody.com/" target="_blank">Notthisbody</a><br><a href="http://thenounproject.com/FivebyFive/" target="_blank">FivebyFive</a></p>
|
||||
|
||||
<h4 id="colophonSection">MEDIA</h4>
|
||||
<p>Intro video: <a href="http://notthisbody.com/">Notthisbody</a>, <a href="https://uwaterloo.ca/arts/people-profiles/glenn-stillar">Glenn Stillar</a> <br>Tutorial videos: <a href="http://notthisbody.com/">Notthisbody</a></p>
|
||||
<p>Intro video: <a href="http://notthisbody.com/" target="_blank">Notthisbody</a>, <a href="https://uwaterloo.ca/arts/people-profiles/glenn-stillar" target="_blank">Glenn Stillar</a> <br>Tutorial videos: <a href="http://notthisbody.com/" target="_blank">Notthisbody</a></p>
|
||||
|
||||
<h4 id="colophonSection">OPEN SOURCE CREDITS</h4>
|
||||
|
||||
|
|
@ -110,12 +110,12 @@
|
|||
<h4 id="colophonSection">Communication</h4>
|
||||
<ul>
|
||||
<li>Asana</li>
|
||||
<li>Invision App <a href="http://invis.io/541GCFJRM">*</a></li>
|
||||
<li>Docracy <a href="https://www.docracy.com/userprofile/show?userId=7366">*</a></li>
|
||||
<li>Google Plus <a href="https://plus.google.com/communities/115060009262157699234">*</a></li>
|
||||
<li>Hackpad <a href="http://metamaps.hackpad.com/">*</a></li>
|
||||
<li>Loomio <a href="https://www.loomio.org/g/bu3L1tIW/topos-ffo">*</a></li>
|
||||
<li>Twitter <a href="http://twitter.com/metamapps">*</a></li>
|
||||
<li>Invision App <a href="http://invis.io/541GCFJRM" target="_blank">*</a></li>
|
||||
<li>Docracy <a href="https://www.docracy.com/userprofile/show?userId=7366" target="_blank">*</a></li>
|
||||
<li>Google Plus <a href="https://plus.google.com/communities/115060009262157699234" target="_blank">*</a></li>
|
||||
<li>Hackpad <a href="http://metamaps.hackpad.com/" target="_blank">*</a></li>
|
||||
<li>Loomio <a href="https://www.loomio.org/g/bu3L1tIW/topos-ffo" target="_blank">*</a></li>
|
||||
<li>Twitter <a href="http://twitter.com/metamapps" target="_blank">*</a></li>
|
||||
<li>Hipchat</li>
|
||||
<li>Google Hangouts</li>
|
||||
<li>Vimeo </li>
|
||||
|
|
@ -123,12 +123,12 @@
|
|||
<br>
|
||||
<h4 id="colophonSection">Design & Development</h4>
|
||||
<ul>
|
||||
<li>Github<a href="https://github.com/metamaps">*</a></li>
|
||||
<li>Pixelapse<a href="https://www.pixelapse.com/poietic/projects/Metamaps.cc/overview">*</a></li>
|
||||
<li>Github<a href="https://github.com/metamaps" target="_blank">*</a></li>
|
||||
<li>Pixelapse<a href="https://www.pixelapse.com/poietic/projects/Metamaps.cc/overview" target="_blank">*</a></li>
|
||||
</ul>
|
||||
<h4 id="colophonSection">Documentation</h4>
|
||||
<ul><li>Dropbox <a href="https://www.dropbox.com/sh/qqkesm0pmzaihfa/AAAv9aCVZeawUzDXrdM9y3T5a?dl=0">*</a></li>
|
||||
<li>Google Drive <a href="https://drive.google.com/folderview?id=0B_RQI2WcwEHLckplOHhhdnZkSUE&usp=sharing">*</a></li>
|
||||
<ul><li>Dropbox <a href="https://www.dropbox.com/sh/qqkesm0pmzaihfa/AAAv9aCVZeawUzDXrdM9y3T5a?dl=0" target="_blank">*</a></li>
|
||||
<li>Google Drive <a href="https://drive.google.com/folderview?id=0B_RQI2WcwEHLckplOHhhdnZkSUE&usp=sharing" target="_blank">*</a></li>
|
||||
<li>Toggl</li></ul>
|
||||
<br>
|
||||
<h4 id="colophonSection">Hosting</h4>
|
||||
|
|
@ -140,7 +140,7 @@
|
|||
<ul><li>Google Analytics</li></ul>
|
||||
<br>
|
||||
<h4 id="colophonSection">Support</h4>
|
||||
<ul><li>Uservoice <a href="http://support.metamaps.cc/">*</a></li></ul>
|
||||
<ul><li>Uservoice <a href="http://support.metamaps.cc/" target="_blank">*</a></li></ul>
|
||||
|
||||
</div>
|
||||
<div class="clearfloat"></div>
|
||||
|
|
|
|||
|
|
@ -50,14 +50,14 @@
|
|||
<a href="/maps/{{id}}">
|
||||
<div class="permission {{editPermission}}"> <!-- must be canEdit or cannotEdit -->
|
||||
<div class="mapCard">
|
||||
<span class="title">
|
||||
<span class="title" title="{{fullName}}">
|
||||
{{name}}
|
||||
</span>
|
||||
<div class="mapScreenshot">
|
||||
{{{screenshot}}}
|
||||
</div>
|
||||
<div class="scroll">
|
||||
<div class="desc">
|
||||
<div class="desc">
|
||||
{{desc}}
|
||||
<div class="clearfloat"></div>
|
||||
</div>
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<div class="result{{rtype}}">
|
||||
<div class="topicMetacode">
|
||||
<img src="{{typeImageURL}}" class="topicIcon" />
|
||||
<span class="metacodeTip">{{type}}</span>
|
||||
<div class="metacodeTip">{{type}}</div>
|
||||
</div>
|
||||
<div class="resultText">
|
||||
<p class="resultTitle">{{label}}</p>
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
</div>
|
||||
<div class="topicOriginatorIcon hoverForTip">
|
||||
<img width="18" height="18" src="{{originatorImage}}">
|
||||
<span class="tip topicOriginator">created by {{originator}}</span>
|
||||
<span class="tip topicOriginator">{{originator}}</span>
|
||||
</div>
|
||||
<div class="topicPermission {{permission}}">
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@
|
|||
<img class="homeVideo" src="/assets/video-screen.png" width="560" height="350" />
|
||||
<div class="callToAction">
|
||||
<h3>Who finds it useful?</h3>
|
||||
<p>Designers, inventors, artists, educators, strategists, consultants, facilitators, organizers, systems thinkers, changemakers, analysts, students, researchers...maybe you!</p>
|
||||
<p>Designers, inventors, artists, educators, strategists, consultants, facilitators, organizers, systems thinkers, changemakers, analysts, students, researchers... maybe you!</p>
|
||||
<a href="/request" class="requestInviteCTA" data-bypass="true">REQUEST INVITE</a>
|
||||
<a href="/explore/featured" class="exploreFeaturedCTA">EXPLORE FEATURED MAPS</a>
|
||||
<button type="button" class="button learnMoreCTA">LEARN MORE</button>
|
||||
<button type="button" class="button learnMoreCTA" onclick="Metamaps.GlobalUI.openLightbox('about');">LEARN MORE</button>
|
||||
</div>
|
||||
<div class="clearfloat"></div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue