From 1c49a805bdfd1cf21b0bbd187973bf03f3901757 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 7 Feb 2014 18:13:51 -0500 Subject: [PATCH] removed more old files, styled request invite page --- app/assets/stylesheets/application.css | 16 +++++ app/controllers/main_controller.rb | 9 --- app/views/layouts/application.html.erb | 2 +- app/views/main/allmaps.html.erb | 17 ----- app/views/main/faq.html.erb | 71 ------------------- app/views/main/invite.html.erb | 14 ---- app/views/main/metamap.html.erb | 32 --------- app/views/main/requestinvite.html.erb | 8 +-- app/views/main/search.js.erb | 95 -------------------------- config/routes.rb | 1 - 10 files changed, 18 insertions(+), 247 deletions(-) delete mode 100644 app/views/main/allmaps.html.erb delete mode 100644 app/views/main/faq.html.erb delete mode 100644 app/views/main/invite.html.erb delete mode 100644 app/views/main/metamap.html.erb delete mode 100644 app/views/main/search.js.erb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5dd81d74..1b795335 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1816,6 +1816,22 @@ cursor: pointer; background-image: url('/assets/MMCCicon_minimize_arrow.png') !important; } +/* request */ + +#wrapper .requestInvite { + width: 510px; + margin: -275px auto 0; + padding: 20px; + background: rgba(0,0,0,0.4); + color: white; + height: 510px; + overflow: hidden; + position: relative; + left: 130px; + top: 50%; + border-radius: 5px; +} + /* --- styling the logo button ---*/ /*.footer { diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index e4e1c834..c08f72eb 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -21,15 +21,6 @@ class MainController < ApplicationController end - # /invite - def invite - @user = current_user - - respond_to do |format| - format.html { respond_with(@user) } - end - end - ### SEARCHING ### # get /search/topics?term=SOMETERM diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7a84e7c1..30116436 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -35,7 +35,7 @@ <%= csrf_meta_tags %> -" > +" > <% if notice %>

<%= notice %>

diff --git a/app/views/main/allmaps.html.erb b/app/views/main/allmaps.html.erb deleted file mode 100644 index 05a60a18..00000000 --- a/app/views/main/allmaps.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -<%# - # @file - # View rendering each map as a card, or empty message. Shows all regardless - # of authentication. - # TODO: What url is this located at? - #%> -

All Maps

- -
- <% @maps.each do |map| %> - <%= render map %> - <% end %> - <% if @maps.empty? %> -


Shucks, there are no maps.

- <% end %> -

-
diff --git a/app/views/main/faq.html.erb b/app/views/main/faq.html.erb deleted file mode 100644 index 1fe6acc4..00000000 --- a/app/views/main/faq.html.erb +++ /dev/null @@ -1,71 +0,0 @@ -<%# - # @file - # Located at / - # Shows 3 most recently created topics, synapses, and maps. - #%> - -<% content_for :title, "FAQ | Metamaps" %> - -

- FAQ -

- -
- -
Who may use Metamaps.cc?
-

You! We are currently in "beta" mode, meaning that the application is undergoing continuous testing and refinement. However, we welcome participants in this trial process with the understanding that things are evolving, and may hold a few surprises! Request an invite if you'd like to explore and build with us. Feedback is always welcome.

- -
What does it take to learn to Metamap?
-

While the interface may not seem familiar at first, we've designed it to be both intuitive and empowering after a bit of practice. There are only a handful of basic functions, like adding topics and drawing "synapse" connections, that are needed get your creative process started. A handy cheat sheet is available on the canvas for reference while mapping, and we have an online manual and tutorials to grasp more advanced functionality. The best way to learn is to start mapping, and to connect with other mappers in our online community.

- -
What is the platform being used for currently?
-

At a basic level, metamaps are great for laying out complex ideas and scenarios. We're seeing maps of design work, topical research, project management, and narrative storylines. Some users have been capturing live workshop event documentation, or organizing study groups. We're using it ourselves to organize collaboration and develop strategies for the project. Check out our Featured Maps! We'd love to see what else you can come up with.

- -
Who made this up? Why?
-

The Metamaps.cc project was launched as an emergent collaboration between artist Gavin Keech, architect Ishan Shapiro, and web developer Connor Turland over the years 2010-12, with input and inspiration from many other peers and projects. Its design draws from the fields of computational cognition, collective intelligence, and human-computer interaction. We continue to seek optimal and novel ways to connect people and ideas through visual information.

- -
How is MM different from other "mind mapping" apps?
-

