summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormenthol2013-07-24 10:19:06 (GMT)
committer Jonathan Sacksick2013-07-24 15:10:42 (GMT)
commit8854f2950d828005581289282789e03550616868 (patch)
tree795c9c6d3559e674db2f389c683662a8725849b4
parentc1e9d6c5b4d3f74035e16c4f2570f04804c4d665 (diff)
Remove Jirafe.
Change-Id: If1a295537be997386859fe1c6fbe17cc894e2b1b Reviewed-on: https://code.drupalcommerce.org/723 Tested-by: JenkinsCG <jenkins@drupalcommerce.org> Reviewed-by: Jonathan Sacksick <jonathan.sacksick@gmail.com>
-rw-r--r--commerce_kickstart.install9
-rwxr-xr-xdrupal-org.make2
-rw-r--r--modules/commerce_kickstart/commerce_kickstart_dfp/commerce_kickstart_dfp.module8
-rw-r--r--modules/commerce_kickstart/commerce_kickstart_dfp/theme/commerce_kickstart_dfp.css9
-rw-r--r--modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.module24
-rw-r--r--themes/commerce_kickstart_admin/css/commerce_kickstart_admin.css5
-rw-r--r--themes/commerce_kickstart_admin/scss/commerce_kickstart_admin.scss4
7 files changed, 9 insertions, 52 deletions
diff --git a/commerce_kickstart.install b/commerce_kickstart.install
index 356e932..2688d84 100644
--- a/commerce_kickstart.install
+++ b/commerce_kickstart.install
@@ -1135,3 +1135,12 @@ function commerce_kickstart_update_7216() {
function commerce_kickstart_update_7217() {
module_enable(array('inline_conditions'));
}
+
+/**
+ * Remove jirafe.
+ */
+function commerce_kickstart_update_7218() {
+ _commerce_kickstart_disable_modules(array('jirafe'));
+ variable_del('jirafe_config');
+ variable_del('jirafe_create_account_link');
+}
diff --git a/drupal-org.make b/drupal-org.make
index 47bf383..6cac170 100755
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -156,8 +156,6 @@ projects[migrate_extras][subdir] = "contrib"
projects[migrate_extras][patch][] = "http://drupal.org/files/migrate_extras-fix-destid2-array-1951904-4.patch"
projects[date][version] = 2.6
projects[date][subdir] = "contrib"
-projects[jirafe][version] = 1.0-rc2
-projects[jirafe][subdir] = "contrib"
projects[yottaa][version] = 1.1
projects[yottaa][subdir] = "contrib"
projects[menu_attributes][version] = 1.0-rc2
diff --git a/modules/commerce_kickstart/commerce_kickstart_dfp/commerce_kickstart_dfp.module b/modules/commerce_kickstart/commerce_kickstart_dfp/commerce_kickstart_dfp.module
index 4496cf0..3c9d65b 100644
--- a/modules/commerce_kickstart/commerce_kickstart_dfp/commerce_kickstart_dfp.module
+++ b/modules/commerce_kickstart/commerce_kickstart_dfp/commerce_kickstart_dfp.module
@@ -49,14 +49,6 @@ function commerce_kickstart_dfp_commerce_kickstart_dfp_paths() {
'dfp_class' => array('dfp-orders'),
'dfp_unit' => 'Kickstart_Orders_Admin',
),
- 'admin/commerce/jirafe' => array(
- 'dfp_selector' => '.page-admin-commerce-jirafe #block-system-main .content:not(:has(#jirafe))',
- 'dfp_class' => array('dfp-jirafe'),
- 'dfp_position' => 'after',
- 'dfp_height' => 540,
- 'dfp_width' => 960,
- 'dfp_unit' => 'Kickstart_Jirafe',
- ),
'admin/commerce/customer-profiles' => array(
'dfp_selector' => '.page-admin-commerce-customer-profiles #title-wrapper',
'dfp_class' => array('dfp-customer-profiles'),
diff --git a/modules/commerce_kickstart/commerce_kickstart_dfp/theme/commerce_kickstart_dfp.css b/modules/commerce_kickstart/commerce_kickstart_dfp/theme/commerce_kickstart_dfp.css
index 3e83350..168c823 100644
--- a/modules/commerce_kickstart/commerce_kickstart_dfp/theme/commerce_kickstart_dfp.css
+++ b/modules/commerce_kickstart/commerce_kickstart_dfp/theme/commerce_kickstart_dfp.css
@@ -53,12 +53,3 @@
height: 60px;
width: 468px;
}
-
-.dfp-jirafe {
- height: 540px;
- width: 960px;
-}
-.page-admin-commerce-jirafe #dfp-wrapper {
- float: none;
- padding-top: 20px;
-}
diff --git a/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.module b/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.module
index 1286433..8432f33 100644
--- a/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.module
+++ b/modules/commerce_kickstart/commerce_kickstart_menus/commerce_kickstart_menus.module
@@ -383,7 +383,6 @@ function commerce_kickstart_menus_menu_alter(&$items) {
'admin/commerce/config/line-items',
'admin/commerce/config/order',
'admin/commerce/config/product-pricing',
- 'admin/commerce/config/jirafe',
'admin/commerce/config/commerce_search_api',
'admin/commerce/config/demo',
);
@@ -408,15 +407,6 @@ function commerce_kickstart_menus_menu_alter(&$items) {
}
$items['admin/reports']['title'] = 'Site reports';
}
- if (isset($items['admin/commerce/jirafe'])) {
- $items['admin/commerce/jirafe']['title'] = 'Analytics';
- $items['admin/commerce/jirafe']['parent'] = 'admin';
- $items['admin/commerce/jirafe']['weight'] = 49;
- $items['admin/commerce/jirafe']['options'] = array(
- 'toolbar_break' => TRUE,
- 'toolbar_css' => 'reports',
- );
- }
// Lingotek alteration.
if (isset($items['admin/settings/lingotek'])) {
$items['admin/settings/lingotek']['options'] = array(
@@ -436,20 +426,6 @@ function commerce_kickstart_menus_menu_alter(&$items) {
}
/**
- * Implements hook_init().
- *
- * Alter the page title on the Jirafe dashboard page.
- */
-function commerce_kickstart_menus_init() {
- $item = menu_get_item();
- if ($item['path'] != 'admin/commerce/jirafe') {
- return;
- }
-
- drupal_set_title(t('Commerce Guys Dashboard by Jirafe'));
-}
-
-/**
* Implements hook_menu_link_alter().
*
* Apply some link configuration stored in the router during the menu
diff --git a/themes/commerce_kickstart_admin/css/commerce_kickstart_admin.css b/themes/commerce_kickstart_admin/css/commerce_kickstart_admin.css
index 37c73fc..322b76d 100644
--- a/themes/commerce_kickstart_admin/css/commerce_kickstart_admin.css
+++ b/themes/commerce_kickstart_admin/css/commerce_kickstart_admin.css
@@ -320,11 +320,6 @@ html.js #-commerce-kickstart-help-store fieldset.collapsible {
min-height: 55px;
}
-/* Reports Jirafe */
-.page-admin-commerce-jirafe #overlay #overlay-content #page {
- padding: 0 0 30px;
-}
-
/* Customer Profiles Fix */
.view-commerce-customer-profiles .views-exposed-form #edit-name-wrapper {
width: 520px;
diff --git a/themes/commerce_kickstart_admin/scss/commerce_kickstart_admin.scss b/themes/commerce_kickstart_admin/scss/commerce_kickstart_admin.scss
index 2b5a944..d9c04a0 100644
--- a/themes/commerce_kickstart_admin/scss/commerce_kickstart_admin.scss
+++ b/themes/commerce_kickstart_admin/scss/commerce_kickstart_admin.scss
@@ -292,10 +292,6 @@ body.installing-additional-functionality ol.task-list {
html.js #-commerce-kickstart-help-store fieldset.collapsible {
min-height: 55px;
}
-/* Reports Jirafe */
-.page-admin-commerce-jirafe #overlay #overlay-content #page {
- padding: 0 0 30px;
-}
/* Customer Profiles Fix */
.view-commerce-customer-profiles .views-exposed-form #edit-name-wrapper {
width: 520px;