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

Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new

Browse source
This commit is contained in:
Connor Turland 2014-10-03 11:26:49 -04:00
commit fae7f9996d
7 changed files with 155 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -16,3 +16,5 @@ db/*.sqlite3
# Ignore all logfiles and tempfiles. # Ignore all logfiles and tempfiles.
log/*.log log/*.log
tmp tmp
.DS_Store

BIN
app/assets/images/.DS_Store vendored Normal file
View file

Binary file not shown.

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

@ -2050,20 +2050,65 @@ float: left;
} }
#cheatSheet .csItem { #cheatSheet .csItem {
margin: 5px 0; margin: 5px 0;
font-size: 15px; font-size: 14px;
line-height: 18px; line-height: 18px;
font-family: 'din-regular';
} }
#cheatSheet .csItem a {
color: #c04f4f;
}
#cheatSheet .csItem img { #cheatSheet .csItem img {
display: inline-block; display: inline-block;
margin: 0 2px; margin-bottom: 10px;
} }
#cheatSheet .csTitle { #cheatSheet .csTitle {
font-weight: bold;
} }
#cheatSheet .indented { #cheatSheet .indented {
margin-left: 15px; margin-left: 15px;
} }
#zoomIn {
background: #424242 url(zoom_sprite.png) no-repeat;
width: 22px;
height: 22px;
display: inline-block;
background-position: -37px -5px;
border-radius: 2px;
margin: 0 4px;
position: relative;
top: 3px;
}
#zoomOut {
background: #424242 url(zoom_sprite.png) no-repeat;
width: 22px;
height: 22px;
display: inline-block;
background-position: -37px -37px;
border-radius: 2px;
margin: 0 4px;
position: relative;
top: 3px;
}
#centerMap {
background: #424242 url(extents_sprite.png) no-repeat;
width: 22px;
height: 22px;
display: inline-block;
background-position: -5px -5px;
border-radius: 2px;
margin: 0 4px;
position: relative;
top: 3px;
}
#helpWrapper { #helpWrapper {
background: none; background: none;
border: none; border: none;
@ -2096,7 +2141,17 @@ float: left;
} }
#quickReference ul { #quickReference ul {
width: 150px; width: 150px;
text-transform: uppercase;
font-size: 14px;
line-height: 14px;
font-family: din-medium;
} }
#quickReference ul li {
padding-bottom: 16px;
}
#quickReference li.ui-state-active a { #quickReference li.ui-state-active a {
color: #00BCD4; color: #00BCD4;
} }

79
app/views/shared/_cheatsheet.html.erb
View file

@ -14,7 +14,6 @@
<div id="quickReference"> <div id="quickReference">
<ul> <ul>
<li><a href="#csTopicView">Topic View</a></li>
<li><a href="#csCreatingTopics">Creating Topics</a></li> <li><a href="#csCreatingTopics">Creating Topics</a></li>
<li><a href="#csEditingTopics">Editing Topics</a></li> <li><a href="#csEditingTopics">Editing Topics</a></li>
<li><a href="#csCreatingSynapses">Creating Synapses</a></li> <li><a href="#csCreatingSynapses">Creating Synapses</a></li>
@ -22,11 +21,13 @@
<li><a href="#csNavigation">Navigation</a></li> <li><a href="#csNavigation">Navigation</a></li>
<li><a href="#csSelection">Selection</a></li> <li><a href="#csSelection">Selection</a></li>
<li><a href="#csSearch">Search</a></li> <li><a href="#csSearch">Search</a></li>
<li><a href="#csTopicView">Topic View</a></li>
</ul> </ul>
<div id="csTopicView"> <div id="csTopicView">
<div class="csItem"><span class="csTitle">Alt + click on topic icon:</span> recenter topics around chosen topic</div> <div class="csItem"><span class="csTitle">Recenter Topics around chosen Topic:</span> Alt + click on the topic OR Right-click + 'center this topic'</div>
<div class="csItem"><span class="csTitle">Right-click + 'center this topic':</span> recenter topics around chosen topic</div>
</div> </div>
<div id="csCreatingTopics"> <div id="csCreatingTopics">
@ -37,83 +38,89 @@
<div class="csItem indented"><span class="csTitle">Esc:</span> Hides auto-suggestion results</div> <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">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 indented"><span class="csTitle">Gear Icon:</span> open up metacode settings</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425787-creating-and-editing-topics" target= "_blank">Learn More</a></div>
</div> </div>
<div id="csEditingTopics"> <div id="csEditingTopics">
<div class="csItem"> <div class="csItem">
<span class="csTitle">Open topic card:</span> double-click on topic icon <span class="csTitle">Open 'Topic' card:</span> Double-click on topic icon
</div> </div>
<div class="csItem indented"> <div class="csItem indented">
<span class="csTitle">Move topic card:</span> click + drag on topic card metacode <span class="csTitle">Move 'Topic' card:</span> Click and drag on topic card metacode
</div> </div>
<div class="csItem indented"> <div class="csItem indented">
<span class="csTitle">Change/edit metacode:</span> mouse over metacode icon, then click on solid colored bar <span class="csTitle">Change/edit metacode:</span> Mouse over metacode icon, then click on solid colored bar
</div> </div>
<div class="csItem indented"> <div class="csItem indented">
<span class="csTitle">Edit topic title, description, link:</span> click on text in respective area <span class="csTitle">Edit Topic title, description, link:</span> Click on text in respective area
</div> </div>
<div class="csItem indented"> <div class="csItem indented">
<span class="csTitle">Save topic title, description, link:</span> hit enter <span class="csTitle">Save Topic title, description, link:</span> Hit enter
</div> </div>
<div class="csItem indented"> <div class="csItem indented">
<span class="csTitle">Change topic permission:</span> click on 'permission' icon (only for topic creator) <span class="csTitle">Change Topic permission:</span> Click on 'Permission' icon (only for topic creator)
</div> </div>
<div class="csItem indented"> <div class="csItem indented">
<span class="csTitle">Open topic view:</span> click on <img src="/assets/MMCCicon_pop-out_black.png" width="16" align="middle" /> icon within topic card bar <span class="csTitle">Open Topic view:</span> Click on <img src="/assets/synapse16.png" width="16" align="middle" /> icon within topic card bar
</div> </div>
<div class="csItem indented"> <div class="csItem indented">
<span class="csTitle">Close topic card:</span> click on canvas <span class="csTitle">Close 'Topic' card:</span> Click on canvas
</div> </div>
<div class="csItem"> <div class="csItem">
<span class="csTitle">Open context menu:</span> right-click on topic icon <span class="csTitle">Open 'Context Menu':</span> Right-click on topic icon
</div> </div>
<div class="csItem indented">*Hide/Remove/Delete topic within context menu</div> <div class="csItem indented">*Hide/Remove/Delete topic within context menu</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425787-creating-and-editing-topics" target= "_blank">Learn More</a></div>
</div> </div>
<div id="csCreatingSynapses"> <div id="csCreatingSynapses">
<div class="csItem"><span class="csTitle">Right-click & drag from one topic to another:</span> open create synapse prompt</div> <div class="csItem"><span class="csTitle">Open 'Create Synapse' prompt:</span> Right-click & drag from one topic to another</div>
<div class="csItem indented"><span class="csTitle">Enter:</span> Create synapse</div> <div class="csItem indented"><span class="csTitle">Enter:</span> Create synapse</div>
<div class="csItem indented">*You do not have to add a description</div> <div class="csItem indented">*You do not have to add a description</div>
<div class="csItem"><span class="csTitle">Right-click + drag from topic to open canvas:</span> create new topic with synapse</div> <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 topic</div>
<div class="csItem indented"><span class="csTitle">Enter:</span> Create synapse</div> <div class="csItem indented"><span class="csTitle">Enter:</span> Create synapse</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425790-creating-and-editing-synapses" target= "_blank">Learn More</a></div>
</div> </div>
<div id="csEditingSynapses"> <div id="csEditingSynapses">
<div class="csItem"><span class="csTitle">Open synapse card:</span>double-click on synapse </div> <div class="csItem"><span class="csTitle">Open 'Synapse' card:</span> Double-click on Synapse </div>
<div class="csItem indented"><span class="csTitle">Edit synapse description:</span> click on current description text</div> <div class="csItem indented"><span class="csTitle">Edit Synapse description:</span> Click on current description text</div>
<div class="csItem indented"><span class="csTitle">Save synapse description:</span> hit enter</div> <div class="csItem indented"><span class="csTitle">Save Synapse description:</span> Hit enter</div>
<div class="csItem indented"><span class="csTitle">Edit directionality:</span> select appropriate arrow boxes</div> <div class="csItem indented"><span class="csTitle">Edit directionality:</span> Select appropriate arrow boxes</div>
<div class="csItem indented"><span class="csTitle">Change synapse permission:</span> click on 'permission' icon (only for synapse creator)</div> <div class="csItem indented"><span class="csTitle">Change synapse permission:</span> Click on 'permission' icon (only for synapse creator)</div>
<div class="csItem"><span class="csTitle">Right-click on synapse:</span> open context menu</div> <div class="csItem"><span class="csTitle">Open 'Context Menu':</span> Right-click on Synapse</div>
<div class="csItem indented">*Hide/Remove/Delete synapse within context menu</div> <div class="csItem indented">*Hide/Remove/Delete synapse within context menu</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425790-creating-and-editing-synapses" target= "_blank">Learn More</a></div>
</div> </div>
<div id="csNavigation"> <div id="csNavigation">
<div class="csItem"><span class="csTitle">Click + drag:</span> move around canvas</div> <div class="csItem"><span class="csTitle">Move around Canvas:</span> Click and drag</div>
<div class="csItem"><span class="csTitle">Scroll:</span> zoom in/out</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">Refresh page:</span> center map</div> <div class="csItem"><span class="csTitle">Center Map:</span> Click <div id="centerMap"></div> OR Refresh page</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425784-viewing-existing-maps" target= "_blank">Learn More</a></div>
</div> </div>
<div id="csSelection"> <div id="csSelection">
<div class="csItem"><span class="csTitle">Click on topic icon:</span> select/deselect topic</div> <div class="csItem"><span class="csTitle">Select/Deselect Topic:</span> Click on topic icon</div>
<div class="csItem"><span class="csTitle">Click on synapse:</span> select/deselect synapse</div> <div class="csItem"><span class="csTitle">Select/Deselect Synapse:</span> Click on synapse</div>
<div class="csItem"><span class="csTitle">Shift + click:</span> select multiple topics / synapses</div> <div class="csItem"><span class="csTitle">Select multiple Topics/Synapses:</span> Shift + click</div>
<div class="csItem"><span class="csTitle">Shift + click + drag on canvas:</span> make selection box, select multiple topics</div> <div class="csItem"><span class="csTitle">Make Selection box, select multiple Topics:</span> Shift + click + drag on Canvas</div>
<div class="csItem"><span class="csTitle">Click + drag on selected topic(s):</span> move all selected topics & synapses</div> <div class="csItem"><span class="csTitle">Move all selected Topics & Synapses:</span> Click + drag on selected Topic(s)</div>
<div class="csItem"><span class="csTitle">Right-click on selected topic(s):</span> open context menu</div> <div class="csItem"><span class="csTitle">Open 'Context Menu':</span> Right-click on selected topic(s)</div>
<div class="csItem indented">*Hide/Remove/Delete/Change permissions of multiple topics & synapses within context menu</div> <div class="csItem indented">*Hide/Remove/Delete/Change permissions of multiple topics & synapses within context menu</div>
<div class="csItem"><span class="csTitle">Click on background:</span> deselect all topics & synapses</div> <div class="csItem"><span class="csTitle">Deselect all topics & Synapses:</span> Click on background or Esc</div>
<div class="csItem"><span class="csTitle">Esc:</span> deselect all topics & synapses</div>
</div> </div>
<div id="csSearch"> <div id="csSearch">
<div class="csItem"><span class="csTitle">Ctrl + /:</span> open search prompt</div> <div class="csItem"><span class="csTitle">Open 'Search' prompt:</span> Ctrl + /</div>
<div class="csItem"><span class="csTitle">Esc:</span> close search prompt</div> <div class="csItem"><span class="csTitle">Close 'Search' prompt:</span> Esc</div>
<div class="csItem"><span class="csTitle">Type into the search prompt:</span> search for topics, maps, & mappers</div>
<div class="csItem"><span class="csTitle">Click on search result:</span> open in new tab</div>
<% if controller_name == "maps" && action_name == "show" %> <% if controller_name == "maps" && action_name == "show" %>
<div class="csItem"><span class="csTitle">Click "+" on a topic result:</span> add to current map</div> <div class="csItem"><span class="csTitle">Add to current Map:</span> Click "+" on a topic result</div>
<% end %> <% end %>
<div class="csItem"><span class="csTitle">Search by metacode:</span> type "[name of metacode]:", then your search query. i.e. idea:create...</div> <div class="csItem"><span class="csTitle">Search by metacode:</span> type "[name of metacode]:", then your search query. i.e. idea:create...</div>
<div class="csItem"><span class="csTitle">Search for map:</span> type "map:", then your search query. i.e. map:exploring...</div> <div class="csItem"><span class="csTitle">Search for map:</span> type "map:", then your search query. i.e. map:exploring...</div>

120
metacode_backgrounds.css
View file

@ -1,120 +0,0 @@
.mbgAction {
background-color: #bd6c85 !important;
}
.mbgActivity {
background-color: #6ebf65 !important;
}
.mbgArgument {
background-color: #7FAEFD !important;
}
.mbgBizarre {
background-color: #bdb25e !important;
}
.mbgCatalyst {
background-color: #EF8964 !important;
}
.mbgClosed {
background-color: #ABB49F !important;
}
.mbgCon {
background-color: #CF7C74 !important;
}
.mbgDecision {
background-color: #cca866 !important;
}
.mbgExample {
background-color: #598559 !important;
}
.mbgExperience {
background-color: #BE995F !important;
}
.mbgForesight {
background-color: #b0b0b0 !important;
}
.mbgFutureDev {
background-color: #25A17F !important;
}
.mbgGoodPractice {
background-color: #BD9E86 !important;
}
.mbgGroup {
background-color: #7076BC !important;
}
.mbgIdea {
background-color: #c4bc5e !important;
}
.mbgImplication {
background-color: #83DECA !important;
}
.mbgInsight {
background-color: #B074AD !important;
}
.mbgIntention {
background-color: #baeaff !important;
}
.mbgKnowledge {
background-color: #60acf7 !important;
}
.mbgList {
background-color: #B7A499 !important;
}
.mbgLocation {
background-color: #abd9a7 !important;
}
.mbgMovieMap {
background-color: #a5a0de !important;
}
.mbgNote {
background-color: #a389a1 !important;
}
.mbgOpenIssue {
background-color: #9bbf71 !important;
}
.mbgOpinion {
background-color: #54a19d !important;
}
.mbgOpportunity {
background-color: #889F64 !important;
}
.mbgPerson {
background-color: #de925f !important;
}
.mbgPlatform {
background-color: #21C8FE !important;
}
.mbgPro {
background-color: #89b879 !important;
}
.mbgProblem {
background-color: #99cfc4 !important;
}
.mbgQuestion {
background-color: #709899 !important;
}
.mbgReference {
background-color: #A7A7A7 !important;
}
.mbgRequirement {
background-color: #d2a7d4 !important;
}
.mbgResearch {
background-color: #CD8E89 !important;
}
.mbgResource {
background-color: #c98c63 !important;
}
.mbgRole {
background-color: #a8595d !important;
}
.mbgTask {
background-color: #2f89ba !important;
}
.mbgTool {
background-color: #828282 !important;
}
.mbgTrajectory {
background-color: #b3953d !important;
}
.mbgWildcard {
background-color: #73c7de !important;
}

21
public/404.html
View file

@ -54,12 +54,17 @@
padding-top: 150px; padding-top: 150px;
} }
.picture { .picture {
width: 500px; width: 450px;
height: 450px;
border: 10px solid #424242;
border-radius: 225px;
-webkit-border-radius: 225px;
-moz-border-radius: 225px;
background: url(/assets/monkeyselfie.jpg) no-repeat;
float: left; float: left;
} background-position:50% 20%;
background-size: 100%;
.picture img { margin-top: 162px;
width: 500px;
} }
.wrapper { .wrapper {
@ -68,10 +73,11 @@
} }
.button { .button {
display: inline-block; display: block;
width: 220px; width: 220px;
height: 14px; height: 14px;
padding: 16px 0; padding: 16px 0;
margin-bottom: 16px;
text-align: center; text-align: center;
border-radius: 2px; border-radius: 2px;
font-size: 14px; font-size: 14px;
@ -93,7 +99,7 @@
.exploreFeaturedCTA { .exploreFeaturedCTA {
background-color: #a354cd; background-color: #a354cd;
margin-right: 16px; margin-bottom: 16px;
} }
.exploreFeaturedCTA:hover { .exploreFeaturedCTA:hover {
@ -117,7 +123,6 @@
</div> </div>
<div class="picture"> <div class="picture">
<img src="/assets/monkeyselfie.jpg"/>
</div> </div>
</div> </div>
</body> </body>

41
test/fixtures/metacodes.yml vendored
View file

@ -12,155 +12,194 @@ one:
two: two:
name: Activity name: Activity
icon: /assets/icons/activity.png icon: /assets/icons/activity.png
color: #6ebf65
three: three:
name: Bizarre name: Bizarre
icon: /assets/icons/bizarre.png icon: /assets/icons/bizarre.png
color: #BDB25E
four: four:
name: Catalyst name: Catalyst
icon: /assets/icons/catalyst.png icon: /assets/icons/catalyst.png
color: #EF8964
five: five:
name: Closed name: Closed
icon: /assets/icons/closed.png icon: /assets/icons/closed.png
color: #ABB49F
six: six:
name: Experience name: Experience
icon: /assets/icons/experience.png icon: /assets/icons/experience.png
color: #BE995F
seven: seven:
name: Future Dev name: Future Dev
icon: /assets/icons/futuredev.png icon: /assets/icons/futuredev.png
color: #25A17F
eight: eight:
name: Group name: Group
icon: /assets/icons/group.png icon: /assets/icons/group.png
color: #7076BC
nine: nine:
name: Idea name: Idea
icon: /assets/icons/idea.png icon: /assets/icons/idea.png
color: #C4BC5E
ten: ten:
name: Implication name: Implication
icon: /assets/icons/implication.png icon: /assets/icons/implication.png
color: #83DECA
eleven: eleven:
name: Insight name: Insight
icon: /assets/icons/insight.png icon: /assets/icons/insight.png
color: #B074AD
twelve: twelve:
name: Intention name: Intention
icon: /assets/icons/intention.png icon: /assets/icons/intention.png
color: #BAEAFF
thirteen: thirteen:
name: Knowledge name: Knowledge
icon: /assets/icons/knowledge.png icon: /assets/icons/knowledge.png
color: #60ACF7
fourteen: fourteen:
name: Location name: Location
icon: /assets/icons/location.png icon: /assets/icons/location.png
color: #ABD9A7
fifteen: fifteen:
name: Open Issue name: Open Issue
icon: /assets/icons/openissue.png icon: /assets/icons/openissue.png
color: #9BBF71
sixteen: sixteen:
name: Opinion name: Opinion
icon: /assets/icons/opinion.png icon: /assets/icons/opinion.png
color: #54A19D
seventeen: seventeen:
name: Opportunity name: Opportunity
icon: /assets/icons/opportunity.png icon: /assets/icons/opportunity.png
color: #889F64
eighteen: eighteen:
name: Person name: Person
icon: /assets/icons/person.png icon: /assets/icons/person.png
color: #DE925F
nineteen: nineteen:
name: Platform name: Platform
icon: /assets/icons/platform.png icon: /assets/icons/platform.png
color: #21C8FE
twenty: twenty:
name: Problem name: Problem
icon: /assets/icons/problem.png icon: /assets/icons/problem.png
color: #99CFC4
twenty-one: twenty-one:
name: Question name: Question
icon: /assets/icons/question.png icon: /assets/icons/question.png
color: #709899
twenty-two: twenty-two:
name: Reference name: Reference
icon: /assets/icons/reference.png icon: /assets/icons/reference.png
color: #A7A7A7
twenty-three: twenty-three:
name: Requirement name: Requirement
icon: /assets/icons/requirement.png icon: /assets/icons/requirement.png
color: #D2A7D4
twenty-four: twenty-four:
name: Resource name: Resource
icon: /assets/icons/resource.png icon: /assets/icons/resource.png
color: #C98C63
twenty-five: twenty-five:
name: Role name: Role
icon: /assets/icons/role.png icon: /assets/icons/role.png
color: #A8595D
twenty-six: twenty-six:
name: Task name: Task
icon: /assets/icons/task.png icon: /assets/icons/task.png
color: #2F89BA
twenty-seven: twenty-seven:
name: Tool name: Tool
icon: /assets/icons/tool.png icon: /assets/icons/tool.png
color: #828282
twenty-eight: twenty-eight:
name: Trajectory name: Trajectory
icon: /assets/icons/trajectory.png icon: /assets/icons/trajectory.png
color: #B3953D
twenty-nine: twenty-nine:
name: Argument name: Argument
icon: /assets/icons/argument.png icon: /assets/icons/argument.png
color: #7FAEFD
thirty: thirty:
name: Con name: Con
icon: /assets/icons/con_icon.png icon: /assets/icons/con_icon.png
color: #CF7C74
thirty-one: thirty-one:
name: Decision name: Decision
icon: /assets/icons/decision.png icon: /assets/icons/decision.png
color: #CCA866
thirty-two: thirty-two:
name: Example name: Example
icon: /assets/icons/example.png icon: /assets/icons/example.png
color: #598559
thirty-three: thirty-three:
name: Foresight name: Foresight
icon: /assets/icons/foresight.png icon: /assets/icons/foresight.png
color: #B0B0B0
thirty-four: thirty-four:
name: Good Practice name: Good Practice
icon: /assets/icons/goodpractice.png icon: /assets/icons/goodpractice.png
color: #BD9E86
thirty-five: thirty-five:
name: List name: List
icon: /assets/icons/list.png icon: /assets/icons/list.png
color: #B7A499
thirty-six: thirty-six:
name: Movie Map name: Movie Map
icon: /assets/icons/moviemap.png icon: /assets/icons/moviemap.png
color: #A5A0DE
thirty-seven: thirty-seven:
name: Note name: Note
icon: /assets/icons/note.png icon: /assets/icons/note.png
color: #A389A1
thirty-eight: thirty-eight:
name: Pro name: Pro
icon: /assets/icons/pro.png icon: /assets/icons/pro.png
color: #89B879
thirty-nine: thirty-nine:
name: Research name: Research
icon: /assets/icons/research.png icon: /assets/icons/research.png
color: #CD8E89
forty: forty:
name: Wildcard name: Wildcard
icon: /assets/icons/wildcard.png icon: /assets/icons/wildcard.png
color: #73C7DE