replace uservoice with docs.metamaps.cc + Hylo (#777)
* replace uservoice with docs.metamaps.cc + Hylo * re-add the feedback tab as link to hylo
This commit is contained in:
Devin Howard
Connor Turland
parent
e2d9b6aef2
commit
261ed49977
11 changed files with 31 additions and 116 deletions
|
|
@ -18,7 +18,6 @@ export SECRET_KEY_BASE='267c8a84f63963282f45bc3010eaddf027abfab58fc759d6e239c800
|
|||
# export S3_BUCKET_NAME
|
||||
# export AWS_ACCESS_KEY_ID
|
||||
# export AWS_SECRET_ACCESS_KEY
|
||||
# export SSO_KEY
|
||||
#
|
||||
# export SMTP_DOMAIN
|
||||
# export SMTP_PASSWORD
|
||||
|
|
|
|||
1
Gemfile
1
Gemfile
|
|
@ -25,7 +25,6 @@ gem 'rack-cors'
|
|||
gem 'redis'
|
||||
gem 'slack-notifier'
|
||||
gem 'snorlax'
|
||||
gem 'uservoice-ruby'
|
||||
|
||||
# asset stuff
|
||||
gem 'jquery-rails'
|
||||
|
|
|
|||
|
|
@ -96,7 +96,6 @@ GEM
|
|||
actionmailer (>= 4.0, < 6)
|
||||
activesupport (>= 4.0, < 6)
|
||||
execjs (2.7.0)
|
||||
ezcrypto (0.7.2)
|
||||
factory_girl (4.7.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.7.0)
|
||||
|
|
@ -138,7 +137,6 @@ GEM
|
|||
nokogiri (1.6.8)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
pkg-config (~> 1.1.7)
|
||||
oauth (0.5.1)
|
||||
orm_adapter (0.5.0)
|
||||
paperclip (5.1.0)
|
||||
activemodel (>= 4.2.0)
|
||||
|
|
@ -255,10 +253,6 @@ GEM
|
|||
uglifier (3.0.2)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unicode-display_width (1.1.1)
|
||||
uservoice-ruby (0.0.11)
|
||||
ezcrypto (>= 0.7.2)
|
||||
json (>= 1.7.5)
|
||||
oauth (>= 0.4.7)
|
||||
warden (1.2.6)
|
||||
rack (>= 1.0)
|
||||
websocket-driver (0.6.4)
|
||||
|
|
@ -307,7 +301,6 @@ DEPENDENCIES
|
|||
snorlax
|
||||
tunemygc
|
||||
uglifier
|
||||
uservoice-ruby
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.3.0p0
|
||||
|
|
|
|||
14
README.md
14
README.md
|
|
@ -11,9 +11,12 @@ You can find a version of this software running at [metamaps.cc][site-beta], whe
|
|||
|
||||
Metamaps is created and maintained by a distributed, nomadic community comprised of technologists, artists and storytellers. You can get in touch by using whichever of these channels you prefer:
|
||||
|
||||
## Community
|
||||
|
||||
- To send us a personal message or request an invite to the open beta, get in touch with us at team@metamaps.cc or @metamapps on Twitter.
|
||||
## How do I learn more?
|
||||
|
||||
- To send us a personal message or request an invite to the open beta, get in touch with us via email, Twitter, or Hylo
|
||||
- User Documentation: [docs.metamaps.cc](https://docs.metamaps.cc)
|
||||
- User Community: [hylo.com/c/metamaps](https://www.hylo.com/c/metamaps)
|
||||
- Development Roadmap: [github.com/metamaps/metamaps/milestones](https://github.com/metamaps/metamaps/milestones)
|
||||
- If you would like to report a bug, please check the [issues][contributing-issues] section in our [contributing instructions][contributing].
|
||||
- If you would like to get set up as a developer, that's great! Read on for help getting your development environment set up.
|
||||
|
||||
|
|
@ -51,10 +54,6 @@ We haven't set up instructions for using Vagrant on Windows, but there are instr
|
|||
|
||||
- [For Windows][windows-installation]
|
||||
|
||||
## Contributing guidelines
|
||||
|
||||
Cloning this repository directly is primarily for those wishing to contribute to our codebase. Check out our [contributing instructions][contributing] to get involved.
|
||||
|
||||
## Licensing information
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or(at your option) any later version.
|
||||
|
|
@ -65,7 +64,6 @@ The license can be read [here][license].
|
|||
|
||||
Copyright (c) 2016 Connor Turland
|
||||
|
||||
[site-blog]: http://blog.metamaps.cc
|
||||
[site-beta]: http://metamaps.cc
|
||||
[license]: https://github.com/metamaps/metamaps/blob/develop/LICENSE
|
||||
[contributing]: https://github.com/metamaps/metamaps/blob/develop/doc/CONTRIBUTING.md
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
var USERVOICE;
|
||||
if(USERVOICE == undefined) {
|
||||
USERVOICE = {};
|
||||
}
|
||||
|
||||
USERVOICE.load = function (name, id, email, sso_token) {
|
||||
// Include the UserVoice JavaScript SDK (only needed once on a page)
|
||||
UserVoice=window.UserVoice||[];(function(){var uv=document.createElement('script');uv.type='text/javascript';uv.async=true;uv.src='//widget.uservoice.com/wybK0nSMNuhlWkIKzTyWg.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(uv,s)})();
|
||||
|
||||
//
|
||||
// UserVoice Javascript SDK developer documentation:
|
||||
// https://www.uservoice.com/o/javascript-sdk
|
||||
//
|
||||
|
||||
// Set colors
|
||||
UserVoice.push(['set', {
|
||||
accent_color: '#448dd6',
|
||||
trigger_color: 'white',
|
||||
trigger_background_color: 'rgba(46, 49, 51, 0.6)'
|
||||
}]);
|
||||
|
||||
// Identify the user and pass traits
|
||||
// To enable, replace sample data with actual user traits and uncomment the line
|
||||
if (name) {
|
||||
UserVoice.push(['setSSO', sso_token]);
|
||||
UserVoice.push(['identify', {
|
||||
'email': email, // User’s email address
|
||||
'name': name, // User’s real name
|
||||
'id': id, // Optional: Unique id of the user
|
||||
}]);
|
||||
}
|
||||
|
||||
// Add default trigger to the bottom-left corner of the window:
|
||||
UserVoice.push(['addTrigger', { mode: 'contact', trigger_position: 'bottom-left' }]);
|
||||
|
||||
// Or, use your own custom trigger:
|
||||
//UserVoice.push(['addTrigger', '#barometer_tab', { mode: 'contact' }]);
|
||||
|
||||
// Autoprompt for Satisfaction and SmartVote (only displayed under certain conditions)
|
||||
UserVoice.push(['autoprompt', {}]);
|
||||
};
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
/* =USERVOICE ICON DEFINE
|
||||
--------------------------------------------------------*/
|
||||
|
||||
.unauthenticated .uv-icon {
|
||||
.unauthenticated .feedback-icon {
|
||||
display: none;
|
||||
}
|
||||
|
||||
div.uv-icon.uv-bottom-left {
|
||||
.feedback-icon {
|
||||
position: fixed;
|
||||
background-image: url(<%= asset_data_uri 'feedback_sprite.png' %>);
|
||||
background-repeat: no-repeat;
|
||||
color:#FFFFFF;
|
||||
|
|
@ -20,6 +18,8 @@ div.uv-icon.uv-bottom-left {
|
|||
opacity: 1;
|
||||
}
|
||||
|
||||
div.uv-icon.uv-bottom-left:hover {
|
||||
.feedback-icon:hover {
|
||||
background-position: 0 -110px;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2,12 +2,14 @@
|
|||
<%= render :partial => 'layouts/templates' %>
|
||||
<%= render :partial => 'shared/metacodeBgColors' %>
|
||||
<script type="text/javascript" charset="utf-8">
|
||||
// TODO move this into Metamaps.ServerData somehow
|
||||
<% if current_user %>
|
||||
Metamaps.Active.Mapper = <%= current_user.to_json.html_safe %>
|
||||
<% else %>
|
||||
Metamaps.Active.Mapper = null;
|
||||
<% end %>
|
||||
|
||||
// TODO move this into frontend/
|
||||
Metamaps.Loading = {
|
||||
loader: new CanvasLoader('loading'),
|
||||
hide: function () {
|
||||
|
|
@ -22,8 +24,6 @@
|
|||
Metamaps.Loading.loader.setDensity(41); // default is 40
|
||||
Metamaps.Loading.loader.setRange(0.9); // default is 1.3
|
||||
Metamaps.Loading.loader.show(); // Hidden by default
|
||||
|
||||
USERVOICE.load();
|
||||
</script>
|
||||
<%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
<a id="chromeIcon" href="https://www.google.com/chrome/browser/" target="_blank">Chrome</a>
|
||||
<a id="fireFoxIcon" href="https://www.mozilla.org/en-US/firefox/new/" target="_blank">Firefox</a>
|
||||
<a id="safariIcon" href="http://support.apple.com/downloads/#safari" target="_blank">Safari</a>
|
||||
<p id="noIEbody">While it's downloading, explore our <a href="http://blog.metamaps.cc/">blog</a>,<br> watch the <a href="http://vimeo.com/88334167">tutorials</a>, or visit our <a href="http://metamapscc.uservoice.com/">knowledge base</a>!
|
||||
<p id="noIEbody">While it's downloading, explore our <a href="http://blog.metamaps.cc/">blog</a>,<br> watch the <a href="http://vimeo.com/88334167">tutorials</a>, or visit our <a href="https://docs.metamaps.cc">knowledge base</a>!
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
<body class="<%= authenticated? ? "authenticated" : "unauthenticated" %>">
|
||||
|
||||
|
||||
<a class='feedback-icon' target='_blank' href='https://hylo.com/c/metamaps'></a>
|
||||
|
||||
<%= content_tag :div, class: "main" do %>
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<div class="csItem indented"><span class="csTitle">Esc:</span> Hides auto-suggestion results</div>
|
||||
<div class="csItem indented"><span class="csTitle">Enter:</span> create a new topic</div>
|
||||
<div class="csItem indented"><span class="csTitle">Gear Icon:</span> open up metacode settings</div>
|
||||
<div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425787-creating-and-editing-topics" target= "_blank">Learn More</a></div>
|
||||
<div class="csItem"><br><a href="https://docs.metamaps.cc/creating_topics.html" target= "_blank">Learn More</a></div>
|
||||
</div>
|
||||
|
||||
<div id="csEditingTopics">
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
<span class="csTitle">Open 'Context Menu':</span> Right-click/alt+click on topic icon or synapse
|
||||
</div>
|
||||
<div class="csItem indented">*Hide/Remove/Delete topic within context menu</div>
|
||||
<div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425787-creating-and-editing-topics" target= "_blank">Learn More</a></div>
|
||||
<div class="csItem"><br><a href="https://docs.metamaps.cc/creating_topics.html" target= "_blank">Learn More</a></div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
<div class="csItem"><span class="csTitle">Create new Topic with Synapse:</span> Right-click + drag from topic to open canvas</div>
|
||||
<div class="csItem indented"><span class="csTitle">Enter:</span> Create topic</div>
|
||||
<div class="csItem indented"><span class="csTitle">Enter:</span> Create synapse</div>
|
||||
<div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425790-creating-and-editing-synapses" target= "_blank">Learn More</a></div>
|
||||
<div class="csItem"><br><a href="https://docs.metamaps.cc/creating_synapses.html" target= "_blank">Learn More</a></div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
<div class="csItem indented"><span class="csTitle">Browse synapses / change visible synapse</span> click on arrow icon and select desired synapse</div>
|
||||
<div class="csItem"><span class="csTitle">Open 'Context Menu':</span> Right-click/alt-click on Synapse</div>
|
||||
<div class="csItem indented">*Hide/Remove/Delete synapse within context menu</div>
|
||||
<div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425790-creating-and-editing-synapses" target= "_blank">Learn More</a></div>
|
||||
<div class="csItem"><br><a href="https://docs.metamaps.cc/creating_synapses.html" target= "_blank">Learn More</a></div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
<div class="csItem"><span class="csTitle">Move around Canvas:</span> Click and drag</div>
|
||||
<div class="csItem"><span class="csTitle">Zoom in/out:</span> Scroll OR click on <div id="zoomIn"> </div> & <div id="zoomOut"> </div></div>
|
||||
<div class="csItem"><span class="csTitle">Zoom to see all:</span> Click <div id="centerMap"></div> OR Ctrl + E</div>
|
||||
<div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425784-viewing-existing-maps" target= "_blank">Learn More</a></div>
|
||||
<div class="csItem"><br><a href="https://docs.metamaps.cc/exploring_maps.html" target= "_blank">Learn More</a></div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -153,43 +153,21 @@
|
|||
<div id="moreResources">
|
||||
<p>For more information about Metamaps.cc, visit our Knowledge Base or skip directly to a section by clicking on one of the categories below.</p>
|
||||
<div class="resourcesColumnOne resourcesColumn">
|
||||
<a href="http://metamapscc.uservoice.com/forums/262715-general" target="_blank" class="button">Feedback Forums</a>
|
||||
<a href="https://hylo.com/c/metamaps" target="_blank" class="button">Hylo User Community</a>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/61031-getting-started" target="_blank">Getting Started</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/63372-key-fundamentals" target="_blank">Key Fundamentals</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/61033-best-practices" target="_blank">Best Practices</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/63377-general-troubleshooting" target="_blank">General Troubleshooting</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/63443-applications-use-cases" target="_blank">Applications & Use Cases</a>
|
||||
</li>
|
||||
<li><a href="https://docs.metamaps.cc/getting_started.html" target="_blank">Getting Started</a></li>
|
||||
<li><a href="https://docs.metamaps.cc/best_practices.html" target="_blank">Best Practices</a></li>
|
||||
<li><a href="https://docs.metamaps.cc/applications_and_use_cases.html" target="_blank">Applications & Use Cases</a></li>
|
||||
<li><a href="https://docs.metamaps.cc/advanced_features.html" target="_blank">Advanced Features</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="resourcesColumnTwo resourcesColumn">
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase" target="_blank" class="button">KNOWLEDGE BASE</a>
|
||||
<a href="https://docs.metamaps.cc" target="_blank" class="button">KNOWLEDGE BASE</a>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/63440-general-questions" target="_blank">General Questions</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/63375-getting-involved" target="_blank">Getting Involved</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/63376-project-organization-governance" target="_blank">Organization & Governance</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/63378-technical-infrastructure" target="_blank">Technical Infrastructure</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://metamapscc.uservoice.com/knowledgebase/topics/63587-theory-references" target="_blank">References & Key Theory</a>
|
||||
</li>
|
||||
<li><a href="https://docs.metamaps.cc/general_questions.html" target="_blank">General Questions</a></li>
|
||||
<li><a href="https://docs.metamaps.cc/project_organization_and_governance.html" target="_blank">Organization & Governance</a></li>
|
||||
<li><a href="https://docs.metamaps.cc/realtime_collaboration_junto.html" target="_blank">Realtime Collaboration</a></li>
|
||||
<li><a href="https://docs.metamaps.cc/importing_and_exporting_data.html" target="_blank">Importing and Exporting Data</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
# frozen_string_literal: true
|
||||
require 'uservoice-ruby'
|
||||
|
||||
def current_sso_token
|
||||
@current_sso_token ||= UserVoice.generate_sso_token(
|
||||
'metamapscc',
|
||||
ENV['SSO_KEY'],
|
||||
{ email: current_user.email },
|
||||
300 # Default expiry time is 5 minutes = 300 seconds
|
||||
)
|
||||
end
|
||||
Loading…
Reference in a new issue