First and foremost, metamaps bring people together into a shared knowledge environment. Topics and maps "in the commons" invite collaborative editing and shared insight. As new content and connections are made throughout the system, all users benefit from collective intelligence. Other distinguishing factors on the platform include a flexible visual categorization system via metacode icons, no built-in structural biases, and a powerful search tool to find content.

- -
Is this an open source project?
-

One of the core principles of our work is the enhancement of the pool of commons resources such as open source technology and shared knowledge. Our basic application framework is licensed as GPL open source on Github for anyone to build on, and this public platform is freely accessible online. Custom features and implementations may be added on to this framework under more restrictive licenses by the development team for partners and clients.

- -
How can I find out more about the project?
-

Reading here is a great first step. We also suggest browsing our blog, visiting the Google+ community, or getting in touch by submitting feedback through the site. We occasionally host online and in person meetups where you can interact with other mappers and see how people are using the platform. The story continues to unfold, and we'd be glad for you to take part.

- -
How can I participate, or support the project?
-

We welcome contributions in many forms. One of the easiest and best things you can do is to keep on mapping your ideas into the commons on the platform! If you're a developer interested in advancing the technology, please join on Github. Designers and others with professional skills should get in touch about opportunities for freelance collaboration through our innovative Open Value Network organizational structure for business development opportunities. Financial contributions are greatly appreciated in support of our work, and can be made through ______

- -
Are you making money from it? Do you plan to?
-

To date, the Metamaps.cc project has been supported by volunteers and small grants or donations. We intend to establish an open collaborative environment to pursue revenue opportunities in an agile and equitable fashion by configuring products and services based on the open source Metamaps technology. Stay tuned for further info via our blog and social media, or get in touch if you'd like to join the team!

- -
I'd like to have a new / different feature. Where can I make suggestions and requests?
-

Thanks for giving it some thought. New features and functions are continually added to the platform as we seek to optimize the experience there for all users. If you find that something is calling out for addition or improvement, send us a note via feedback form or in the online community. The more detail and context you can provide, the better!

- -
I made a cool map...want to check it out?
-

Yes! Send us the link via feedback form or flag us on social media. We're always curious what mappers are able to do with the platform, and we'd love to pass great examples around so that others can see.

