Skip to content
Browse files

Remove actionitems popup

  • Loading branch information...
1 parent f5708ec commit 3358f2c10968eebfb9b4fd3720a70b5307d50d35 @nathansobo committed
View
6 app/assets/javascripts/views/layout.js
@@ -43,7 +43,6 @@ _.constructor("Views.Layout", View.Template, {
subview("disconnectDialog", Views.Lightboxes.DisconnectDialog);
subview("inviteBox", Views.Lightboxes.InviteBox);
subview("addOrganizationForm", Views.Lightboxes.AddOrganizationForm);
- subview("actionitemsPopup", Views.Lightboxes.ActionitemsPopup);
subview("fullScreenConsensus", Views.Lightboxes.FullScreenConsensus);
subview("fullScreenAnswer", Views.Lightboxes.FullScreenAnswer);
@@ -209,11 +208,6 @@ _.constructor("Views.Layout", View.Template, {
this.organizationNameSeparator.hide();
this.organizationName.hide();
} else {
- if (!Application.currentUser().sawActionitemsPopup()) {
- Application.currentUser().update({sawActionitemsPopup: true});
- this.actionitemsPopup.show();
- }
-
this.organizationNameSeparator.show();
this.organizationName.show();
this.organizationName.bindText(organization, 'name');
View
19 app/assets/javascripts/views/lightboxes/actionitems_popup.js
@@ -1,19 +0,0 @@
-// Copyright (c) 2010-2011, Nathan Sobo and Max Brunsfeld. This file is
-// licensed under the Affero General Public License version 3 or later. See
-// the COPYRIGHT file.
-
-_.constructor('Views.Lightboxes.ActionitemsPopup', Views.Lightboxes.Lightbox, {
- id: "actionitems-popup",
-
- lightboxContent: function() { with(this.builder) {
- h1(function() {
- raw(("Using Hyperarchy for meetings? Please switch to our new product, <em>Action Items.</em>"))
- });
- div("Action Items is designed for meetings, and we'll be building all features for private teams there. We've already transferred your accounts and data.");
-
- a({'class': "button", href: "https://actionitems.us"}, "Switch to Action Items").click(function() {
- window.location = "https://actionitems.us";
- return false;
- });
- }}
-});
View
10 db/migrate/062_add_saw_actionitems_popup_to_users.rb
@@ -0,0 +1,10 @@
+Sequel.migration do
+ up do
+ drop_column :users, :saw_actionitems_popup
+ end
+
+ down do
+ add_column :users, :saw_actionitems_popup, TrueClass, :default => false
+ end
+end
+

0 comments on commit 3358f2c

Please sign in to comment.
Something went wrong with that request. Please try again.