diff --git a/src/olympia/files/tests/test_commands.py b/src/olympia/files/tests/test_commands.py
index 783d00b420..6b7703036a 100644
--- a/src/olympia/files/tests/test_commands.py
+++ b/src/olympia/files/tests/test_commands.py
@@ -31,7 +31,7 @@ class TestWebextExtractPermissions(UploadTest):
def setUp(self):
super(TestWebextExtractPermissions, self).setUp()
self.platform = amo.PLATFORM_ALL.id
- self.addon = Addon.objects.create(guid='guid@jetpack',
+ self.addon = Addon.objects.create(guid='guid@webext',
type=amo.ADDON_EXTENSION,
name='xxx')
self.version = Version.objects.create(addon=self.addon)
diff --git a/src/olympia/reviewers/models.py b/src/olympia/reviewers/models.py
index 286ef71a84..a08c050b70 100644
--- a/src/olympia/reviewers/models.py
+++ b/src/olympia/reviewers/models.py
@@ -43,7 +43,6 @@ VIEW_QUEUE_FLAGS = (
_('Needs Admin Content Review')),
('needs_admin_theme_review', 'needs-admin-theme-review',
_('Needs Admin Static Theme Review')),
- ('is_jetpack', 'jetpack', _('Jetpack Add-on')),
('is_restart_required', 'is_restart_required', _('Requires Restart')),
('pending_info_request', 'info', _('More Information Requested')),
('expired_info_request', 'expired-info', _('Expired Information Request')),
@@ -112,7 +111,6 @@ class ViewQueue(RawSQLModel):
needs_admin_content_review = models.NullBooleanField()
needs_admin_theme_review = models.NullBooleanField()
is_restart_required = models.BooleanField()
- is_jetpack = models.BooleanField()
source = models.CharField(max_length=100)
is_webextension = models.BooleanField()
latest_version = models.CharField(max_length=255)
@@ -142,7 +140,6 @@ class ViewQueue(RawSQLModel):
('expired_info_request', (
'TIMEDIFF(addons_addonreviewerflags.pending_info_request,'
'NOW()) < 0')),
- ('is_jetpack', 'MAX(files.jetpack_version IS NOT NULL)'),
('is_restart_required', 'MAX(files.is_restart_required)'),
('source', 'versions.source'),
('is_webextension', 'MAX(files.is_webextension)'),
diff --git a/src/olympia/reviewers/tests/test_models.py b/src/olympia/reviewers/tests/test_models.py
index 1e59a515a6..3bb6aec189 100644
--- a/src/olympia/reviewers/tests/test_models.py
+++ b/src/olympia/reviewers/tests/test_models.py
@@ -136,13 +136,6 @@ class TestPendingQueue(TestQueue):
queue = self.Queue.objects.get()
assert queue.flags == [('info', 'More Information Requested')]
- def test_flags_jetpack(self):
- self.new_addon().find_latest_version(self.channel).all_files[0].update(
- jetpack_version='1.8')
-
- queue = self.Queue.objects.get()
- assert queue.flags == [('jetpack', 'Jetpack Add-on')]
-
def test_flags_is_restart_required(self):
self.new_addon().find_latest_version(self.channel).all_files[0].update(
is_restart_required=True)
diff --git a/src/olympia/reviewers/tests/test_views.py b/src/olympia/reviewers/tests/test_views.py
index a007e2f248..b84f498775 100644
--- a/src/olympia/reviewers/tests/test_views.py
+++ b/src/olympia/reviewers/tests/test_views.py
@@ -1227,21 +1227,6 @@ class TestQueueBasics(QueueTest):
assert response.status_code == 200
assert pq(response.content)('th.ordered a').text() == text
- def test_flags_jetpack(self):
- addon = addon_factory(
- status=amo.STATUS_NOMINATED, name='Jetpack',
- version_kw={'version': '0.1'},
- file_kw={'status': amo.STATUS_AWAITING_REVIEW,
- 'jetpack_version': 1.2})
-
- r = self.client.get(reverse('reviewers.queue_nominated'))
-
- rows = pq(r.content)('#addon-queue tr.addon-row')
- assert rows.length == 1
- assert rows.attr('data-addon') == str(addon.id)
- assert rows.find('td').eq(1).text() == 'Jetpack 0.1'
- assert rows.find('.ed-sprite-jetpack').length == 1
-
def test_flags_is_restart_required(self):
addon = addon_factory(
status=amo.STATUS_NOMINATED, name='Some Add-on',
@@ -1255,7 +1240,6 @@ class TestQueueBasics(QueueTest):
assert rows.length == 1
assert rows.attr('data-addon') == str(addon.id)
assert rows.find('td').eq(1).text() == 'Some Add-on 0.1'
- assert rows.find('.ed-sprite-jetpack').length == 0
assert rows.find('.ed-sprite-is_restart_required').length == 1
def test_flags_is_restart_required_false(self):
@@ -1271,7 +1255,6 @@ class TestQueueBasics(QueueTest):
assert rows.length == 1
assert rows.attr('data-addon') == str(addon.id)
assert rows.find('td').eq(1).text() == 'Restartless 0.1'
- assert rows.find('.ed-sprite-jetpack').length == 0
assert rows.find('.ed-sprite-is_restart_required').length == 0
def test_tabnav_permissions(self):
diff --git a/src/olympia/versions/models.py b/src/olympia/versions/models.py
index 282efb8465..41632a0cd1 100644
--- a/src/olympia/versions/models.py
+++ b/src/olympia/versions/models.py
@@ -502,10 +502,6 @@ class Version(OnChangeMixin, ModelBase):
return not bool([f for f in self.all_files if f.status not in
amo.UNREVIEWED_FILE_STATUSES])
- @property
- def is_jetpack(self):
- return all(f.jetpack_version for f in self.all_files)
-
@property
def sources_provided(self):
return bool(self.source)
diff --git a/static/css/impala/developers.less b/static/css/impala/developers.less
index deb1ea5068..fe0f00c748 100644
--- a/static/css/impala/developers.less
+++ b/static/css/impala/developers.less
@@ -83,90 +83,6 @@
line-height: 1.3em;
}
-#jetpack-overlay {
- background-color: rgba(0, 0, 0, 0.6);
- height: 100%;
- left: 0;
- position: fixed;
- top: 0;
- width: 100%;
- z-index: 1000;
- text-align: center;
-
- video {
- .border-box();
- max-height: 100%;
- padding: 1em;
- width: 100%;
- }
-}
-
-#jetpack {
- ul {
- color: #777;
- font-size: 14px;
- list-style: disc;
- padding-bottom: 1em;
- list-style-position: inside;
-
- li {
- padding-bottom: 5px;
- }
- }
-
- h2.section {
- font-family: Georgia;
- font-size: 25px;
- font-style: italic;
- margin-bottom: 0.5em;
- }
- p {
- .p-light;
- margin-bottom: 1em;
- }
- .island p {
- font-size: 14px;
- }
- h2 a {
- font-weight: bold;
- }
- .cols-light {
- div {
- padding: 0 2em;
- margin: 2em 0;
- border-left: 2px dotted #C6E1FF;
-
- &:first-child {
- border-left: 0 none;
- }
- h3 {
- color: #555;
- font-weight: bold;
- font-size: 1.3em;
- margin-bottom: 0.5em;
- }
- p {
- font-size: 1em;
- }
- }
- }
- .jetpack-builder, .jetpack-sdk {
- padding: 1em 0 1em 100px;
- position: relative;
-
- img {
- position: absolute;
- top: 10px;
- left: 5px;
- }
- }
- .jetpack_footer {
- color: #555;
- margin-top: 1em;
- text-align: center;
- }
-}
-
.html-rtl #devhub-promo {
overflow: hidden;
diff --git a/static/css/zamboni/files.css b/static/css/zamboni/files.css
index f0a39f51dc..b02cd3fc55 100644
--- a/static/css/zamboni/files.css
+++ b/static/css/zamboni/files.css
@@ -123,7 +123,6 @@
.collapsed-files .command,
.collapsed-files #toggle-known-container,
-.collapsed-files #jetpack-version,
.collapsed-files #tab-stops-container {
display: none !important;
}
@@ -632,11 +631,6 @@ a.selected > span {
margin-top: .3em;
}
-#jetpack-version {
- margin: .5em 0;
-}
-
-
option.status-public {
font-weight: bold;
}
diff --git a/static/css/zamboni/reviewers.less b/static/css/zamboni/reviewers.less
index 6c4922d70c..18ee2d8e2f 100644
--- a/static/css/zamboni/reviewers.less
+++ b/static/css/zamboni/reviewers.less
@@ -24,7 +24,6 @@
.ed-sprite-seamonkey { background-position: 0 -32px; }
.ed-sprite-android { background-position: 0 -48px; }
.ed-sprite-mobile { background-position: 0 -64px; }
-.ed-sprite-jetpack { background-position: 0 -80px; }
.ed-sprite-is_restart_required { background-position: 0 -96px; }
.ed-sprite-notes { background-position: 0 -112px; }
.ed-sprite-needs-admin-content-review { background-position: 0 -128px; }
diff --git a/static/js/zamboni/devhub.js b/static/js/zamboni/devhub.js
index a0d704e482..8b3fd789fb 100644
--- a/static/js/zamboni/devhub.js
+++ b/static/js/zamboni/devhub.js
@@ -59,41 +59,6 @@ $(document).ready(function() {
$uploadAddon.addonUploader(opt);
}
- // Jetpack
- if($('#jetpack').exists()) {
- $('a[rel="video-lightbox"]').click(_pd(function() {
- var $this = $(this),
- text = gettext('Your browser does not support the video tag'),
- $overlay = $('
', {id: 'jetpack-overlay'}),
- $video = $('