- -
Someone else changed my cool map (or favorite topic) without asking me...sad face :(
-

If your map / topic was set to Commons permission for editing, than any other logged-in user on the site will be able to make changes. We consider this a feature, not a bug, which encourages collaborative maps and an evolving collective knowledge garden. You can easily avoid unwanted changes by setting your permissions to Public, which others may still view and copy to another version if they wish. Courtesy, care, and the benefit of the doubt will go a long ways towards maintaining a happy, healthy, and productive communal atmosphere on Metamaps.cc

- -
How do I "_________" on metamaps?
-

Link to our cheatsheet stuff...and manual.

- -
- - \ No newline at end of file diff --git a/app/views/main/invite.html.erb b/app/views/main/invite.html.erb deleted file mode 100644 index 96473c65..00000000 --- a/app/views/main/invite.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -<%# - # @file - # TODO: Where is this file located? - # Page allowing users to invite others to Metamaps. - #%> - -<% content_for :title, "Invite | Metamaps" %> - -
-

Invite Others

-

You can invite others to the Metamaps platform. Just send them the link to

http://metamaps.cc/users/sign_up

and give them the access code shown below.

-
<%= @user.code %>
-

We invite you to be conscious as to who you invite to this platform, because much of the collaborative editing is based on trust. We want to cultivate a community here that is fun, wise, creative, and flourishing. Can you help us build a community like that?

-
diff --git a/app/views/main/metamap.html.erb b/app/views/main/metamap.html.erb deleted file mode 100644 index ef617257..00000000 --- a/app/views/main/metamap.html.erb +++ /dev/null @@ -1,32 +0,0 @@ -<%# - # @file - # TODO: Where is this file located? - # TODO: What does this file do? - # TODO: Is this code old or in use? - # I think it shows all topics, and is deprecated. -Devin - #%> -<% unless @topic.nil? %> -
-
-
-
-
-
-
-
- -<% end %> -<% if @topic.nil? %> -


Shucks, there is nothing in metamaps.

-<% end %> - -<% if authenticated? %> - <%= render :partial => 'topics/new' %> - <%= render :partial => 'synapses/new' %> -<% end %> - diff --git a/app/views/main/requestinvite.html.erb b/app/views/main/requestinvite.html.erb index 9e1ff6e9..4ebadf64 100644 --- a/app/views/main/requestinvite.html.erb +++ b/app/views/main/requestinvite.html.erb @@ -6,13 +6,7 @@ <% content_for :title, "Request Invite | Metamaps" %> - - - +

Request Invite diff --git a/app/views/main/search.js.erb b/app/views/main/search.js.erb deleted file mode 100644 index 2be2dcc4..00000000 --- a/app/views/main/search.js.erb +++ /dev/null @@ -1,95 +0,0 @@ -/* - * @file - * This javascript code is run when you execute a search query. - * From the "Find"/"Seek" tab on the console. - */ -$('.getTopicsInput').attr('value',''); - -var h = Mconsole.canvas.element.clientHeight / 2; -var w = Mconsole.canvas.element.clientWidth / 2; - -var myX = -w + 400; -var myY = -h + 100; -var even = true; - -<% @topics.each do |topic| %> - if ($.isEmptyObject(Mconsole.graph.nodes)) { - json = <%= topic.self_as_json.html_safe %>; - Mconsole.loadJSON(json); - var temp = Mconsole.graph.getNode('<%= topic.id %>'); - temp.setData('dim', 1, 'start'); - temp.setData('dim', 25, 'end'); - temp.setData('greenCircle',true); - temp.setData('whiteCircle',false); - temp.setPos(new $jit.Complex(myX, myY), 'current'); - temp.setPos(new $jit.Complex(myX, myY), 'start'); - temp.setPos(new $jit.Complex(myX, myY), 'end'); - Mconsole.fx.plotNode(temp, Mconsole.canvas); - Mconsole.labels.plotLabel(Mconsole.canvas, temp, Mconsole.config); - myX += 100; - even = !even; - } else { - var temp = Mconsole.graph.getNode('<%= topic.id %>'); - if (temp == undefined) { - var newnode = <%= topic.self_as_json.html_safe %>; - Mconsole.graph.addNode(newnode); - var temp = Mconsole.graph.getNode('<%= topic.id %>'); - temp.setData('dim', 1, 'start'); - temp.setData('dim', 25, 'end'); - temp.setData('greenCircle',true); - temp.setData('whiteCircle',false); - if (myX > (w-100)) { - myX = -w + 400; - myY += 200; - even = true; - } - if (even) { - temp.setPos(new $jit.Complex(myX, myY), 'current'); - temp.setPos(new $jit.Complex(myX, myY), 'start'); - temp.setPos(new $jit.Complex(myX, myY), 'end'); - } - else if (!even) { - temp.setPos(new $jit.Complex(myX, myY+100), 'current'); - temp.setPos(new $jit.Complex(myX, myY+100), 'start'); - temp.setPos(new $jit.Complex(myX, myY+100), 'end'); - } - Mconsole.fx.plotNode(temp, Mconsole.canvas); - Mconsole.labels.plotLabel(Mconsole.canvas, temp, Mconsole.config); - myX += 100; - even = !even; - } - } -<% end %> - -<% @synapses.each do |synapse| %> - var temp1 = null, temp2 = null; - temp1 = Mconsole.graph.getNode(<%= synapse.topic1.id %>); - temp2 = Mconsole.graph.getNode(<%= synapse.topic2.id %>); - if (temp1 != undefined && temp2 != undefined) { - Mconsole.graph.addAdjacence(temp1, temp2, {}); - temp = Mconsole.graph.getAdjacence(temp1.id, temp2.id); - temp.setDataset('start', { - lineWidth: 0.4 - }); - temp.setDataset('end', { - lineWidth: 2 - }); - var d = new Array(<%= synapse.node1_id.to_s() %>, <%= synapse.node2_id.to_s() %>); - temp.setDataset('current', { - desc: '<%= synapse.desc %>', - showDesc: false, - category: '<%= synapse.category %>', - id: '<%= synapse.id %>', - userid: '<%= synapse.user.id %>', - username: '<%= synapse.user.name %>', - permission: '<%= synapse.permission %>' - }); - temp.setData('direction', d); - Mconsole.fx.plotLine(temp, Mconsole.canvas); - } -<% end %> - - Mconsole.fx.animate({ - modes: ['node-property:dim','edge-property:lineWidth'], - duration: 500 - }); diff --git a/config/routes.rb b/config/routes.rb index 255bec03..576bb113 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,6 @@ ISSAD::Application.routes.draw do root to: 'main#home', via: :get match 'request', to: 'main#requestinvite', via: :get, as: :request - match 'invite', to: 'main#invite', via: :get, as: :invite match 'paq', to: 'main#paq', via: :get, as: :paq match '/search/topics', to: 'main#searchtopics', via: :get, as: :searchtopics